gwh/saturnng
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

step towards 49g UI

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-09-25 13:58:55 +02:00
parent d8648a0df7
commit a5f60a12bd
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
4 changed files with 1373 additions and 373 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/ui4x_bitmaps_small_font.h
View file

@ -333,28 +333,28 @@ static unsigned char rcurly_bits[] = { 0x03, 0x04, 0x04, 0x08, 0x04, 0x04, 0x03
#define sqr_48gx_width 11 #define sqr_48gx_width 11
#define sqr_48gx_height 13 #define sqr_48gx_height 13
static unsigned char sqr_48gx_bits[] = { 0x00, 0x03, 0x80, 0x04, 0x00, 0x04, 0x00, 0x02, 0x00, 0x01, 0x80, 0x07, 0x00, static unsigned char sqr_48gx_bits[] = { 0x00, 0x03, 0x80, 0x04, 0x00, 0x04, 0x00, 0x02, 0x00, 0x01, 0x80, 0x07, 0x00,
0x00, 0x66, 0x00, 0x14, 0x00, 0x08, 0x00, 0x14, 0x00, 0x53, 0x00, 0x21, 0x00 }; 0x00, 0x66, 0x00, 0x14, 0x00, 0x08, 0x00, 0x14, 0x00, 0x53, 0x00, 0x21, 0x00 };
#define root_48gx_width 18 #define root_48gx_width 18
#define root_48gx_height 15 #define root_48gx_height 15
static unsigned char root_48gx_bits[] = { 0x66, 0x00, 0x00, 0x14, 0x00, 0x00, 0x08, 0x00, 0x00, 0x14, 0x00, 0x00, 0x53, 0xfe, 0x03, static unsigned char root_48gx_bits[] = { 0x66, 0x00, 0x00, 0x14, 0x00, 0x00, 0x08, 0x00, 0x00, 0x14, 0x00, 0x00, 0x53, 0xfe, 0x03,
0x21, 0x02, 0x02, 0x00, 0x02, 0x00, 0x00, 0x99, 0x00, 0x00, 0x91, 0x00, 0x10, 0x91, 0x00, 0x21, 0x02, 0x02, 0x00, 0x02, 0x00, 0x00, 0x99, 0x00, 0x00, 0x91, 0x00, 0x10, 0x91, 0x00,
0xa0, 0x50, 0x00, 0xc0, 0x60, 0x00, 0x80, 0x20, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x00 }; 0xa0, 0x50, 0x00, 0xc0, 0x60, 0x00, 0x80, 0x20, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x00 };
#define pow10_48gx_width 13 #define pow10_48gx_width 13
#define pow10_48gx_height 12 #define pow10_48gx_height 12
static unsigned char pow10_48gx_bits[] = { 0x00, 0x12, 0x00, 0x0c, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x09, 0x32, 0x00, static unsigned char pow10_48gx_bits[] = { 0x00, 0x12, 0x00, 0x0c, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x09, 0x32, 0x00,
0x4b, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x32, 0x00 }; 0x4b, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x32, 0x00 };
#define exp_48gx_width 13 #define exp_48gx_width 13
#define exp_48gx_height 12 #define exp_48gx_height 12
static unsigned char exp_48gx_bits[] = { 0x00, 0xfb, 0x00, 0xf6, 0x00, 0xe6, 0x00, 0xf6, 0x80, 0xed, 0x18, 0xe0, static unsigned char exp_48gx_bits[] = { 0x00, 0xfb, 0x00, 0xf6, 0x00, 0xe6, 0x00, 0xf6, 0x80, 0xed, 0x18, 0xe0,
0x36, 0xe0, 0x36, 0xe0, 0x1f, 0xe0, 0x03, 0xe0, 0x13, 0xe0, 0x0e, 0xe0 }; 0x36, 0xe0, 0x36, 0xe0, 0x1f, 0xe0, 0x03, 0xe0, 0x13, 0xe0, 0x0e, 0xe0 };
#define parens_48gx_width 20 #define parens_48gx_width 20
#define parens_48gx_height 12 #define parens_48gx_height 12
static unsigned char parens_48gx_bits[] = { 0x0c, 0x00, 0x03, 0x06, 0x00, 0x06, 0x06, 0x00, 0x06, 0x03, 0x00, 0x0c, static unsigned char parens_48gx_bits[] = { 0x0c, 0x00, 0x03, 0x06, 0x00, 0x06, 0x06, 0x00, 0x06, 0x03, 0x00, 0x0c,
0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c,
0x03, 0x00, 0x0c, 0x06, 0x00, 0x06, 0x06, 0x00, 0x06, 0x0c, 0x00, 0x03 }; 0x03, 0x00, 0x0c, 0x06, 0x00, 0x06, 0x06, 0x00, 0x06, 0x0c, 0x00, 0x03 };
#define hash_48gx_width 8 #define hash_48gx_width 8
#define hash_48gx_height 12 #define hash_48gx_height 12
@ -363,28 +363,28 @@ static unsigned char hash_48gx_bits[] = { 0x00, 0x00, 0x48, 0x48, 0xfe, 0x24, 0x
#define bracket_48gx_width 12 #define bracket_48gx_width 12
#define bracket_48gx_height 12 #define bracket_48gx_height 12
static unsigned char bracket_48gx_bits[] = { 0x0f, 0x0f, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, static unsigned char bracket_48gx_bits[] = { 0x0f, 0x0f, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c,
0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x0f, 0x0f }; 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x0f, 0x0f };
#define under_48gx_width 10 #define under_48gx_width 10
#define under_48gx_height 12 #define under_48gx_height 12
static unsigned char under_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, static unsigned char under_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03 }; 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03 };
#define prog_48gx_width 24 #define prog_48gx_width 24
#define prog_48gx_height 12 #define prog_48gx_height 12
static unsigned char prog_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xc3, 0x18, static unsigned char prog_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xc3, 0x18,
0x8c, 0x81, 0x31, 0xc6, 0x00, 0x63, 0x63, 0x00, 0xc6, 0xc6, 0x00, 0x63, 0x8c, 0x81, 0x31, 0xc6, 0x00, 0x63, 0x63, 0x00, 0xc6, 0xc6, 0x00, 0x63,
0x8c, 0x81, 0x31, 0x18, 0xc3, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 0x8c, 0x81, 0x31, 0x18, 0xc3, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
#define quote_48gx_width 12 #define quote_48gx_width 12
#define quote_48gx_height 12 #define quote_48gx_height 12
static unsigned char quote_48gx_bits[] = { 0x05, 0x0a, 0x05, 0x0a, 0x05, 0x0a, 0x05, 0x0a, 0x00, 0x00, 0x00, 0x00, static unsigned char quote_48gx_bits[] = { 0x05, 0x0a, 0x05, 0x0a, 0x05, 0x0a, 0x05, 0x0a, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
#define curly_48gx_width 14 #define curly_48gx_width 14
#define curly_48gx_height 12 #define curly_48gx_height 12
static unsigned char curly_48gx_bits[] = { 0x0c, 0x0c, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x03, 0x30, static unsigned char curly_48gx_bits[] = { 0x0c, 0x0c, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x03, 0x30,
0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x0c, 0x0c }; 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x0c, 0x0c };
#define colon_48gx_width 8 #define colon_48gx_width 8
#define colon_48gx_height 12 #define colon_48gx_height 12
@ -393,18 +393,18 @@ static unsigned char colon_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0
#define angle_48gx_width 12 #define angle_48gx_width 12
#define angle_48gx_height 12 #define angle_48gx_height 12
static unsigned char angle_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0xc0, 0x00, 0xe0, 0x01, static unsigned char angle_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0xc0, 0x00, 0xe0, 0x01,
0xb0, 0x03, 0x18, 0x03, 0x0c, 0x03, 0x06, 0x03, 0xff, 0x0f, 0xff, 0x0f }; 0xb0, 0x03, 0x18, 0x03, 0x0c, 0x03, 0x06, 0x03, 0xff, 0x0f, 0xff, 0x0f };
#define pi_48gx_width 10 #define pi_48gx_width 10
#define pi_48gx_height 12 #define pi_48gx_height 12
static unsigned char pi_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xfe, 0x03, 0xff, 0x01, static unsigned char pi_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xfe, 0x03, 0xff, 0x01,
0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00 }; 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00 };
#define nl_48gx_width 18 #define nl_48gx_width 18
#define nl_48gx_height 12 #define nl_48gx_height 12
static unsigned char nl_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x03, 0xf0, 0x00, 0x03, static unsigned char nl_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x03, 0xf0, 0x00, 0x03,
0xfc, 0x00, 0x03, 0xff, 0xff, 0x03, 0xff, 0xff, 0x03, 0xfc, 0x00, 0x00, 0xfc, 0x00, 0x03, 0xff, 0xff, 0x03, 0xff, 0xff, 0x03, 0xfc, 0x00, 0x00,
0xf0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 0xf0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
#define comma_48gx_width 3 #define comma_48gx_width 3
#define comma_48gx_height 12 #define comma_48gx_height 12
@ -413,8 +413,8 @@ static unsigned char comma_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0
#define arrow_48gx_width 18 #define arrow_48gx_width 18
#define arrow_48gx_height 12 #define arrow_48gx_height 12
static unsigned char arrow_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x3c, 0x00, static unsigned char arrow_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x3c, 0x00,
0x00, 0xfc, 0x00, 0xff, 0xff, 0x03, 0xff, 0xff, 0x03, 0x00, 0xfc, 0x00, 0x00, 0xfc, 0x00, 0xff, 0xff, 0x03, 0xff, 0xff, 0x03, 0x00, 0xfc, 0x00,
0x00, 0x3c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 0x00, 0x3c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
#define equal_48gx_width 8 #define equal_48gx_width 8
#define equal_48gx_height 12 #define equal_48gx_height 12

