[teklib-general] teklib: Display X11: Amalgamed build (from a single source) adde...

[Timm S. Mueller]

details:   http://hg.teklib.org/teklib/rev/86009414c89c
changeset: 236:86009414c89c
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Thu Jan 15 01:03:16 2009 +0100
description:
Display X11: Amalgamed build (from a single source) added, some cleanup

diffs (truncated from 1538 to 100 lines):

diff -r ff917f56d03f -r 86009414c89c src/display_x11/build/tmkmakefile
--- a/src/display_x11/build/tmkmakefile	Wed Jan 14 11:58:21 2009 +0100
+++ b/src/display_x11/build/tmkmakefile	Thu Jan 15 01:03:16 2009 +0100
@@ -15,14 +15,26 @@
 	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/
 
-	[embed body="modlink"]
-		display_x11
-		$(OBJDIR)/display_x11_mod.mo \
-			$(OBJDIR)/display_x11_inst.mo \
-			$(OBJDIR)/display_x11_font.mo \
-			$(OBJDIR)/display_x11_api.mo \
-			$(OBJDIR)/display_x11_utf8.mo
-	[/embed]
+
+	[switch]
+		[case config="posix_linux_gcc_release"]
+			[embed body="modlink"]
+				display_x11
+				$(OBJDIR)/display_x11_all.mo
+			[/embed]
+		[/case]
+		[default]
+			[embed body="modlink"]
+				display_x11
+				$(OBJDIR)/display_x11_mod.mo \
+					$(OBJDIR)/display_x11_inst.mo \
+					$(OBJDIR)/display_x11_font.mo \
+					$(OBJDIR)/display_x11_api.mo \
+					$(OBJDIR)/display_x11_utf8.mo
+			[/embed]
+		[/default]
+	[/switch]
+
 	[embed body="moddep"]
 		$(OBJDIR)/display_x11_mod.mo
 		display_x11_mod.c
@@ -48,6 +60,11 @@
 		display_x11_utf8.c
 		display_x11_mod.h
 	[/embed]
+	[embed body="moddep"]
+		$(OBJDIR)/display_x11_all.mo
+		display_x11_all.c
+		display_x11_mod.h
+	[/embed]
 
 [/body]
 
diff -r ff917f56d03f -r 86009414c89c src/display_x11/display_x11_all.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/display_x11/display_x11_all.c	Thu Jan 15 01:03:16 2009 +0100
@@ -0,0 +1,20 @@
+
+/*
+**	teklib/src/display_x11/display_x11_all.c
+**	Written by Timm S. Mueller <tmueller at neoscientists.org>
+**	See copyright notice in teklib/COPYRIGHT
+*/
+
+#ifndef EXPORT
+#define EXPORT static TMODAPI
+#endif
+
+#ifndef LOCAL
+#define LOCAL static
+#endif
+
+#include "display_x11_mod.c"
+#include "display_x11_api.c"
+#include "display_x11_inst.c"
+#include "display_x11_font.c"
+#include "display_x11_utf8.c"
diff -r ff917f56d03f -r 86009414c89c src/display_x11/display_x11_api.c
--- a/src/display_x11/display_x11_api.c	Wed Jan 14 11:58:21 2009 +0100
+++ b/src/display_x11/display_x11_api.c	Thu Jan 15 01:03:16 2009 +0100
@@ -10,16 +10,12 @@
 
 /*****************************************************************************/
 
-LOCAL void
-x11_openvisual(X11DISPLAY *mod, struct TVRequest *req)
+LOCAL void x11_openvisual(X11DISPLAY *mod, struct TVRequest *req)
 {
+	TAPTR TExecBase = TGetExecBase(mod);
 	TTAGITEM *tags = req->tvr_Op.OpenWindow.Tags;
-	TAPTR exec = TGetExecBase(mod);
-	X11WINDOW *v;
+	X11WINDOW *v = TAlloc0(mod->x11_MemMgr, sizeof(X11WINDOW));
 
-	TDBPRINTF(TDB_TRACE,("openvisual\n"));
-
-	v = TExecAlloc0(exec, mod->x11_MemMgr, sizeof(X11WINDOW));
 	req->tvr_Op.OpenWindow.Window = v;
 	if (v == TNULL) return;
 
@@ -51,6 +47,7 @@
 		v->sizehints = XAllocSizeHints();
 		if (v->sizehints == TNULL)