mirror of
https://github.com/moonlight-stream/moonlight-embedded.git
synced 2025-07-03 16:25:31 +00:00
Read all pending X11 events during input handling
This commit is contained in:
parent
f79a99bc05
commit
697bee2954
129
src/input/x11.c
129
src/input/x11.c
@ -46,86 +46,85 @@ static Cursor cursor;
|
|||||||
static bool grabbed = True;
|
static bool grabbed = True;
|
||||||
|
|
||||||
static int x11_handler(int fd) {
|
static int x11_handler(int fd) {
|
||||||
if (!XPending(display))
|
|
||||||
return LOOP_OK;
|
|
||||||
|
|
||||||
XEvent event;
|
XEvent event;
|
||||||
int button = 0;
|
int button = 0;
|
||||||
int motion_x, motion_y;
|
int motion_x, motion_y;
|
||||||
|
|
||||||
XNextEvent(display, &event);
|
while (XPending(display)) {
|
||||||
switch (event.type) {
|
XNextEvent(display, &event);
|
||||||
case KeyPress:
|
switch (event.type) {
|
||||||
case KeyRelease:
|
case KeyPress:
|
||||||
if (event.xkey.keycode >= 8 && event.xkey.keycode < (sizeof(keyCodes)/sizeof(keyCodes[0]) + 8)) {
|
case KeyRelease:
|
||||||
if ((keyboard_modifiers & MODIFIERS) == MODIFIERS && event.type == KeyRelease) {
|
if (event.xkey.keycode >= 8 && event.xkey.keycode < (sizeof(keyCodes)/sizeof(keyCodes[0]) + 8)) {
|
||||||
grabbed = !grabbed;
|
if ((keyboard_modifiers & MODIFIERS) == MODIFIERS && event.type == KeyRelease) {
|
||||||
XDefineCursor(display, window, grabbed ? cursor : 0);
|
grabbed = !grabbed;
|
||||||
}
|
XDefineCursor(display, window, grabbed ? cursor : 0);
|
||||||
|
}
|
||||||
|
|
||||||
int modifier = 0;
|
int modifier = 0;
|
||||||
switch (event.xkey.keycode) {
|
switch (event.xkey.keycode) {
|
||||||
case 0x32:
|
case 0x32:
|
||||||
case 0x3e:
|
case 0x3e:
|
||||||
modifier = MODIFIER_SHIFT;
|
modifier = MODIFIER_SHIFT;
|
||||||
|
break;
|
||||||
|
case 0x40:
|
||||||
|
case 0x6c:
|
||||||
|
modifier = MODIFIER_ALT;
|
||||||
|
break;
|
||||||
|
case 0x25:
|
||||||
|
case 0x69:
|
||||||
|
modifier = MODIFIER_CTRL;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (modifier != 0) {
|
||||||
|
if (event.type == KeyPress)
|
||||||
|
keyboard_modifiers |= modifier;
|
||||||
|
else
|
||||||
|
keyboard_modifiers &= ~modifier;
|
||||||
|
}
|
||||||
|
|
||||||
|
short code = 0x80 << 8 | keyCodes[event.xkey.keycode - 8];
|
||||||
|
LiSendKeyboardEvent(code, event.type == KeyPress ? KEY_ACTION_DOWN : KEY_ACTION_UP, keyboard_modifiers);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ButtonPress:
|
||||||
|
case ButtonRelease:
|
||||||
|
switch (event.xbutton.button) {
|
||||||
|
case Button1:
|
||||||
|
button = BUTTON_LEFT;
|
||||||
break;
|
break;
|
||||||
case 0x40:
|
case Button2:
|
||||||
case 0x6c:
|
button = BUTTON_MIDDLE;
|
||||||
modifier = MODIFIER_ALT;
|
|
||||||
break;
|
break;
|
||||||
case 0x25:
|
case Button3:
|
||||||
case 0x69:
|
button = BUTTON_RIGHT;
|
||||||
modifier = MODIFIER_CTRL;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (modifier != 0) {
|
if (button != 0)
|
||||||
if (event.type == KeyPress)
|
LiSendMouseButtonEvent(event.type==ButtonPress ? BUTTON_ACTION_PRESS : BUTTON_ACTION_RELEASE, button);
|
||||||
keyboard_modifiers |= modifier;
|
break;
|
||||||
else
|
case MotionNotify:
|
||||||
keyboard_modifiers &= ~modifier;
|
motion_x = event.xmotion.x - last_x;
|
||||||
|
motion_y = event.xmotion.y - last_y;
|
||||||
|
if (abs(motion_x) > 0 || abs(motion_y) > 0) {
|
||||||
|
if (last_x >= 0 && last_y >= 0)
|
||||||
|
LiSendMouseMoveEvent(motion_x, motion_y);
|
||||||
|
|
||||||
|
if (grabbed)
|
||||||
|
XWarpPointer(display, None, window, 0, 0, 0, 0, 640, 360);
|
||||||
}
|
}
|
||||||
|
|
||||||
short code = 0x80 << 8 | keyCodes[event.xkey.keycode - 8];
|
last_x = grabbed ? 640 : event.xmotion.x;
|
||||||
LiSendKeyboardEvent(code, event.type == KeyPress ? KEY_ACTION_DOWN : KEY_ACTION_UP, keyboard_modifiers);
|
last_y = grabbed ? 360 : event.xmotion.y;
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ButtonPress:
|
|
||||||
case ButtonRelease:
|
|
||||||
switch (event.xbutton.button) {
|
|
||||||
case Button1:
|
|
||||||
button = BUTTON_LEFT;
|
|
||||||
break;
|
break;
|
||||||
case Button2:
|
case ClientMessage:
|
||||||
button = BUTTON_MIDDLE;
|
if (event.xclient.data.l[0] == wm_deletemessage)
|
||||||
break;
|
return LOOP_RETURN;
|
||||||
case Button3:
|
|
||||||
button = BUTTON_RIGHT;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (button != 0)
|
|
||||||
LiSendMouseButtonEvent(event.type==ButtonPress ? BUTTON_ACTION_PRESS : BUTTON_ACTION_RELEASE, button);
|
|
||||||
break;
|
|
||||||
case MotionNotify:
|
|
||||||
motion_x = event.xmotion.x - last_x;
|
|
||||||
motion_y = event.xmotion.y - last_y;
|
|
||||||
if (abs(motion_x) > 0 || abs(motion_y) > 0) {
|
|
||||||
if (last_x >= 0 && last_y >= 0)
|
|
||||||
LiSendMouseMoveEvent(motion_x, motion_y);
|
|
||||||
|
|
||||||
if (grabbed)
|
|
||||||
XWarpPointer(display, None, window, 0, 0, 0, 0, 640, 360);
|
|
||||||
}
|
|
||||||
|
|
||||||
last_x = grabbed ? 640 : event.xmotion.x;
|
|
||||||
last_y = grabbed ? 360 : event.xmotion.y;
|
|
||||||
break;
|
|
||||||
case ClientMessage:
|
|
||||||
if (event.xclient.data.l[0] == wm_deletemessage)
|
|
||||||
return LOOP_RETURN;
|
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return LOOP_OK;
|
return LOOP_OK;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user