mir/scrcpy
2
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy synced 2025-09-01 14:55:13 +00:00
Code Issues Releases Wiki Activity

Explicitly pass control flag to input manager

Browse Source 
Replace the "global" control flag in the input_manager by a function
parameter to make explicit that the behavior depends whether
--no-control has been set.
This commit is contained in:
Romain Vimont
2019-03-03 11:05:26 +01:00
parent 6baed8a06f
commit f7efafd846
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/input_manager.c
View File

@@ -191,7 +191,8 @@ input_manager_process_text_input(struct input_manager *input_manager,
void
input_manager_process_key(struct input_manager *input_manager,
const SDL_KeyboardEvent *event) {
const SDL_KeyboardEvent *event,
bool control) {
bool ctrl = event->keysym.mod & (KMOD_LCTRL | KMOD_RCTRL);
bool alt = event->keysym.mod & (KMOD_LALT | KMOD_RALT);
bool meta = event->keysym.mod & (KMOD_LGUI | KMOD_RGUI);
@@ -202,9 +203,6 @@ input_manager_process_key(struct input_manager *input_manager,
return;
}
// false if the user requested not to interact with the device
bool control = input_manager->control;
// capture all Ctrl events
if (ctrl | meta) {
SDL_Keycode keycode = event->keysym.sym;
@@ -341,10 +339,8 @@ is_outside_device_screen(struct input_manager *input_manager, int x, int y)
void
input_manager_process_mouse_button(struct input_manager *input_manager,
const SDL_MouseButtonEvent *event) {
// false if the user requested not to interact with the device
bool control = input_manager->control;
const SDL_MouseButtonEvent *event,
bool control) {
if (event->type == SDL_MOUSEBUTTONDOWN) {
if (control && event->button == SDL_BUTTON_RIGHT) {
press_back_or_turn_screen_on(input_manager->controller);