aljaz/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2025-12-18 14:04:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor screencontrol to inputmanager

Browse Source 
The "screen control" handled user input, which happened to be only
used to control the screen.

The controller and screen were passed to every function. Instead, group
them in a struct input_manager.

The purpose is to add a new shortcut to enable/disable FPS counter. This
feature is not related to "screen control", and will require access to
the "frames" instance.
This commit is contained in:
Romain Vimont
2018-02-15 12:07:47 +01:00
parent fb0e467585
commit 000ced9ba8
5 changed files with 65 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/scrcpy.c
View File

@@ -16,11 +16,11 @@
#include "events.h"
#include "frames.h"
#include "fpscounter.h"
#include "inputmanager.h"
#include "log.h"
#include "lockutil.h"
#include "netutil.h"
#include "screen.h"
#include "screencontrol.h"
#include "server.h"
#include "tinyxpm.h"
@@ -30,6 +30,11 @@ static struct frames frames;
static struct decoder decoder;
static struct controller controller;
static struct input_manager input_manager = {
.controller = &controller,
.screen = &screen,
};
static void event_loop(void) {
SDL_Event event;
while (SDL_WaitEvent(&event)) {
@@ -60,23 +65,23 @@ static void event_loop(void) {
}
break;
case SDL_TEXTINPUT: {
screencontrol_handle_text_input(&controller, &screen, &event.text);
input_manager_process_text_input(&input_manager, &event.text);
break;
}
case SDL_KEYDOWN:
case SDL_KEYUP:
screencontrol_handle_key(&controller, &screen, &event.key);
input_manager_process_key(&input_manager, &event.key);
break;
case SDL_MOUSEMOTION:
screencontrol_handle_mouse_motion(&controller, &screen, &event.motion);
input_manager_process_mouse_motion(&input_manager, &event.motion);
break;
case SDL_MOUSEWHEEL: {
screencontrol_handle_mouse_wheel(&controller, &screen, &event.wheel);
input_manager_process_mouse_wheel(&input_manager, &event.wheel);
break;
}
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP: {
screencontrol_handle_mouse_button(&controller, &screen, &event.button);
input_manager_process_mouse_button(&input_manager, &event.button);
break;
}
}