Re: changes in -back (path.m _stroke:)

[Alexander Malmberg]

Alexander Malmberg wrote:
> Until then, I've attached a patch [snip]

Well, I have now. :)

- Alexander Malmberg

? back.gdt
? back.gpr
? ftfont.m-printhack
? fttrace.m
? Documentation/ANNOUNCE
? Documentation/INSTALL
? Documentation/NEWS
? Documentation/README
? Documentation/version.texi
? Documentation/Back/General
? Headers/rds
? Source/rds
? Source/art/fontmapgen.m
? Source/art/ftfont.m-ft209
? Source/art/ftfont.m-ft214
? Source/art/ftfont.m.cur
? Source/art/func_list.txt
? Source/art/patch.txt
Index: config.h.in
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/back/config.h.in,v
retrieving revision 1.11
diff -u -r1.11 config.h.in
--- config.h.in 22 Oct 2003 19:19:09 -0000      1.11
+++ config.h.in 14 Jan 2005 14:06:10 -0000
@@ -3,6 +3,7 @@
 
 #define SERVER_x11   1
 #define SERVER_win32 2
+#define SERVER_rds   3
 
 
 /* Define to type of graphics context to build */
Index: configure.ac
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/back/configure.ac,v
retrieving revision 1.27
diff -u -r1.27 configure.ac
--- configure.ac        2 Sep 2004 02:56:10 -0000       1.27
+++ configure.ac        14 Jan 2005 14:06:10 -0000
@@ -415,6 +415,7 @@
 AH_TOP([
 #define SERVER_x11   1
 #define SERVER_win32 2
+#define SERVER_rds   3
 ])
 
 #--------------------------------------------------------------------
Index: Source/GSBackend.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/back/Source/GSBackend.m,v
retrieving revision 1.5
diff -u -r1.5 GSBackend.m
--- Source/GSBackend.m  2 Aug 2004 21:50:17 -0000       1.5
+++ Source/GSBackend.m  14 Jan 2005 14:06:10 -0000
@@ -38,6 +38,8 @@
 #include <x11/XGServer.h>
 #elif BUILD_SERVER == SERVER_win32
 #include <win32/WIN32Server.h>
+#elif BUILD_SERVER == SERVER_rds
+#include <rds/RDSServer.h>
 #endif
 
 /* Call the correct initalization routines for the choosen
@@ -56,6 +58,8 @@
   [XGServer initializeBackend];
 #elif BUILD_SERVER == SERVER_win32
   [WIN32Server initializeBackend];
+#elif BUILD_SERVER == SERVER_rds
+  [RDSServer initializeBackend];
 #else
   [NSException raise: NSInternalInconsistencyException
               format: @"No Window Server configured in backend"];
Index: Source/art/ARTContext.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/back/Source/art/ARTContext.m,v
retrieving revision 1.26
diff -u -r1.26 ARTContext.m
--- Source/art/ARTContext.m     11 Jan 2005 19:23:54 -0000      1.26
+++ Source/art/ARTContext.m     14 Jan 2005 14:06:10 -0000
@@ -666,6 +666,7 @@
   gstate = [[ARTGState allocWithZone: [self zone]] initWithDrawContext: self];
   [gstate DPSsetalpha: 1.0];
   [gstate DPSsetlinewidth: 1.0];
+  [gstate DPSsetstrokeadjust: 1];
 
 #ifdef RDS
   {
Index: Source/art/GNUmakefile.preamble
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/back/Source/art/GNUmakefile.preamble,v
retrieving revision 1.1
diff -u -r1.1 GNUmakefile.preamble
--- Source/art/GNUmakefile.preamble     20 Aug 2002 16:35:55 -0000      1.1
+++ Source/art/GNUmakefile.preamble     14 Jan 2005 14:06:10 -0000
@@ -30,7 +30,7 @@
 ADDITIONAL_CPPFLAGS += -Wall $(CONFIG_SYSTEM_DEFS)
 
 # Additional flags to pass to the Objective-C compiler
-#ADDITIONAL_OBJCFLAGS = 
+#ADDITIONAL_OBJCFLAGS =
 
 # Additional flags to pass to the C compiler
 #ADDITIONAL_CFLAGS = 
Index: Source/x11/XGServerWindow.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/back/Source/x11/XGServerWindow.m,v
retrieving revision 1.48
diff -u -r1.48 XGServerWindow.m
--- Source/x11/XGServerWindow.m 8 Dec 2004 23:57:06 -0000       1.48
+++ Source/x11/XGServerWindow.m 14 Jan 2005 14:06:11 -0000
@@ -1500,7 +1500,7 @@
   data = [rep bitmapData];
   screen = [[[self screenList] objectAtIndex: 0] intValue];
   xIconPixmap = XCreatePixmap(dpy,
-                      [self xDisplayRootWindowForScreen:screen],
+                      [self xDisplayRootWindowForScreen: screen],
                       [rep pixelsWide], [rep pixelsHigh],
                       DefaultDepth(dpy, screen));
   pixgc = XCreateGC(dpy, xIconPixmap, 0, NULL);
Index: Source/x11/convert.c
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/back/Source/x11/convert.c,v
retrieving revision 1.3
diff -u -r1.3 convert.c
--- Source/x11/convert.c        22 Jul 2003 04:28:43 -0000      1.3
+++ Source/x11/convert.c        14 Jan 2005 14:06:11 -0000
@@ -1054,7 +1054,7 @@
        unsigned short rmask, gmask, bmask;
        unsigned short roffs, goffs, boffs;
        unsigned short *rtable, *gtable, *btable;
-    
+
        roffs = context->red_offset;
        goffs = context->green_offset;
        boffs = context->blue_offset;
Index: Source/xlib/GSXftFontInfo.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/core/back/Source/xlib/GSXftFontInfo.m,v
retrieving revision 1.11
diff -u -r1.11 GSXftFontInfo.m
--- Source/xlib/GSXftFontInfo.m 30 Aug 2004 15:27:14 -0000      1.11
+++ Source/xlib/GSXftFontInfo.m 14 Jan 2005 14:06:11 -0000
@@ -213,6 +213,22 @@
   allFonts = fcxft_allFonts;
 }
 
+-(NSString *) defaultSystemFontName
+{
+  return @"Insert suitable sans font here";
+}
+
+-(NSString *) defaultBoldSystemFontName
+{
+  return @"Insert suitable bold sans font here";
+}
+
+-(NSString *) defaultFixedPitchFontName
+{
+  return @"Insert suitable fixed pitch font here";
+}
+
+
 @end
 #endif