From ee908ca0a197ac579ab8abc5695c9ce421a96a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bert=20M=C3=BCnnich?= Date: Thu, 5 Oct 2017 13:49:11 +0200 Subject: [PATCH] Simplify cursor reset in image mode No need to give cursor name. reset_cursor() is now the only place to decide what cursor to fall back to. --- commands.c | 2 +- main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/commands.c b/commands.c index 01e7878..522413d 100644 --- a/commands.c +++ b/commands.c @@ -351,8 +351,8 @@ bool ci_drag(arg_t _) x = e.xmotion.x; y = e.xmotion.y; } - win_set_cursor(&win, CURSOR_ARROW); set_timeout(reset_cursor, TO_CURSOR_HIDE, true); + reset_cursor(); return true; } diff --git a/main.c b/main.c index f7e5762..5a828a9 100644 --- a/main.c +++ b/main.c @@ -622,8 +622,8 @@ void on_buttonpress(XButtonEvent *bev) static Time firstclick; if (mode == MODE_IMAGE) { - win_set_cursor(&win, CURSOR_ARROW); set_timeout(reset_cursor, TO_CURSOR_HIDE, true); + reset_cursor(); for (i = 0; i < ARRLEN(buttons); i++) { if (buttons[i].button == bev->button && @@ -783,8 +783,8 @@ void run(void) break; case MotionNotify: if (mode == MODE_IMAGE) { - win_set_cursor(&win, CURSOR_ARROW); set_timeout(reset_cursor, TO_CURSOR_HIDE, true); + reset_cursor(); } break; }