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

Use keyboard combination to quit in SDL mode

Browse Source
This commit is contained in:
Iwan Timmer
2015-08-03 21:53:50 +02:00
parent 881acff6b3
commit 721b7561c7
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/input/sdlinput.c
View File

@@ -23,7 +23,8 @@
#include "limelight-common/Limelight.h"
#include <stdbool.h>
#define QUIT_MODIFIERS (MODIFIER_SHIFT|MODIFIER_ALT|MODIFIER_CTRL)
#define QUIT_KEY SDLK_q
typedef struct _GAMEPAD_STATE {
char leftTrigger, rightTrigger;
@@ -69,7 +70,7 @@ static PGAMEPAD_STATE get_gamepad(SDL_JoystickID sdl_id) {
return &gamepads[0];
}
void sdlinput_handle_event(SDL_Event* event) {
bool sdlinput_handle_event(SDL_Event* event) {
int button = 0;
PGAMEPAD_STATE gamepad;
switch (event->type) {
@@ -128,6 +129,10 @@ void sdlinput_handle_event(SDL_Event* event) {
keyboard_modifiers &= ~modifier;
}
// Quit the stream if all the required quit keys are down
if ((keyboard_modifiers & QUIT_MODIFIERS) == QUIT_MODIFIERS && event->key.keysym.sym == QUIT_KEY && event->type==SDL_KEYUP)
return false;
LiSendKeyboardEvent(0x80 << 8 | button, event->type==SDL_KEYDOWN?KEY_ACTION_DOWN:KEY_ACTION_UP, keyboard_modifiers);
break;
case SDL_CONTROLLERAXISMOTION:
@@ -152,7 +157,7 @@ void sdlinput_handle_event(SDL_Event* event) {
gamepad->rightTrigger = (event->caxis.value >> 8) + 127;
break;
default:
return;
return true;
}
LiSendMultiControllerEvent(gamepad->id, gamepad->buttons, gamepad->leftTrigger, gamepad->rightTrigger, gamepad->leftStickX, gamepad->leftStickY, gamepad->rightStickX, gamepad->rightStickY);
break;
@@ -206,7 +211,7 @@ void sdlinput_handle_event(SDL_Event* event) {
button = RB_FLAG;
break;
default:
return;
return true;
}
if (event->type == SDL_CONTROLLERBUTTONDOWN)
gamepad->buttons |= button;
@@ -216,6 +221,7 @@ void sdlinput_handle_event(SDL_Event* event) {
LiSendMultiControllerEvent(gamepad->id, gamepad->buttons, gamepad->leftTrigger, gamepad->rightTrigger, gamepad->leftStickX, gamepad->leftStickY, gamepad->rightStickX, gamepad->rightStickY);
break;
}
return true;
}
#endif /* HAVE_SDL */

3
src/input/sdlinput.h
View File

@@ -19,6 +19,7 @@
#ifdef HAVE_SDL
#include <stdbool.h>
#include <SDL.h>
static const short keyCodes[] = {
@@ -50,6 +51,6 @@ static const short keyCodes[] = {
};
void sdlinput_init();
void sdlinput_handle_event(SDL_Event* event);
bool sdlinput_handle_event(SDL_Event* event);
#endif /* HAVE_SDL */

6
src/sdl.c
View File

@@ -36,10 +36,10 @@ void sdl_loop() {
SDL_Event event;
while(!done && SDL_WaitEvent(&event)) {
sdlinput_handle_event(&event);
if (event.type == SDL_QUIT) {
if (!sdlinput_handle_event(&event))
done = false;
else if (event.type == SDL_QUIT)
done = true;
}
}
}