Update to ncurses 5.7, with local changes reapplied.

This is around eight years worth of changes (previously we were around ncurses
5.2), too many to list - many bug fixes and also a few new functions.

A major bump for libcurses, libpanel, libform and libmenu.

ok deraadt

1 files changed, 80 insertions, 49 deletions

diff --git a/lib/libcurses/trace/lib_tracemse.c b/lib/libcurses/trace/lib_tracemse.c
index 3346d87e224..798aae9f563 100644
--- a/lib/libcurses/trace/lib_tracemse.c
+++ b/lib/libcurses/trace/lib_tracemse.c
@@ -1,7 +1,7 @@
-/*	$OpenBSD: lib_tracemse.c,v 1.4 2003/03/18 16:55:54 millert Exp $	*/
+/* $OpenBSD: lib_tracemse.c,v 1.5 2010/01/12 23:22:07 nicm Exp $ */
 
 /****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -31,6 +31,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
@@ -39,62 +40,92 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$From: lib_tracemse.c,v 1.8 2000/12/10 03:02:45 tom Exp $")
+MODULE_ID("$Id: lib_tracemse.c,v 1.5 2010/01/12 23:22:07 nicm Exp $")
 
 #ifdef TRACE
 
+#define my_buffer sp->tracemse_buf
+
 NCURSES_EXPORT(char *)
-_tracemouse(MEVENT const *ep)
+_nc_tracemouse(SCREEN *sp, MEVENT const *ep)
 {
-    static char buf[80];
-
-    (void) snprintf(buf, sizeof(buf), "id %2d  at (%2d, %2d, %2d) state %4lx = {",
-		    ep->id, ep->x, ep->y, ep->z, ep->bstate);
-
-#define SHOW(m, s) if ((ep->bstate & m)==m) {strlcat(buf,s,sizeof(buf)); strlcat(buf, ", ",sizeof(buf));}
-    SHOW(BUTTON1_RELEASED, "release-1")
-	SHOW(BUTTON1_PRESSED, "press-1")
-	SHOW(BUTTON1_CLICKED, "click-1")
-	SHOW(BUTTON1_DOUBLE_CLICKED, "doubleclick-1")
-	SHOW(BUTTON1_TRIPLE_CLICKED, "tripleclick-1")
-	SHOW(BUTTON1_RESERVED_EVENT, "reserved-1")
-	SHOW(BUTTON2_RELEASED, "release-2")
-	SHOW(BUTTON2_PRESSED, "press-2")
-	SHOW(BUTTON2_CLICKED, "click-2")
-	SHOW(BUTTON2_DOUBLE_CLICKED, "doubleclick-2")
-	SHOW(BUTTON2_TRIPLE_CLICKED, "tripleclick-2")
-	SHOW(BUTTON2_RESERVED_EVENT, "reserved-2")
-	SHOW(BUTTON3_RELEASED, "release-3")
-	SHOW(BUTTON3_PRESSED, "press-3")
-	SHOW(BUTTON3_CLICKED, "click-3")
-	SHOW(BUTTON3_DOUBLE_CLICKED, "doubleclick-3")
-	SHOW(BUTTON3_TRIPLE_CLICKED, "tripleclick-3")
-	SHOW(BUTTON3_RESERVED_EVENT, "reserved-3")
-	SHOW(BUTTON4_RELEASED, "release-4")
-	SHOW(BUTTON4_PRESSED, "press-4")
-	SHOW(BUTTON4_CLICKED, "click-4")
-	SHOW(BUTTON4_DOUBLE_CLICKED, "doubleclick-4")
-	SHOW(BUTTON4_TRIPLE_CLICKED, "tripleclick-4")
-	SHOW(BUTTON4_RESERVED_EVENT, "reserved-4")
-	SHOW(BUTTON_CTRL, "ctrl")
-	SHOW(BUTTON_SHIFT, "shift")
-	SHOW(BUTTON_ALT, "alt")
-	SHOW(ALL_MOUSE_EVENTS, "all-events")
-	SHOW(REPORT_MOUSE_POSITION, "position")
+	(void) snprintf(my_buffer, TRACEMSE_MAX, TRACEMSE_FMT,
+		   ep->id,
+		   ep->x,
+		   ep->y,
+		   ep->z,
+		   (unsigned long) ep->bstate);
+
+#define SHOW(m, s) \
+    if ((ep->bstate & m) == m) {		\
+	strlcat(my_buffer, s, TRACEMSE_MAX);	\
+	strlcat(my_buffer, ", ", TRACEMSE_MAX);	\
+}
+
+    SHOW(BUTTON1_RELEASED, "release-1");
+    SHOW(BUTTON1_PRESSED, "press-1");
+    SHOW(BUTTON1_CLICKED, "click-1");
+    SHOW(BUTTON1_DOUBLE_CLICKED, "doubleclick-1");
+    SHOW(BUTTON1_TRIPLE_CLICKED, "tripleclick-1");
+#if NCURSES_MOUSE_VERSION == 1
+    SHOW(BUTTON1_RESERVED_EVENT, "reserved-1");
+#endif
+
+    SHOW(BUTTON2_RELEASED, "release-2");
+    SHOW(BUTTON2_PRESSED, "press-2");
+    SHOW(BUTTON2_CLICKED, "click-2");
+    SHOW(BUTTON2_DOUBLE_CLICKED, "doubleclick-2");
+    SHOW(BUTTON2_TRIPLE_CLICKED, "tripleclick-2");
+#if NCURSES_MOUSE_VERSION == 1
+    SHOW(BUTTON2_RESERVED_EVENT, "reserved-2");
+#endif
+
+    SHOW(BUTTON3_RELEASED, "release-3");
+    SHOW(BUTTON3_PRESSED, "press-3");
+    SHOW(BUTTON3_CLICKED, "click-3");
+    SHOW(BUTTON3_DOUBLE_CLICKED, "doubleclick-3");
+    SHOW(BUTTON3_TRIPLE_CLICKED, "tripleclick-3");
+#if NCURSES_MOUSE_VERSION == 1
+    SHOW(BUTTON3_RESERVED_EVENT, "reserved-3");
+#endif
+
+    SHOW(BUTTON4_RELEASED, "release-4");
+    SHOW(BUTTON4_PRESSED, "press-4");
+    SHOW(BUTTON4_CLICKED, "click-4");
+    SHOW(BUTTON4_DOUBLE_CLICKED, "doubleclick-4");
+    SHOW(BUTTON4_TRIPLE_CLICKED, "tripleclick-4");
+#if NCURSES_MOUSE_VERSION == 1
+    SHOW(BUTTON4_RESERVED_EVENT, "reserved-4");
+#endif
+
+#if NCURSES_MOUSE_VERSION == 2
+    SHOW(BUTTON5_RELEASED, "release-5");
+    SHOW(BUTTON5_PRESSED, "press-5");
+    SHOW(BUTTON5_CLICKED, "click-5");
+    SHOW(BUTTON5_DOUBLE_CLICKED, "doubleclick-5");
+    SHOW(BUTTON5_TRIPLE_CLICKED, "tripleclick-5");
+#endif
+
+    SHOW(BUTTON_CTRL, "ctrl");
+    SHOW(BUTTON_SHIFT, "shift");
+    SHOW(BUTTON_ALT, "alt");
+    SHOW(ALL_MOUSE_EVENTS, "all-events");
+    SHOW(REPORT_MOUSE_POSITION, "position");
+
 #undef SHOW
 
-	if (buf[strlen(buf) - 1] == ' ')
-	buf[strlen(buf) - 2] = '\0';
-    (void) strlcat(buf, "}", sizeof(buf));
-    return (buf);
+    if (my_buffer[strlen(my_buffer) - 1] == ' ')
+	my_buffer[strlen(my_buffer) - 2] = '\0';
+    (void) strlcat(my_buffer, "}", TRACEMSE_MAX);
+    return (my_buffer);
 }
 
-#else /* !TRACE */
-/* don't make empty module */
-NCURSES_EXPORT(void)
-_nc_lib_tracemouse(void);
-NCURSES_EXPORT(void)
-_nc_lib_tracemouse(void)
+NCURSES_EXPORT(char *)
+_tracemouse(MEVENT const *ep)
 {
+    return _nc_tracemouse(SP, ep);
 }
+
+#else /* !TRACE */
+EMPTY_MODULE(_nc_lib_tracemouse)
 #endif