From a9253dbac0dbdaf4a756dd194803b9a012a4c5ca Mon Sep 17 00:00:00 2001 From: "Lael N. Santos" Date: Thu, 15 Oct 2020 20:17:11 -0300 Subject: [PATCH 1/4] added definition NCURSES_MOUSE_VERSION in pdcurses curses.h --- src/core/pdcurses/curses.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/pdcurses/curses.h b/src/core/pdcurses/curses.h index b9fcbf8..e932520 100755 --- a/src/core/pdcurses/curses.h +++ b/src/core/pdcurses/curses.h @@ -35,6 +35,9 @@ PDCurses portable platform definitions list: #define SYSVcurses 1 /* System V Curses routines */ #define BSDcurses 1 /* BSD Curses routines */ #define CHTYPE_LONG 1 /* size of chtype; long */ +#ifndef NOMOUSE +#define NCURSES_MOUSE_VERSION 2 /* Use ncurses style mouse API */ +#endif /*----------------------------------------------------------------------*/ From 250a8ba01ef4d35e5ceaac831ca312d8dd2cc0d4 Mon Sep 17 00:00:00 2001 From: "Lael N. Santos" Date: Fri, 16 Oct 2020 19:55:59 -0300 Subject: [PATCH 2/4] Restored macros to accept pdcurses mouse --- src/core/lcurses/lcurses.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/lcurses/lcurses.c b/src/core/lcurses/lcurses.c index 3ba4f4a..eb2786e 100644 --- a/src/core/lcurses/lcurses.c +++ b/src/core/lcurses/lcurses.c @@ -623,7 +623,7 @@ static void register_curses_constants(lua_State *L) CC(KEY_COPY) CC(KEY_CREATE) CC(KEY_END) CC(KEY_EXIT) CC(KEY_FIND) CC(KEY_HELP) CC(KEY_MARK) CC(KEY_MESSAGE) -#if !defined(XCURSES) && !defined(PDCURSES) +#if !defined(XCURSES) #ifndef NOMOUSE CC(KEY_MOUSE) #endif @@ -650,7 +650,7 @@ static void register_curses_constants(lua_State *L) CC2(KEY_F6, KEY_F(6)) CC2(KEY_F7, KEY_F(7)) CC2(KEY_F8, KEY_F(8)) CC2(KEY_F9, KEY_F(9)) CC2(KEY_F10, KEY_F(10)) CC2(KEY_F11, KEY_F(11)) CC2(KEY_F12, KEY_F(12)) -#if !defined(XCURSES) && !defined(PDCURSES) +#if !defined(XCURSES) #ifndef NOMOUSE /* Mouse Constants */ CC(BUTTON1_RELEASED); CC(BUTTON1_PRESSED); CC(BUTTON1_CLICKED); @@ -763,7 +763,7 @@ LC_NUMBER2(LINES, LINES) ** mouse ** ======================================================= */ -#if !defined(XCURSES) && !defined(PDCURSES) +#if !defined(XCURSES) #ifndef NOMOUSE static int lc_ungetmouse(lua_State *L) @@ -2405,7 +2405,7 @@ static const luaL_Reg curseslib[] = /* outopts */ { "nl", lc_nl }, -#if !defined(XCURSES) && !defined(PDCURSES) +#if !defined(XCURSES) #ifndef NOMOUSE { "mousemask", lc_mousemask }, { "mouseinterval", lc_mouseinterval}, From a461b5d04f2c93ed23312a64cab2a26ff6f17dda Mon Sep 17 00:00:00 2001 From: "Lael N. Santos" Date: Fri, 16 Oct 2020 23:37:48 -0300 Subject: [PATCH 3/4] repush --- src/core/pdcurses/curses.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/pdcurses/curses.h b/src/core/pdcurses/curses.h index e932520..e1d1500 100755 --- a/src/core/pdcurses/curses.h +++ b/src/core/pdcurses/curses.h @@ -36,7 +36,7 @@ PDCurses portable platform definitions list: #define BSDcurses 1 /* BSD Curses routines */ #define CHTYPE_LONG 1 /* size of chtype; long */ #ifndef NOMOUSE -#define NCURSES_MOUSE_VERSION 2 /* Use ncurses style mouse API */ +#define NCURSES_MOUSE_VERSION 2 /* Use ncurses style mouse API */ #endif /*----------------------------------------------------------------------*/ From 51ab4a4f7ac94d7e89107ea992da70515f421b8f Mon Sep 17 00:00:00 2001 From: "Lael N. Santos" Date: Fri, 16 Oct 2020 23:59:44 -0300 Subject: [PATCH 4/4] remove redefinition of function --- src/core/pdcurses/pdcurses/mouse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/pdcurses/pdcurses/mouse.c b/src/core/pdcurses/pdcurses/mouse.c index 10faec9..bfb9dbc 100755 --- a/src/core/pdcurses/pdcurses/mouse.c +++ b/src/core/pdcurses/pdcurses/mouse.c @@ -218,12 +218,14 @@ void wmouse_position(WINDOW *win, int *y, int *x) } } +#ifndef NCURSES_MOUSE_VERSION unsigned long getmouse(void) { PDC_LOG(("getmouse() - called\n")); return SP->_trap_mbe; } +#endif unsigned long getbmap(void) {