diff options
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Events.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 597359cf1..b19dda3ac 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -167,7 +167,7 @@ void nxagentHandleCollectPropertyEvent(XEvent*); void nxagentHandleCollectGrabPointerEvent(int resource); -Bool nxagentCollectGrabPointerPredicate(Display *display, XEvent *X, XPointer ptr); +Bool nxagentCollectGrabPointerPredicate(Display *disp, XEvent *X, XPointer ptr); /* * Used in Handlers.c to synchronize the agent with the remote X @@ -702,7 +702,7 @@ static void nxagentToggleAutoGrab(void) nxagentDisableAutoGrab(); } -static Bool nxagentExposurePredicate(Display *display, XEvent *event, XPointer window) +static Bool nxagentExposurePredicate(Display *disp, XEvent *event, XPointer window) { /* * Handle both Expose and ProcessedExpose events. The latters are @@ -720,12 +720,12 @@ static Bool nxagentExposurePredicate(Display *display, XEvent *event, XPointer w } } -static int nxagentAnyEventPredicate(Display *display, XEvent *event, XPointer parameter) +static int nxagentAnyEventPredicate(Display *disp, XEvent *event, XPointer parameter) { return 1; } -int nxagentInputEventPredicate(Display *display, XEvent *event, XPointer parameter) +int nxagentInputEventPredicate(Display *disp, XEvent *event, XPointer parameter) { switch (event -> type) { @@ -1238,7 +1238,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already int resource = nxagentWaitForResource(NXGetCollectGrabPointerResource, nxagentCollectGrabPointerPredicate); - ScreenPtr pScreen = nxagentScreen(X.xbutton.window); + pScreen = nxagentScreen(X.xbutton.window); viewportCursor = XCreateFontCursor(nxagentDisplay, XC_fleur); NXCollectGrabPointer(nxagentDisplay, resource, @@ -1380,7 +1380,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already } case MotionNotify: { - ScreenPtr pScreen = nxagentScreen(X.xmotion.window); + pScreen = nxagentScreen(X.xmotion.window); #ifdef TEST fprintf(stderr, "%s: Going to handle new MotionNotify event.\n", __func__); @@ -1593,6 +1593,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already { for (int k = 0; k < 8; k++) { + if (val & (1 << k)) { #ifdef NXAGENT_FIXKEYS_DEBUG fprintf(stderr, "sending KeyRelease event for keycode: %x\n", @@ -3882,7 +3883,7 @@ void nxagentDeactivatePointerGrab(void) } } -Bool nxagentCollectGrabPointerPredicate(Display *display, XEvent *X, XPointer ptr) +Bool nxagentCollectGrabPointerPredicate(Display *disp, XEvent *X, XPointer ptr) { return (X -> xclient.window == 0 && X -> xclient.message_type == 0 && |