Display and control your Android device
Fix touch events HiDPI-scaling
Romain Vimonte8a565f9ea91
diff --git a/app/src/input_manager.c b/app/src/input_manager.cindex 52f4f9fe..9c22ee0a 100644--- a/app/src/input_manager.c+++ b/app/src/input_manager.c@@ -434,7 +434,7 @@ convert_mouse_motion(const SDL_MouseMotionEvent *from, struct screen *screen,to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;to->inject_touch_event.position.screen_size = screen->frame_size;to->inject_touch_event.position.point =- screen_convert_to_frame_coords(screen, from->x, from->y);+ screen_convert_window_to_frame_coords(screen, from->x, from->y);to->inject_touch_event.pressure = 1.f;to->inject_touch_event.buttons = convert_mouse_buttons(from->state);@@ -472,15 +472,15 @@ convert_touch(const SDL_TouchFingerEvent *from, struct screen *screen,to->inject_touch_event.pointer_id = from->fingerId;to->inject_touch_event.position.screen_size = screen->frame_size;- int ww;- int wh;- SDL_GL_GetDrawableSize(screen->window, &ww, &wh);+ int dw;+ int dh;+ SDL_GL_GetDrawableSize(screen->window, &dw, &dh);// SDL touch event coordinates are normalized in the range [0; 1]- int32_t x = from->x * ww;- int32_t y = from->y * wh;+ int32_t x = from->x * dw;+ int32_t y = from->y * dh;to->inject_touch_event.position.point =- screen_convert_to_frame_coords(screen, x, y);+ screen_convert_drawable_to_frame_coords(screen, x, y);to->inject_touch_event.pressure = from->pressure;to->inject_touch_event.buttons = 0;@@ -510,7 +510,7 @@ convert_mouse_button(const SDL_MouseButtonEvent *from, struct screen *screen,to->inject_touch_event.pointer_id = POINTER_ID_MOUSE;to->inject_touch_event.position.screen_size = screen->frame_size;to->inject_touch_event.position.point =- screen_convert_to_frame_coords(screen, from->x, from->y);+ screen_convert_window_to_frame_coords(screen, from->x, from->y);to->inject_touch_event.pressure = 1.f;to->inject_touch_event.buttons =convert_mouse_buttons(SDL_BUTTON(from->button));@@ -575,7 +575,8 @@ convert_mouse_wheel(const SDL_MouseWheelEvent *from, struct screen *screen,struct position position = {.screen_size = screen->frame_size,- .point = screen_convert_to_frame_coords(screen, mouse_x, mouse_y),+ .point = screen_convert_window_to_frame_coords(screen,+ mouse_x, mouse_y),};to->type = CONTROL_MSG_TYPE_INJECT_SCROLL_EVENT;diff --git a/app/src/screen.c b/app/src/screen.cindex 4cee61b0..fe2bc867 100644--- a/app/src/screen.c+++ b/app/src/screen.c@@ -580,14 +580,14 @@ screen_handle_window_event(struct screen *screen,}struct point-screen_convert_to_frame_coords(struct screen *screen, int32_t x, int32_t y) {+screen_convert_drawable_to_frame_coords(struct screen *screen,+ int32_t x, int32_t y) {unsigned rotation = screen->rotation;assert(rotation < 4);int32_t w = screen->content_size.width;int32_t h = screen->content_size.height;- screen_hidpi_scale_coords(screen, &x, &y);x = (int64_t) (x - screen->rect.x) * w / screen->rect.w;y = (int64_t) (y - screen->rect.y) * h / screen->rect.h;@@ -616,6 +616,13 @@ screen_convert_to_frame_coords(struct screen *screen, int32_t x, int32_t y) {return result;}+struct point+screen_convert_window_to_frame_coords(struct screen *screen,+ int32_t x, int32_t y) {+ screen_hidpi_scale_coords(screen, &x, &y);+ return screen_convert_drawable_to_frame_coords(screen, x, y);+}+voidscreen_hidpi_scale_coords(struct screen *screen, int32_t *x, int32_t *y) {// take the HiDPI scaling (dw/ww and dh/wh) into accountdiff --git a/app/src/screen.h b/app/src/screen.hindex 4c3a593e..c4fbbf66 100644--- a/app/src/screen.h+++ b/app/src/screen.h@@ -124,7 +124,14 @@ screen_handle_window_event(struct screen *screen, const SDL_WindowEvent *event);// convert point from window coordinates to frame coordinates// x and y are expressed in pixelsstruct point-screen_convert_to_frame_coords(struct screen *screen, int32_t x, int32_t y);+screen_convert_window_to_frame_coords(struct screen *screen,+ int32_t x, int32_t y);++// convert point from drawable coordinates to frame coordinates+// x and y are expressed in pixels+struct point+screen_convert_drawable_to_frame_coords(struct screen *screen,+ int32_t x, int32_t y);// Convert coordinates from window to drawable.// Events are expressed in window coordinates, but content is expressed in