pretty-code

This commit is contained in:
Gwenhael Le Moine 2023-05-17 16:16:08 +02:00
parent 9c56f4916b
commit ffdb73a83d
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
4 changed files with 211 additions and 130 deletions

View file

@ -358,7 +358,8 @@ void update_display( void ) {
for ( j = 0; j < line_length; j++ ) {
val = read_nibble( addr++ );
disp.disp_image->data[ data_addr++ ] = nibble_bitmap[ val ];
disp.disp_image->data[ data_addr_2++ ] = nibble_bitmap[ val ];
disp.disp_image->data[ data_addr_2++ ] =
nibble_bitmap[ val ];
}
addr += addr_pad;
data_addr += line_pad;

View file

@ -491,7 +491,7 @@ int read_files( void ) {
strcpy( fnam, path );
strcat( fnam, "rom" );
if ( !read_rom_file( fnam, &saturn.rom, &rom_size ) )
return 0;
return 0;
if ( verbose )
printf( "read %s\n", fnam );

186
src/x48.c
View file

@ -743,27 +743,61 @@ button_t buttons_sx[] = {
0, 0, 0, 0, "I", "MODES", 1, 0, 0, 0 },
{ "VAR", 0, 0, 0x72, 150, 50, 36, 26, WHITE, "VAR",
0, 0, 0, 0, "J", "MEMORY", 1, 0, 0, 0 },
{ "UP", 0, 0, 0x71, 200, 50, 36, 26, WHITE, 0,
{ "UP", 0, 0, 0x71, 200, 50, 36, 26, WHITE, 0,
0, up_width, up_height, up_bitmap, "K", "LIBRARY", 1, 0, 0, 0 },
{ "NXT", 0, 0, 0x70, 250, 50, 36, 26, WHITE, "NXT",
0, 0, 0, 0, "L", "PREV", 0, 0, 0, 0 },
{ "COLON", 0, 0, 0x04, 0, 100, 36, 26, WHITE,
0, 0, colon_width, colon_height, colon_bitmap, "M", "UP", 0, "HOME",
0, 0 },
{ "COLON",
0,
0,
0x04,
0,
100,
36,
26,
WHITE,
0,
0,
colon_width,
colon_height,
colon_bitmap,
"M",
"UP",
0,
"HOME",
0,
0 },
{ "STO", 0, 0, 0x64, 50, 100, 36, 26, WHITE, "STO",
0, 0, 0, 0, "N", "DEF", 0, "RCL", 0, 0 },
{ "EVAL", 0, 0, 0x63, 100, 100, 36, 26, WHITE, "EVAL",
0, 0, 0, 0, "O", "aQ", 0, "aNUM", 0, 0 },
{ "LEFT", 0, 0, 0x62, 150, 100, 36, 26,
{ "LEFT", 0, 0, 0x62, 150, 100, 36, 26,
WHITE, 0, 0, left_width, left_height, left_bitmap, "P", "GRAPH",
0, 0, 0, 0 },
{ "DOWN", 0, 0, 0x61, 200, 100, 36, 26,
{ "DOWN", 0, 0, 0x61, 200, 100, 36, 26,
WHITE, 0, 0, down_width, down_height, down_bitmap, "Q", "REVIEW",
0, 0, 0, 0 },
{ "RIGHT", 0, 0, 0x60, 250, 100, 36, 26, WHITE,
0, 0, right_width, right_height, right_bitmap, "R", "SWAP", 0, 0,
0, 0 },
{ "RIGHT",
0,
0,
0x60,
250,
100,
36,
26,
WHITE,
0,
0,
right_width,
right_height,
right_bitmap,
"R",
"SWAP",
0,
0,
0,
0 },
{ "SIN", 0, 0, 0x34, 0, 150, 36, 26, WHITE, "SIN",
0, 0, 0, 0, "S", "ASIN", 0, "b", 0, 0 },
@ -771,12 +805,13 @@ button_t buttons_sx[] = {
0, 0, 0, 0, "T", "ACOS", 0, "c", 0, 0 },
{ "TAN", 0, 0, 0x53, 100, 150, 36, 26, WHITE, "TAN",
0, 0, 0, 0, "U", "ATAN", 0, "d", 0, 0 },
{ "SQRT", 0, 0, 0x52, 150, 150, 36, 26, WHITE, 0,
0, sqrt_width, sqrt_height, sqrt_bitmap, "V", "e", 0, "f", 0, 0 },
{ "POWER", 0, 0, 0x51, 200, 150, 36, 26, WHITE,
{ "SQRT", 0, 0, 0x52, 150, 150, 36, 26,
WHITE, 0, 0, sqrt_width, sqrt_height, sqrt_bitmap, "V", "e",
0, "f", 0, 0 },
{ "POWER", 0, 0, 0x51, 200, 150, 36, 26, WHITE,
0, 0, power_width, power_height, power_bitmap, "W", "g", 0, "LOG",
0, 0 },
{ "INV", 0, 0, 0x50, 250, 150, 36, 26, WHITE, 0,
{ "INV", 0, 0, 0x50, 250, 150, 36, 26, WHITE, 0,
0, inv_width, inv_height, inv_bitmap, "X", "h", 0, "LN", 0, 0 },
{ "ENTER", 0, 0, 0x44, 0, 200, 86, 26, WHITE, "ENTER",
@ -788,7 +823,7 @@ button_t buttons_sx[] = {
0, 0, 0, 0, "Z", "2D", 0, "3D", 0, 0 },
{ "DEL", 0, 0, 0x41, 200, 200, 36, 26, WHITE, "DEL",
0, 0, 0, 0, 0, "PURGE", 0, 0, 0, 0 },
{ "BS", 0, 0, 0x40, 250, 200, 36, 26, WHITE, 0,
{ "BS", 0, 0, 0x40, 250, 200, 36, 26, WHITE, 0,
0, bs_width, bs_height, bs_bitmap, 0, "DROP", 0, "CLR", 0, 0 },
{ "ALPHA",
@ -817,10 +852,10 @@ button_t buttons_sx[] = {
1, 0, 0, 0, 0, "PLOT", 1, 0, 0, 0 },
{ "9", 0, 0, 0x31, 180, 250, 46, 26, WHITE, "9",
1, 0, 0, 0, 0, "ALGEBRA", 1, 0, 0, 0 },
{ "DIV", 0, 0, 0x30, 240, 250, 46, 26, WHITE, 0,
{ "DIV", 0, 0, 0x30, 240, 250, 46, 26, WHITE, 0,
0, div_width, div_height, div_bitmap, 0, "( )", 0, "#", 0, 0 },
{ "SHL", 0, 0, 0x25, 0, 300, 36, 26, LEFT, 0,
{ "SHL", 0, 0, 0x25, 0, 300, 36, 26, LEFT, 0,
0, shl_width, shl_height, shl_bitmap, 0, 0, 0, 0, 0, 0 },
{ "4", 0, 0, 0x23, 60, 300, 46, 26, WHITE, "4",
1, 0, 0, 0, 0, "TIME", 1, 0, 0, 0 },
@ -828,10 +863,10 @@ button_t buttons_sx[] = {
1, 0, 0, 0, 0, "STAT", 1, 0, 0, 0 },
{ "6", 0, 0, 0x21, 180, 300, 46, 26, WHITE, "6",
1, 0, 0, 0, 0, "UNITS", 1, 0, 0, 0 },
{ "MUL", 0, 0, 0x20, 240, 300, 46, 26, WHITE, 0,
{ "MUL", 0, 0, 0x20, 240, 300, 46, 26, WHITE, 0,
0, mul_width, mul_height, mul_bitmap, 0, "[ ]", 0, "_", 0, 0 },
{ "SHR", 0, 0, 0x15, 0, 350, 36, 26, RIGHT, 0,
{ "SHR", 0, 0, 0x15, 0, 350, 36, 26, RIGHT, 0,
0, shr_width, shr_height, shr_bitmap, 0, 0, 0, 0, 0, 0 },
{ "1", 0, 0, 0x13, 60, 350, 46, 26, WHITE, "1",
1, 0, 0, 0, 0, "RAD", 0, "POLAR", 0, 0 },
@ -839,7 +874,7 @@ button_t buttons_sx[] = {
1, 0, 0, 0, 0, "STACK", 0, "ARG", 0, 0 },
{ "3", 0, 0, 0x11, 180, 350, 46, 26, WHITE, "3",
1, 0, 0, 0, 0, "CMD", 0, "MENU", 0, 0 },
{ "MINUS", 0, 0, 0x10, 240, 350, 46, 26, WHITE,
{ "MINUS", 0, 0, 0x10, 240, 350, 46, 26, WHITE,
0, 0, minus_width, minus_height, minus_bitmap, 0, "i", 0, "j",
0, 0 },
@ -851,7 +886,7 @@ button_t buttons_sx[] = {
1, 0, 0, 0, 0, ", ", 0, " k", 0, 0 },
{ "SPC", 0, 0, 0x01, 180, 400, 46, 26, WHITE, "SPC",
0, 0, 0, 0, 0, "l ", 0, " m", 0, 0 },
{ "PLUS", 0, 0, 0x00, 240, 400, 46, 26,
{ "PLUS", 0, 0, 0x00, 240, 400, 46, 26,
WHITE, 0, 0, plus_width, plus_height, plus_bitmap, 0, "{ }",
0, ": :", 0, 0 },
@ -987,27 +1022,61 @@ button_t buttons_gx[] = {
0, 0, 0, 0, "I", 0, 0, "MODES", 0, 0 },
{ "VAR", 0, 0, 0x72, 150, 50, 36, 26, WHITE, "VAR",
0, 0, 0, 0, "J", 0, 0, "MEMORY", 0, 0 },
{ "UP", 0, 0, 0x71, 200, 50, 36, 26, WHITE, 0,
{ "UP", 0, 0, 0x71, 200, 50, 36, 26, WHITE, 0,
0, up_width, up_height, up_bitmap, "K", 0, 0, "STACK", 0, 0 },
{ "NXT", 0, 0, 0x70, 250, 50, 36, 26, WHITE, "NXT",
0, 0, 0, 0, "L", "PREV", 0, "MENU", 0, 0 },
{ "COLON", 0, 0, 0x04, 0, 100, 36, 26, WHITE,
0, 0, colon_width, colon_height, colon_bitmap, "M", "UP", 0, "HOME",
0, 0 },
{ "COLON",
0,
0,
0x04,
0,
100,
36,
26,
WHITE,
0,
0,
colon_width,
colon_height,
colon_bitmap,
"M",
"UP",
0,
"HOME",
0,
0 },
{ "STO", 0, 0, 0x64, 50, 100, 36, 26, WHITE, "STO",
0, 0, 0, 0, "N", "DEF", 0, "RCL", 0, 0 },
{ "EVAL", 0, 0, 0x63, 100, 100, 36, 26, WHITE, "EVAL",
0, 0, 0, 0, "O", "aNUM", 0, "UNDO", 0, 0 },
{ "LEFT", 0, 0, 0x62, 150, 100, 36, 26,
{ "LEFT", 0, 0, 0x62, 150, 100, 36, 26,
WHITE, 0, 0, left_width, left_height, left_bitmap, "P", "PICTURE",
0, 0, 0, 0 },
{ "DOWN", 0, 0, 0x61, 200, 100, 36, 26,
{ "DOWN", 0, 0, 0x61, 200, 100, 36, 26,
WHITE, 0, 0, down_width, down_height, down_bitmap, "Q", "VIEW",
0, 0, 0, 0 },
{ "RIGHT", 0, 0, 0x60, 250, 100, 36, 26, WHITE,
0, 0, right_width, right_height, right_bitmap, "R", "SWAP", 0, 0,
0, 0 },
{ "RIGHT",
0,
0,
0x60,
250,
100,
36,
26,
WHITE,
0,
0,
right_width,
right_height,
right_bitmap,
"R",
"SWAP",
0,
0,
0,
0 },
{ "SIN", 0, 0, 0x34, 0, 150, 36, 26, WHITE, "SIN",
0, 0, 0, 0, "S", "ASIN", 0, "b", 0, 0 },
@ -1015,12 +1084,13 @@ button_t buttons_gx[] = {
0, 0, 0, 0, "T", "ACOS", 0, "c", 0, 0 },
{ "TAN", 0, 0, 0x53, 100, 150, 36, 26, WHITE, "TAN",
0, 0, 0, 0, "U", "ATAN", 0, "d", 0, 0 },
{ "SQRT", 0, 0, 0x52, 150, 150, 36, 26, WHITE, 0,
0, sqrt_width, sqrt_height, sqrt_bitmap, "V", "n", 0, "o", 0, 0 },
{ "POWER", 0, 0, 0x51, 200, 150, 36, 26, WHITE,
{ "SQRT", 0, 0, 0x52, 150, 150, 36, 26,
WHITE, 0, 0, sqrt_width, sqrt_height, sqrt_bitmap, "V", "n",
0, "o", 0, 0 },
{ "POWER", 0, 0, 0x51, 200, 150, 36, 26, WHITE,
0, 0, power_width, power_height, power_bitmap, "W", "p", 0, "LOG",
0, 0 },
{ "INV", 0, 0, 0x50, 250, 150, 36, 26, WHITE, 0,
{ "INV", 0, 0, 0x50, 250, 150, 36, 26, WHITE, 0,
0, inv_width, inv_height, inv_bitmap, "X", "q", 0, "LN", 0, 0 },
{ "ENTER", 0, 0, 0x44, 0, 200, 86, 26, WHITE, "ENTER",
@ -1032,7 +1102,7 @@ button_t buttons_gx[] = {
0, 0, 0, 0, "Z", "PURG", 0, "ARG", 0, 0 },
{ "DEL", 0, 0, 0x41, 200, 200, 36, 26, WHITE, "DEL",
0, 0, 0, 0, 0, "CLEAR", 0, 0, 0, 0 },
{ "BS", 0, 0, 0x40, 250, 200, 36, 26, WHITE, 0,
{ "BS", 0, 0, 0x40, 250, 200, 36, 26, WHITE, 0,
0, bs_width, bs_height, bs_bitmap, 0, "DROP", 0, 0, 0, 0 },
{ "ALPHA",
@ -1061,10 +1131,10 @@ button_t buttons_gx[] = {
1, 0, 0, 0, 0, 0, 1, "PLOT", 0, 0 },
{ "9", 0, 0, 0x31, 180, 250, 46, 26, WHITE, "9",
1, 0, 0, 0, 0, 0, 1, "SYMBOLIC", 0, 0 },
{ "DIV", 0, 0, 0x30, 240, 250, 46, 26, WHITE, 0,
{ "DIV", 0, 0, 0x30, 240, 250, 46, 26, WHITE, 0,
0, div_width, div_height, div_bitmap, 0, "r ", 0, "s", 0, 0 },
{ "SHL", 0, 0, 0x25, 0, 300, 36, 26, LEFT, 0,
{ "SHL", 0, 0, 0x25, 0, 300, 36, 26, LEFT, 0,
0, shl_width, shl_height, shl_bitmap, 0, 0, 0, 0, 0, 0 },
{ "4", 0, 0, 0x23, 60, 300, 46, 26, WHITE, "4",
1, 0, 0, 0, 0, 0, 1, "TIME", 0, 0 },
@ -1072,10 +1142,10 @@ button_t buttons_gx[] = {
1, 0, 0, 0, 0, 0, 1, "STAT", 0, 0 },
{ "6", 0, 0, 0x21, 180, 300, 46, 26, WHITE, "6",
1, 0, 0, 0, 0, 0, 1, "UNITS", 0, 0 },
{ "MUL", 0, 0, 0x20, 240, 300, 46, 26, WHITE, 0,
{ "MUL", 0, 0, 0x20, 240, 300, 46, 26, WHITE, 0,
0, mul_width, mul_height, mul_bitmap, 0, "t ", 0, "u", 0, 0 },
{ "SHR", 0, 0, 0x15, 0, 350, 36, 26, RIGHT, 0,
{ "SHR", 0, 0, 0x15, 0, 350, 36, 26, RIGHT, 0,
0, shr_width, shr_height, shr_bitmap, 0, 0, 1, " ", 0, 0 },
{ "1", 0, 0, 0x13, 60, 350, 46, 26, WHITE, "1",
1, 0, 0, 0, 0, 0, 1, "I/O", 0, 0 },
@ -1083,7 +1153,7 @@ button_t buttons_gx[] = {
1, 0, 0, 0, 0, 0, 1, "LIBRARY", 0, 0 },
{ "3", 0, 0, 0x11, 180, 350, 46, 26, WHITE, "3",
1, 0, 0, 0, 0, 0, 1, "EQ LIB", 0, 0 },
{ "MINUS", 0, 0, 0x10, 240, 350, 46, 26, WHITE,
{ "MINUS", 0, 0, 0x10, 240, 350, 46, 26, WHITE,
0, 0, minus_width, minus_height, minus_bitmap, 0, "v ", 0, "w",
0, 0 },
@ -1095,8 +1165,9 @@ button_t buttons_gx[] = {
1, 0, 0, 0, 0, "\002 ", 0, "\001", 0, 0 },
{ "SPC", 0, 0, 0x01, 180, 400, 46, 26, WHITE, "SPC",
0, 0, 0, 0, 0, "\005 ", 0, "z", 0, 0 },
{ "PLUS", 0, 0, 0x00, 240, 400, 46, 26, WHITE, 0, 0,
plus_width, plus_height, plus_bitmap, 0, "x ", 0, "y", 0, 0 },
{ "PLUS", 0, 0, 0x00, 240, 400, 46, 26,
WHITE, 0, 0, plus_width, plus_height, plus_bitmap, 0, "x ",
0, "y", 0, 0 },
{ 0 } };
@ -1150,7 +1221,8 @@ icon_map_t icon_maps_gx[] = {
{ hp48_text_gx_width, hp48_text_gx_height, LABEL, hp48_text_gx_bitmap },
{ hp48_keys_width, hp48_keys_height, BLACK, hp48_keys_bitmap },
{ hp48_orange_width, hp48_orange_height, LEFT, hp48_orange_bitmap },
{ hp48_green_gx_width, hp48_green_gx_height, RIGHT, hp48_green_gx_bitmap } };
{ hp48_green_gx_width, hp48_green_gx_height, RIGHT,
hp48_green_gx_bitmap } };
#define KEYBOARD_HEIGHT ( buttons[ LAST_BUTTON ].y + buttons[ LAST_BUTTON ].h )
#define KEYBOARD_WIDTH ( buttons[ LAST_BUTTON ].x + buttons[ LAST_BUTTON ].w )
@ -2791,8 +2863,9 @@ void DrawMore( unsigned int w, unsigned int h, unsigned int offset_y,
XSetForeground( dpy, gc, COLOR( LOGO ) );
x = DISPLAY_OFFSET_X + hp_width;
y = hp_height + 8 - hp48gx_height;
pix = XCreateBitmapFromData( dpy, keypad->pixmap, ( char* )hp48gx_bitmap,
hp48gx_width, hp48gx_height );
pix =
XCreateBitmapFromData( dpy, keypad->pixmap, ( char* )hp48gx_bitmap,
hp48gx_width, hp48gx_height );
XCopyPlane( dpy, pix, keypad->pixmap, gc, 0, 0, hp48gx_width,
hp48gx_height, x, y, 1 );
XFreePixmap( dpy, pix );
@ -2801,9 +2874,9 @@ void DrawMore( unsigned int w, unsigned int h, unsigned int offset_y,
x = DISPLAY_OFFSET_X + DISPLAY_WIDTH - gx_128K_ram_width +
gx_silver_x_hot + 2;
y = 10 + gx_silver_y_hot;
pix =
XCreateBitmapFromData( dpy, keypad->pixmap, ( char* )gx_silver_bitmap,
gx_silver_width, gx_silver_height );
pix = XCreateBitmapFromData( dpy, keypad->pixmap,
( char* )gx_silver_bitmap, gx_silver_width,
gx_silver_height );
XSetStipple( dpy, gc, pix );
XSetTSOrigin( dpy, gc, x, y );
XFillRectangle( dpy, keypad->pixmap, gc, x, y, gx_silver_width,
@ -2814,9 +2887,9 @@ void DrawMore( unsigned int w, unsigned int h, unsigned int offset_y,
x = DISPLAY_OFFSET_X + display_width - gx_128K_ram_width +
gx_green_x_hot + 2;
y = 10 + gx_green_y_hot;
pix =
XCreateBitmapFromData( dpy, keypad->pixmap, ( char* )gx_green_bitmap,
gx_green_width, gx_green_height );
pix = XCreateBitmapFromData( dpy, keypad->pixmap,
( char* )gx_green_bitmap, gx_green_width,
gx_green_height );
XSetStipple( dpy, gc, pix );
XSetTSOrigin( dpy, gc, x, y );
XFillRectangle( dpy, keypad->pixmap, gc, x, y, gx_green_width,
@ -2829,8 +2902,9 @@ void DrawMore( unsigned int w, unsigned int h, unsigned int offset_y,
x = DISPLAY_OFFSET_X;
y = TOP_SKIP - DISP_FRAME - hp48sx_height - 3;
pix = XCreateBitmapFromData( dpy, keypad->pixmap, ( char* )hp48sx_bitmap,
hp48sx_width, hp48sx_height );
pix =
XCreateBitmapFromData( dpy, keypad->pixmap, ( char* )hp48sx_bitmap,
hp48sx_width, hp48sx_height );
XCopyPlane( dpy, pix, keypad->pixmap, gc, 0, 0, hp48sx_width,
hp48sx_height, x, y, 1 );
@ -2840,8 +2914,9 @@ void DrawMore( unsigned int w, unsigned int h, unsigned int offset_y,
x = DISPLAY_OFFSET_X + display_width - 1 - science_width;
y = TOP_SKIP - DISP_FRAME - science_height - 4;
pix = XCreateBitmapFromData( dpy, keypad->pixmap, ( char* )science_bitmap,
science_width, science_height );
pix =
XCreateBitmapFromData( dpy, keypad->pixmap, ( char* )science_bitmap,
science_width, science_height );
XCopyPlane( dpy, pix, keypad->pixmap, gc, 0, 0, science_width,
science_height, x, y, 1 );
@ -4306,7 +4381,8 @@ void SDLDrawLogo( unsigned int w, unsigned int h, unsigned int cut,
gx_green_x_hot + 2;
y = 10 + gx_green_y_hot;
surf = SDLCreateSurfFromData(
gx_green_width, gx_green_height, gx_green_bitmap, ARGBColors[ RIGHT ],
gx_green_width, gx_green_height, gx_green_bitmap,
ARGBColors[ RIGHT ],
0 ); // Background transparent: draw only green menu
srect.x = 0;
srect.y = 0;

150
src/x48.h
View file

@ -324,7 +324,7 @@ static unsigned char hp48_bottom_bitmap[] = {
#define hp48_logo_width 13
#define hp48_logo_height 4
static unsigned char hp48_logo_bitmap[] = { 0x00, 0x00, 0x00, 0x00,
0xf8, 0x1f, 0xf8, 0x1f };
0xf8, 0x1f, 0xf8, 0x1f };
#define hp48_text_width 29
#define hp48_text_height 7
@ -415,7 +415,7 @@ static unsigned char hp48_top_gx_bitmap[] = {
#define hp48_logo_gx_width 16
#define hp48_logo_gx_height 4
static unsigned char hp48_logo_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00,
0xf8, 0xf7, 0xf8, 0xf7 };
0xf8, 0xf7, 0xf8, 0xf7 };
#define hp48_text_gx_width 29
#define hp48_text_gx_height 7
@ -563,15 +563,15 @@ static unsigned char bs_bitmap[] = {
#define alpha_width 12
#define alpha_height 10
static unsigned char alpha_bitmap[] = { 0x78, 0x00, 0x84, 0x08, 0x82, 0x09, 0x83,
0x05, 0x83, 0x05, 0x83, 0x03, 0x83, 0x01,
0x83, 0x01, 0x46, 0x09, 0x3c, 0x06 };
static unsigned char alpha_bitmap[] = {
0x78, 0x00, 0x84, 0x08, 0x82, 0x09, 0x83, 0x05, 0x83, 0x05,
0x83, 0x03, 0x83, 0x01, 0x83, 0x01, 0x46, 0x09, 0x3c, 0x06 };
#define div_width 10
#define div_height 10
static unsigned char div_bitmap[] = { 0x30, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00,
0x00, 0xff, 0x03, 0xff, 0x03, 0x00, 0x00,
0x00, 0x00, 0x30, 0x00, 0x30, 0x00 };
0x00, 0xff, 0x03, 0xff, 0x03, 0x00, 0x00,
0x00, 0x00, 0x30, 0x00, 0x30, 0x00 };
#define shl_width 24
#define shl_height 14
@ -584,8 +584,8 @@ static unsigned char shl_bitmap[] = {
#define mul_width 10
#define mul_height 10
static unsigned char mul_bitmap[] = { 0x03, 0x03, 0x87, 0x03, 0xce, 0x01, 0xfc,
0x00, 0x78, 0x00, 0x78, 0x00, 0xfc, 0x00,
0xce, 0x01, 0x87, 0x03, 0x03, 0x03 };
0x00, 0x78, 0x00, 0x78, 0x00, 0xfc, 0x00,
0xce, 0x01, 0x87, 0x03, 0x03, 0x03 };
#define shr_width 24
#define shr_height 14
@ -597,20 +597,20 @@ static unsigned char shr_bitmap[] = {
#define minus_width 10
#define minus_height 10
static unsigned char minus_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xff, 0x03, 0xff, 0x03, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
static unsigned char minus_bitmap[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03,
0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
#define plus_width 10
#define plus_height 10
static unsigned char plus_bitmap[] = { 0x30, 0x00, 0x30, 0x00, 0x30, 0x00, 0x30,
0x00, 0xff, 0x03, 0xff, 0x03, 0x30, 0x00,
0x30, 0x00, 0x30, 0x00, 0x30, 0x00 };
0x00, 0xff, 0x03, 0xff, 0x03, 0x30, 0x00,
0x30, 0x00, 0x30, 0x00, 0x30, 0x00 };
#define colon_width 2
#define colon_height 10
static unsigned char colon_bitmap[] = { 0x03, 0x03, 0x03, 0x03, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00 };
0x00, 0x00, 0x00, 0x00, 0x00 };
/* Below used only for X11 */
#define last_width 120
@ -636,45 +636,47 @@ static unsigned char last_bitmap[] = {
#define blank_width 4
#define blank_height 7
static unsigned char blank_bitmap[] = { 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00 };
0x00, 0x00, 0x00 };
#define hash_width 5
#define hash_height 7
static unsigned char hash_bitmap[] = { 0x00, 0x0a, 0x1f, 0x0a, 0x0a, 0x1f, 0x0a };
static unsigned char hash_bitmap[] = { 0x00, 0x0a, 0x1f, 0x0a,
0x0a, 0x1f, 0x0a };
#define lbrace_width 3
#define lbrace_height 7
static unsigned char lbrace_bitmap[] = { 0x04, 0x02, 0x01, 0x01,
0x01, 0x02, 0x04 };
0x01, 0x02, 0x04 };
#define rbrace_width 3
#define rbrace_height 7
static unsigned char rbrace_bitmap[] = { 0x01, 0x02, 0x04, 0x04,
0x04, 0x02, 0x01 };
0x04, 0x02, 0x01 };
#define comma_width 3
#define comma_height 7
static unsigned char comma_bitmap[] = { 0x00, 0x00, 0x00, 0x00,
0x06, 0x06, 0x03 };
0x06, 0x06, 0x03 };
#define slash_width 3
#define slash_height 7
static unsigned char slash_bitmap[] = { 0x04, 0x04, 0x02, 0x02,
0x02, 0x01, 0x01 };
0x02, 0x01, 0x01 };
#define two_width 5
#define two_height 7
static unsigned char two_bitmap[] = { 0x0e, 0x11, 0x10, 0x08, 0x04, 0x02, 0x1f };
static unsigned char two_bitmap[] = { 0x0e, 0x11, 0x10, 0x08,
0x04, 0x02, 0x1f };
#define three_width 5
#define three_height 7
static unsigned char three_bitmap[] = { 0x0e, 0x11, 0x10, 0x0c,
0x10, 0x11, 0x0e };
0x10, 0x11, 0x0e };
#define small_colon_width 2
#define small_colon_height 7
static unsigned char small_colon_bitmap[] = { 0x00, 0x03, 0x03, 0x00,
0x03, 0x03, 0x00 };
0x03, 0x03, 0x00 };
#define A_width 5
#define A_height 7
@ -783,37 +785,38 @@ static unsigned char Z_bitmap[] = { 0x1f, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1f };
#define lbracket_width 3
#define lbracket_height 7
static unsigned char lbracket_bitmap[] = { 0x07, 0x01, 0x01, 0x01,
0x01, 0x01, 0x07 };
0x01, 0x01, 0x07 };
#define rbracket_width 3
#define rbracket_height 7
static unsigned char rbracket_bitmap[] = { 0x07, 0x04, 0x04, 0x04,
0x04, 0x04, 0x07 };
0x04, 0x04, 0x07 };
#define arrow_width 7
#define arrow_height 7
static unsigned char arrow_bitmap[] = { 0x00, 0x08, 0x18, 0x3f,
0x18, 0x08, 0x00 };
0x18, 0x08, 0x00 };
#define diff_width 5
#define diff_height 7
static unsigned char diff_bitmap[] = { 0x0e, 0x10, 0x10, 0x1e, 0x11, 0x11, 0x0e };
static unsigned char diff_bitmap[] = { 0x0e, 0x10, 0x10, 0x1e,
0x11, 0x11, 0x0e };
#define integral_width 5
#define integral_height 8
static unsigned char integral_bitmap[] = { 0x0c, 0x12, 0x02, 0x04,
0x04, 0x08, 0x09, 0x06 };
0x04, 0x08, 0x09, 0x06 };
#define sigma_width 6
#define sigma_height 9
static unsigned char sigma_bitmap[] = { 0x3f, 0x21, 0x02, 0x04, 0x08,
0x04, 0x02, 0x21, 0x3f };
0x04, 0x02, 0x21, 0x3f };
#define sqr_width 11
#define sqr_height 10
static unsigned char sqr_bitmap[] = { 0x00, 0x03, 0x80, 0x04, 0x00, 0x04, 0x00,
0x02, 0x26, 0x01, 0x94, 0x07, 0x08, 0x00,
0x14, 0x00, 0x53, 0x00, 0x21, 0x00 };
0x02, 0x26, 0x01, 0x94, 0x07, 0x08, 0x00,
0x14, 0x00, 0x53, 0x00, 0x21, 0x00 };
#define root_width 18
#define root_height 13
@ -826,35 +829,36 @@ static unsigned char root_bitmap[] = {
#define pow10_width 13
#define pow10_height 9
static unsigned char pow10_bitmap[] = { 0x00, 0x12, 0x00, 0x0c, 0x32, 0x04,
0x4b, 0x0a, 0x4a, 0x09, 0x4a, 0x00,
0x4a, 0x00, 0x4a, 0x00, 0x32, 0x00 };
0x4b, 0x0a, 0x4a, 0x09, 0x4a, 0x00,
0x4a, 0x00, 0x4a, 0x00, 0x32, 0x00 };
#define exp_width 11
#define exp_height 9
static unsigned char exp_bitmap[] = { 0x80, 0x04, 0x00, 0x03, 0x00, 0x01,
0x8c, 0x02, 0x52, 0x02, 0x09, 0x00,
0x07, 0x00, 0x21, 0x00, 0x1e, 0x00 };
0x8c, 0x02, 0x52, 0x02, 0x09, 0x00,
0x07, 0x00, 0x21, 0x00, 0x1e, 0x00 };
#define under_width 6
#define under_height 7
static unsigned char under_bitmap[] = { 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x3f };
0x00, 0x00, 0x3f };
#define prog_width 16
#define prog_height 7
static unsigned char prog_bitmap[] = { 0x48, 0x12, 0x24, 0x24, 0x12, 0x48, 0x09,
0x90, 0x12, 0x48, 0x24, 0x24, 0x48, 0x12 };
static unsigned char prog_bitmap[] = { 0x48, 0x12, 0x24, 0x24, 0x12,
0x48, 0x09, 0x90, 0x12, 0x48,
0x24, 0x24, 0x48, 0x12 };
#define string_width 10
#define string_height 7
static unsigned char string_bitmap[] = { 0x85, 0x02, 0x85, 0x02, 0x85,
0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00 };
0x02, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00 };
#define equal_width 5
#define equal_height 7
static unsigned char equal_bitmap[] = { 0x00, 0x1f, 0x00, 0x00,
0x1f, 0x00, 0x00 };
0x1f, 0x00, 0x00 };
#define nl_width 8
#define nl_height 7
@ -867,24 +871,24 @@ static unsigned char pi_bitmap[] = { 0x20, 0x1f, 0x12, 0x12, 0x12, 0x12, 0x12 };
#define angle_width 8
#define angle_height 7
static unsigned char angle_bitmap[] = { 0x40, 0x20, 0x10, 0x28,
0x44, 0x42, 0xff };
0x44, 0x42, 0xff };
#define lcurly_width 5
#define lcurly_height 7
static unsigned char lcurly_bitmap[] = { 0x18, 0x04, 0x04, 0x02,
0x04, 0x04, 0x18 };
0x04, 0x04, 0x18 };
#define rcurly_width 5
#define rcurly_height 7
static unsigned char rcurly_bitmap[] = { 0x03, 0x04, 0x04, 0x08,
0x04, 0x04, 0x03 };
0x04, 0x04, 0x03 };
#define sqr_gx_width 11
#define sqr_gx_height 13
static unsigned char sqr_gx_bitmap[] = { 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 };
static unsigned char sqr_gx_bitmap[] = {
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 };
#define root_gx_width 18
#define root_gx_height 15
@ -915,7 +919,7 @@ static unsigned char parens_gx_bitmap[] = {
#define hash_gx_width 8
#define hash_gx_height 12
static unsigned char hash_gx_bitmap[] = { 0x00, 0x00, 0x48, 0x48, 0xfe, 0x24,
0x24, 0x7f, 0x12, 0x12, 0x00, 0x00 };
0x24, 0x7f, 0x12, 0x12, 0x00, 0x00 };
#define bracket_gx_width 12
#define bracket_gx_height 12
@ -951,7 +955,7 @@ static unsigned char curly_gx_bitmap[] = {
#define colon_gx_width 8
#define colon_gx_height 12
static unsigned char colon_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3,
0xc3, 0x00, 0x00, 0xc3, 0xc3, 0x00 };
0xc3, 0x00, 0x00, 0xc3, 0xc3, 0x00 };
#define angle_gx_width 12
#define angle_gx_height 12
@ -975,7 +979,7 @@ static unsigned char nl_gx_bitmap[] = {
#define comma_gx_width 3
#define comma_gx_height 12
static unsigned char comma_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x07, 0x07, 0x07, 0x04, 0x04, 0x02 };
0x07, 0x07, 0x07, 0x04, 0x04, 0x02 };
#define arrow_gx_width 18
#define arrow_gx_height 12
@ -987,7 +991,7 @@ static unsigned char arrow_gx_bitmap[] = {
#define equal_gx_width 8
#define equal_gx_height 12
static unsigned char equal_gx_bitmap[] = { 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
0x00, 0xff, 0xff, 0x00, 0x00, 0x00 };
0x00, 0xff, 0xff, 0x00, 0x00, 0x00 };
typedef struct letter_t {
unsigned int w, h;
@ -1091,26 +1095,26 @@ static letter_t small_font[] = {
{ rbracket_width, rbracket_height, rbracket_bitmap },
{ 0, 0, 0 },
{ under_width, under_height, under_bitmap },
{ 0, 0, 0 }, /* # 96 */
{ arrow_width, arrow_height, arrow_bitmap }, /* a == left arrow */
{ diff_width, diff_height, diff_bitmap }, /* b == differential */
{ integral_width, integral_height, integral_bitmap }, /* c == integral */
{ sigma_width, sigma_height, sigma_bitmap }, /* d == sigma */
{ sqr_width, sqr_height, sqr_bitmap }, /* e == sqr */
{ root_width, root_height, root_bitmap }, /* f == root */
{ pow10_width, pow10_height, pow10_bitmap }, /* g == pow10 */
{ exp_width, exp_height, exp_bitmap }, /* h == exp */
{ prog_width, prog_height, prog_bitmap }, /* i == << >> */
{ string_width, string_height, string_bitmap }, /* j == " " */
{ nl_width, nl_height, nl_bitmap }, /* k == New Line */
{ pi_width, pi_height, pi_bitmap }, /* l == pi */
{ angle_width, angle_height, angle_bitmap }, /* m == angle */
{ sqr_gx_width, sqr_gx_height, sqr_gx_bitmap }, /* n == sqr gx */
{ root_gx_width, root_gx_height, root_gx_bitmap }, /* o == root gx */
{ pow10_gx_width, pow10_gx_height, pow10_gx_bitmap }, /* p == pow10 gx */
{ exp_gx_width, exp_gx_height, exp_gx_bitmap }, /* q == exp gx */
{ parens_gx_width, parens_gx_height, parens_gx_bitmap }, /* r == ( ) gx */
{ hash_gx_width, hash_gx_height, hash_gx_bitmap }, /* s == # gx */
{ 0, 0, 0 }, /* # 96 */
{ arrow_width, arrow_height, arrow_bitmap }, /* a == left arrow */
{ diff_width, diff_height, diff_bitmap }, /* b == differential */
{ integral_width, integral_height, integral_bitmap }, /* c == integral */
{ sigma_width, sigma_height, sigma_bitmap }, /* d == sigma */
{ sqr_width, sqr_height, sqr_bitmap }, /* e == sqr */
{ root_width, root_height, root_bitmap }, /* f == root */
{ pow10_width, pow10_height, pow10_bitmap }, /* g == pow10 */
{ exp_width, exp_height, exp_bitmap }, /* h == exp */
{ prog_width, prog_height, prog_bitmap }, /* i == << >> */
{ string_width, string_height, string_bitmap }, /* j == " " */
{ nl_width, nl_height, nl_bitmap }, /* k == New Line */
{ pi_width, pi_height, pi_bitmap }, /* l == pi */
{ angle_width, angle_height, angle_bitmap }, /* m == angle */
{ sqr_gx_width, sqr_gx_height, sqr_gx_bitmap }, /* n == sqr gx */
{ root_gx_width, root_gx_height, root_gx_bitmap }, /* o == root gx */
{ pow10_gx_width, pow10_gx_height, pow10_gx_bitmap }, /* p == pow10 gx */
{ exp_gx_width, exp_gx_height, exp_gx_bitmap }, /* q == exp gx */
{ parens_gx_width, parens_gx_height, parens_gx_bitmap }, /* r == ( ) gx */
{ hash_gx_width, hash_gx_height, hash_gx_bitmap }, /* s == # gx */
{ bracket_gx_width, bracket_gx_height, bracket_gx_bitmap }, /* t == [] gx */
{ under_gx_width, under_gx_height, under_gx_bitmap }, /* u == _ gx */
{ prog_gx_width, prog_gx_height, prog_gx_bitmap }, /* v == << >> gx */