aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tudor Brindus <me@tbrindus.ca>2022-01-17 16:53:46 -0500
committerLibravatar Simon Ser <contact@emersion.fr>2022-01-21 13:13:16 +0100
commit9a2155eed26d3d73059c39dd68a324f2f43332db (patch)
tree18a5e38c6e740bcc9d7b215b8840e76c3a5f96e3
parentbuild: bump version to 1.7-rc3 (diff)
downloadsway-9a2155eed26d3d73059c39dd68a324f2f43332db.tar.gz
sway-9a2155eed26d3d73059c39dd68a324f2f43332db.tar.zst
sway-9a2155eed26d3d73059c39dd68a324f2f43332db.zip
input/cursor: count pointer gestures as idle activity
Fixes https://github.com/swaywm/sway/issues/6765. (cherry picked from commit fd53f80156cee413a5166fb8e904a11901e45548)
-rw-r--r--sway/input/cursor.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index d8b1abeb..322b91fb 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -927,6 +927,7 @@ static void handle_pointer_pinch_begin(struct wl_listener *listener, void *data)
927 struct sway_cursor *cursor = wl_container_of( 927 struct sway_cursor *cursor = wl_container_of(
928 listener, cursor, pinch_begin); 928 listener, cursor, pinch_begin);
929 struct wlr_event_pointer_pinch_begin *event = data; 929 struct wlr_event_pointer_pinch_begin *event = data;
930 cursor_handle_activity_from_device(cursor, event->device);
930 wlr_pointer_gestures_v1_send_pinch_begin( 931 wlr_pointer_gestures_v1_send_pinch_begin(
931 cursor->pointer_gestures, cursor->seat->wlr_seat, 932 cursor->pointer_gestures, cursor->seat->wlr_seat,
932 event->time_msec, event->fingers); 933 event->time_msec, event->fingers);
@@ -936,6 +937,7 @@ static void handle_pointer_pinch_update(struct wl_listener *listener, void *data
936 struct sway_cursor *cursor = wl_container_of( 937 struct sway_cursor *cursor = wl_container_of(
937 listener, cursor, pinch_update); 938 listener, cursor, pinch_update);
938 struct wlr_event_pointer_pinch_update *event = data; 939 struct wlr_event_pointer_pinch_update *event = data;
940 cursor_handle_activity_from_device(cursor, event->device);
939 wlr_pointer_gestures_v1_send_pinch_update( 941 wlr_pointer_gestures_v1_send_pinch_update(
940 cursor->pointer_gestures, cursor->seat->wlr_seat, 942 cursor->pointer_gestures, cursor->seat->wlr_seat,
941 event->time_msec, event->dx, event->dy, 943 event->time_msec, event->dx, event->dy,
@@ -946,6 +948,7 @@ static void handle_pointer_pinch_end(struct wl_listener *listener, void *data) {
946 struct sway_cursor *cursor = wl_container_of( 948 struct sway_cursor *cursor = wl_container_of(
947 listener, cursor, pinch_end); 949 listener, cursor, pinch_end);
948 struct wlr_event_pointer_pinch_end *event = data; 950 struct wlr_event_pointer_pinch_end *event = data;
951 cursor_handle_activity_from_device(cursor, event->device);
949 wlr_pointer_gestures_v1_send_pinch_end( 952 wlr_pointer_gestures_v1_send_pinch_end(
950 cursor->pointer_gestures, cursor->seat->wlr_seat, 953 cursor->pointer_gestures, cursor->seat->wlr_seat,
951 event->time_msec, event->cancelled); 954 event->time_msec, event->cancelled);
@@ -964,6 +967,7 @@ static void handle_pointer_swipe_update(struct wl_listener *listener, void *data
964 struct sway_cursor *cursor = wl_container_of( 967 struct sway_cursor *cursor = wl_container_of(
965 listener, cursor, swipe_update); 968 listener, cursor, swipe_update);
966 struct wlr_event_pointer_swipe_update *event = data; 969 struct wlr_event_pointer_swipe_update *event = data;
970 cursor_handle_activity_from_device(cursor, event->device);
967 wlr_pointer_gestures_v1_send_swipe_update( 971 wlr_pointer_gestures_v1_send_swipe_update(
968 cursor->pointer_gestures, cursor->seat->wlr_seat, 972 cursor->pointer_gestures, cursor->seat->wlr_seat,
969 event->time_msec, event->dx, event->dy); 973 event->time_msec, event->dx, event->dy);
@@ -973,6 +977,7 @@ static void handle_pointer_swipe_end(struct wl_listener *listener, void *data) {
973 struct sway_cursor *cursor = wl_container_of( 977 struct sway_cursor *cursor = wl_container_of(
974 listener, cursor, swipe_end); 978 listener, cursor, swipe_end);
975 struct wlr_event_pointer_swipe_end *event = data; 979 struct wlr_event_pointer_swipe_end *event = data;
980 cursor_handle_activity_from_device(cursor, event->device);
976 wlr_pointer_gestures_v1_send_swipe_end( 981 wlr_pointer_gestures_v1_send_swipe_end(
977 cursor->pointer_gestures, cursor->seat->wlr_seat, 982 cursor->pointer_gestures, cursor->seat->wlr_seat,
978 event->time_msec, event->cancelled); 983 event->time_msec, event->cancelled);