[teklib-general] teklib: display_x11_font.h merged to display_x11_mod.h; utf8-uti...

[Timm S. Mueller]

details:   http://hg.teklib.org/teklib/rev/ea7ca5594fa7
changeset: 169:ea7ca5594fa7
user:      Timm S. Mueller <tmueller at neoscientists.org>
date:      Sat Apr 05 07:42:01 2008 +0200
description:
display_x11_font.h merged to display_x11_mod.h; utf8-utils is now properly
built and no longer included as a source

diffs (truncated from 917 to 100 lines):

diff -r ea06d291a255 -r ea7ca5594fa7 src/display_x11/build/tmkmakefile
--- a/src/display_x11/build/tmkmakefile	Sat Apr 05 07:40:33 2008 +0200
+++ b/src/display_x11/build/tmkmakefile	Sat Apr 05 07:42:01 2008 +0200
@@ -20,7 +20,8 @@
 		$(OBJDIR)/display_x11_mod.mo \
 			$(OBJDIR)/display_x11_inst.mo \
 			$(OBJDIR)/display_x11_font.mo \
-			$(OBJDIR)/display_x11_api.mo
+			$(OBJDIR)/display_x11_api.mo \
+			$(OBJDIR)/display_x11_utf8.mo
 	[/embed]
 	[embed body="moddep"]
 		$(OBJDIR)/display_x11_mod.mo
@@ -42,11 +43,32 @@
 		display_x11_api.c
 		display_x11_mod.h
 	[/embed]
+	[embed body="moddep"]
+		$(OBJDIR)/display_x11_utf8.mo
+		display_x11_utf8.c
+		display_x11_mod.h
+	[/embed]
 
 [/body]
+
+[body name="sourcetargets"]
+	[embed body="sources"]
+		display_x11_mod.c
+		display_x11_mod.h
+	[/embed]
+	[embed body="sourcedep"]
+		$(SRCDIR)/display_x11_mod.c
+		display_x11_mod.c display_x11_api.c display_x11_font.c display_x11_utf8.c
+	[/embed]
+	[embed body="sourcedep"]
+		$(SRCDIR)/display_x11_mod.h
+		display_x11_mod.h
+	[/embed]
+[/body]
+
 
 [include name="BUILD:builds.tmk"/]
 
 [render to="tmk_"]
-	makefile_modules
+	makefile_modules_sources
 [/render]
diff -r ea06d291a255 -r ea7ca5594fa7 src/display_x11/display_x11_font.c
--- a/src/display_x11/display_x11_font.c	Sat Apr 05 07:40:33 2008 +0200
+++ b/src/display_x11/display_x11_font.c	Sat Apr 05 07:42:01 2008 +0200
@@ -25,9 +25,9 @@
 #include <tek/proto/hal.h>
 
 #include "display_x11_mod.h"
-#include "display_x11_font.h"
-
-#include "utf8-tools.c"
+/*#include "display_x11_font.h"*/
+
+/*#include "utf8-tools.c"*/
 
 #define DISABLE_XFT	TFALSE
 
@@ -697,6 +697,24 @@ fnt_matchfont_xft(TMOD_X11 *mod, FcPatte
 /*****************************************************************************/
 /* convert an utf8 encoded string to latin-1
 */
+
+struct readstringdata
+{
+	/* src string: */
+	const unsigned char *src;
+	/* src string length: */
+	size_t srclen;
+};
+
+static int readstring(struct utf8reader *rd)
+{
+	struct readstringdata *ud = rd->udata;
+	if (ud->srclen == 0)
+		return -1;
+	ud->srclen--;
+	return *ud->src++;
+}
+
 TSTRPTR
 utf8tolatin(TMOD_X11 *mod, TSTRPTR utf8string, TINT len)
 {
diff -r ea06d291a255 -r ea7ca5594fa7 src/display_x11/display_x11_font.h
--- a/src/display_x11/display_x11_font.h	Sat Apr 05 07:40:33 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-#ifndef _TEK_DISPLAY_X11_FONT_H
-#define _TEK_DISPLAY_X11_FONT_H
-
-#include <X11/Xft/Xft.h>
-
-#define DEFFONTNAME			"-misc-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*"
-
-/* "-*-fname-medium-r-*-*-xxx-*-*-*-*-*-iso8859-1" */