gwh/libx48ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ui_sdl] use COLORS

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-06-12 14:04:32 +02:00
parent 1d7d9969cd
commit 7700923cae
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/ui_sdl.c
View file

@ -137,7 +137,7 @@ static void write_text( int x, int y, const char* string, unsigned int length, u
} }
} }
static void colors_setup( color_t* colors ) static void colors_setup( void )
{ {
int r, g, b; int r, g, b;
// Adjust the LCD color according to the contrast // Adjust the LCD color according to the contrast
@ -149,25 +149,25 @@ static void colors_setup( color_t* colors )
for ( unsigned i = FIRST_COLOR; i < LAST_COLOR; i++ ) { for ( unsigned i = FIRST_COLOR; i < LAST_COLOR; i++ ) {
if ( config.mono ) { if ( config.mono ) {
r = colors[ i ].mono_rgb; r = COLORS[ i ].mono_rgb;
g = colors[ i ].mono_rgb; g = COLORS[ i ].mono_rgb;
b = colors[ i ].mono_rgb; b = COLORS[ i ].mono_rgb;
} else if ( config.gray ) { } else if ( config.gray ) {
r = colors[ i ].gray_rgb; r = COLORS[ i ].gray_rgb;
g = colors[ i ].gray_rgb; g = COLORS[ i ].gray_rgb;
b = colors[ i ].gray_rgb; b = COLORS[ i ].gray_rgb;
} else { } else {
r = colors[ i ].r; r = COLORS[ i ].r;
g = colors[ i ].g; g = COLORS[ i ].g;
b = colors[ i ].b; b = COLORS[ i ].b;
} }
ARGBColors[ i ] = 0xff000000 | ( r << 16 ) | ( g << 8 ) | b; ARGBColors[ i ] = 0xff000000 | ( r << 16 ) | ( g << 8 ) | b;
} }
r = ( 0x13 - contrast ) * ( colors[ LCD ].r / 0x10 ); r = ( 0x13 - contrast ) * ( COLORS[ LCD ].r / 0x10 );
g = ( 0x13 - contrast ) * ( colors[ LCD ].g / 0x10 ); g = ( 0x13 - contrast ) * ( COLORS[ LCD ].g / 0x10 );
b = 128 - ( ( 0x13 - contrast ) * ( ( 128 - colors[ LCD ].b ) / 0x10 ) ); b = 128 - ( ( 0x13 - contrast ) * ( ( 128 - COLORS[ LCD ].b ) / 0x10 ) );
ARGBColors[ PIXEL ] = 0xff000000 | ( r << 16 ) | ( g << 8 ) | b; ARGBColors[ PIXEL ] = 0xff000000 | ( r << 16 ) | ( g << 8 ) | b;
} }
@ -1355,11 +1355,10 @@ void sdl_update_LCD( void )
{ {
if ( display.on ) { if ( display.on ) {
int i; int i;
long addr; long addr = display.disp_start;
static int old_offset = -1; static int old_offset = -1;
static int old_lines = -1; static int old_lines = -1;
addr = display.disp_start;
if ( display.offset != old_offset ) { if ( display.offset != old_offset ) {
memset( lcd_nibbles_buffer, 0xf0, ( size_t )( ( display.lines + 1 ) * NIBS_PER_BUFFER_ROW ) ); memset( lcd_nibbles_buffer, 0xf0, ( size_t )( ( display.lines + 1 ) * NIBS_PER_BUFFER_ROW ) );
old_offset = display.offset; old_offset = display.offset;
@ -1453,7 +1452,7 @@ void sdl_draw_annunc( void )
void sdl_adjust_contrast( void ) void sdl_adjust_contrast( void )
{ {
colors_setup( opt_gx ? colors_gx : colors_sx ); colors_setup();
create_annunc(); create_annunc();
// redraw LCD // redraw LCD
@ -1534,7 +1533,7 @@ void init_sdl_ui( int argc, char** argv )
/* BUTTONS = opt_gx ? BUTTONS_gx : BUTTONS_sx; */ /* BUTTONS = opt_gx ? BUTTONS_gx : BUTTONS_sx; */
colors_setup( COLORS ); colors_setup();
if ( !config.hide_chrome ) { if ( !config.hide_chrome ) {
int cut = BUTTONS[ HPKEY_MTH ].y + KEYBOARD_OFFSET_Y - 19; int cut = BUTTONS[ HPKEY_MTH ].y + KEYBOARD_OFFSET_Y - 19;