From e68e72fb2c9a04726898cadfc5f0751d4926fc2b Mon Sep 17 00:00:00 2001 From: William McBrine Date: Sun, 20 Jan 2019 14:22:54 -0500 Subject: [PATCH] Use mmask_t for the "classic" mouse interface, where appropriate. --- curses.h | 10 +++++----- pdcurses/mouse.c | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/curses.h b/curses.h index 58cfa393..39d54c5f 100644 --- a/curses.h +++ b/curses.h @@ -288,7 +288,7 @@ typedef struct int orig_cursor; /* original cursor size */ int lines; /* new value for LINES */ int cols; /* new value for COLS */ - unsigned long _trap_mbe; /* trap these mouse button events */ + mmask_t _trap_mbe; /* trap these mouse button events */ int mouse_wait; /* time to wait (in ms) for a button release after a press, in order to count it as a click */ @@ -1225,12 +1225,12 @@ PDCEX int fixterm(void); PDCEX int saveterm(void); PDCEX void setsyx(int, int); -PDCEX int mouse_set(unsigned long); -PDCEX int mouse_on(unsigned long); -PDCEX int mouse_off(unsigned long); +PDCEX int mouse_set(mmask_t); +PDCEX int mouse_on(mmask_t); +PDCEX int mouse_off(mmask_t); PDCEX int request_mouse_pos(void); PDCEX void wmouse_position(WINDOW *, int *, int *); -PDCEX unsigned long getmouse(void); +PDCEX mmask_t getmouse(void); /* ncurses */ diff --git a/pdcurses/mouse.c b/pdcurses/mouse.c index c4c550e1..889a97bc 100644 --- a/pdcurses/mouse.c +++ b/pdcurses/mouse.c @@ -9,12 +9,12 @@ mouse ### Synopsis - int mouse_set(unsigned long mbe); - int mouse_on(unsigned long mbe); - int mouse_off(unsigned long mbe); + int mouse_set(mmask_t mbe); + int mouse_on(mmask_t mbe); + int mouse_off(mmask_t mbe); int request_mouse_pos(void); void wmouse_position(WINDOW *win, int *y, int *x); - unsigned long getmouse(void); + mmask_t getmouse(void); int mouseinterval(int wait); bool wenclose(const WINDOW *win, int y, int x); @@ -141,7 +141,7 @@ mouse static bool ungot = FALSE; -int mouse_set(unsigned long mbe) +int mouse_set(mmask_t mbe) { PDC_LOG(("mouse_set() - called: event %x\n", mbe)); @@ -149,7 +149,7 @@ int mouse_set(unsigned long mbe) return PDC_mouse_set(); } -int mouse_on(unsigned long mbe) +int mouse_on(mmask_t mbe) { PDC_LOG(("mouse_on() - called: event %x\n", mbe)); @@ -157,7 +157,7 @@ int mouse_on(unsigned long mbe) return PDC_mouse_set(); } -int mouse_off(unsigned long mbe) +int mouse_off(mmask_t mbe) { PDC_LOG(("mouse_off() - called: event %x\n", mbe)); @@ -194,7 +194,7 @@ void wmouse_position(WINDOW *win, int *y, int *x) } } -unsigned long getmouse(void) +mmask_t getmouse(void) { PDC_LOG(("getmouse() - called\n")); @@ -348,7 +348,7 @@ int nc_getmouse(MEVENT *event) int ungetmouse(MEVENT *event) { int i; - unsigned long bstate; + mmask_t bstate; PDC_LOG(("ungetmouse() - called\n"));