blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove width_mm from wlr_touch events

This commit is contained in:
Drew DeVault 2018-03-28 11:04:40 -04:00
parent a35a5786b0
commit 324b9d910d
10 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/drm/legacy.c
View File

@ -47,7 +47,7 @@ bool legacy_crtc_set_cursor(struct wlr_drm_backend *drm,
if (drmModeSetCursor(drm->fd, crtc->id, gbm_bo_get_handle(bo).u32, if (drmModeSetCursor(drm->fd, crtc->id, gbm_bo_get_handle(bo).u32,
plane->surf.width, plane->surf.height)) { plane->surf.width, plane->surf.height)) {
wlr_log_errno(L_ERROR, "Failed to set hardware cursor"); wlr_log_errno(L_DEBUG, "Failed to set hardware cursor");
return false; return false;
} }

10
backend/libinput/touch.c
View File

@ -35,9 +35,8 @@ void handle_touch_down(struct libinput_event *event,
wlr_event.time_msec = wlr_event.time_msec =
usec_to_msec(libinput_event_touch_get_time_usec(tevent)); usec_to_msec(libinput_event_touch_get_time_usec(tevent));
wlr_event.touch_id = libinput_event_touch_get_slot(tevent); wlr_event.touch_id = libinput_event_touch_get_slot(tevent);
wlr_event.x_mm = libinput_event_touch_get_x(tevent); wlr_event.x = libinput_event_touch_get_x_transformed(tevent, 1);
wlr_event.y_mm = libinput_event_touch_get_y(tevent); wlr_event.y = libinput_event_touch_get_y_transformed(tevent, 1);
libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm);
wlr_signal_emit_safe(&wlr_dev->touch->events.down, &wlr_event); wlr_signal_emit_safe(&wlr_dev->touch->events.down, &wlr_event);
} }
@ -74,9 +73,8 @@ void handle_touch_motion(struct libinput_event *event,
wlr_event.time_msec = wlr_event.time_msec =
usec_to_msec(libinput_event_touch_get_time_usec(tevent)); usec_to_msec(libinput_event_touch_get_time_usec(tevent));
wlr_event.touch_id = libinput_event_touch_get_slot(tevent); wlr_event.touch_id = libinput_event_touch_get_slot(tevent);
wlr_event.x_mm = libinput_event_touch_get_x(tevent); wlr_event.x = libinput_event_touch_get_x_transformed(tevent, 1);
wlr_event.y_mm = libinput_event_touch_get_y(tevent); wlr_event.y = libinput_event_touch_get_y_transformed(tevent, 1);
libinput_device_get_size(libinput_dev, &wlr_event.width_mm, &wlr_event.height_mm);
wlr_signal_emit_safe(&wlr_dev->touch->events.motion, &wlr_event); wlr_signal_emit_safe(&wlr_dev->touch->events.motion, &wlr_event);
} }

8
examples/pointer.c
View File

