moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-02-16 02:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename QUIT_MODIFIERS and MODIFIERS constants to ACTION_MODIFIERS

Browse Source 
For consistency in the evdev, sdl and x11 input drivers.
This commit is contained in:
Hugo Hromic
2018-12-01 13:30:49 +00:00
parent 9ab10f0dab
commit 9a1db0919b
2 changed files with 4 additions and 4 deletions
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;
#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_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
if ((dev->modifiers & QUIT_MODIFIERS) == QUIT_MODIFIERS &&
if ((dev->modifiers & ACTION_MODIFIERS) == ACTION_MODIFIERS &&
ev->code == QUIT_KEY && ev->value != 0) {
return false;
}

4
src/input/x11.c
View File

@@ -31,7 +31,7 @@
#include <stdlib.h>
#include <poll.h>
#define MODIFIERS (MODIFIER_SHIFT|MODIFIER_ALT|MODIFIER_CTRL)
#define ACTION_MODIFIERS (MODIFIER_SHIFT|MODIFIER_ALT|MODIFIER_CTRL)
static Display *display;
static Window window;
@@ -56,7 +56,7 @@ static int x11_handler(int fd) {
case KeyPress:
case KeyRelease:
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)
return LOOP_RETURN;
else {