[teklib-general] teklib: merge

[Franciska Schulze]

details:   http://hg.teklib.org/teklib/rev/89ca3599550e
changeset: 198:89ca3599550e
user:      Franciska Schulze <fschulze at neoscientists.org>
date:      Mon Jul 28 11:01:36 2008 +0000
description:
merge

diffs (truncated from 2106 to 100 lines):

diff -r 9c01d5093593 -r 89ca3599550e Makefile
--- a/Makefile	Mon May 19 12:30:42 2008 +0000
+++ b/Makefile	Mon Jul 28 11:01:36 2008 +0000
@@ -94,3 +94,8 @@ build/tmk_$(PLATFORM)_$(HOST)_$(COMPILER
 $(TEKLIB)/bin/ps2/tmkmf:
 	- at mkdir -p $(TEKLIB)/bin/ps2
 	$(CC) -I$(TEKLIB) -I$(TEKLIB)/src/hal $(TEKLIB)/build/tmkmf.c -pthread -ldl -lm -o $@
+
+###############################################################################
+
+kdiff:
+	-(a=$$(mktemp -du) && hg clone $$PWD $$a && kdiff3 $$a $$PWD; rm -rf $$a)
diff -r 9c01d5093593 -r 89ca3599550e src/display_dfb/display_dfb_api.c
--- a/src/display_dfb/display_dfb_api.c	Mon May 19 12:30:42 2008 +0000
+++ b/src/display_dfb/display_dfb_api.c	Mon Jul 28 11:01:36 2008 +0000
@@ -6,62 +6,8 @@
 
 #include "display_dfb_mod.h"
 
-/*****************************************************************************/
-
-static TBOOL
-check_backup(VISUAL *v, TINT tvcmd, TINT x, TINT y, TINT a, TINT b)
-{
-
-#if 0
-	if (v->backup_valid != -1)
-	{
-		switch (tvcmd)
-		{
-			case TVCMD_RECT:
-			case TVCMD_FRECT:
-			case TVCMD_TEXT:
-				if (v->oldmousex >= x && v->oldmousex <= x+a &&
-					v->oldmousey >= y && v->oldmousey <= y+b)
-					v->backup_valid = TFALSE;
-				break;
-			case TVCMD_LINE:
-				if (v->oldmousex >= TMIN(x,a) && v->oldmousex <= TMAX(x,a) &&
-					v->oldmousey >= TMIN(y,b) && v->oldmousey <= TMAX(y,b))
-					v->backup_valid = TFALSE;
-				break;
-			case TVCMD_CLEAR:
-					v->backup_valid = TFALSE;
-			default:
-				break;
-		}
-
-		if (v->backup_valid == TFALSE)
-		{
-			/* restore saved data */
-			v->primary->Blit(v->primary, v->backup, NULL, v->oldmousex, v->oldmousey);
-		}
-	}
-	return v->backup_valid;
-#endif
-	return TTRUE;
-}
-
-static TVOID
-update_backup(TMOD_DFB *mod, VISUAL *v)
-{
-#if 0
-	if (v->backup_valid == TFALSE || v->backup_valid == -1)
-	{
-		DFBRectangle rect = { v->mousex, v->mousey, mod->dfb_CursorWidth,
-								mod->dfb_CursorHeight };
-		v->backup->Blit(v->backup, v->primary, &rect, 0, 0);
-		v->backup_valid = TTRUE;
-		v->cursor_valid = TFALSE;
-	}
-#endif
-	//v->winsurface->Flip(v->winsurface, NULL, 0);
-
-}
+TBOOL getimsg(TMOD_DFB *mod, VISUAL *v, TIMSG **msgptr, TUINT type);
+TVOID genimsg(TMOD_DFB *mod, VISUAL *vold, VISUAL *vnew, TUINT type);
 
 /*****************************************************************************/
 
@@ -71,23 +17,16 @@ dfb_openvisual(TMOD_DFB *mod, struct TVR
 	TTAGITEM *tags = req->tvr_Op.OpenVisual.Tags;
 	TAPTR exec = TGetExecBase(mod);
 	VISUAL *v;
-	//DFBSurfaceDescription dsc;
 	DFBWindowDescription wdsc;
 
 	struct FontNode *fn;
-
-#if 0
-	if (!TISLISTEMPTY(&mod->dfb_vlist))
-	{
-		req->tvr_Op.OpenVisual.Instance = TNULL;
-		return;
-	}
-#endif
 
 	v = TExecAlloc0(exec, mod->dfb_MemMgr, sizeof(VISUAL));
 	req->tvr_Op.OpenVisual.Instance = v;
 	if (v == TNULL) return;