From 8be22aececdd7a2dbd6e856e406c825e7ade0cc5 Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Thu, 19 Oct 2023 11:11:34 +0200
Subject: [PATCH] [ui_text] Wow, --tui --tiny was much easier then I feared!

---
 README.md               |   4 ++
 dist/x48ng.man.1        |   2 +
 src/runtime_options.c   |  11 +++++
 src/runtime_options.h   |   1 +
 src/ui_text.c           |  94 ++++++++++++++++++++++++++++++++++++++--
 tui-tiny-screenshot.png | Bin 0 -> 6762 bytes
 6 files changed, 108 insertions(+), 4 deletions(-)
 create mode 100644 tui-tiny-screenshot.png

diff --git a/README.md b/README.md
index c6f696f..0c66f19 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,10 @@ You can use the script `setup-x48ng-home.sh` or simply run `x48ng --rom=<romfile
 
 ![screenshot of x48ng --tui --small running in a terminal](./tui-small-screenshot.png?raw=true "screenshot of x48ng --tui running in a terminal")
 
+### `--tui --tiny` version (ncurses)
+
+![screenshot of x48ng --tui --tiny running in a terminal](./tui-tiny-screenshot.png?raw=true "screenshot of x48ng --tui running in a terminal")
+
 ### `--tui` version (ncurses)
 
 ![screenshot of x48ng --tui running in a terminal](./tui-screenshot.png?raw=true "screenshot of x48ng --tui running in a terminal")
diff --git a/dist/x48ng.man.1 b/dist/x48ng.man.1
index dc138f4..4216c50 100644
--- a/dist/x48ng.man.1
+++ b/dist/x48ng.man.1
@@ -112,6 +112,8 @@ where options include (depending on compiled front-ends):
            \-\-gray                make the UI grayscale (default: false)
 .br
            \-\-small               make the text UI small (2×2 pixels per character) (default: false)
+.br
+           \-\-tiny                make the text UI tiny (2×4 pixels per character) (default: false)
 
 .SH DESCRIPTION
 .I x48ng
diff --git a/src/runtime_options.c b/src/runtime_options.c
index 84bb16b..a776eef 100644
--- a/src/runtime_options.c
+++ b/src/runtime_options.c
@@ -42,6 +42,7 @@ bool gray = false;
 
 /* tui */
 bool small = false;
+bool tiny = false;
 
 /* sdl */
 bool hide_chrome = false;
@@ -238,6 +239,7 @@ int parse_args( int argc, char* argv[] )
     int clopt_mono = -1;
     int clopt_gray = -1;
     int clopt_small = -1;
+    int clopt_tiny = -1;
 
     char* optstring = "c:hvVtsirT";
     struct option long_options[] = {
@@ -281,6 +283,7 @@ int parse_args( int argc, char* argv[] )
         { "mono",            no_argument,       &clopt_mono,               true         },
         { "gray",            no_argument,       &clopt_gray,               true         },
         { "small",           no_argument,       &clopt_small,              true         },
+        { "tiny",            no_argument,       &clopt_tiny,               true         },
 
         { 0,                 0,                 0,                         0            }
     };
@@ -339,6 +342,8 @@ int parse_args( int argc, char* argv[] )
                       "     --gray               make the UI grayscale (default: "
                       "false)\n"
                       "     --small            make the text UI small (2×2 pixels per character) (default: "
+                      "false)\n"
+                      "     --tiny             make the text UI tiny (2×4 pixels per character) (default: "
                       "false)\n";
     while ( c != EOF ) {
         c = getopt_long( argc, argv, optstring, long_options, &option_index );
@@ -505,6 +510,9 @@ int parse_args( int argc, char* argv[] )
     lua_getglobal( config_lua_values, "small" );
     small = lua_toboolean( config_lua_values, -1 );
 
+    lua_getglobal( config_lua_values, "tiny" );
+    tiny = lua_toboolean( config_lua_values, -1 );
+
     lua_getglobal( config_lua_values, "x11_visual" );
     x11_visual = ( char* )luaL_optstring( config_lua_values, -1, "default" );
 
@@ -572,6 +580,8 @@ int parse_args( int argc, char* argv[] )
         gray = clopt_gray;
     if ( clopt_small != -1 )
         small = clopt_small;
+    if ( clopt_tiny != -1 )
+        tiny = clopt_tiny;
 
     /* After getting configs and params */
     /* normalize config_dir again in case it's been modified */
@@ -622,6 +632,7 @@ int parse_args( int argc, char* argv[] )
         fprintf( stdout, "mono = %s\n", mono ? "true" : "false" );
         fprintf( stdout, "gray = %s\n", gray ? "true" : "false" );
         fprintf( stdout, "small = %s\n", small ? "true" : "false" );
+        fprintf( stdout, "tiny = %s\n", tiny ? "true" : "false" );
         fprintf( stdout, "\n" );
         fprintf( stdout, "x11_visual = \"%s\"\n", x11_visual );
         fprintf( stdout, "netbook = %s\n", netbook ? "true" : "false" );
diff --git a/src/runtime_options.h b/src/runtime_options.h
index 8023c87..29aa1d6 100644
--- a/src/runtime_options.h
+++ b/src/runtime_options.h
@@ -24,6 +24,7 @@ extern bool gray;
 
 /* tui */
 extern bool small;
+extern bool tiny;
 
 /* sdl */
 extern bool hide_chrome;
diff --git a/src/ui_text.c b/src/ui_text.c
index 8556752..bb6e16b 100644
--- a/src/ui_text.c
+++ b/src/ui_text.c
@@ -23,8 +23,8 @@
 #define LCD_HEIGHT 64
 #define LCD_OFFSET_X 1
 #define LCD_OFFSET_Y 1
-#define LCD_BOTTOM LCD_OFFSET_Y + ( small ? ( LCD_HEIGHT / 2 ) : LCD_HEIGHT )
-#define LCD_RIGHT LCD_OFFSET_X + ( small ? ( LCD_WIDTH / 2 ) + 1 : LCD_WIDTH )
+#define LCD_BOTTOM LCD_OFFSET_Y + ( small ? ( LCD_HEIGHT / 2 ) : tiny ? ( LCD_HEIGHT / 4 ) : LCD_HEIGHT )
+#define LCD_RIGHT LCD_OFFSET_X + ( ( small || tiny ) ? ( LCD_WIDTH / 2 ) + 1 : LCD_WIDTH )
 
 #define LCD_COLOR_BG 48
 #define LCD_COLOR_FG 49
@@ -56,14 +56,98 @@ static inline void ncurses_draw_annunciators( void )
         mvaddwstr( 0, 4 + ( i * 4 ), ( ( annunciators_bits[ i ] & val ) == annunciators_bits[ i ] ) ? annunciators_icons[ i ] : L" " );
 }
 
+static inline wchar_t eight_bits_to_braille_char( bool b1, bool b2, bool b3, bool b4, bool b5, bool b6, bool b7, bool b8 )
+{
+    /*********/
+    /* b1 b4 */
+    /* b2 b5 */
+    /* b3 b6 */
+    /* b7 b8 */
+    /*********/
+    uint16_t chr = 0x2800;
+
+    if ( b1 )
+        chr |= 0b0000000000000001;
+    if ( b2 )
+        chr |= 0b0000000000000010;
+    if ( b3 )
+        chr |= 0b0000000000000100;
+    if ( b4 )
+        chr |= 0b0000000000001000;
+    if ( b5 )
+        chr |= 0b0000000000010000;
+    if ( b6 )
+        chr |= 0b0000000000100000;
+    if ( b7 )
+        chr |= 0b0000000001000000;
+    if ( b8 )
+        chr |= 0b0000000010000000;
+
+    return ( wchar_t )chr;
+}
+
+static inline void ncurses_draw_lcd_tiny( void )
+{
+    bool b1, b2, b3, b4, b5, b6, b7, b8;
+    int nibble_top, nibble_middle_top, nibble_middle_bottom, nibble_bottom;
+    int step_x = 2;
+    int step_y = 4;
+
+    wchar_t line[ 66 ]; /* ( LCD_WIDTH / step_x ) + 1 */
+
+    if ( !mono && has_colors() )
+        attron( COLOR_PAIR( LCD_COLORS_PAIR ) );
+
+    for ( int y = 0; y < LCD_HEIGHT; y += step_y ) {
+        wcscpy( line, L"" );
+
+        for ( int nibble_x = 0; nibble_x < NIBBLES_PER_ROW - 1; ++nibble_x ) {
+            nibble_top = lcd_nibbles_buffer[ y ][ nibble_x ];
+            nibble_top &= 0x0f;
+
+            nibble_middle_top = lcd_nibbles_buffer[ y + 1 ][ nibble_x ];
+            nibble_middle_top &= 0x0f;
+
+            nibble_middle_bottom = lcd_nibbles_buffer[ y + 2 ][ nibble_x ];
+            nibble_middle_bottom &= 0x0f;
+
+            nibble_bottom = lcd_nibbles_buffer[ y + 3 ][ nibble_x ];
+            nibble_bottom &= 0x0f;
+
+            for ( int bit_x = 0; bit_x < NIBBLES_NB_BITS; bit_x += step_x ) {
+                b1 = 0 != ( nibble_top & ( 1 << ( bit_x & 3 ) ) );
+                b4 = 0 != ( nibble_top & ( 1 << ( ( bit_x + 1 ) & 3 ) ) );
+
+                b2 = 0 != ( nibble_middle_top & ( 1 << ( bit_x & 3 ) ) );
+                b5 = 0 != ( nibble_middle_top & ( 1 << ( ( bit_x + 1 ) & 3 ) ) );
+
+                b3 = 0 != ( nibble_middle_bottom & ( 1 << ( bit_x & 3 ) ) );
+                b6 = 0 != ( nibble_middle_bottom & ( 1 << ( ( bit_x + 1 ) & 3 ) ) );
+
+                b7 = 0 != ( nibble_bottom & ( 1 << ( bit_x & 3 ) ) );
+                b8 = 0 != ( nibble_bottom & ( 1 << ( ( bit_x + 1 ) & 3 ) ) );
+
+                wchar_t pixels = eight_bits_to_braille_char( b1, b2, b3, b4, b5, b6, b7, b8 );
+                wcsncat( line, &pixels, 1 );
+            }
+        }
+        mvaddwstr( LCD_OFFSET_Y + ( y / step_y ), LCD_OFFSET_X, line );
+    }
+
+    if ( !mono && has_colors() )
+        attroff( COLOR_PAIR( LCD_COLORS_PAIR ) );
+
+    wrefresh( stdscr );
+}
+
 static inline wchar_t bitsquare_to_small_char( bool top_left, bool top_right, bool bottom_left, bool bottom_right )
 {
     if ( top_left ) {
         if ( top_right ) {
             if ( bottom_left )
-                return bottom_right ? L'█' : L'▛';
+                return bottom_right ? L'█' : L'▛'; /* 0x2588 0x2598 */
             else
-                return bottom_right ? L'▜' : L'▀';
+                return bottom_right ? L'▜' : L'▀'; /* 0x259C 0x2580 */
         } else {
             if ( bottom_left )
                 return bottom_right ? L'▙' : L'▌';
@@ -486,6 +570,8 @@ void text_update_LCD( void )
 
     if ( small )
         ncurses_draw_lcd_small();
+    else if ( tiny )
+        ncurses_draw_lcd_tiny();
     else
         ncurses_draw_lcd();
 }
diff --git a/tui-tiny-screenshot.png b/tui-tiny-screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d4287e57fc00e9e0d6939305f8dbdc10bae3547
GIT binary patch
literal 6762
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
Wcl`AS&AlD~E@y|G_E)zB#{U;vdv-ej

literal 0
HcmV?d00001