mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input/cursor: fix hide cursor timeouts on tablets and touchscreens 

This commit refactors `cursor_handle_activity` to also take the idle
source, so that it can be reused for tablet and touch activity.
Previously, the timeouts would be tracked, but the cursor would never be
un-hidden for anything but pointers.

Fixes #5169.
This commit is contained in:
Tudor Brindus 2020-04-19 22:49:19 -04:00 committed by Simon Ser
parent c23182fd7a
commit 44b2d3ad81
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sway/input/cursor.h
View File

@ -85,7 +85,8 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
void cursor_rebase(struct sway_cursor *cursor); void cursor_rebase(struct sway_cursor *cursor);
void cursor_rebase_all(void); void cursor_rebase_all(void);
void cursor_handle_activity(struct sway_cursor *cursor); void cursor_handle_activity(struct sway_cursor *cursor,
enum sway_input_idle_source idle_source);
void cursor_unhide(struct sway_cursor *cursor); void cursor_unhide(struct sway_cursor *cursor);
int cursor_get_timeout(struct sway_cursor *cursor); int cursor_get_timeout(struct sway_cursor *cursor);

29
sway/input/cursor.c
View File

@ -241,11 +241,12 @@ int cursor_get_timeout(struct sway_cursor *cursor) {
return timeout; return timeout;
} }
void cursor_handle_activity(struct sway_cursor *cursor) { void cursor_handle_activity(struct sway_cursor *cursor,
enum sway_input_idle_source idle_source) {
wl_event_source_timer_update( wl_event_source_timer_update(
cursor->hide_source, cursor_get_timeout(cursor)); cursor->hide_source, cursor_get_timeout(cursor));
seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_POINTER); seat_idle_notify_activity(cursor->seat, idle_source);
if (cursor->hidden) { if (cursor->hidden) {
cursor_unhide(cursor); cursor_unhide(cursor);
} }
@ -270,7 +271,7 @@ void cursor_unhide(struct sway_cursor *cursor) {
static void cursor_motion(struct sway_cursor *cursor, uint32_t time_msec, static void cursor_motion(struct sway_cursor *cursor, uint32_t time_msec,
struct wlr_input_device *device, double dx, double dy, struct wlr_input_device *device, double dx, double dy,
double dx_unaccel, double dy_unaccel) { double dx_unaccel, double dy_unaccel) {
cursor_handle_activity(cursor); cursor_handle_activity(cursor, IDLE_SOURCE_POINTER);
wlr_relative_pointer_manager_v1_send_relative_motion( wlr_relative_pointer_manager_v1_send_relative_motion(
server.relative_pointer_manager, server.relative_pointer_manager,
@ -353,7 +354,7 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
} }
} }
cursor_handle_activity(cursor); cursor_handle_activity(cursor, IDLE_SOURCE_POINTER);
dispatch_cursor_button(cursor, event->device, dispatch_cursor_button(cursor, event->device,
event->time_msec, event->button, event->state); event->time_msec, event->button, event->state);
transaction_commit_dirty(); transaction_commit_dirty();
@ -367,20 +368,20 @@ void dispatch_cursor_axis(struct sway_cursor *cursor,
static void handle_cursor_axis(struct wl_listener *listener, void *data) { static void handle_cursor_axis(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, axis); struct sway_cursor *cursor = wl_container_of(listener, cursor, axis);
struct wlr_event_pointer_axis *event = data; struct wlr_event_pointer_axis *event = data;
cursor_handle_activity(cursor); cursor_handle_activity(cursor, IDLE_SOURCE_POINTER);
dispatch_cursor_axis(cursor, event); dispatch_cursor_axis(cursor, event);
transaction_commit_dirty(); transaction_commit_dirty();
} }
static void handle_cursor_frame(struct wl_listener *listener, void *data) { static void handle_cursor_frame(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, frame); struct sway_cursor *cursor = wl_container_of(listener, cursor, frame);
cursor_handle_activity(cursor); cursor_handle_activity(cursor, IDLE_SOURCE_POINTER);
wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat); wlr_seat_pointer_notify_frame(cursor->seat->wlr_seat);
} }
static void handle_touch_down(struct wl_listener *listener, void *data) { static void handle_touch_down(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down); struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_down);
seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TOUCH); cursor_handle_activity(cursor, IDLE_SOURCE_TOUCH);
struct wlr_event_touch_down *event = data; struct wlr_event_touch_down *event = data;
struct sway_seat *seat = cursor->seat; struct sway_seat *seat = cursor->seat;
@ -415,7 +416,7 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
static void handle_touch_up(struct wl_listener *listener, void *data) { static void handle_touch_up(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up); struct sway_cursor *cursor = wl_container_of(listener, cursor, touch_up);
seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TOUCH); cursor_handle_activity(cursor, IDLE_SOURCE_TOUCH);
struct wlr_event_touch_up *event = data; struct wlr_event_touch_up *event = data;
struct wlr_seat *seat = cursor->seat->wlr_seat; struct wlr_seat *seat = cursor->seat->wlr_seat;
// TODO: fall back to cursor simulation if client has not bound to touch // TODO: fall back to cursor simulation if client has not bound to touch
@ -425,7 +426,7 @@ static void handle_touch_up(struct wl_listener *listener, void *data) {
static void handle_touch_motion(struct wl_listener *listener, void *data) { static void handle_touch_motion(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = struct sway_cursor *cursor =
wl_container_of(listener, cursor, touch_motion); wl_container_of(listener, cursor, touch_motion);
seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TOUCH); cursor_handle_activity(cursor, IDLE_SOURCE_TOUCH);
struct wlr_event_touch_motion *event = data; struct wlr_event_touch_motion *event = data;
struct sway_seat *seat = cursor->seat; struct sway_seat *seat = cursor->seat;
@ -494,6 +495,8 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
bool change_x, bool change_y, bool change_x, bool change_y,
double x, double y, double dx, double dy, double x, double y, double dx, double dy,
int32_t time_msec) { int32_t time_msec) {
cursor_handle_activity(cursor, IDLE_SOURCE_TABLET_TOOL);
if (!change_x && !change_y) { if (!change_x && !change_y) {
return; return;
} }
@ -536,7 +539,7 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
static void handle_tool_axis(struct wl_listener *listener, void *data) { static void handle_tool_axis(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_axis); struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_axis);
seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TABLET_TOOL); cursor_handle_activity(cursor, IDLE_SOURCE_TABLET_TOOL);
struct wlr_event_tablet_tool_axis *event = data; struct wlr_event_tablet_tool_axis *event = data;
struct sway_tablet_tool *sway_tool = event->tool->data; struct sway_tablet_tool *sway_tool = event->tool->data;
@ -592,7 +595,7 @@ static void handle_tool_axis(struct wl_listener *listener, void *data) {
static void handle_tool_tip(struct wl_listener *listener, void *data) { static void handle_tool_tip(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_tip); struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_tip);
seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TABLET_TOOL); cursor_handle_activity(cursor, IDLE_SOURCE_TABLET_TOOL);
struct wlr_event_tablet_tool_tip *event = data; struct wlr_event_tablet_tool_tip *event = data;
struct sway_tablet_tool *sway_tool = event->tool->data; struct sway_tablet_tool *sway_tool = event->tool->data;
struct wlr_tablet_v2_tablet *tablet_v2 = sway_tool->tablet->tablet_v2; struct wlr_tablet_v2_tablet *tablet_v2 = sway_tool->tablet->tablet_v2;
@ -640,7 +643,7 @@ static struct sway_tablet *get_tablet_for_device(struct sway_cursor *cursor,
static void handle_tool_proximity(struct wl_listener *listener, void *data) { static void handle_tool_proximity(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_proximity); struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_proximity);
seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TABLET_TOOL); cursor_handle_activity(cursor, IDLE_SOURCE_TABLET_TOOL);
struct wlr_event_tablet_tool_proximity *event = data; struct wlr_event_tablet_tool_proximity *event = data;
struct wlr_tablet_tool *tool = event->tool; struct wlr_tablet_tool *tool = event->tool;
@ -671,7 +674,7 @@ static void handle_tool_proximity(struct wl_listener *listener, void *data) {
static void handle_tool_button(struct wl_listener *listener, void *data) { static void handle_tool_button(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_button); struct sway_cursor *cursor = wl_container_of(listener, cursor, tool_button);
struct sway_seat *seat = cursor->seat; struct sway_seat *seat = cursor->seat;
seat_idle_notify_activity(cursor->seat, IDLE_SOURCE_TABLET_TOOL); cursor_handle_activity(cursor, IDLE_SOURCE_TABLET_TOOL);
struct wlr_event_tablet_tool_button *event = data; struct wlr_event_tablet_tool_button *event = data;
struct sway_tablet_tool *sway_tool = event->tool->data; struct sway_tablet_tool *sway_tool = event->tool->data;

2
sway/input/seat.c
View File

@ -1368,7 +1368,7 @@ void seat_apply_config(struct sway_seat *seat,
seat_configure_device(seat, seat_device->input_device); seat_configure_device(seat, seat_device->input_device);
} }
cursor_handle_activity(seat->cursor); cursor_handle_activity(seat->cursor, IDLE_SOURCE_POINTER);
} }
struct seat_config *seat_get_config(struct sway_seat *seat) { struct seat_config *seat_get_config(struct sway_seat *seat) {