1660
src/ui4x_common.c
View file

File diff suppressed because it is too large Load diff

44
src/ui4x_inner.h
View file

@ -8,27 +8,27 @@
#include "ui4x_bitmaps_big_font.h" #include "ui4x_bitmaps_big_font.h"
// Colors // Colors
/* SX GX */ /* 48SX 48GX 49g */
#define WHITE 0 /* #ffffff #ffffff */ #define WHITE 0 /* #ffffff #ffffff #ffffff */
#define LEFT 1 /* #ffa600 #ffbaff */ #define LEFT 1 /* #ffa600 #ffbaff #7476dd */
#define RIGHT 2 /* #00d2ff #00ffcc */ #define RIGHT 2 /* #00d2ff #00ffcc #d46262 */
#define BUT_TOP 3 /* #6d5d5d #646464 */ #define BUT_TOP 3 /* #6d5d5d #646464 #646464 */
#define BUTTON 4 /* #5a4d4d #585858 */ #define BUTTON 4 /* #5a4d4d #585858 #909b94 */
#define BUT_BOT 5 /* #4c4141 #4a4a4a */ #define BUT_BOT 5 /* #4c4141 #4a4a4a #4a4a4a */
#define LCD 6 /* #cadd5c #cadd5c */ #define LCD 6 /* #cadd5c #cadd5c #a8c0b0 */
#define PIXEL 7 /* #000080 #000080 */ #define PIXEL 7 /* #000080 #000080 #000020 */
#define PAD_TOP 8 /* #6d4e4e #585858 */ #define PAD_TOP 8 /* #6d4e4e #585858 #585858 */
#define PAD 9 /* #5a4040 #4a4a4a */ #define PAD 9 /* #5a4040 #4a4a4a #4a4a4a */
#define PAD_BOT 10 /* #4c3636 #404040 */ #define PAD_BOT 10 /* #4c3636 #404040 #404040 */
#define DISP_PAD_TOP 11 /* #9b7654 #808080 */ #define DISP_PAD_TOP 11 /* #9b7654 #808080 #808080 */
#define DISP_PAD 12 /* #7c5e43 #68686e */ #define DISP_PAD 12 /* #7c5e43 #68686e #86a6b9 */
#define DISP_PAD_BOT 13 /* #644b35 #54545a */ #define DISP_PAD_BOT 13 /* #644b35 #54545a #97b7ca */
#define LOGO 14 /* #cca96b #b0b0b8 */ #define LOGO 14 /* #cca96b #b0b0b8 #b0b0b8 */
#define LOGO_BACK 15 /* #404040 #68686e */ #define LOGO_BACK 15 /* #404040 #68686e #68686e */
#define LABEL 16 /* #cab890 #f0f0f0 */ #define LABEL 16 /* #cab890 #f0f0f0 #f0f0f0 */
#define FRAME 17 /* #000000 #000000 */ #define FRAME 17 /* #000000 #000000 #000000 */
#define UNDERLAY 18 /* #3c2a2a #68686e */ #define UNDERLAY 18 /* #3c2a2a #68686e #4f6165 */
#define BLACK 19 /* #000000 #000000 */ #define BLACK 19 /* #000000 #000000 #000000 */
#define FIRST_COLOR WHITE #define FIRST_COLOR WHITE
#define LAST_COLOR BLACK #define LAST_COLOR BLACK
@ -77,9 +77,11 @@ extern letter_t big_font[ 128 ];
extern color_t colors_48sx[ NB_COLORS ]; extern color_t colors_48sx[ NB_COLORS ];
extern color_t colors_48gx[ NB_COLORS ]; extern color_t colors_48gx[ NB_COLORS ];
extern color_t colors_49g[ NB_COLORS ];
extern button_t buttons_48sx[ NB_KEYS ]; extern button_t buttons_48sx[ NB_KEYS ];
extern button_t buttons_48gx[ NB_KEYS ]; extern button_t buttons_48gx[ NB_KEYS ];
extern button_t buttons_49g[ NB_KEYS ];
#define small_ascent 8 #define small_ascent 8
#define small_descent 4 #define small_descent 4

