[xorg-commit-diffs] xc/programs/Xserver/include dixstruct.h, 1.1.4.3, 1.1.4.3.2.1

[Stuart Kreitman]

Committed by: stukreit

Update of /cvs/xorg/xc/programs/Xserver/include
In directory pdx:/tmp/cvs-serv13684

Modified Files:
      Tag: DAMAGE-XFIXES
	dixstruct.h 
Log Message:
integration from modular tree.
Modified Files:
  Tag: DAMAGE-XFIXES
	dixstruct.h 


Index: dixstruct.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/include/dixstruct.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.3.2.1
diff -u -d -r1.1.4.3 -r1.1.4.3.2.1
--- a/dixstruct.h	5 Mar 2004 13:41:06 -0000	1.1.4.3
+++ b/dixstruct.h	30 Mar 2004 17:01:52 -0000	1.1.4.3.2.1
@@ -68,6 +68,28 @@
 	      ClientStateCheckingSecurity,
 	      ClientStateCheckedSecurity} ClientState;
 
+#ifdef XFIXES
+typedef struct _saveSet {
+    struct _Window  *windowPtr;
+    Bool	    toRoot;
+    Bool	    remap;
+} SaveSetElt;
+#define SaveSetWindow(ss)   ((ss).windowPtr)
+#define SaveSetToRoot(ss)   ((ss).toRoot)
+#define SaveSetRemap(ss)    ((ss).remap)
+#define SaveSetAssignWindow(ss,w)   ((ss).windowPtr = (w))
+#define SaveSetAssignToRoot(ss,tr)  ((ss).toRoot = (tr))
+#define SaveSetAssignRemap(ss,rm)  ((ss).remap = (rm))
+#else
+typedef struct _Window *SaveSetElt;
+#define SaveSetWindow(ss)   (ss)
+#define SaveSetToRoot(ss)   FALSE
+#define SaveSetRemap(ss)    TRUE
+#define SaveSetAssignWindow(ss,w)   ((ss) = (w))
+#define SaveSetAssignToRoot(ss,tr)
+#define SaveSetAssignRemap(ss,rm)
+#endif
+
 typedef struct _Client {
     int         index;
     Mask        clientAsMask;
@@ -85,7 +107,7 @@
     Drawable    lastDrawableID;
     GCPtr       lastGC;
     GContext    lastGCID;
-    pointer    *saveSet;
+    SaveSetElt	*saveSet;
     int         numSaved;
     pointer     screenPrivate[MAXSCREENS];
     int         (**requestVector) (
@@ -148,8 +170,8 @@
 extern Bool SmartScheduleIdle;
 extern Bool SmartScheduleTimerStopped;
 extern Bool SmartScheduleStartTimer(void);
-#define SMART_MAX_PRIORITY  (20)
-#define SMART_MIN_PRIORITY  (-20)
+#define SMART_MAX_PRIORITY  20
+#define SMART_MIN_PRIORITY  -20
 
 extern Bool SmartScheduleInit(void);