X-Git-Url: https://ncurses.scripts.mit.edu/?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_mouse.c;h=1348877f667a5c81180f3156e399f11e31439cc2;hb=d7e564522107d120f566f85f0a9efbac058b4f50;hp=8cb12d9fc6e17b25612ae2c912d5a7f24886e827;hpb=eeac2ef5db363494c4272b6dca6d9a0474153381;p=ncurses.git

diff --git a/test/test_mouse.c b/test/test_mouse.c
index 8cb12d9f..1348877f 100644
--- a/test/test_mouse.c
+++ b/test/test_mouse.c
@@ -22,7 +22,7 @@
  * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
  ****************************************************************************/
 /*
- * $Id: test_mouse.c,v 1.18 2022/05/15 00:20:27 tom Exp $
+ * $Id: test_mouse.c,v 1.23 2022/08/20 18:12:16 tom Exp $
  *
  * Author: Leonid S Usov
  *
@@ -43,7 +43,18 @@ raw_loop(void)
     char *xtermcap;
 
     tcgetattr(0, &old);
+#if HAVE_CFMAKERAW
     cfmakeraw(&tty);
+#else
+    tty = old;
+    tty.c_iflag &= (unsigned) (~(IGNBRK | BRKINT | PARMRK | ISTRIP
+				 | INLCR | IGNCR | ICRNL | IXON));
+    tty.c_oflag &= (unsigned) (~OPOST);
+    tty.c_lflag &= (unsigned) (~(ECHO | ECHONL | ICANON | ISIG | IEXTEN));
+    tty.c_cflag &= (unsigned) (~(CSIZE | PARENB));
+    tty.c_cflag |= CS8;
+    tcsetattr(0, TCSANOW, &tty);
+#endif
 
     setupterm(NULL, 0, 0);
     xtermcap = tigetstr("XM");
@@ -57,7 +68,7 @@ raw_loop(void)
 
     tcsetattr(0, TCSANOW, &tty);
 
-    while (true) {
+    while (1) {
 	int c = getc(stdin);
 	const char *pretty;
 
@@ -86,11 +97,13 @@ static void
 logw(const char *fmt, ...)
 {
     int row = getcury(stdscr);
-
     va_list args;
+
     va_start(args, fmt);
     wmove(stdscr, row++, 0);
     vw_printw(stdscr, fmt, args);
+    va_end(args);
+
     clrtoeol();
 
     row %= (getmaxy(stdscr) - logoffset);
@@ -110,7 +123,7 @@ usage(void)
     {
 	"Usage: test_mouse [options]",
 	"",
-	"Test mouse events.  These examples for $TERM demonstrate xterm"
+	"Test mouse events.  These examples for $TERM demonstrate xterm",
 	"features:",
 	"    xterm",
 	"    xterm-1002",
@@ -194,9 +207,9 @@ main(int argc, char *argv[])
 		unsigned btn;
 		mmask_t events;
 #if NCURSES_MOUSE_VERSION > 1
-		const int max_btn = 5;
+		const unsigned max_btn = 5;
 #else
-		const int max_btn = 4;
+		const unsigned max_btn = 4;
 #endif
 		const mmask_t btn_mask = (NCURSES_BUTTON_RELEASED |
 					  NCURSES_BUTTON_PRESSED |