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

more static functiosn in ui_x11.c + small stuff

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-05-23 13:50:42 +02:00
parent 70b53fae1b
commit a2fb56e1a7
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
2 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/ui.c
View file

@ -153,14 +153,11 @@ void ui_init_LCD( void ) { memset( lcd_nibbles_buffer, 0xf0, sizeof( lcd_nibbles
int SmallTextWidth( const char* string, unsigned int length )
{
unsigned int i;
int w;
w = 0;
for ( i = 0; i < length; i++ ) {
if ( small_font[ ( int )string[ i ] ].h != 0 ) {
int w = 0;
for ( unsigned int i = 0; i < length; i++ ) {
if ( small_font[ ( int )string[ i ] ].h != 0 )
w += small_font[ ( int )string[ i ] ].w + 1;
} else {
else {
if ( config.verbose )
fprintf( stderr, "Unknown small letter 0x00%x\n", ( int )string[ i ] );
w += 5;
@ -175,16 +172,16 @@ void start_UI( int argc, char** argv )
ui_init_LCD();
switch ( config.frontend_type ) {
#if ( defined( HAS_X11 ) )
#if defined( HAS_X11 )
case FRONTEND_X11:
default:
init_x11_ui( argc, argv );
break;
#endif
#if ( defined( HAS_SDL ) )
#if defined( HAS_SDL )
case FRONTEND_SDL:
# if ( !defined( HAS_X11 ) )
# if !defined( HAS_X11 )
default:
# endif
init_sdl_ui( argc, argv );
@ -205,16 +202,16 @@ void ui_stop( void )
ui_init_LCD();
switch ( config.frontend_type ) {
#if ( defined( HAS_X11 ) )
#if defined( HAS_X11 )
case FRONTEND_X11:
default:
x11_ui_stop();
break;
#endif
#if ( defined( HAS_SDL ) )
#if defined( HAS_SDL )
case FRONTEND_SDL:
# if ( !defined( HAS_X11 ) )
# if !defined( HAS_X11 )
default:
# endif
sdl_ui_stop();

28
src/ui_x11.c
View file

@ -3476,7 +3476,7 @@ static inline void _DrawMore( unsigned int offset_y, x11_keypad_t* local_keypad
}
}
void DrawKeypad( x11_keypad_t* local_keypad )
static void DrawKeypad( x11_keypad_t* local_keypad )
{
XCopyArea( dpy, local_keypad->pixmap, mainW, gc, 0, 0, local_keypad->width, local_keypad->height, 0, 0 );
}
@ -3557,7 +3557,7 @@ static inline void _CreateIcon( void )
XSetFillStyle( dpy, gc, FillSolid );
}
void refresh_icon( void )
static void refresh_icon( void )
{
int icon_state = ( ( display.on && !( ( ANN_IO & saturn.annunc ) == ANN_IO ) ) ||
( display.on && !( ( ANN_ALPHA & saturn.annunc ) == ANN_ALPHA ) ) );
@ -3768,7 +3768,7 @@ shm_error:
}
}
void _DrawSerialDevices( char* wire, char* ir )
static void _DrawSerialDevices( char* wire, char* ir )
{
char name[ 128 ];
int x, y, w, h;
@ -3828,7 +3828,7 @@ static inline void _CreateBackground( int width, int height, int w_top, int h_to
XFillRectangle( dpy, local_keypad->pixmap, gc, 0, 0, width, height );
}
bool CreateWindows( int argc, char** argv )
static bool CreateWindows( int argc, char** argv )
{
XSizeHints hint, ih;
XWMHints wmh;
@ -4119,7 +4119,7 @@ bool CreateWindows( int argc, char** argv )
return true;
}
void key_event( int b, XEvent* xev )
static void key_event( int b, XEvent* xev )
{
if ( xev->type == KeyPress )
press_key( b );
@ -4129,7 +4129,7 @@ void key_event( int b, XEvent* xev )
DrawButton( b );
}
void refresh_display( void )
static void refresh_display( void )
{
if ( !shm_flag )
return;
@ -4145,7 +4145,7 @@ void refresh_display( void )
lcd.display_update = 0;
}
void redraw_annunc( void )
static void redraw_annunc( void )
{
last_annunc_state = -1;
x11_draw_annunc();
@ -4167,7 +4167,8 @@ static inline void _DrawDisp( void )
redraw_annunc();
}
void save_options( int argc, char** argv )
// Used in init_x11_ui()
static void save_options( int argc, char** argv )
{
int l;
@ -4189,7 +4190,7 @@ void save_options( int argc, char** argv )
}
}
void save_command_line( void )
static void save_command_line( void )
{
int wm_argc = 0;
char** wm_argv = ( char** )malloc( ( saved_argc + 5 ) * sizeof( char* ) );
@ -4204,7 +4205,7 @@ void save_command_line( void )
XSetCommand( dpy, mainW, wm_argv, wm_argc );
}
void decode_key( XEvent* xev, KeySym sym, char* buf, int buflen )
static void decode_key( XEvent* xev, KeySym sym, char* buf, int buflen )
{
if ( buflen == 1 )
switch ( buf[ 0 ] ) {
@ -4478,9 +4479,7 @@ void decode_key( XEvent* xev, KeySym sym, char* buf, int buflen )
}
}
void x11_ui_stop( void ) { XCloseDisplay( dpy ); }
void x11_release_all_keys( void )
static void x11_release_all_keys( void )
{
release_all_keys();
for ( int b = FIRST_HPKEY; b <= LAST_HPKEY; b++ )
@ -4515,6 +4514,7 @@ static inline void draw_row( long addr, int row )
draw_nibble( i, row, read_nibble( addr + i ) );
}
// Used in init_x11_ui()
static inline bool InitDisplay( void )
{
/*
@ -4553,6 +4553,8 @@ static inline bool InitDisplay( void )
/* public */
/**********/
void x11_ui_stop( void ) { XCloseDisplay( dpy ); }
void x11_get_event( void )
{
XEvent xev;