arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 06:18:07 +00:00
Code Issues Releases Wiki Activity

feat(core/emu): handle arrow buttons as swipes

Browse Source 
[no changelog]
This commit is contained in:
obrusvit 2024-03-16 15:22:32 +01:00 committed by Vít Obrusník
parent 58187625f1
commit 54468abd89
1 changed files with 163 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

223
core/embed/trezorhal/unix/touch/touch.c
View File

@ -31,17 +31,166 @@
extern int sdl_display_res_x, sdl_display_res_y; extern int sdl_display_res_x, sdl_display_res_y;
extern int sdl_touch_offset_x, sdl_touch_offset_y; extern int sdl_touch_offset_x, sdl_touch_offset_y;
static bool _touch_detected = false;
static int _touch_x = 0; static int _touch_x = 0;
static int _touch_y = 0; static int _touch_y = 0;
// distance from the edge where arrow button swipe starts [px]
static const int _btn_swipe_begin = 20;
// length of the arrow button swipe [px]
static const int _btn_swipe_length = 60;
// A state machine to handle both mouse inputs (simulating touch) and arrow
// buttons (to simulate scroll movements). The variable `input_state` is used to
// ensure that arrow keys are not processed when mouse input is in progress and
// that mouse actions are not processed while arrow button swipe is not
// finished.
typedef enum {
IDLE,
MOUSE_DOWN_INSIDE,
MOUSE_DOWN_OUTSIDE,
BUTTON_SWIPE_LEFT_INITIATED,
BUTTON_SWIPE_RIGHT_INITIATED,
BUTTON_SWIPE_UP_INITIATED,
BUTTON_SWIPE_DOWN_INITIATED,
BUTTON_SWIPE_COMPLETED
} touch_input_state_t;
static touch_input_state_t input_state = IDLE;
static bool is_inside_display(int x, int y) { static bool is_inside_display(int x, int y) {
return (x >= sdl_touch_offset_x && y >= sdl_touch_offset_y && return x >= sdl_touch_offset_x && y >= sdl_touch_offset_y &&
x - sdl_touch_offset_x < sdl_display_res_x && x - sdl_touch_offset_x < sdl_display_res_x &&
y - sdl_touch_offset_y < sdl_display_res_y); y - sdl_touch_offset_y < sdl_display_res_y;
}
static bool is_button_swipe_initiated() {
return input_state == BUTTON_SWIPE_LEFT_INITIATED ||
input_state == BUTTON_SWIPE_RIGHT_INITIATED ||
input_state == BUTTON_SWIPE_UP_INITIATED ||
input_state == BUTTON_SWIPE_DOWN_INITIATED;
}
static void handle_mouse_events(SDL_Event event, int* ev_type, int* ev_x,
int* ev_y) {
bool inside_display = is_inside_display(event.button.x, event.button.y);
switch (event.type) {
case SDL_MOUSEBUTTONDOWN:
if (inside_display) {
*ev_x = event.button.x - sdl_touch_offset_x;
*ev_y = event.button.y - sdl_touch_offset_y;
*ev_type = TOUCH_START;
input_state = MOUSE_DOWN_INSIDE;
}
break;
case SDL_MOUSEBUTTONUP:
if (input_state != IDLE) {
*ev_x = inside_display ? event.button.x - sdl_touch_offset_x : _touch_x;
*ev_y = inside_display ? event.button.y - sdl_touch_offset_y : _touch_y;
*ev_type = TOUCH_END;
input_state = IDLE;
}
break;
case SDL_MOUSEMOTION:
if (input_state != IDLE) {
if (inside_display) {
*ev_x = event.motion.x - sdl_touch_offset_x;
*ev_y = event.motion.y - sdl_touch_offset_y;
// simulate TOUCH_START if pressed in mouse returned on visible area
*ev_type =
(input_state == MOUSE_DOWN_OUTSIDE) ? TOUCH_START : TOUCH_MOVE;
input_state = MOUSE_DOWN_INSIDE;
} else {
if (input_state == MOUSE_DOWN_INSIDE) {
// use last valid coordinates and simulate TOUCH_END
*ev_x = _touch_x;
*ev_y = _touch_y;
*ev_type = TOUCH_END;
}
input_state = MOUSE_DOWN_OUTSIDE;
}
}
break;
}
}
static void handle_button_events(SDL_Event event, int* ev_type, int* ev_x,
int* ev_y) {
// Handle arrow buttons to trigger a scroll movement by set length in the
// direction of the button
if (event.type == SDL_KEYDOWN && !event.key.repeat &&
!is_button_swipe_initiated()) {
switch (event.key.keysym.sym) {
case SDLK_LEFT:
*ev_x = _btn_swipe_begin;
*ev_y = sdl_display_res_y / 2;
*ev_type = TOUCH_START;
input_state = BUTTON_SWIPE_LEFT_INITIATED;
break;
case SDLK_RIGHT:
*ev_x = sdl_display_res_x - _btn_swipe_begin;
*ev_y = sdl_display_res_y / 2;
*ev_type = TOUCH_START;
input_state = BUTTON_SWIPE_RIGHT_INITIATED;
break;
case SDLK_UP:
*ev_x = sdl_display_res_x / 2;
*ev_y = _btn_swipe_begin;
*ev_type = TOUCH_START;
input_state = BUTTON_SWIPE_UP_INITIATED;
break;
case SDLK_DOWN:
*ev_x = sdl_display_res_x / 2;
*ev_y = sdl_display_res_y - _btn_swipe_begin;
*ev_type = TOUCH_START;
input_state = BUTTON_SWIPE_DOWN_INITIATED;
break;
}
} else if (event.type == SDL_KEYUP && input_state != IDLE) {
switch (event.key.keysym.sym) {
case SDLK_LEFT:
if (input_state == BUTTON_SWIPE_LEFT_INITIATED) {
*ev_x = _btn_swipe_begin + _btn_swipe_length;
*ev_y = sdl_display_res_y / 2;
*ev_type = TOUCH_MOVE;
input_state = BUTTON_SWIPE_COMPLETED;
}
break;
case SDLK_RIGHT:
if (input_state == BUTTON_SWIPE_RIGHT_INITIATED) {
*ev_x = sdl_display_res_x - _btn_swipe_begin - _btn_swipe_length;
*ev_y = sdl_display_res_y / 2;
*ev_type = TOUCH_MOVE;
input_state = BUTTON_SWIPE_COMPLETED;
}
break;
case SDLK_UP:
if (input_state == BUTTON_SWIPE_UP_INITIATED) {
*ev_x = sdl_display_res_x / 2;
*ev_y = _btn_swipe_begin + _btn_swipe_length;
*ev_type = TOUCH_MOVE;
input_state = BUTTON_SWIPE_COMPLETED;
}
break;
case SDLK_DOWN:
if (input_state == BUTTON_SWIPE_DOWN_INITIATED) {
*ev_x = sdl_display_res_x / 2;
*ev_y = sdl_display_res_y - _btn_swipe_begin - _btn_swipe_length;
*ev_type = TOUCH_MOVE;
input_state = BUTTON_SWIPE_COMPLETED;
}
break;
}
}
} }
uint32_t touch_read(void) { uint32_t touch_read(void) {
if (input_state == BUTTON_SWIPE_COMPLETED) {
input_state = IDLE;
return TOUCH_END | touch_pack_xy(_touch_x, _touch_y);
}
emulator_poll_events(); emulator_poll_events();
SDL_Event event; SDL_Event event;
SDL_PumpEvents(); SDL_PumpEvents();
@ -51,68 +200,20 @@ uint32_t touch_read(void) {
int ev_type = 0; int ev_type = 0;
while (SDL_PollEvent(&event) > 0) { while (SDL_PollEvent(&event) > 0) {
switch (event.type) { if (input_state == IDLE || input_state == MOUSE_DOWN_INSIDE ||
case SDL_MOUSEBUTTONDOWN: input_state == MOUSE_DOWN_OUTSIDE) {
if (is_inside_display(event.button.x, event.button.y)) { handle_mouse_events(event, &ev_type, &ev_x, &ev_y);
ev_x = event.button.x - sdl_touch_offset_x; }
ev_y = event.button.y - sdl_touch_offset_y; if (input_state == IDLE || is_button_swipe_initiated()) {
ev_type = TOUCH_START; handle_button_events(event, &ev_type, &ev_x, &ev_y);
}
break;
case SDL_MOUSEBUTTONUP:
if (_touch_detected) {
if (is_inside_display(event.button.x, event.button.y)) {
ev_x = event.button.x - sdl_touch_offset_x;
ev_y = event.button.y - sdl_touch_offset_y;
} else {
// use last valid coordinates
ev_x = _touch_x;
ev_y = _touch_y;
}
ev_type = TOUCH_END;
}
break;
case SDL_MOUSEMOTION:
if (is_inside_display(event.motion.x, event.motion.y)) {
ev_x = event.motion.x - sdl_touch_offset_x;
ev_y = event.motion.y - sdl_touch_offset_y;
if (_touch_detected) {
ev_type = TOUCH_MOVE;
} else if (event.motion.state != 0) { // button pressed ?
// simulate TOUCH_START
ev_type = TOUCH_START;
}
} else {
if (_touch_detected) {
// use last valid coordinates and simulate TOUCH_END
ev_x = _touch_x;
ev_y = _touch_y;
ev_type = TOUCH_END;
}
}
break;
} }
if (ev_type != 0) { if (ev_type != 0) {
_touch_x = ev_x; _touch_x = ev_x;
_touch_y = ev_y; _touch_y = ev_y;
break;
if (ev_type == TOUCH_START) {
_touch_detected = true;
break;
}
if (ev_type == TOUCH_END) {
_touch_detected = false;
break;
}
} }
} }
return ev_type | touch_pack_xy(ev_x, ev_y); return ev_type | touch_pack_xy(ev_x, ev_y);
} }
@ -120,7 +221,9 @@ void touch_init(void) {}
void touch_power_on(void) {} void touch_power_on(void) {}
void touch_wait_until_ready(void) {} void touch_wait_until_ready(void) {}
uint32_t touch_is_detected(void) { return _touch_detected; } uint32_t touch_is_detected(void) {
return input_state == MOUSE_DOWN_INSIDE || is_button_swipe_initiated();
}
#endif #endif