[teklib-general] teklib: Changes merged in from tekUI

[Timm S. Mueller]

details:   http://hg.teklib.org/teklib/rev/ba451747ca32
changeset: 260:ba451747ca32
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Fri May 01 19:22:06 2009 +0200
description:
Changes merged in from tekUI

diffs (truncated from 193 to 100 lines):

diff -r 1423a3fa5a22 -r ba451747ca32 src/display_x11/build/tmkmakefile
--- a/src/display_x11/build/tmkmakefile	Tue Mar 24 11:13:56 2009 +0100
+++ b/src/display_x11/build/tmkmakefile	Fri May 01 19:22:06 2009 +0200
@@ -14,7 +14,6 @@
 
 	EXTRAMODLIBS = -L/usr/X11R6/lib -lX11 -lXext
 	EXTRADEFS = -D_XOPEN_SOURCE -DENABLE_XFT -I/usr/X11R6/include/ -I/usr/include/freetype2/ -I/usr/X11R6/include/freetype2/
-
 
 	[switch]
 		[case config="posix_linux_gcc_release"]
diff -r 1423a3fa5a22 -r ba451747ca32 src/display_x11/display_x11_api.c
--- a/src/display_x11/display_x11_api.c	Tue Mar 24 11:13:56 2009 +0100
+++ b/src/display_x11/display_x11_api.c	Fri May 01 19:22:06 2009 +0200
@@ -139,13 +139,11 @@
 		swa.event_mask = x11_seteventmask(mod, v,
 			(TUINT) TGetTag(tags, TVisual_EventMask, 0));
 
-		#if defined(NOCURSOR)
-		if (getenv("NOCURSOR"))
+		if (TGetTag(tags, TVisual_BlankCursor, TFALSE))
 		{
 			swa.cursor = mod->x11_NullCursor;
 			swa_mask |= CWCursor;
 		}
-		#endif
 
 		v->window = XCreateWindow(mod->x11_Display,
 			RootWindow(mod->x11_Display, mod->x11_Screen),
@@ -457,7 +455,7 @@
 	tri[2].y = (TINT16) array[5];
 
 	XFillPolygon(mod->x11_Display, v->window, v->gc, tri, 3,
-		Nonconvex, CoordModeOrigin);
+		Convex, CoordModeOrigin);
 
 	for (i = 3; i < num; i++)
 	{
@@ -472,7 +470,7 @@
 			setfgpen(mod, v, penarray[i]);
 
 		XFillPolygon(mod->x11_Display, v->window, v->gc, tri, 3,
-			Nonconvex, CoordModeOrigin);
+			Convex, CoordModeOrigin);
 	}
 }
 
@@ -504,7 +502,7 @@
 	tri[2].y = (TINT16) array[5];
 
 	XFillPolygon(mod->x11_Display, v->window, v->gc, tri, 3,
-		Nonconvex, CoordModeOrigin);
+		Convex, CoordModeOrigin);
 
 	for (i = 3; i < num; i++)
 	{
@@ -517,7 +515,7 @@
 			setfgpen(mod, v, penarray[i]);
 
 		XFillPolygon(mod->x11_Display, v->window, v->gc, tri, 3,
-			Nonconvex, CoordModeOrigin);
+			Convex, CoordModeOrigin);
 	}
 }
 
diff -r 1423a3fa5a22 -r ba451747ca32 src/display_x11/display_x11_font.c
--- a/src/display_x11/display_x11_font.c	Tue Mar 24 11:13:56 2009 +0100
+++ b/src/display_x11/display_x11_font.c	Fri May 01 19:22:06 2009 +0200
@@ -21,6 +21,7 @@
 #include "display_x11_mod.h"
 
 /*****************************************************************************/
+
 static TBOOL hostopenfont(X11DISPLAY *mod, struct FontNode *fn,
 	struct fnt_attr *fattr);
 #if defined(ENABLE_XFT)
@@ -79,9 +80,11 @@
 {
 	#if defined(ENABLE_XFT)
 
+	#if 0
 	int major, minor, first;
-	if (XQueryExtension(mod->x11_Display, "Composite", &major, &minor, &first))
-		return TFALSE;
+ 	if (XQueryExtension(mod->x11_Display, "Composite", &major, &minor, &first))
+ 		return TFALSE;
+ 	#endif
 	if (mod->x11_Depth > 24)
 		return TFALSE;
 
diff -r 1423a3fa5a22 -r ba451747ca32 src/display_x11/display_x11_inst.c
--- a/src/display_x11/display_x11_inst.c	Tue Mar 24 11:13:56 2009 +0100
+++ b/src/display_x11/display_x11_inst.c	Fri May 01 19:22:06 2009 +0200
@@ -287,7 +287,6 @@
 
 /*****************************************************************************/
 
-#if defined(NOCURSOR)
 static void x11_createnullcursor(X11DISPLAY *mod)
 {