[xorg-commit-diffs] xc/programs/Xserver/include dix.h, 1.1.4.4, 1.1.4.4.2.1

[Stuart Kreitman]

Committed by: stukreit

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

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


Index: dix.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/include/dix.h,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.4.2.1
diff -u -d -r1.1.4.4 -r1.1.4.4.2.1
--- a/dix.h	5 Mar 2004 13:41:05 -0000	1.1.4.4
+++ b/dix.h	30 Mar 2004 17:00:59 -0000	1.1.4.4.2.1
@@ -379,6 +379,12 @@
     unsigned char * /*source*/,
     int /*length*/);
 
+extern int CompareISOLatin1Lowered(
+    unsigned char * /*a*/,
+    int alen,
+    unsigned char * /*b*/,
+    int blen);
+
 #ifdef XCSECURITY
 
 extern WindowPtr SecurityLookupWindow(
@@ -423,12 +429,14 @@
 
 extern void NoopDDA(void);
 
-extern int AlterSaveSetForClient(
+int AlterSaveSetForClient(
     ClientPtr /*client*/,
     WindowPtr /*pWin*/,
-    unsigned /*mode*/);
-
-extern void DeleteWindowFromAnySaveSet(
+    unsigned /*mode*/,
+    Bool /*toRoot*/,
+    Bool /*remap*/);
+  
+void DeleteWindowFromAnySaveSet(
     WindowPtr /*pWin*/);
 
 extern void BlockHandler(
@@ -785,4 +793,21 @@
     int count;
 } DeviceEventInfoRec;
 
+/*
+ * SelectionCallback stuff
+ */
+
+extern CallbackListPtr SelectionCallback;
+
+typedef enum {
+    SelectionSetOwner,
+    SelectionWindowDestroy,
+    SelectionClientClose
+} SelectionCallbackKind;
+
+typedef struct {
+    struct _Selection	    *selection;
+    SelectionCallbackKind   kind;
+} SelectionInfoRec;
+
 #endif /* DIX_H */