Skip to content

N
nx-libs
Commit f887d428 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

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.
parent 582618af
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 53 deletions
nx-X11/programs/Xserver/dix/events.c
View file @ f887d428
...@@ -1436,7 +1436,11 @@ AllowSome(ClientPtr client, TimeStamp time, DeviceIntPtr thisDev, int newState) ...@@ -1436,7 +1436,11 @@ AllowSome(ClientPtr client, TimeStamp time, DeviceIntPtr thisDev, int newState)
} }
int int
#ifdef NXAGENT_SERVER
xorg_ProcAllowEvents(register ClientPtr client)
#else
ProcAllowEvents(register ClientPtr client) ProcAllowEvents(register ClientPtr client)
#endif
{ {
TimeStamp time; TimeStamp time;
DeviceIntPtr mouse = inputInfo.pointer; DeviceIntPtr mouse = inputInfo.pointer;
......
nx-X11/programs/Xserver/hw/nxagent/NXevents.c
View file @ f887d428
...@@ -230,59 +230,26 @@ DeactivatePointerGrab(register DeviceIntPtr mouse) ...@@ -230,59 +230,26 @@ DeactivatePointerGrab(register DeviceIntPtr mouse)
#endif #endif
} }
// int int
// ProcAllowEvents(register ClientPtr client) ProcAllowEvents(register ClientPtr client)
// { {
// TimeStamp time; int rc = xorg_ProcAllowEvents(client);
// DeviceIntPtr mouse = inputInfo.pointer;
// DeviceIntPtr keybd = inputInfo.keyboard; if (rc != Success)
// REQUEST(xAllowEventsReq); return rc;
//
// REQUEST_SIZE_MATCH(xAllowEventsReq); /*
// time = ClientTimeToServerTime(stuff->time); * This is not necessary if we export grab to X as asynchronous.
// switch (stuff->mode) *
// { * if (nxagentOption(Rootless) && stuff -> mode != ReplayKeyboard &&
// case ReplayPointer: * stuff -> mode != SyncKeyboard && stuff -> mode != AsyncKeyboard)
// AllowSome(client, time, mouse, NOT_GRABBED); * {
// break; * XAllowEvents(nxagentDisplay, stuff -> mode, CurrentTime);
// case SyncPointer: * }
// AllowSome(client, time, mouse, FREEZE_NEXT_EVENT); */
// break;
// case AsyncPointer: return Success;
// 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;
// }
static WindowPtr static WindowPtr
XYToWindow(int x, int y) XYToWindow(int x, int y)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment