Module Name: xsrc
Committed By: mrg
Date: Wed Apr 27 09:32:11 UTC 2016
Modified Files:
xsrc/external/mit/libXi/dist/src: XGMotion.c XGetDCtl.c XGetFCtl.c
XGetProp.c XIProperties.c XISelEv.c XQueryDv.c
Log Message:
merge libXi 1.7.6
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXi/dist/src/XGMotion.c \
xsrc/external/mit/libXi/dist/src/XGetDCtl.c \
xsrc/external/mit/libXi/dist/src/XGetProp.c \
xsrc/external/mit/libXi/dist/src/XIProperties.c \
xsrc/external/mit/libXi/dist/src/XISelEv.c \
xsrc/external/mit/libXi/dist/src/XQueryDv.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXi/dist/src/XGetFCtl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXi/dist/src/XGMotion.c
diff -u xsrc/external/mit/libXi/dist/src/XGMotion.c:1.3 xsrc/external/mit/libXi/dist/src/XGMotion.c:1.4
--- xsrc/external/mit/libXi/dist/src/XGMotion.c:1.3 Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XGMotion.c Wed Apr 27 09:32:10 2016
@@ -81,7 +81,7 @@ XGetDeviceMotionEvents(
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XDeviceTimeCoord *) NoSuchExtension);
+ return NULL;
GetReq(GetDeviceMotionEvents, req);
req->reqType = info->codes->major_opcode;
Index: xsrc/external/mit/libXi/dist/src/XGetDCtl.c
diff -u xsrc/external/mit/libXi/dist/src/XGetDCtl.c:1.3 xsrc/external/mit/libXi/dist/src/XGetDCtl.c:1.4
--- xsrc/external/mit/libXi/dist/src/XGetDCtl.c:1.3 Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XGetDCtl.c Wed Apr 27 09:32:11 2016
@@ -79,7 +79,7 @@ XGetDeviceControl(
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl, info) == -1)
- return ((XDeviceControl *) NoSuchExtension);
+ return NULL;
GetReq(GetDeviceControl, req);
req->reqType = info->codes->major_opcode;
Index: xsrc/external/mit/libXi/dist/src/XGetProp.c
diff -u xsrc/external/mit/libXi/dist/src/XGetProp.c:1.3 xsrc/external/mit/libXi/dist/src/XGetProp.c:1.4
--- xsrc/external/mit/libXi/dist/src/XGetProp.c:1.3 Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XGetProp.c Wed Apr 27 09:32:11 2016
@@ -75,7 +75,7 @@ XGetDeviceDontPropagateList(
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XEventClass *) NoSuchExtension);
+ return NULL;
GetReq(GetDeviceDontPropagateList, req);
req->reqType = info->codes->major_opcode;
Index: xsrc/external/mit/libXi/dist/src/XIProperties.c
diff -u xsrc/external/mit/libXi/dist/src/XIProperties.c:1.3 xsrc/external/mit/libXi/dist/src/XIProperties.c:1.4
--- xsrc/external/mit/libXi/dist/src/XIProperties.c:1.3 Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XIProperties.c Wed Apr 27 09:32:11 2016
@@ -51,7 +51,7 @@ XIListProperties(Display* dpy, int devic
LockDisplay(dpy);
*num_props_return = 0;
if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1)
- goto cleanup;
+ goto cleanup_unlocked;
GetReq(XIListProperties, req);
req->reqType = info->codes->major_opcode;
@@ -76,6 +76,7 @@ XIListProperties(Display* dpy, int devic
cleanup:
UnlockDisplay(dpy);
+cleanup_unlocked:
SyncHandle();
return props;
}
Index: xsrc/external/mit/libXi/dist/src/XISelEv.c
diff -u xsrc/external/mit/libXi/dist/src/XISelEv.c:1.3 xsrc/external/mit/libXi/dist/src/XISelEv.c:1.4
--- xsrc/external/mit/libXi/dist/src/XISelEv.c:1.3 Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XISelEv.c Wed Apr 27 09:32:11 2016
@@ -60,7 +60,7 @@ XISelectEvents(Display* dpy, Window win,
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1) {
r = NoSuchExtension;
- goto out;
+ goto out_unlocked;
}
for (i = 0; i < num_masks; i++) {
@@ -114,6 +114,7 @@ XISelectEvents(Display* dpy, Window win,
free(buff);
out:
UnlockDisplay(dpy);
+out_unlocked:
SyncHandle();
return r;
@@ -134,7 +135,7 @@ XIGetSelectedEvents(Display* dpy, Window
*num_masks_return = -1;
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1)
- goto out;
+ goto out_unlocked;
GetReq(XIGetSelectedEvents, req);
@@ -209,6 +210,8 @@ out:
Xfree(mask_in);
UnlockDisplay(dpy);
+
+out_unlocked:
SyncHandle();
return mask_out;
Index: xsrc/external/mit/libXi/dist/src/XQueryDv.c
diff -u xsrc/external/mit/libXi/dist/src/XQueryDv.c:1.3 xsrc/external/mit/libXi/dist/src/XQueryDv.c:1.4
--- xsrc/external/mit/libXi/dist/src/XQueryDv.c:1.3 Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XQueryDv.c Wed Apr 27 09:32:11 2016
@@ -78,7 +78,7 @@ XQueryDeviceState(
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XDeviceState *) NoSuchExtension);
+ return NULL;
GetReq(QueryDeviceState, req);
req->reqType = info->codes->major_opcode;
Index: xsrc/external/mit/libXi/dist/src/XGetFCtl.c
diff -u xsrc/external/mit/libXi/dist/src/XGetFCtl.c:1.4 xsrc/external/mit/libXi/dist/src/XGetFCtl.c:1.5
--- xsrc/external/mit/libXi/dist/src/XGetFCtl.c:1.4 Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XGetFCtl.c Wed Apr 27 09:32:11 2016
@@ -79,7 +79,7 @@ XGetFeedbackControl(
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XFeedbackState *) NoSuchExtension);
+ return NULL;
GetReq(GetFeedbackControl, req);
req->reqType = info->codes->major_opcode;
