X11/include/X11 Xlib.h, 3.27, 3.28 Xlibint.h, 3.32, 3.33 Xutil.h, 3.9, 3.10

[Daniel Stone]

Committed by: daniels

Update of /cvs/xlibs/X11/include/X11
In directory gabe:/tmp/cvs-serv2397/include/X11

Modified Files:
	Xlib.h Xlibint.h Xutil.h 
Log Message:
* include/X11/Xutil.h:
* include/X11/Xlib.h:
* include/X11/Xlibint.h:
* src/ConnDis.c (_X11TransConnectDisplay):
* src/ErrDes.c (XGetErrorDatabaseText):
* src/GetWAttrs.c (XGetWindowAttributes):
* src/Host.c:
* src/KeyBind.c (UCSConvertCase) (XConvertCase):
* src/LiHosts.c:
* src/OpenDis.c:
* src/PutBEvent.c (XPutBackEvent):
* src/StrKeysym.c (XStringToKeysym):
* src/XKBBind.c (XkbRefreshKeyboardMapping):
* src/XKBCvt.c:
* src/XlibInt.c:
* src/cmsCmap.c:
* src/cmsColNm.c:
* src/imDefLkup.c (_XimGetWindowEventmask):
* src/imInsClbk.c (_XimUnRegisterIMInstantiateCallback):
* src/imLcFlt.c (_XimLocalFilter):
* src/imLcIm.c (_XimLocalIMFree):
* src/imRm.c:
* src/imThaiFlt.c (tis2ucs):
* src/imTrans.c:
* src/lcEuc.c (euc_ctstowcs) (euc_ctstombs):
* src/lcFile.c:
* src/lcSjis.c:
* src/lcUTF8.c (create_tofontcs_conv):
* src/omGeneric.c (parse_fontdata):
* src/util/makekeys.c (main):
Resync with X.Org HEAD, including a security fix for the error DB name
and a minor stack smash in XKB code, thread-safe XGetWindowAttributes
and XPutBackEvent, case-conversion cleanups and updates, and large-scale
localisation/input cleanups and adherance to the specification.


Index: Xlib.h
===================================================================
RCS file: /cvs/xlibs/X11/include/X11/Xlib.h,v
retrieving revision 3.27
retrieving revision 3.28
diff -u -d -r3.27 -r3.28
--- Xlib.h	27 Jun 2004 22:31:31 -0000	3.27
+++ Xlib.h	28 Jan 2005 18:48:07 -0000	3.28
@@ -651,7 +651,8 @@
 	Time time;		/* milliseconds */
 	int x, y;		/* pointer x, y coordinates in event window */
 	int x_root, y_root;	/* coordinates relative to root */
-	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
+	int mode;		/* NotifyNormal, NotifyWhileGrabbed, NotifyGrab,
+	                           NotifyUngrab */
 	int detail;
 	/*
 	 * NotifyAncestor, NotifyVirtual, NotifyInferior, 

Index: Xlibint.h
===================================================================
RCS file: /cvs/xlibs/X11/include/X11/Xlibint.h,v
retrieving revision 3.32
retrieving revision 3.33
diff -u -d -r3.32 -r3.33
--- Xlibint.h	27 Jun 2004 22:31:31 -0000	3.32
+++ Xlibint.h	28 Jan 2005 18:48:07 -0000	3.33
@@ -1301,6 +1301,15 @@
     int n,
     int ordering);
 
+Status _XGetWindowAttributes(
+    register Display *dpy,
+    Window w,
+    XWindowAttributes *attr);
+
+int _XPutBackEvent (
+    register Display *dpy,
+    register XEvent *event);
+
 _XFUNCPROTOEND
 
 #endif /* _XLIBINT_H_ */

Index: Xutil.h
===================================================================
RCS file: /cvs/xlibs/X11/include/X11/Xutil.h,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- Xutil.h	14 Apr 2004 20:07:07 -0000	3.9
+++ Xutil.h	28 Jan 2005 18:48:07 -0000	3.10
@@ -247,16 +247,19 @@
 #define IsMiscFunctionKey(keysym) \
   (((KeySym)(keysym) >= XK_Select)   && ((KeySym)(keysym) <= XK_Break))
 
+#ifdef XK_XKB_KEYS
+ #define IsModifierKey(keysym) \
+   ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \
+    || (((KeySym)(keysym) >= XK_ISO_Lock) && \
+        ((KeySym)(keysym) <= XK_ISO_Last_Group_Lock)) \
+    || ((KeySym)(keysym) == XK_Mode_switch) \
+    || ((KeySym)(keysym) == XK_Num_Lock))
+#else
 #define IsModifierKey(keysym) \
   ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \
-   || (((KeySym)(keysym) >= XK_ISO_Lock) && \
-       ((KeySym)(keysym) <= XK_ISO_Last_Group_Lock)) \
    || ((KeySym)(keysym) == XK_Mode_switch) \
    || ((KeySym)(keysym) == XK_Num_Lock))
-/*
- * opaque reference to Region data type 
- */
-typedef struct _XRegion *Region; 
+#endif
 
 /* Return values from XRectInRegion() */