From 8bb1ebbb6c25fc83f8f2fcc01d8a6526dbe48f4e Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Thu, 7 May 2015 23:28:42 +0200 Subject: [PATCH] window: do not redefine BUTTON5_PRESSED if NCURSES_MOUSE_VERSION > 1 --- src/window.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/window.h b/src/window.h index 406eab13..08268403 100644 --- a/src/window.h +++ b/src/window.h @@ -95,16 +95,16 @@ const int KEY_BACKSPACE_2 = 127; #undef KEY_ENTER const int KEY_ENTER = 13; -#if NCURSES_SEQUENCE_ESCAPING -# if NCURSES_MOUSE_VERSION == 1 +#if NCURSES_MOUSE_VERSION == 1 +# if NCURSES_SEQUENCE_ESCAPING // NOTICE: define BUTTON5_PRESSED to be BUTTON2_PRESSED with additional mask // (I noticed that it sometimes returns 134217728 (2^27) instead of expected // mask, so the modified define does it right. # define BUTTON5_PRESSED (BUTTON2_PRESSED | (1U << 27)) -# endif // NCURSES_MOUSE_VERSION == 1 -#else -# define BUTTON5_PRESSED (1U << 27) -#endif // NCURSES_SEQUENCE_ESCAPING +# else +# define BUTTON5_PRESSED (1U << 27) +# endif // NCURSES_SEQUENCE_ESCAPING +#endif // NCURSES_MOUSE_VERSION == 1 // undefine macros with colliding names #undef border