@ -217,8 +217,8 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
struct wlr_event_touch_down *event = data; struct wlr_event_touch_down *event = data;
struct touch_point *point = calloc(1, sizeof(struct touch_point)); struct touch_point *point = calloc(1, sizeof(struct touch_point));
point->touch_id = event->touch_id; point->touch_id = event->touch_id;
point->x = event->x_mm / event->width_mm; point->x = event->x;
point->y = event->y_mm / event->height_mm; point->y = event->y;
wl_list_insert(&sample->touch_points, &point->link); wl_list_insert(&sample->touch_points, &point->link);
warp_to_touch(sample, event->device); warp_to_touch(sample, event->device);
@ -232,8 +232,8 @@ static void handle_touch_motion(struct wl_listener *listener, void *data) {
struct touch_point *point; struct touch_point *point;
wl_list_for_each(point, &sample->touch_points, link) { wl_list_for_each(point, &sample->touch_points, link) {
if (point->touch_id == event->touch_id) { if (point->touch_id == event->touch_id) {
point->x = event->x_mm / event->width_mm; point->x = event->x;
point->y = event->y_mm / event->height_mm; point->y = event->y;
break; break;
} }
} }

8
examples/support/shared.c
View File

@ -167,8 +167,8 @@ static void touch_down_notify(struct wl_listener *listener, void *data) {
struct wlr_event_touch_down *event = data; struct wlr_event_touch_down *event = data;
struct touch_state *tstate = wl_container_of(listener, tstate, down); struct touch_state *tstate = wl_container_of(listener, tstate, down);
if (tstate->compositor->touch_down_cb) { if (tstate->compositor->touch_down_cb) {
tstate->compositor->touch_down_cb(tstate, event->touch_id, tstate->compositor->touch_down_cb(tstate,
event->x_mm, event->y_mm, event->width_mm, event->height_mm); event->touch_id, event->x, event->y);
} }
} }
@ -176,8 +176,8 @@ static void touch_motion_notify(struct wl_listener *listener, void *data) {
struct wlr_event_touch_motion *event = data; struct wlr_event_touch_motion *event = data;
struct touch_state *tstate = wl_container_of(listener, tstate, motion); struct touch_state *tstate = wl_container_of(listener, tstate, motion);
if (tstate->compositor->touch_motion_cb) { if (tstate->compositor->touch_motion_cb) {
tstate->compositor->touch_motion_cb(tstate, event->touch_id, tstate->compositor->touch_motion_cb(tstate,
event->x_mm, event->y_mm, event->width_mm, event->height_mm); event->touch_id, event->x, event->y);
} }
} }

8
examples/support/shared.h
View File

