New patch to review: 6b83829 libpayload: Don't declare mouse support in tinycurses

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/87

-gerrit

commit 6b8382926be735a0c14c7ff516f0a390df4f1708
Author: Patrick Georgi 
Date:   Thu Mar 10 14:53:54 2011 +0100

libpayload: Don't declare mouse support in tinycurses

Change-Id: Id1ff3d85617e3ec063ce332cf13920dfbbb7cf26
    Signed-off-by: Patrick Georgi 
---
 payloads/libpayload/curses/tinycurses.c   |    2 ++
 payloads/libpayload/include/curses.h      |    6 +++++-
 payloads/libpayload/include/curses.priv.h |    2 ++
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/payloads/libpayload/curses/tinycurses.c b/payloads/libpayload/curses/tinycurses.c
index fb492b6..fe6e7de 100644
--- a/payloads/libpayload/curses/tinycurses.c
+++ b/payloads/libpayload/curses/tinycurses.c
@@ -286,7 +286,9 @@ int endwin(void)
    	return ERR;

SP->_endwin = TRUE;
+#ifdef NCURSES_MOUSE_VERSION
    SP->_mouse_wrap(SP);
+#endif
    // _nc_screen_wrap();
    // _nc_mvcur_wrap();       /* wrap up cursor addressing */
    // return reset_shell_mode();
diff --git a/payloads/libpayload/include/curses.h b/payloads/libpayload/include/curses.h
index 1859f02..0c97941 100644
--- a/payloads/libpayload/include/curses.h
+++ b/payloads/libpayload/include/curses.h
@@ -58,7 +58,7 @@
 /*
  * Identify the mouse encoding version.
  */
-#define NCURSES_MOUSE_VERSION 1
+// #define NCURSES_MOUSE_VERSION 1

/*
  * Definitions to facilitate DLL's.
@@ -1495,6 +1495,7 @@ extern NCURSES_EXPORT(const char *) _nc_viswibuf(const wint_t *);

/* mouse interface */

+#ifdef NCURSES_MOUSE_VERSION
 #if NCURSES_MOUSE_VERSION > 1
 #define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 5))
 #else
@@ -1591,6 +1592,7 @@ extern NCURSES_EXPORT(bool) wmouse_trafo (const WINDOW*, int*, int*, bool);
 extern NCURSES_EXPORT(bool) mouse_trafo (int*, int*, bool);              /* generated */

#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
+#endif

/* other non-XSI functions */

@@ -1616,7 +1618,9 @@ extern NCURSES_EXPORT(char *) _tracecchar_t2 (int, const cchar_t *);
 #define _tracech_t		_tracechtype
 #define _tracech_t2		_tracechtype2
 #endif
+#ifdef NCURSES_MOUSE_VERSION
 extern NCURSES_EXPORT(char *) _tracemouse (const MEVENT *);
+#endif
 extern NCURSES_EXPORT(void) trace (const unsigned int);

/* trace masks */
diff --git a/payloads/libpayload/include/curses.priv.h b/payloads/libpayload/include/curses.priv.h
index 594b4da..78b7ff3 100644
--- a/payloads/libpayload/include/curses.priv.h
+++ b/payloads/libpayload/include/curses.priv.h
@@ -514,6 +514,7 @@ struct screen {
 #define _nc_idlok SP->_nc_sp_idlok
 #define _nc_idcok SP->_nc_sp_idcok

+#ifdef NCURSES_MOUSE_VERSION
    /*
     * These are the data that support the mouse interface.
     */
@@ -531,6 +532,7 @@ struct screen {
    NCURSES_CONST char *_mouse_xtermcap; /* string to enable/disable mouse */
    MEVENT		_mouse_events[EV_MAX];	/* hold the last mouse event seen */
    MEVENT		*_mouse_eventp;	/* next free slot in event queue */
+#endif

#if USE_GPM_SUPPORT
    bool		_mouse_gpm_loaded;