moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2025-07-03 08:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hhromic/code-cleanup'

Browse Source
This commit is contained in:
Iwan Timmer 2019-01-18 19:10:28 +01:00
commit 497cb87ea5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/input/evdev.c
View File

@ -93,7 +93,7 @@ static bool grabbingDevices;
int evdev_gamepads = 0; int evdev_gamepads = 0;
#define QUIT_MODIFIERS (MODIFIER_SHIFT|MODIFIER_ALT|MODIFIER_CTRL) #define ACTION_MODIFIERS (MODIFIER_SHIFT|MODIFIER_ALT|MODIFIER_CTRL)
#define QUIT_KEY KEY_Q #define QUIT_KEY KEY_Q
#define QUIT_BUTTONS (PLAY_FLAG|BACK_FLAG|LB_FLAG|RB_FLAG) #define QUIT_BUTTONS (PLAY_FLAG|BACK_FLAG|LB_FLAG|RB_FLAG)
@ -224,7 +224,7 @@ static bool evdev_handle_event(struct input_event *ev, struct input_device *dev)
} }
// Quit the stream if all the required quit keys are down // Quit the stream if all the required quit keys are down
if ((dev->modifiers & QUIT_MODIFIERS) == QUIT_MODIFIERS && if ((dev->modifiers & ACTION_MODIFIERS) == ACTION_MODIFIERS &&
ev->code == QUIT_KEY && ev->value != 0) { ev->code == QUIT_KEY && ev->value != 0) {
return false; return false;
} }

7
src/input/x11.c
View File

@ -31,7 +31,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <poll.h> #include <poll.h>
#define MODIFIERS (MODIFIER_SHIFT|MODIFIER_ALT|MODIFIER_CTRL) #define ACTION_MODIFIERS (MODIFIER_SHIFT|MODIFIER_ALT|MODIFIER_CTRL)
#define QUIT_KEY 0x18 /* KEY_Q */
static Display *display; static Display *display;
static Window window; static Window window;
@ -56,8 +57,8 @@ static int x11_handler(int fd) {
case KeyPress: case KeyPress:
case KeyRelease: case KeyRelease:
if (event.xkey.keycode >= 8 && event.xkey.keycode < (sizeof(keyCodes)/sizeof(keyCodes[0]) + 8)) { if (event.xkey.keycode >= 8 && event.xkey.keycode < (sizeof(keyCodes)/sizeof(keyCodes[0]) + 8)) {
if ((keyboard_modifiers & MODIFIERS) == MODIFIERS && event.type == KeyRelease) { if ((keyboard_modifiers & ACTION_MODIFIERS) == ACTION_MODIFIERS && event.type == KeyRelease) {
if (event.xkey.keycode == 0x18) if (event.xkey.keycode == QUIT_KEY)
return LOOP_RETURN; return LOOP_RETURN;
else { else {
grabbed = !grabbed; grabbed = !grabbed;