@ -102,10 +102,10 @@ struct compositor_state {
enum wlr_axis_source source, enum wlr_axis_source source,
enum wlr_axis_orientation orientation, enum wlr_axis_orientation orientation,
double delta); double delta);
void (*touch_down_cb)(struct touch_state *s, int32_t touch_id, void (*touch_down_cb)(struct touch_state *s,
double x, double y, double width, double height); int32_t touch_id, double x, double y);
void (*touch_motion_cb)(struct touch_state *s, int32_t touch_id, void (*touch_motion_cb)(struct touch_state *s,
double x, double y, double width, double height); int32_t touch_id, double x, double y);
void (*touch_up_cb)(struct touch_state *s, int32_t touch_id); void (*touch_up_cb)(struct touch_state *s, int32_t touch_id);
void (*touch_cancel_cb)(struct touch_state *s, int32_t touch_id); void (*touch_cancel_cb)(struct touch_state *s, int32_t touch_id);
void (*tool_axis_cb)(struct tablet_tool_state *s, void (*tool_axis_cb)(struct tablet_tool_state *s,

16
examples/touch.c
View File

@ -60,13 +60,13 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
wlr_output_swap_buffers(wlr_output, NULL, NULL); wlr_output_swap_buffers(wlr_output, NULL, NULL);
} }
static void handle_touch_down(struct touch_state *tstate, int32_t touch_id, static void handle_touch_down(struct touch_state *tstate,
double x, double y, double width, double height) { int32_t touch_id, double x, double y) {
struct sample_state *sample = tstate->compositor->data; struct sample_state *sample = tstate->compositor->data;
struct touch_point *point = calloc(1, sizeof(struct touch_point)); struct touch_point *point = calloc(1, sizeof(struct touch_point));
point->touch_id = touch_id; point->touch_id = touch_id;
point->x = x / width; point->x = x;
point->y = y / height; point->y = y;
wl_list_insert(&sample->touch_points, &point->link); wl_list_insert(&sample->touch_points, &point->link);
} }
@ -81,14 +81,14 @@ static void handle_touch_up(struct touch_state *tstate, int32_t touch_id) {
} }
} }
static void handle_touch_motion(struct touch_state *tstate, int32_t touch_id, static void handle_touch_motion(struct touch_state *tstate,
double x, double y, double width, double height) { int32_t touch_id, double x, double y) {
struct sample_state *sample = tstate->compositor->data; struct sample_state *sample = tstate->compositor->data;
struct touch_point *point; struct touch_point *point;
wl_list_for_each(point, &sample->touch_points, link) { wl_list_for_each(point, &sample->touch_points, link) {
if (point->touch_id == touch_id) { if (point->touch_id == touch_id) {
point->x = x / width; point->x = x;
point->y = y / height; point->y = y;
break; break;
} }
} }

2
include/wlr/types/wlr_cursor.h
View File

@ -156,6 +156,6 @@ void wlr_cursor_map_input_to_region(struct wlr_cursor *cur,
*/ */
bool wlr_cursor_absolute_to_layout_coords(struct wlr_cursor *cur, bool wlr_cursor_absolute_to_layout_coords(struct wlr_cursor *cur,
struct wlr_input_device *device, double x_mm, double y_mm, struct wlr_input_device *device, double x_mm, double y_mm,
double width_mm, double height_mm, double *lx, double *ly); double *lx, double *ly);
#endif #endif

8
include/wlr/types/wlr_touch.h
View File

@ -23,8 +23,8 @@ struct wlr_event_touch_down {
struct wlr_input_device *device; struct wlr_input_device *device;
uint32_t time_msec; uint32_t time_msec;
int32_t touch_id; int32_t touch_id;
double x_mm, y_mm; // From 0..1
double width_mm, height_mm; double x, y;
}; };
struct wlr_event_touch_up { struct wlr_event_touch_up {
@ -37,8 +37,8 @@ struct wlr_event_touch_motion {
struct wlr_input_device *device; struct wlr_input_device *device;
uint32_t time_msec; uint32_t time_msec;
int32_t touch_id; int32_t touch_id;
double x_mm, y_mm; // From 0..1
double width_mm, height_mm; double x, y;
}; };
struct wlr_event_touch_cancel { struct wlr_event_touch_cancel {

9
rootston/cursor.c
View File

@ -310,10 +310,8 @@ void roots_cursor_handle_touch_down(struct roots_cursor *cursor,
struct roots_desktop *desktop = cursor->seat->input->server->desktop; struct roots_desktop *desktop = cursor->seat->input->server->desktop;
struct wlr_surface *surface = NULL; struct wlr_surface *surface = NULL;
double lx, ly; double lx, ly;
bool result = bool result = wlr_cursor_absolute_to_layout_coords(cursor->cursor,
wlr_cursor_absolute_to_layout_coords(cursor->cursor, event->device, event->x, event->y, &lx, &ly);
event->device, event->x_mm, event->y_mm, event->width_mm,
event->height_mm, &lx, &ly);
if (!result) { if (!result) {
return; return;
} }
@ -365,8 +363,7 @@ void roots_cursor_handle_touch_motion(struct roots_cursor *cursor,
double lx, ly; double lx, ly;
bool result = bool result =
wlr_cursor_absolute_to_layout_coords(cursor->cursor, wlr_cursor_absolute_to_layout_coords(cursor->cursor,
event->device, event->x_mm, event->y_mm, event->width_mm, event->device, event->x, event->y, &lx, &ly);
event->height_mm, &lx, &ly);
if (!result) { if (!result) {
return; return;
} }

12
types/wlr_cursor.c
View File

@ -640,19 +640,15 @@ void wlr_cursor_map_input_to_region(struct wlr_cursor *cur,
} }
bool wlr_cursor_absolute_to_layout_coords(struct wlr_cursor *cur, bool wlr_cursor_absolute_to_layout_coords(struct wlr_cursor *cur,
struct wlr_input_device *device, double x_mm, double y_mm, struct wlr_input_device *device, double x, double y,
double width_mm, double height_mm, double *lx, double *ly) { double *lx, double *ly) {
if (width_mm <= 0 || height_mm <= 0) {
return false;
}
struct wlr_box *mapping = get_mapping(cur, device); struct wlr_box *mapping = get_mapping(cur, device);
if (!mapping) { if (!mapping) {
mapping = wlr_output_layout_get_box(cur->state->layout, NULL); mapping = wlr_output_layout_get_box(cur->state->layout, NULL);
} }
*lx = x_mm > 0 ? mapping->width * (x_mm / width_mm) + mapping->x : cur->x; *lx = x > 0 ? mapping->width * x + mapping->x : cur->x;
*ly = y_mm > 0 ? mapping->height * (y_mm / height_mm) + mapping->y : cur->y; *ly = y > 0 ? mapping->height * y + mapping->y : cur->y;
return true; return true;
} }