diff -urNp nxlib-071231/FillPolygon.c nxlib-071231.elpa/FillPolygon.c --- nxlib-071231/FillPolygon.c 2002-08-14 03:37:47.000000000 +0200 +++ nxlib-071231.elpa/FillPolygon.c 2007-12-31 14:58:59.000000000 +0100 @@ -27,8 +27,8 @@ XFillPolygon(Display * display, Drawable } } - if (shape == Complex || shape == Convex) - printf("XFillPolygon: Complex/Convex\n"); +// if (shape == Complex || shape == Convex) +// printf("XFillPolygon: Complex/Convex\n"); GrFillPoly(d, gc->gid, npoints, gr_points); diff -urNp nxlib-071231/LoadFont.c nxlib-071231.elpa/LoadFont.c --- nxlib-071231/LoadFont.c 2007-11-20 03:48:08.000000000 +0100 +++ nxlib-071231.elpa/LoadFont.c 2008-08-29 10:12:11.000000000 +0200 @@ -163,7 +163,10 @@ XLoadFont(Display * dpy, _Xconst char *n /* found font, load into server*/ if (fontname) + { font = GrCreateFont(fontname, height, NULL); + GrSetFontAttr(font, GR_TFANTIALIAS | GR_TFKERNING, 0); + } printf("XLoadFont('%s') = '%s' height %d [%d]\n", name, fontname, height, font); if (fontname) diff -urNp nxlib-071231/Makefile nxlib-071231.elpa/Makefile --- nxlib-071231/Makefile 2007-11-20 05:11:55.000000000 +0100 +++ nxlib-071231.elpa/Makefile 2008-08-02 16:08:17.000000000 +0200 @@ -8,19 +8,22 @@ # # set to Microwindows and X11 include and lib directories -MWIN=/home/greg/net/microwin/src -X11=/usr/X11R6 +MWIN=/home/davide/progetti/microwindows/src +X11_INCLUDE=/usr/include MWIN_INCLUDE=$(MWIN)/include -MWIN_LIB=$(MWIN)/lib -X11_LIB=$(X11)/lib +#MWIN_LIB=$(MWIN)/lib +#X11_LIB=$(X11)/lib # set to X11 font PCF/TTF font.dir search directories, rgb.txt file location # if not required, set X11_FONT_DIRx=0 -X11_FONT_DIR1=/usr/lib/X11/fonts/100dpi -X11_FONT_DIR2=/usr/lib/X11/fonts/misc -X11_FONT_DIR3=/usr/lib/X11/fonts/TTF -X11_RGBTXT=/usr/lib/X11/rgb.txt +X11_FONT_DIR1=/lib/X11 +X11_FONT_DIR2=0 +X11_FONT_DIR3=0 +#X11_FONT_DIR1=/usr/lib/X11/fonts/100dpi +#X11_FONT_DIR2=/usr/lib/X11/fonts/misc +#X11_FONT_DIR3=/usr/lib/X11/fonts/TTF +X11_RGBTXT=/lib/X11/rgb.txt # set to Y for big endian architecture (should be automatic) BIGENDIAN=N @@ -39,7 +42,7 @@ SOEXTRALIBS = -L$(MWIN_LIB) -lnano-X INSTALL_DIR = $(X11_LIB) # compiler flags -CC = gcc +CC = arm-linux-gcc LN = ln -s MV = mv RM = rm -f diff -urNp nxlib-071231/Text.c nxlib-071231.elpa/Text.c --- nxlib-071231/Text.c 2002-09-23 05:23:25.000000000 +0200 +++ nxlib-071231.elpa/Text.c 2008-08-02 11:22:00.000000000 +0200 @@ -5,8 +5,11 @@ XDrawString(Display *dpy, Drawable d, GC _Xconst char *string, int length) { if (length > 0) + { + GrSetGCUseBackground(gc->gid, GR_FALSE); GrText(d, gc->gid, x, y, (char *)string, length, GR_TFASCII|GR_TFBASELINE); + } return 0; } diff -urNp nxlib-071231/Xlcint.h nxlib-071231.elpa/Xlcint.h --- nxlib-071231/Xlcint.h 2003-08-11 22:17:56.000000000 +0200 +++ nxlib-071231.elpa/Xlcint.h 2007-12-31 15:26:51.000000000 +0100 @@ -71,7 +71,7 @@ from The Open Group. #include "Xresource.h" #include "Xutil.h" /*#include "Xvarargs.h"*/ -#include "varargs.h" +#include "stdarg.h" typedef Bool (*XFilterEventProc)( #if NeedFunctionPrototypes