Fix GSSendBezierPath. Fix includes for wraster files

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@13271 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,13 @@
+2002-03-29  Adam Fedor  <fedor@gnu.org>
+
+	* Source/gsc/GSGState.m (-GSSendBezierPath:): Append path in all
+	cases.
+	(- GSRectFillList): Implement.
+	* Source/x11/XGServerWindow.m: 
+	([XGServer -windowbounds:]): Don't get screen bounds.
+
+	* Source/x11/*.c: Fix includes.
+
 2002-03-27  Adam Fedor  <fedor@gnu.org>
 
 	* Source/x11/GNUmakefile: Get headers from right place.

Source/gsc/GSGState.m

@@ -37,8 +37,6 @@
       path = [NSBezierPath new]; \
     }
 
-#define AINDEX 5
-
 @implementation GSGState
 
 /* Designated initializer. */
@@ -578,15 +576,16 @@
 
 - (void) GSSendBezierPath: (NSBezierPath *)newpath
 {
-  if (path)
-    [path appendBezierPath: path];
-  else
-    ASSIGN(path, newpath);
+  CHECK_PATH;
+  [path appendBezierPath: path];
 }
 
 - (void) GSRectFillList: (const NSRect *)rects : (int) count
 {
-  [self notImplemented: _cmd];
+  int i;
+  for (i=0; i < count; i++)
+    [self DPSrectfill: NSMinX(rects[i]) : NSMinY(rects[i])
+	  : NSWidth(rects[i]) : NSHeight(rects[i])];
 }
 
 - (void)DPSimage: (NSAffineTransform*) matrix 

Source/x11/XGServerWindow.m

@@ -43,7 +43,6 @@
 #include "x11/XGDragView.h"
 #include "x11/XGInputServer.h"
 
-#define MAX_SCREENS	100
 #define XDPY (((RContext *)context)->dpy)
 #define XDRW (((RContext *)context)->drawable)
 #define XSCR (((RContext *)context)->screen_number)
@@ -1714,8 +1713,6 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
   NSRect rect;
 
   window = WINDOW_WITH_TAG(win);
-  if (!window && win < MAX_SCREENS)
-    window = [self _rootWindowForScreen: win];
   if (!window)
     return NSZeroRect;
 
@@ -1855,8 +1852,6 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
   gswindow_device_t *window;
 
   window = WINDOW_WITH_TAG(win);
-  if (!window && win < MAX_SCREENS)
-    window = [self _rootWindowForScreen: win];
   if (!window)
     return 0;
 
@@ -1986,7 +1981,7 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
     }
 
   /* FIXME: Doesn't take into account any offset added to the window
-     (from PSsetXgcdrawable) or possible scaling (unlikely in X-windows,
+     (from PSsetgcdrawable) or possible scaling (unlikely in X-windows,
      but what about other devices?) */
   rect.origin.y = NSHeight(window->xframe) - NSMaxY(rect);
 
@@ -2056,11 +2051,11 @@ NSDebugLLog(@"Frame", @"X2O %d, %@, %@", win->number,
 		     GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
 
   if (ret != GrabSuccess)
-    NSLog(@"Failed to grab pointer\n");
+    NSDebugLLog(@"XGTrace", @"Failed to grab pointer\n");
   else
     {
       grab_window = window;
-      NSDebugLLog(@"NSWindow", @"Grabbed pointer\n");
+      NSDebugLLog(@"XGTrace", @"Grabbed pointer\n");
     }
   return (ret == GrabSuccess) ? YES : NO;
 }
@@ -2580,11 +2575,12 @@ _computeDepth(int class, int bpp)
   Display *display;
   int res_x, res_y;
 
- if (screen_num < 0 || screen_num >= ScreenCount(XDPY))
-   {
-     NSLog(@"Invalidparam: no screen %d", screen_num);
-     return NSMakeSize(0,0);
-   }
+  display = XDPY;
+  if (screen_num < 0 || screen_num >= ScreenCount(XDPY))
+    {
+      NSLog(@"Invalidparam: no screen %d", screen_num);
+      return NSMakeSize(0,0);
+    }
   // This does not take virtual displays into account!! 
   res_x = DisplayWidth(display, screen_num) / 
       (DisplayWidthMM(display, screen_num) / 25.4);

Source/x11/context.c

@@ -32,10 +32,8 @@
 
 #include <math.h>
 
-#include "StdCmap.h"
-
-#include "xrtools.h"
-
+#include "x11/wraster.h"
+#include "x11/StdCmap.h"
 
 extern void _wraster_change_filter(int type);
 

Source/x11/convert.c

@@ -33,7 +33,7 @@
 #include "bench.h"
 #endif
 
-#include "xrtools.h"
+#include "x11/wraster.h"
 
 #ifdef XSHM
 extern Pixmap R_CreateXImageMappedPixmap(RContext *context, RXImage *ximage);

Source/x11/draw.c

@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "xrtools.h"
+#include "x11/wraster.h"
 
 
 #define MIN(a,b)	((a) < (b) ? (a) : (b))

Source/x11/gradient.c

@@ -28,7 +28,7 @@
 
 #include <assert.h>
 
-#include "xrtools.h"
+#include "x11/wraster.h"
 
 
 static RImage *renderHGradient(unsigned width, unsigned height, 

Source/x11/misc.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <X11/Xlib.h>
 
-#include "xrtools.h"
+#include "x11/wraster.h"
 
 
 void 

Source/x11/raster.c

@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <X11/Xlib.h>
-#include "xrtools.h"
+#include "x11/wraster.h"
 
 #include <assert.h>
 

Source/x11/scale.c

@@ -34,7 +34,7 @@
 
 #include <assert.h>
 
-#include "xrtools.h"
+#include "x11/wraster.h"
 
 
 /*

Source/x11/xutil.c

@@ -35,7 +35,7 @@
 #include <sys/shm.h>
 #endif /* XSHM */
 
-#include "xrtools.h"
+#include "x11/wraster.h"
 
 
 #ifdef XSHM

gnustep-back.spec.in

@@ -4,6 +4,7 @@ Copyright: LGPL
 Group: Development/Libraries
 Source: ftp://ftp.gnustep.org/pub/gnustep/core/%{gs_name}-%{gs_version}.tar.gz
 Requires: gnustep-gui
+Obsoletes: gnustep-xgps
 
 %description 
 This is a backend for the GNUstep gui Library which allows you to use