fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-07 13:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools/debug-gui: draw a sprite for the unaccelerated pointer as well

Browse source 
Add a second grey v-shaped (upside down triangle) pointer that moves around
with the unaccelerated deltas. This makes it easier to visualize how the
unaccelerated pointer moves around, the snake helps for some use-cases but not
all of them.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-03-10 15:05:59 +10:00
parent 1926a66fab
commit 39b64107e9
2 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tools/libinput-debug-gui.c
View file

@ -88,6 +88,7 @@ struct window {
/* sprite position */ /* sprite position */
struct point pointer; struct point pointer;
struct point unaccelerated;
/* these are for the delta coordinates, but they're not /* these are for the delta coordinates, but they're not
* deltas, they are converted into abs positions */ * deltas, they are converted into abs positions */
@ -651,6 +652,15 @@ draw_pointer(struct window *w, cairo_t *cr)
cairo_rel_line_to(cr, 0, -15); cairo_rel_line_to(cr, 0, -15);
cairo_fill(cr); cairo_fill(cr);
/* draw unaccelerated sprite */
cairo_set_source_rgb(cr, 0.7, 0.7, 0.7);
cairo_save(cr);
cairo_move_to(cr, w->unaccelerated.x, w->unaccelerated.y);
cairo_rel_line_to(cr, -5, -10);
cairo_rel_line_to(cr, 10, 0);
cairo_rel_line_to(cr, -5, 10);
cairo_fill(cr);
/* pointer deltas */ /* pointer deltas */
mask = ARRAY_LENGTH(w->deltas); mask = ARRAY_LENGTH(w->deltas);
first = max(w->ndeltas + 1, mask) - mask; first = max(w->ndeltas + 1, mask) - mask;
@ -765,6 +775,8 @@ map_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
w->pointer.x = w->width/2; w->pointer.x = w->width/2;
w->pointer.y = w->height/2; w->pointer.y = w->height/2;
w->unaccelerated.x = w->width/2;
w->unaccelerated.y = w->height/2;
w->deltas[0].x = w->pointer.x; w->deltas[0].x = w->pointer.x;
w->deltas[0].y = w->pointer.y; w->deltas[0].y = w->pointer.y;
@ -1071,20 +1083,22 @@ handle_event_motion(struct libinput_event *ev, struct window *w)
struct libinput_event_pointer *p = libinput_event_get_pointer_event(ev); struct libinput_event_pointer *p = libinput_event_get_pointer_event(ev);
double dx = libinput_event_pointer_get_dx(p), double dx = libinput_event_pointer_get_dx(p),
dy = libinput_event_pointer_get_dy(p); dy = libinput_event_pointer_get_dy(p);
double dx_unaccel = libinput_event_pointer_get_dx_unaccelerated(p),
dy_unaccel = libinput_event_pointer_get_dy_unaccelerated(p);
struct point point; struct point point;
const int mask = ARRAY_LENGTH(w->deltas); const int mask = ARRAY_LENGTH(w->deltas);
size_t idx; size_t idx;
w->pointer.x += dx; w->pointer.x = clip(w->pointer.x + dx, 0.0, w->width);
w->pointer.y += dy; w->pointer.y = clip(w->pointer.y + dy, 0.0, w->height);
w->pointer.x = clip(w->pointer.x, 0.0, w->width); w->unaccelerated.x = clip(w->unaccelerated.x + dx_unaccel, 0.0, w->width);
w->pointer.y = clip(w->pointer.y, 0.0, w->height); w->unaccelerated.y = clip(w->unaccelerated.y + dy_unaccel, 0.0, w->height);
idx = w->ndeltas % mask; idx = w->ndeltas % mask;
point = w->deltas[idx]; point = w->deltas[idx];
idx = (w->ndeltas + 1) % mask; idx = (w->ndeltas + 1) % mask;
point.x += libinput_event_pointer_get_dx_unaccelerated(p); point.x += dx_unaccel;
point.y += libinput_event_pointer_get_dy_unaccelerated(p); point.y += dy_unaccel;
w->deltas[idx] = point; w->deltas[idx] = point;
w->ndeltas++; w->ndeltas++;
} }

8
tools/libinput-debug-gui.man
View file

@ -51,6 +51,14 @@ The cursor is displayed as black triangle. Various markers are displayed in
light grey to help debug cusor positioning. The cursor movement is light grey to help debug cusor positioning. The cursor movement is
the one as seen by libinput and may not match the cursor movement of the the one as seen by libinput and may not match the cursor movement of the
display server. display server.
.PP
The unaccelerated cusor motion is displayed as a grey upside-down triangle.
The movement of this cursor typically reflects the relative motion in device
units and can differ significantly to the normal cursor movement.
.PP
The unaccelerated cursor motion is also displayed as a yellow snake. This is
the connected set of recent deltas. Unlike the unaccelerated cursor, these
coordinates are not clipped to the window.
.TP 8 .TP 8
.B Button testing .B Button testing
Four oblongs are displayed at the bottom. The top three are left, middle, Four oblongs are displayed at the bottom. The top three are left, middle,