aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-05-22 21:56:39 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-11-01 16:36:24 +0100
commitf887d428c4443c2df31e831e6b1a3eec23a03aeb (patch)
treeeb13d40b693bfdf2a606baf3d9844145995ca685 /nx-X11/programs
parent582618af8bbad1da7a40b41b7fcefce0fe096abd (diff)
downloadnx-libs-f887d428c4443c2df31e831e6b1a3eec23a03aeb.tar.gz
nx-libs-f887d428c4443c2df31e831e6b1a3eec23a03aeb.tar.bz2
nx-libs-f887d428c4443c2df31e831e6b1a3eec23a03aeb.zip
NXevents.c: call upstream ProcAllocEvents()
Our version only adds some commented code, so it is not really necessary. But it is cleaner to handle it that way.
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/dix/events.c4
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXevents.c73
2 files changed, 24 insertions, 53 deletions
diff --git a/nx-X11/programs/Xserver/dix/events.c b/nx-X11/programs/Xserver/dix/events.c
index 6a8a4043e..c99e55a87 100644
--- a/nx-X11/programs/Xserver/dix/events.c
+++ b/nx-X11/programs/Xserver/dix/events.c
@@ -1436,7 +1436,11 @@ AllowSome(ClientPtr client, TimeStamp time, DeviceIntPtr thisDev, int newState)
}
int
+#ifdef NXAGENT_SERVER
+xorg_ProcAllowEvents(register ClientPtr client)
+#else
ProcAllowEvents(register ClientPtr client)
+#endif
{
TimeStamp time;
DeviceIntPtr mouse = inputInfo.pointer;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
index 5baadde35..606b5e3b8 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXevents.c
@@ -230,59 +230,26 @@ DeactivatePointerGrab(register DeviceIntPtr mouse)
#endif
}
-// int
-// ProcAllowEvents(register ClientPtr client)
-// {
-// TimeStamp time;
-// DeviceIntPtr mouse = inputInfo.pointer;
-// DeviceIntPtr keybd = inputInfo.keyboard;
-// REQUEST(xAllowEventsReq);
-//
-// REQUEST_SIZE_MATCH(xAllowEventsReq);
-// time = ClientTimeToServerTime(stuff->time);
-// switch (stuff->mode)
-// {
-// case ReplayPointer:
-// AllowSome(client, time, mouse, NOT_GRABBED);
-// break;
-// case SyncPointer:
-// AllowSome(client, time, mouse, FREEZE_NEXT_EVENT);
-// break;
-// case AsyncPointer:
-// AllowSome(client, time, mouse, THAWED);
-// break;
-// case ReplayKeyboard:
-// AllowSome(client, time, keybd, NOT_GRABBED);
-// break;
-// case SyncKeyboard:
-// AllowSome(client, time, keybd, FREEZE_NEXT_EVENT);
-// break;
-// case AsyncKeyboard:
-// AllowSome(client, time, keybd, THAWED);
-// break;
-// case SyncBoth:
-// AllowSome(client, time, keybd, FREEZE_BOTH_NEXT_EVENT);
-// break;
-// case AsyncBoth:
-// AllowSome(client, time, keybd, THAWED_BOTH);
-// break;
-// default:
-// client->errorValue = stuff->mode;
-// return BadValue;
-// }
-//
-// /*
-// * This is not necessary if we export grab to X as asynchronous.
-// *
-// * if (nxagentOption(Rootless) && stuff -> mode != ReplayKeyboard &&
-// * stuff -> mode != SyncKeyboard && stuff -> mode != AsyncKeyboard)
-// * {
-// * XAllowEvents(nxagentDisplay, stuff -> mode, CurrentTime);
-// * }
-// */
-//
-// return Success;
-// }
+int
+ProcAllowEvents(register ClientPtr client)
+{
+ int rc = xorg_ProcAllowEvents(client);
+
+ if (rc != Success)
+ return rc;
+
+ /*
+ * This is not necessary if we export grab to X as asynchronous.
+ *
+ * if (nxagentOption(Rootless) && stuff -> mode != ReplayKeyboard &&
+ * stuff -> mode != SyncKeyboard && stuff -> mode != AsyncKeyboard)
+ * {
+ * XAllowEvents(nxagentDisplay, stuff -> mode, CurrentTime);
+ * }
+ */
+
+ return Success;
+}
static WindowPtr
XYToWindow(int x, int y)