'newtest' can now show mouse events (if -m switch is added). On-screen layout rearranged so it fits in 24x80 windows.

Author: Bill-Gray

demos/newtest.c

@@ -29,6 +29,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <locale.h>
+#include <stdbool.h>
 
 int PDC_write_screen_to_file( const char *filename, WINDOW *win);
 
@@ -154,6 +155,7 @@ int main( int argc, char **argv)
 #endif
 {
     int quit = 0, i,  use_slk = 1;
+    bool show_mouse_moves = false;
 #ifdef PDCURSES
     bool blink_state = FALSE;
     int fmt = 0xa;
@@ -231,6 +233,9 @@ int main( int argc, char **argv)
                     sscanf( argv[i] + 2, "%x", &unicode_offset);
                     break;
 #endif
+                case 'm':
+                    show_mouse_moves = true;
+                    break;
                 default:
                     printf( "Option '%s' unrecognized\n", argv[i]);
                     break;
@@ -261,7 +266,7 @@ int main( int argc, char **argv)
     init_pair( 1, COLOR_WHITE, COLOR_BLACK);
     init_pair( 2, COLOR_BLACK, COLOR_YELLOW);
 
-    mousemask( ALL_MOUSE_EVENTS, NULL);
+    mousemask( ALL_MOUSE_EVENTS | (show_mouse_moves ? REPORT_MOUSE_POSITION : 0), NULL);
     attrset( COLOR_PAIR( 1));
     while( !quit)
     {
@@ -345,24 +350,33 @@ int main( int argc, char **argv)
 
 #endif
 
+            mvaddstr( 5, 1, "   0 1 2 3 4 5 6 7 8 9 a b c d e f");
+            for( i = 0; i < 8; i++)
+                {
+                char buff[4];
+
+                sprintf( buff, "%02x",
+#ifdef HAVE_WIDE
+                                (unsigned)( i * 16 + unicode_offset) & 0xff);
+#else
+                                (unsigned)( i * 16 + 128) & 0xff);
+#endif
+                mvaddstr( 6 + i, 1, buff);
+                mvaddstr( 6 + i, 36, buff);
+                }
             for( i = 0; i < 128; i++)
             {                 /* Show extended characters: */
-                char buff[6];
 #ifdef HAVE_WIDE
-                wchar_t wbuff[3];
-
-                sprintf( buff, "%02x ",
-                           (unsigned)( i + unicode_offset) & 0xff);
-                mvaddstr( 5 + i % 16, (i / 16) * 5, buff);
-                wbuff[0] = (wchar_t)( i + unicode_offset);
-                wbuff[1] = (wchar_t)' ';
-                wbuff[2] = (wchar_t)0;
-                addwstr( wbuff);
-#else
+                wchar_t buff[2];
 
-                sprintf( buff, "%02x %c", i + 128, (char)(i + 128));
-                mvaddstr( 5 + i % 16, (i / 16) * 5, buff);
+                buff[0] = (wchar_t)( i + unicode_offset);
+                buff[1] = '\0';
+                mvaddwstr( 6 + i / 16, 4 + 2 * (i % 16), buff);
+#else
+                move( 6 + i / 16, 4 + 2 * (i % 16));
+                addch( i + 128);
 #endif
+                addch( ' ');
             }
 
 #if(CHTYPE_LONG >= 2)       /* "non-standard" 64-bit chtypes     */
@@ -406,8 +420,6 @@ int main( int argc, char **argv)
             for( i = 0; i < 6; i++)
             {
                 static const wchar_t spanish[] = L"Espa\xf1ol";
-                const int line0 = line + i / 3;
-                const int col = 5 + 25 * (i % 3);
 
                 static const wchar_t russian[] = {0x0420, 0x0443, 0x0441, 0x0441,
                    0x043a, 0x0438, 0x0439, L' ', 0x044f, 0x0437, 0x044b, 0x043a, 0};
@@ -430,15 +442,14 @@ int main( int argc, char **argv)
                 static const wchar_t *texts[6] = { spanish, russian, greek,
                                 georgian, fullwidth, combining_marks};
 
-                if( line0 < ymax && col < xmax)
-                   mvaddnwstr( line0, 5 + 25 * (i % 3), texts[i], xmax - col);
+                mvaddwstr( 15 + i / 2, 2 + 20 * (i % 2), texts[i]);
             }
 #if(CHTYPE_LONG >= 2)       /* "non-standard" 64-bit chtypes     */
              mvaddch( line - 1, 58, (chtype)0x1d11e);
 #endif            /* U+1D11E = musical symbol G clef */
             line += 2;
 #endif
-        mvaddstr( line, 1, curses_version( ));
+        mvaddstr( 19, 1, curses_version( ));
 
 #ifdef MAYBE_TRY_THIS_SOMEWHERE_ELSE
         mvaddstr(  1, COL3, "Click on cursor descriptions to");