[teklib-general] teklib: RawFB driver: Added input thread, some cleanup; X11: Add...

Timm S. Mueller tmueller at neoscientists.org
Wed Dec 3 09:52:48 CET 2008


details:   http://hg.teklib.org/teklib/rev/26f2c2d9990d
changeset: 207:26f2c2d9990d
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Thu Nov 27 18:49:49 2008 +0100
description:
RawFB driver: Added input thread, some cleanup; X11: Added missing sanity
check during initialization

diffs (truncated from 491 to 100 lines):

diff -r a7ff2e7d888e -r 26f2c2d9990d src/display_rawfb/display_rawfb_api.c
--- a/src/display_rawfb/display_rawfb_api.c	Wed Nov 26 01:22:15 2008 +0100
+++ b/src/display_rawfb/display_rawfb_api.c	Thu Nov 27 18:49:49 2008 +0100
@@ -1,5 +1,6 @@
+
 /*
-**	teklib/src/display_rawfb/display_rawfb_api.c - RawFB Display driver
+**	teklib/src/display_rawfb/display_rawfb_api.c - Raw framebuffer driver
 **	Written by Franciska Schulze <fschulze at schulze-mueller.de>
 **	See copyright notice in teklib/COPYRIGHT
 */
@@ -43,9 +44,9 @@
 				{
 					struct FontNode *fn;
 
-					if (mod->subdevice)
+					if (mod->rawfb_SubDevice)
 					{
-						v->subreq->tvr_Req.io_Device = mod->subdevice;
+						v->subreq->tvr_Req.io_Device = mod->rawfb_SubDevice;
 						v->subreq->tvr_Req.io_Command = TVCMD_OPENVISUAL;
 						v->subreq->tvr_Req.io_ReplyPort = v->replyport;
 						v->subreq->tvr_Op.OpenVisual.Instance = TNULL;
@@ -64,9 +65,9 @@
 					TExecLock(mod->rawfb_ExecBase, mod->rawfb_Lock);
 
 					/* init default font */
-					fn = mod->rawfb_fm.deffont;
+					fn = mod->rawfb_FontManager.deffont;
 					v->curfont = fn;
-					mod->rawfb_fm.defref++;
+					mod->rawfb_FontManager.defref++;
 
 					/* register default font */
 					//TDBPRINTF(TDB_TRACE,("Add window: %p\n", v->window));
@@ -113,7 +114,7 @@
 	/* release window here */
 
 	TExecLock(mod->rawfb_ExecBase, mod->rawfb_Lock);
-	mod->rawfb_fm.defref--;
+	mod->rawfb_FontManager.defref--;
 	TExecUnlock(mod->rawfb_ExecBase, mod->rawfb_Lock);
 
 	if (v->subinst)
@@ -498,8 +499,7 @@
 {
 	struct attrdata *data = hook->thk_Data;
 	TTAGITEM *item = obj;
-	VISUAL *v = data->v;
-
+	/*VISUAL *v = data->v;*/
 	switch (item->tti_Tag)
 	{
 		default:
diff -r a7ff2e7d888e -r 26f2c2d9990d src/display_rawfb/display_rawfb_font.c
--- a/src/display_rawfb/display_rawfb_font.c	Wed Nov 26 01:22:15 2008 +0100
+++ b/src/display_rawfb/display_rawfb_font.c	Thu Nov 27 18:49:49 2008 +0100
@@ -1,5 +1,6 @@
+
 /*
-**	teklib/src/display_rawfb/display_rawfb_font.c - DirectFB Display driver
+**	teklib/src/display_rawfb/display_rawfb_font.c - Raw framebuffer driver
 **	Written by Franciska Schulze <fschulze at schulze-mueller.de>
 **	See copyright notice in teklib/COPYRIGHT
 */
@@ -390,7 +391,7 @@
 
 				/* append to the list of open fonts */
 				TDBPRINTF(TDB_WARN, ("O '%s' %dpx\n", fattr.fname, fattr.fpxsize));
-				TAddTail(&mod->rawfb_fm.openfonts, &fn->handle.thn_Node);
+				TAddTail(&mod->rawfb_FontManager.openfonts, &fn->handle.thn_Node);
 				font = (TAPTR)fn;
 			}
 			else
@@ -709,13 +710,13 @@
 	struct FontNode *fn = (struct FontNode *) font;
 	TAPTR exec = TGetExecBase(mod);
 
-	if (font == mod->rawfb_fm.deffont)
+	if (font == mod->rawfb_FontManager.deffont)
 	{
-		if (mod->rawfb_fm.defref)
+		if (mod->rawfb_FontManager.defref)
 		{
 			/* prevent freeing of default font if it's */
 			/* still referenced */
-			mod->rawfb_fm.defref--;
+			mod->rawfb_FontManager.defref--;
 			return;
 		}
 	}
diff -r a7ff2e7d888e -r 26f2c2d9990d src/display_rawfb/display_rawfb_mod.c
--- a/src/display_rawfb/display_rawfb_mod.c	Wed Nov 26 01:22:15 2008 +0100
+++ b/src/display_rawfb/display_rawfb_mod.c	Thu Nov 27 18:49:49 2008 +0100
@@ -1,5 +1,6 @@
+
 /*
-**	teklib/src/display_rawfb/display_rawfb_mod.c - DirectFB Display driver
+**	teklib/src/display_rawfb/display_rawfb_mod.c - Raw framebuffer driver
 **	Written by Franciska Schulze <fschulze at schulze-mueller.de>


More information about the teklib-general mailing list