summaryrefslogtreecommitdiffstats
path: root/sway/input/cursor.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r--sway/input/cursor.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 83b5212d..680fe39e 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -206,7 +206,7 @@ void cursor_handle_activity(struct sway_cursor *cursor) {
206 wl_event_source_timer_update( 206 wl_event_source_timer_update(
207 cursor->hide_source, cursor_get_timeout(cursor)); 207 cursor->hide_source, cursor_get_timeout(cursor));
208 208
209 wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); 209 seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_POINTER);
210 if (cursor->hidden) { 210 if (cursor->hidden) {
211 cursor_unhide(cursor); 211 cursor_unhide(cursor);
212 } 212 }
@@ -341,7 +341,7 @@ static void handle_cursor_frame(struct wl_listener *listener, void *data) {
341 341
342static void handle_touch_down(struct wl_listener *listener, void *data) { 342static void handle_touch_down(struct wl_listener *listener, void *data) {
343 struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down); 343 struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down);
344 wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); 344 seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TOUCH);
345 struct wlr_event_touch_down *event = data; 345 struct wlr_event_touch_down *event = data;
346 346
347 struct sway_seat *seat = cursor->seat; 347 struct sway_seat *seat = cursor->seat;
@@ -372,7 +372,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
372 372
373static void handle_touch_up(struct wl_listener *listener, void *data) { 373static void handle_touch_up(struct wl_listener *listener, void *data) {
374 struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up); 374 struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up);
375 wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); 375 seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TOUCH);
376 struct wlr_event_touch_up *event = data; 376 struct wlr_event_touch_up *event = data;
377 struct wlr_seat *seat = cursor->seat->wlr_seat; 377 struct wlr_seat *seat = cursor->seat->wlr_seat;
378 // TODO: fall back to cursor simulation if client has not bound to touch 378 // TODO: fall back to cursor simulation if client has not bound to touch
@@ -382,7 +382,7 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
382static void handle_touch_motion(struct wl_listener *listener, void *data) { 382static void handle_touch_motion(struct wl_listener *listener, void *data) {
383 struct sway_cursor *cursor = 383 struct sway_cursor *cursor =
384 wl_container_of(listener, cursor, touch_motion); 384 wl_container_of(listener, cursor, touch_motion);
385 wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); 385 seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TOUCH);
386 struct wlr_event_touch_motion *event = data; 386 struct wlr_event_touch_motion *event = data;
387 387
388 struct sway_seat *seat = cursor->seat; 388 struct sway_seat *seat = cursor->seat;
@@ -492,7 +492,7 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
492 492
493static void handle_tool_axis(struct wl_listener *listener, void *data) { 493static void handle_tool_axis(struct wl_listener *listener, void *data) {
494 struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_axis); 494 struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_axis);
495 wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); 495 seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TABLET_TOOL);
496 struct wlr_event_tablet_tool_axis *event = data; 496 struct wlr_event_tablet_tool_axis *event = data;
497 struct sway_tablet_tool *sway_tool = event->tool->data; 497 struct sway_tablet_tool *sway_tool = event->tool->data;
498 498
@@ -548,7 +548,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
548 548
549static void handle_tool_tip(struct wl_listener *listener, void *data) { 549static void handle_tool_tip(struct wl_listener *listener, void *data) {
550 struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_tip); 550 struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_tip);
551 wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); 551 seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TABLET_TOOL);
552 struct wlr_event_tablet_tool_tip *event = data; 552 struct wlr_event_tablet_tool_tip *event = data;
553 struct sway_tablet_tool *sway_tool = event->tool->data; 553 struct sway_tablet_tool *sway_tool = event->tool->data;
554 struct wlr_tablet_v2_tablet *tablet_v2 = sway_tool->tablet->tablet_v2; 554 struct wlr_tablet_v2_tablet *tablet_v2 = sway_tool->tablet->tablet_v2;
@@ -589,7 +589,7 @@ static struct sway_tablet *get_tablet_for_device(struct sway_cursor *cursor,
589 589
590static void handle_tool_proximity(struct wl_listener *listener, void *data) { 590static void handle_tool_proximity(struct wl_listener *listener, void *data) {
591 struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_proximity); 591 struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_proximity);
592 wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); 592 seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TABLET_TOOL);
593 struct wlr_event_tablet_tool_proximity *event = data; 593 struct wlr_event_tablet_tool_proximity *event = data;
594 594
595 struct wlr_tablet_tool *tool = event->tool; 595 struct wlr_tablet_tool *tool = event->tool;
@@ -619,7 +619,7 @@ static void handle_tool_proximity(struct wl_listener *listener, void *data) {
619 619
620static void handle_tool_button(struct wl_listener *listener, void *data) { 620static void handle_tool_button(struct wl_listener *listener, void *data) {
621 struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_button); 621 struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_button);
622 wlr_idle_notify_activity(server.idle, cursor->seat->wlr_seat); 622 seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TABLET_TOOL);
623 struct wlr_event_tablet_tool_button *event = data; 623 struct wlr_event_tablet_tool_button *event = data;
624 struct sway_tablet_tool *sway_tool = event->tool->data; 624 struct sway_tablet_tool *sway_tool = event->tool->data;
625 struct wlr_tablet_v2_tablet *tablet_v2 = sway_tool->tablet->tablet_v2; 625 struct wlr_tablet_v2_tablet *tablet_v2 = sway_tool->tablet->tablet_v2;