summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-08-05 03:23:16 -0400
committerDrew DeVault <sir@cmpwn.com>2019-08-06 11:31:12 +0900
commit56b5ad777cd033fe96af0cec7e89c21af766e8a4 (patch)
tree6394aca59aaa99424fe5d9a986b063afb6451ad6
parenta9e31d925fb34005ad3b13cff855b6d192753e78 (diff)
input/cursor: do not hide when buttons are pressed
This just adds a small quality of life improvement to the cursor hiding functionality. The cursor will no longer be hidden unless all buttons are released.
-rw-r--r--sway/input/cursor.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 26e60cde8..5739aafb0 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -186,7 +186,12 @@ static int hide_notify(void *data) {
return 1;
}
-int cursor_get_timeout(struct sway_cursor *cursor){
+int cursor_get_timeout(struct sway_cursor *cursor) {
+ if (cursor->pressed_button_count > 0) {
+ // Do not hide cursor unless all buttons are released
+ return 0;
+ }
+
struct seat_config *sc = seat_get_config(cursor->seat);
if (!sc) {
sc = seat_get_config_by_name("*");
@@ -299,7 +304,6 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
static void handle_cursor_button(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
struct wlr_event_pointer_button *event = data;
- cursor_handle_activity(cursor);
if (event->state == WLR_BUTTON_PRESSED) {
cursor->pressed_button_count++;
@@ -311,6 +315,7 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
}
}
+ cursor_handle_activity(cursor);
dispatch_cursor_button(cursor, event->device,
event->time_msec, event->button, event->state);
transaction_commit_dirty();