[X2Go-Commits] [nx-libs] 76/108: Lift Xi to 1.3.0.0 (identical to 1.2.0)
git-admin at x2go.org
git-admin at x2go.org
Fri Nov 9 20:35:52 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit 266c3d68d5abae1de80e807dbbe3252b34c4a04f
Author: Ulrich Sibiller <uli42 at gmx.de>
Date: Thu Nov 1 15:41:34 2018 +0100
Lift Xi to 1.3.0.0 (identical to 1.2.0)
---
nx-X11/programs/Xserver/Xi/allowev.c | 1 -
nx-X11/programs/Xserver/Xi/chgdctl.c | 1 -
nx-X11/programs/Xserver/Xi/chgfctl.c | 1 -
nx-X11/programs/Xserver/Xi/chgkbd.c | 1 -
nx-X11/programs/Xserver/Xi/chgkmap.c | 1 -
nx-X11/programs/Xserver/Xi/chgprop.c | 1 -
nx-X11/programs/Xserver/Xi/chgptr.c | 1 -
nx-X11/programs/Xserver/Xi/closedev.c | 1 -
nx-X11/programs/Xserver/Xi/devbell.c | 1 -
nx-X11/programs/Xserver/Xi/exevents.c | 18 ++++++++++++++++++
nx-X11/programs/Xserver/Xi/extinit.c | 10 ++++------
nx-X11/programs/Xserver/Xi/getbmap.c | 1 -
nx-X11/programs/Xserver/Xi/getdctl.c | 1 -
nx-X11/programs/Xserver/Xi/getfctl.c | 1 -
nx-X11/programs/Xserver/Xi/getfocus.c | 1 -
nx-X11/programs/Xserver/Xi/getkmap.c | 1 -
nx-X11/programs/Xserver/Xi/getmmap.c | 1 -
nx-X11/programs/Xserver/Xi/getprop.c | 1 -
nx-X11/programs/Xserver/Xi/getselev.c | 1 -
nx-X11/programs/Xserver/Xi/getvers.c | 1 -
nx-X11/programs/Xserver/Xi/grabdev.c | 1 -
nx-X11/programs/Xserver/Xi/grabdevb.c | 1 -
nx-X11/programs/Xserver/Xi/grabdevk.c | 1 -
nx-X11/programs/Xserver/Xi/gtmotion.c | 4 +---
nx-X11/programs/Xserver/Xi/listdev.c | 1 -
nx-X11/programs/Xserver/Xi/opendev.c | 3 +--
nx-X11/programs/Xserver/Xi/selectev.c | 1 -
nx-X11/programs/Xserver/Xi/sendexev.c | 1 -
nx-X11/programs/Xserver/Xi/setbmap.c | 1 -
nx-X11/programs/Xserver/Xi/setdval.c | 1 -
nx-X11/programs/Xserver/Xi/setfocus.c | 1 -
nx-X11/programs/Xserver/Xi/setmmap.c | 1 -
nx-X11/programs/Xserver/Xi/setmode.c | 1 -
nx-X11/programs/Xserver/Xi/stubs.c | 1 -
nx-X11/programs/Xserver/Xi/ungrdev.c | 1 -
nx-X11/programs/Xserver/Xi/ungrdevb.c | 1 -
nx-X11/programs/Xserver/Xi/ungrdevk.c | 1 -
nx-X11/programs/Xserver/code-versions.txt | 2 +-
38 files changed, 25 insertions(+), 45 deletions(-)
diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c
index 8981f91..76b2f60 100644
--- a/nx-X11/programs/Xserver/Xi/allowev.c
+++ b/nx-X11/programs/Xserver/Xi/allowev.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c
index 566df59..260dd0e 100644
--- a/nx-X11/programs/Xserver/Xi/chgdctl.c
+++ b/nx-X11/programs/Xserver/Xi/chgdctl.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.c b/nx-X11/programs/Xserver/Xi/chgfctl.c
index 31cb0a0..00117fa 100644
--- a/nx-X11/programs/Xserver/Xi/chgfctl.c
+++ b/nx-X11/programs/Xserver/Xi/chgfctl.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/chgkbd.c b/nx-X11/programs/Xserver/Xi/chgkbd.c
index 4e8b5ee..8f4e357 100644
--- a/nx-X11/programs/Xserver/Xi/chgkbd.c
+++ b/nx-X11/programs/Xserver/Xi/chgkbd.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/chgkmap.c b/nx-X11/programs/Xserver/Xi/chgkmap.c
index 604fcd9..f8bad95 100644
--- a/nx-X11/programs/Xserver/Xi/chgkmap.c
+++ b/nx-X11/programs/Xserver/Xi/chgkmap.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/chgprop.c b/nx-X11/programs/Xserver/Xi/chgprop.c
index b8d0403..6ee00a0 100644
--- a/nx-X11/programs/Xserver/Xi/chgprop.c
+++ b/nx-X11/programs/Xserver/Xi/chgprop.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/chgptr.c b/nx-X11/programs/Xserver/Xi/chgptr.c
index af2625f..76cd1e0 100644
--- a/nx-X11/programs/Xserver/Xi/chgptr.c
+++ b/nx-X11/programs/Xserver/Xi/chgptr.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/closedev.c b/nx-X11/programs/Xserver/Xi/closedev.c
index b41474e..21180cd 100644
--- a/nx-X11/programs/Xserver/Xi/closedev.c
+++ b/nx-X11/programs/Xserver/Xi/closedev.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/devbell.c b/nx-X11/programs/Xserver/Xi/devbell.c
index a709175..22fe5cb 100644
--- a/nx-X11/programs/Xserver/Xi/devbell.c
+++ b/nx-X11/programs/Xserver/Xi/devbell.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/exevents.c b/nx-X11/programs/Xserver/Xi/exevents.c
index e614b5a..428e577 100644
--- a/nx-X11/programs/Xserver/Xi/exevents.c
+++ b/nx-X11/programs/Xserver/Xi/exevents.c
@@ -174,6 +174,9 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
}
if (xE->u.u.type == DeviceKeyPress) {
+ if (!k)
+ return;
+
modifiers = k->modifierMap[key];
kptr = &k->down[key >> 3];
if (*kptr & bit) { /* allow ddx to generate multiple downs */
@@ -203,6 +206,9 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
return;
}
} else if (xE->u.u.type == DeviceKeyRelease) {
+ if (!k)
+ return;
+
kptr = &k->down[key >> 3];
if (!(*kptr & bit)) /* guard against duplicates */
return;
@@ -225,6 +231,9 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
if (other->fromPassiveGrab && (key == other->activatingKey))
deactivateDeviceGrab = TRUE;
} else if (xE->u.u.type == DeviceButtonPress) {
+ if (!b)
+ return;
+
kptr = &b->down[key >> 3];
*kptr |= bit;
if (other->valuator)
@@ -242,6 +251,9 @@ ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
return;
} else if (xE->u.u.type == DeviceButtonRelease) {
+ if (!b)
+ return;
+
kptr = &b->down[key >> 3];
*kptr &= ~bit;
if (other->valuator)
@@ -1075,6 +1087,9 @@ MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)
DeviceIntPtr dev;
dev = LookupDeviceIntRec(pEvents->deviceid & DEVICE_BITS);
+ if (!dev)
+ return 0;
+
if (pEvents->type == DeviceMotionNotify) {
if (mask & DevicePointerMotionHintMask) {
if (WID(dev->valuator->motionHintWindow) == pEvents->event) {
@@ -1096,6 +1111,9 @@ CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type,
DeviceIntPtr dev;
dev = LookupDeviceIntRec(xE->deviceid & DEVICE_BITS);
+ if (!dev)
+ return;
+
if (type == DeviceMotionNotify)
dev->valuator->motionHintWindow = pWin;
else if ((type == DeviceButtonPress) && (!grab) &&
diff --git a/nx-X11/programs/Xserver/Xi/extinit.c b/nx-X11/programs/Xserver/Xi/extinit.c
index a50552c..adf69b0 100644
--- a/nx-X11/programs/Xserver/Xi/extinit.c
+++ b/nx-X11/programs/Xserver/Xi/extinit.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -201,8 +200,8 @@ Mask PropagateMask[MAX_DEVICES];
*
*/
-static XExtensionVersion thisversion =
- {XI_Present,
+static XExtensionVersion thisversion =
+ {XI_Present,
SERVER_XI_MAJOR_VERSION,
SERVER_XI_MINOR_VERSION,
};
@@ -576,8 +575,7 @@ SEventDeviceValuator(deviceValuator * from, deviceValuator * to)
swaps(&to->sequenceNumber);
swaps(&to->device_state);
ip = &to->valuator0;
- for (i=0; i<6; i++)
- {
+ for (i = 0; i < 6; i++) {
swapl((ip + i)); /* macro - braces are required */
}
}
@@ -822,7 +820,7 @@ IResetProc(ExtensionEntry * unused)
*
*/
- void
+void
AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
{
dev->type = type;
diff --git a/nx-X11/programs/Xserver/Xi/getbmap.c b/nx-X11/programs/Xserver/Xi/getbmap.c
index 696685b..45f9764 100644
--- a/nx-X11/programs/Xserver/Xi/getbmap.c
+++ b/nx-X11/programs/Xserver/Xi/getbmap.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/getdctl.c b/nx-X11/programs/Xserver/Xi/getdctl.c
index 7cc96cb..e050e36 100644
--- a/nx-X11/programs/Xserver/Xi/getdctl.c
+++ b/nx-X11/programs/Xserver/Xi/getdctl.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/getfctl.c b/nx-X11/programs/Xserver/Xi/getfctl.c
index 9f75753..82de179 100644
--- a/nx-X11/programs/Xserver/Xi/getfctl.c
+++ b/nx-X11/programs/Xserver/Xi/getfctl.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c
index 5111522..8d0850d 100644
--- a/nx-X11/programs/Xserver/Xi/getfocus.c
+++ b/nx-X11/programs/Xserver/Xi/getfocus.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/getkmap.c b/nx-X11/programs/Xserver/Xi/getkmap.c
index 419d108..87fd4ba 100644
--- a/nx-X11/programs/Xserver/Xi/getkmap.c
+++ b/nx-X11/programs/Xserver/Xi/getkmap.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/getmmap.c b/nx-X11/programs/Xserver/Xi/getmmap.c
index ce11e3e..74b6d02 100644
--- a/nx-X11/programs/Xserver/Xi/getmmap.c
+++ b/nx-X11/programs/Xserver/Xi/getmmap.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/getprop.c b/nx-X11/programs/Xserver/Xi/getprop.c
index 77075c9..0782194 100644
--- a/nx-X11/programs/Xserver/Xi/getprop.c
+++ b/nx-X11/programs/Xserver/Xi/getprop.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/getselev.c b/nx-X11/programs/Xserver/Xi/getselev.c
index b36b833..010cc83 100644
--- a/nx-X11/programs/Xserver/Xi/getselev.c
+++ b/nx-X11/programs/Xserver/Xi/getselev.c
@@ -44,7 +44,6 @@ SOFTWARE.
********************************************************/
-
/***********************************************************************
*
* Extension function to get the current selected events for a given window.
diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c
index d66175d..93d9c25 100644
--- a/nx-X11/programs/Xserver/Xi/getvers.c
+++ b/nx-X11/programs/Xserver/Xi/getvers.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/grabdev.c b/nx-X11/programs/Xserver/Xi/grabdev.c
index dc95e7c..654775d 100644
--- a/nx-X11/programs/Xserver/Xi/grabdev.c
+++ b/nx-X11/programs/Xserver/Xi/grabdev.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/grabdevb.c b/nx-X11/programs/Xserver/Xi/grabdevb.c
index 922a819..55336fb 100644
--- a/nx-X11/programs/Xserver/Xi/grabdevb.c
+++ b/nx-X11/programs/Xserver/Xi/grabdevb.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c
index aceeec1..428452d 100644
--- a/nx-X11/programs/Xserver/Xi/grabdevk.c
+++ b/nx-X11/programs/Xserver/Xi/grabdevk.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/gtmotion.c b/nx-X11/programs/Xserver/Xi/gtmotion.c
index 72209d1..2be719b 100644
--- a/nx-X11/programs/Xserver/Xi/gtmotion.c
+++ b/nx-X11/programs/Xserver/Xi/gtmotion.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -142,8 +141,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
size = sizeof(Time) + (axes * sizeof(INT32));
tsize = num_events * size;
coords = (INT32 *) malloc(tsize);
- if (!coords)
- {
+ if (!coords) {
SendErrorToClient(client, IReqCode, X_GetDeviceMotionEvents, 0,
BadAlloc);
return Success;
diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c
index bd62fa0..44f1286 100644
--- a/nx-X11/programs/Xserver/Xi/listdev.c
+++ b/nx-X11/programs/Xserver/Xi/listdev.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c
index 5927546..e3ad4da 100644
--- a/nx-X11/programs/Xserver/Xi/opendev.c
+++ b/nx-X11/programs/Xserver/Xi/opendev.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
@@ -163,7 +162,7 @@ ProcXOpenDevice(register ClientPtr client)
rep.length = (j * sizeof(xInputClassInfo) + 3) >> 2;
rep.num_classes = j;
WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep);
- WriteToClient(client, j * sizeof (xInputClassInfo), evbase);
+ WriteToClient(client, j * sizeof(xInputClassInfo), evbase);
return (Success);
}
diff --git a/nx-X11/programs/Xserver/Xi/selectev.c b/nx-X11/programs/Xserver/Xi/selectev.c
index bb3d11b..5c06465 100644
--- a/nx-X11/programs/Xserver/Xi/selectev.c
+++ b/nx-X11/programs/Xserver/Xi/selectev.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c
index ef7b9c4..a86829f 100644
--- a/nx-X11/programs/Xserver/Xi/sendexev.c
+++ b/nx-X11/programs/Xserver/Xi/sendexev.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/setbmap.c b/nx-X11/programs/Xserver/Xi/setbmap.c
index d7a5b67..7f67ef7 100644
--- a/nx-X11/programs/Xserver/Xi/setbmap.c
+++ b/nx-X11/programs/Xserver/Xi/setbmap.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c
index 69a5275..909f03f 100644
--- a/nx-X11/programs/Xserver/Xi/setdval.c
+++ b/nx-X11/programs/Xserver/Xi/setdval.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/setfocus.c b/nx-X11/programs/Xserver/Xi/setfocus.c
index 18ef292..b561832 100644
--- a/nx-X11/programs/Xserver/Xi/setfocus.c
+++ b/nx-X11/programs/Xserver/Xi/setfocus.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c
index 74e0821..cfc0819 100644
--- a/nx-X11/programs/Xserver/Xi/setmmap.c
+++ b/nx-X11/programs/Xserver/Xi/setmmap.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/setmode.c b/nx-X11/programs/Xserver/Xi/setmode.c
index 4f6f816..da2c634 100644
--- a/nx-X11/programs/Xserver/Xi/setmode.c
+++ b/nx-X11/programs/Xserver/Xi/setmode.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/stubs.c b/nx-X11/programs/Xserver/Xi/stubs.c
index e737855..0ba8a40 100644
--- a/nx-X11/programs/Xserver/Xi/stubs.c
+++ b/nx-X11/programs/Xserver/Xi/stubs.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/ungrdev.c b/nx-X11/programs/Xserver/Xi/ungrdev.c
index e84a1c3..f095fd1 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdev.c
+++ b/nx-X11/programs/Xserver/Xi/ungrdev.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/ungrdevb.c b/nx-X11/programs/Xserver/Xi/ungrdevb.c
index f5e086e..9cd0755 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdevb.c
+++ b/nx-X11/programs/Xserver/Xi/ungrdevb.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/Xi/ungrdevk.c b/nx-X11/programs/Xserver/Xi/ungrdevk.c
index 42ebcd6..8829fcc 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdevk.c
+++ b/nx-X11/programs/Xserver/Xi/ungrdevk.c
@@ -1,4 +1,3 @@
-
/************************************************************
Copyright 1989, 1998 The Open Group
diff --git a/nx-X11/programs/Xserver/code-versions.txt b/nx-X11/programs/Xserver/code-versions.txt
index 1337a1d..5a09d89 100644
--- a/nx-X11/programs/Xserver/code-versions.txt
+++ b/nx-X11/programs/Xserver/code-versions.txt
@@ -18,5 +18,5 @@ record 1.4.2
render 6.9/7.0
Xext 7.1/1.1
xfixes 1.4.2
-Xi 7.1/1.1
+Xi 1.3.0.0
xkb 7.1/1.1
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list