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

seat: add debug logs when validating grab serials 

Makes it easier to debug when something goes wrong, e.g. button_count stuck
to 2 because the compositor ate a button release event.
This commit is contained in:
emersion 2019-03-05 01:36:23 +01:00 committed by Drew DeVault
parent 9601019192
commit 30d3426164
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
types/seat/wlr_seat_pointer.c
View File

@ -412,10 +412,16 @@ bool wlr_seat_validate_pointer_grab_serial(struct wlr_seat *seat,
struct wlr_surface *origin, uint32_t serial) { struct wlr_surface *origin, uint32_t serial) {
if (seat->pointer_state.button_count != 1 || if (seat->pointer_state.button_count != 1 ||
seat->pointer_state.grab_serial != serial) { seat->pointer_state.grab_serial != serial) {
wlr_log(WLR_DEBUG, "Pointer grab serial validation failed: "
"button_count=%"PRIu32" grab_serial=%"PRIu32" (got %"PRIu32")",
seat->pointer_state.button_count,
seat->pointer_state.grab_serial, serial);
return false; return false;
} }
if (origin != NULL && seat->pointer_state.focused_surface != origin) { if (origin != NULL && seat->pointer_state.focused_surface != origin) {
wlr_log(WLR_DEBUG, "Pointer grab serial validation failed: "
"invalid origin surface");
return false; return false;
} }

6
types/seat/wlr_seat_touch.c
View File

@ -365,6 +365,10 @@ bool wlr_seat_validate_touch_grab_serial(struct wlr_seat *seat,
struct wlr_touch_point **point_ptr) { struct wlr_touch_point **point_ptr) {
if (wlr_seat_touch_num_points(seat) != 1 || if (wlr_seat_touch_num_points(seat) != 1 ||
seat->touch_state.grab_serial != serial) { seat->touch_state.grab_serial != serial) {
wlr_log(WLR_DEBUG, "Touch grab serial validation failed: "
"num_points=%d grab_serial=%"PRIu32" (got %"PRIu32")",
wlr_seat_touch_num_points(seat),
seat->touch_state.grab_serial, serial);
return false; return false;
} }
@ -378,5 +382,7 @@ bool wlr_seat_validate_touch_grab_serial(struct wlr_seat *seat,
} }
} }
wlr_log(WLR_DEBUG, "Touch grab serial validation failed: "
"invalid origin surface");
return false; return false;
} }