Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Make some mouse processors ops optional

Browse source 
Do not force all mouse processors to implement scroll events or touch
events.
This commit is contained in:
Romain Vimont 2021-12-30 15:08:42 +01:00
parent bc674721dc
commit 57f1655d4b
2 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/input_manager.c
View file

@ -657,6 +657,7 @@ input_manager_process_mouse_motion(struct input_manager *im,
im->forward_all_clicks), im->forward_all_clicks),
}; };
assert(im->mp->ops->process_mouse_motion);
im->mp->ops->process_mouse_motion(im->mp, &evt); im->mp->ops->process_mouse_motion(im->mp, &evt);
if (im->vfinger_down) { if (im->vfinger_down) {
@ -671,6 +672,11 @@ input_manager_process_mouse_motion(struct input_manager *im,
static void static void
input_manager_process_touch(struct input_manager *im, input_manager_process_touch(struct input_manager *im,
const SDL_TouchFingerEvent *event) { const SDL_TouchFingerEvent *event) {
if (!im->mp->ops->process_touch) {
// The mouse processor does not support touch events
return;
}
int dw; int dw;
int dh; int dh;
SDL_GL_GetDrawableSize(im->screen->window, &dw, &dh); SDL_GL_GetDrawableSize(im->screen->window, &dw, &dh);
@ -764,6 +770,7 @@ input_manager_process_mouse_button(struct input_manager *im,
im->forward_all_clicks), im->forward_all_clicks),
}; };
assert(im->mp->ops->process_mouse_click);
im->mp->ops->process_mouse_click(im->mp, &evt); im->mp->ops->process_mouse_click(im->mp, &evt);
// Pinch-to-zoom simulation. // Pinch-to-zoom simulation.
@ -795,6 +802,11 @@ input_manager_process_mouse_button(struct input_manager *im,
static void static void
input_manager_process_mouse_wheel(struct input_manager *im, input_manager_process_mouse_wheel(struct input_manager *im,
const SDL_MouseWheelEvent *event) { const SDL_MouseWheelEvent *event) {
if (!im->mp->ops->process_mouse_scroll) {
// The mouse processor does not support scroll events
return;
}
// mouse_x and mouse_y are expressed in pixels relative to the window // mouse_x and mouse_y are expressed in pixels relative to the window
int mouse_x; int mouse_x;
int mouse_y; int mouse_y;

20
app/src/trait/mouse_processor.h
View file

@ -19,18 +19,38 @@ struct sc_mouse_processor {
}; };
struct sc_mouse_processor_ops { struct sc_mouse_processor_ops {
/**
* Process a mouse motion event
*
* This function is mandatory.
*/
void void
(*process_mouse_motion)(struct sc_mouse_processor *mp, (*process_mouse_motion)(struct sc_mouse_processor *mp,
const struct sc_mouse_motion_event *event); const struct sc_mouse_motion_event *event);
/**
* Process a mouse click event
*
* This function is mandatory.
*/
void void
(*process_mouse_click)(struct sc_mouse_processor *mp, (*process_mouse_click)(struct sc_mouse_processor *mp,
const struct sc_mouse_click_event *event); const struct sc_mouse_click_event *event);
/**
* Process a mouse scroll event
*
* This function is optional.
*/
void void
(*process_mouse_scroll)(struct sc_mouse_processor *mp, (*process_mouse_scroll)(struct sc_mouse_processor *mp,
const struct sc_mouse_scroll_event *event); const struct sc_mouse_scroll_event *event);
/**
* Process a touch event
*
* This function is optional.
*/
void void
(*process_touch)(struct sc_mouse_processor *mp, (*process_touch)(struct sc_mouse_processor *mp,
const struct sc_touch_event *event); const struct sc_touch_event *event);