xserver/mi mi.h, 3.13, 3.14 mibstore.c, 1.13, 1.14 miglblt.c, 1.8, 1.9 mipolytext.c, 1.5, 1.6 misprite.c, 3.15, 3.16 miwideline.c, 1.14, 1.15

Committed by: keithp

Update of /cvs/xserver/xserver/mi
In directory gabe:/tmp/cvs-serv25750/mi

Modified Files:
	mi.h mibstore.c miglblt.c mipolytext.c misprite.c miwideline.c 
Log Message:
2005-08-07  Keith Packard  <[email protected]>

	* configure.ac:
	* dix/dispatch.c:
	* dix/events.c:
	* dix/glyphcurs.c:
	* dix/main.c:
	* dix/swaprep.c:
	* dix/xpstubs.c:
	* fb/fbglyph.c:
	* hw/kdrive/chips/chipsdraw.c:
	* hw/kdrive/ephyr/hostx.c: (hostx_screen_init):
	* hw/kdrive/epson/epson13806draw.c:
	* hw/kdrive/i810/i810draw.c:
	* hw/kdrive/mach64/mach64draw.c:
	* hw/kdrive/nvidia/nvidiadraw.c:
	* hw/kdrive/smi/smidraw.c:
	* hw/kdrive/src/kaa.c:
	* hw/kdrive/src/kinput.c: (KdMouseAccelerate):
	* include/dixfont.h:
	* include/dixfontstr.h:
	* mi/mi.h:
	* mi/mibstore.c:
	* mi/miglblt.c:
	* mi/mipolytext.c:
	* mi/misprite.c:
	* mi/miwideline.c:
	* miext/damage/damage.c:
	* miext/shadow/shadow.c:
	* miext/shadow/shalloc.c:
	* miext/shadow/shpacked.c:
	* miext/shadow/shplanar.c:
	* miext/shadow/shplanar8.c:
	* miext/shadow/shrotate.c:
	* miext/shadow/shrotpack.h:
	* miext/shadow/shrotpackYX.h:
	* os/xstrans.c:
	* os/xstrans.h:
	Build with modular X.org libraries and headers.

	* composite/compwindow.c
	Don't damage unmoved windows.
	Let border clip reset leave damage alone,
	pending actual damage for painting.


Index: mi.h
===================================================================
RCS file: /cvs/xserver/xserver/mi/mi.h,v
retrieving revision 3.13
retrieving revision 3.14
diff -u -d -r3.13 -r3.14
--- mi.h	7 Nov 2003 23:29:29 -0000	3.13
+++ mi.h	8 Aug 2005 06:25:21 -0000	3.14
@@ -54,7 +54,7 @@
 #include "validate.h"
 #include "window.h"
 #include "gc.h"
-#include "font.h"
+#include "dixfont.h"
 #include "input.h"
 #include "cursor.h"
 

Index: mibstore.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/mibstore.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mibstore.c	12 Feb 2004 18:58:49 -0000	1.13
+++ mibstore.c	8 Aug 2005 06:25:21 -0000	1.14
@@ -57,7 +57,6 @@
 #include "gcstruct.h"
 #include "windowstr.h"
 #include "pixmapstr.h"
-#include "fontstruct.h"
 #include "dixfontstr.h"
 #include "dixstruct.h"		/* For requestingClient */
 #include "mi.h"

Index: miglblt.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miglblt.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- miglblt.c	11 Sep 2003 05:12:51 -0000	1.8
+++ miglblt.c	8 Aug 2005 06:25:21 -0000	1.9
@@ -55,7 +55,6 @@
 #include	<X11/Xmd.h>
 #include	<X11/Xproto.h>
 #include	"misc.h"
-#include	"fontstruct.h"
 #include	"dixfontstr.h"
 #include	"gcstruct.h"
 #include	"windowstr.h"

Index: mipolytext.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/mipolytext.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mipolytext.c	11 Sep 2003 05:12:51 -0000	1.5
+++ mipolytext.c	8 Aug 2005 06:25:21 -0000	1.6
@@ -63,7 +63,6 @@
 #include	<X11/Xproto.h>
 #include	"misc.h"
 #include	"gcstruct.h"
-#include	"fontstruct.h"
 #include	"dixfontstr.h"
 #include	"mi.h"
 

Index: misprite.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/misprite.c,v
retrieving revision 3.15
retrieving revision 3.16
diff -u -d -r3.15 -r3.16
--- misprite.c	8 Feb 2005 22:39:20 -0000	3.15
+++ misprite.c	8 Aug 2005 06:25:21 -0000	3.16
@@ -42,7 +42,6 @@
 # include   "input.h"
 # include   "mi.h"
 # include   "cursorstr.h"
-# include   "font.h"
 # include   "scrnintstr.h"
 # include   "colormapst.h"
 # include   "windowstr.h"
@@ -50,7 +49,6 @@
 # include   "mipointer.h"
 # include   "mispritest.h"
 # include   "dixfontstr.h"
-# include   "fontstruct.h"
 #ifdef RENDER
 # include   "mipict.h"
 #endif

Index: miwideline.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miwideline.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- miwideline.c	11 Sep 2003 05:12:51 -0000	1.14
+++ miwideline.c	8 Aug 2005 06:25:21 -0000	1.15
@@ -1171,6 +1171,12 @@
     }
     else if (dx == 0)
     {
+	if (dy < 0)
+	{
+	    dy = -dy;
+	    /* dx = -dx, but dx is already 0 */
+	    isLeft = !isLeft;
+	}
 	topy = yorgi;
 	bottomy = yorgi + dy;
 	if (isLeft)