Commit c80605a1 authored by Ulrich Sibiller's avatar Ulrich Sibiller

Keystroke.c: Boolify nxagentCheckSpecialKeystroke

parent ac3794c5
...@@ -410,13 +410,13 @@ static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X) ...@@ -410,13 +410,13 @@ static enum nxagentSpecialKeystroke find_keystroke(XKeyEvent *X)
return ret; return ret;
} }
int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) Bool nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
{ {
enum nxagentSpecialKeystroke stroke = find_keystroke(X); enum nxagentSpecialKeystroke stroke = find_keystroke(X);
*result = doNothing; *result = doNothing;
if (stroke == KEYSTROKE_NOTHING) if (stroke == KEYSTROKE_NOTHING)
return 0; return False;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentCheckSpecialKeystroke: got code %x - state %x - stroke %d\n", fprintf(stderr, "nxagentCheckSpecialKeystroke: got code %x - state %x - stroke %d\n",
...@@ -436,7 +436,7 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) ...@@ -436,7 +436,7 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
{ {
*result = doStartKbd; *result = doStartKbd;
return 1; return True;
} }
switch (stroke) { switch (stroke) {
...@@ -492,7 +492,7 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) ...@@ -492,7 +492,7 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
break; break;
case KEYSTROKE_IGNORE: case KEYSTROKE_IGNORE:
/* this is used e.g. to ignore C-A-Backspace aka XK_Terminate_Server */ /* this is used e.g. to ignore C-A-Backspace aka XK_Terminate_Server */
return 1; return True;
break; break;
case KEYSTROKE_FORCE_SYNCHRONIZATION: case KEYSTROKE_FORCE_SYNCHRONIZATION:
nxagentForceSynchronization = 1; nxagentForceSynchronization = 1;
...@@ -517,7 +517,7 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) ...@@ -517,7 +517,7 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
nxagentLastInputDevicesDumpTime = 0; nxagentLastInputDevicesDumpTime = 0;
} }
} }
return 1; return True;
#endif #endif
break; break;
case KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB: case KEYSTROKE_DEACTIVATE_INPUT_DEVICES_GRAB:
...@@ -525,7 +525,7 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) ...@@ -525,7 +525,7 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
if (X->type == KeyPress) { if (X->type == KeyPress) {
nxagentDeactivateInputDevicesGrab(); nxagentDeactivateInputDevicesGrab();
} }
return 1; return True;
#endif #endif
break; break;
case KEYSTROKE_FULLSCREEN: case KEYSTROKE_FULLSCREEN:
...@@ -562,5 +562,5 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result) ...@@ -562,5 +562,5 @@ int nxagentCheckSpecialKeystroke(XKeyEvent *X, enum HandleEventResult *result)
case KEYSTROKE_MAX: case KEYSTROKE_MAX:
break; break;
} }
return (*result == doNothing) ? 0 : 1; return (*result == doNothing);
} }
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "Events.h" #include "Events.h"
extern int nxagentCheckSpecialKeystroke(XKeyEvent*, enum HandleEventResult*); extern Bool nxagentCheckSpecialKeystroke(XKeyEvent*, enum HandleEventResult*);
unsigned int nxagentAltMetaMask; unsigned int nxagentAltMetaMask;
......
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