4
src/ui4x_sdl2.c
View file

@ -7,8 +7,8 @@
#include "ui4x_common.h" #include "ui4x_common.h"
#include "ui4x_inner.h" #include "ui4x_inner.h"
#define COLORS ( config.model == MODEL_48GX ? colors_48gx : colors_48sx ) #define COLORS ( config.model == MODEL_48GX ? colors_48gx : ( config.model == MODEL_49G ? colors_49g : colors_48sx ) )
#define BUTTONS ( config.model == MODEL_48GX ? buttons_48gx : buttons_48sx ) #define BUTTONS ( config.model == MODEL_48GX ? buttons_48gx : ( config.model == MODEL_49G ? buttons_49g : buttons_48sx ) )
#define KEYBOARD_HEIGHT ( BUTTONS[ LAST_HPKEY ].y + BUTTONS[ LAST_HPKEY ].h ) #define KEYBOARD_HEIGHT ( BUTTONS[ LAST_HPKEY ].y + BUTTONS[ LAST_HPKEY ].h )
#define KEYBOARD_WIDTH ( BUTTONS[ LAST_HPKEY ].x + BUTTONS[ LAST_HPKEY ].w ) #define KEYBOARD_WIDTH ( BUTTONS[ LAST_HPKEY ].x + BUTTONS[ LAST_HPKEY ].w )