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

ui_* can use saturn.annunc directly, no need to copy it in display

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-04-02 21:42:59 +02:00
parent 1057a1471a
commit 091556e9ad
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
6 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/emu_init.c
View file

@ -197,8 +197,6 @@ void init_display( void )
display.contrast = saturn.contrast_ctrl;
display.contrast |= ( ( saturn.disp_test & 0x1 ) << 4 );
display.annunc = saturn.annunc;
}
int init_emulator( void )

1
src/emu_memory.c
View file

@ -102,7 +102,6 @@ void write_dev_mem( long addr, int val )
case 0x10c: /* ANNUNC */
saturn.annunc &= ~nibble_masks[ addr - 0x10b ];
saturn.annunc |= val << ( ( addr - 0x10b ) * 4 );
display.annunc = saturn.annunc;
device.ann_touched = 1;
return;
case 0x10d: /* BAUD */

2
src/emulator.h
View file

@ -176,8 +176,6 @@ typedef struct display_t {
long menu_start;
long menu_end;
int annunc;
} display_t;
typedef struct mem_cntl_t {

2
src/ui_sdl.c
View file

@ -2009,7 +2009,7 @@ void sdl_menu_draw_nibble( word_20 addr, word_4 val )
void sdl_draw_annunc( void )
{
int val = display.annunc;
int val = saturn.annunc;
if ( val == last_annunc_state )
return;

2
src/ui_text.c
View file

@ -357,7 +357,7 @@ void text_menu_draw_nibble( word_20 addr, word_4 val )
void text_draw_annunc( void )
{
wchar_t* annunciators_icons[ 6 ] = { L"↰", L"↱", L"α", L"🪫", L"⌛", L"⇄" };
int val = display.annunc;
int val = saturn.annunc;
if ( val == last_annunc_state )
return;

6
src/ui_x11.c
View file

@ -1820,8 +1820,8 @@ void refresh_icon( void )
{
int icon_state;
icon_state = ( ( display.on && !( ( ANN_IO & display.annunc ) == ANN_IO ) ) ||
( display.on && !( ( ANN_ALPHA & display.annunc ) == ANN_ALPHA ) ) );
icon_state = ( ( display.on && !( ( ANN_IO & saturn.annunc ) == ANN_IO ) ) ||
( display.on && !( ( ANN_ALPHA & saturn.annunc ) == ANN_ALPHA ) ) );
if ( icon_state == last_icon_state )
return;
@ -3717,7 +3717,7 @@ void x11_menu_draw_nibble( word_20 addr, word_4 val )
void x11_draw_annunc( void )
{
int val = display.annunc;
int val = saturn.annunc;
if ( val == last_annunc_state )
return;