unify naming in ui_*
This commit is contained in:
parent
b4dddbd542
commit
194b8d6ab9
3 changed files with 14 additions and 14 deletions
10
src/ui_sdl.c
10
src/ui_sdl.c
|
@ -1683,19 +1683,19 @@ static inline void draw_nibble( int col, int row, int val )
|
||||||
|
|
||||||
static inline void draw_row( long addr, int row )
|
static inline void draw_row( long addr, int row )
|
||||||
{
|
{
|
||||||
int v;
|
int nibble;
|
||||||
int line_length = NIBBLES_PER_ROW;
|
int line_length = NIBBLES_PER_ROW;
|
||||||
|
|
||||||
if ( ( display.offset > 3 ) && ( row <= display.lines ) )
|
if ( ( display.offset > 3 ) && ( row <= display.lines ) )
|
||||||
line_length += 2;
|
line_length += 2;
|
||||||
|
|
||||||
for ( int i = 0; i < line_length; i++ ) {
|
for ( int i = 0; i < line_length; i++ ) {
|
||||||
v = read_nibble( addr + i );
|
nibble = read_nibble( addr + i );
|
||||||
if ( v == lcd_nibbles_buffer[ row ][ i ] )
|
if ( nibble == lcd_nibbles_buffer[ row ][ i ] )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
lcd_nibbles_buffer[ row ][ i ] = v;
|
lcd_nibbles_buffer[ row ][ i ] = nibble;
|
||||||
draw_nibble( i, row, v );
|
draw_nibble( i, row, nibble );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -528,7 +528,6 @@ int text_get_event( void ) { return ncurses_get_event(); }
|
||||||
|
|
||||||
void text_adjust_contrast() { text_update_LCD(); }
|
void text_adjust_contrast() { text_update_LCD(); }
|
||||||
|
|
||||||
/* TODO: not specific to tui */
|
|
||||||
void text_update_LCD( void )
|
void text_update_LCD( void )
|
||||||
{
|
{
|
||||||
if ( display.on ) {
|
if ( display.on ) {
|
||||||
|
@ -562,6 +561,7 @@ void text_update_LCD( void )
|
||||||
} else
|
} else
|
||||||
memset( lcd_nibbles_buffer, 0xf0, sizeof( lcd_nibbles_buffer ) );
|
memset( lcd_nibbles_buffer, 0xf0, sizeof( lcd_nibbles_buffer ) );
|
||||||
|
|
||||||
|
/* text UI specific from here */
|
||||||
if ( small )
|
if ( small )
|
||||||
ncurses_draw_lcd_small();
|
ncurses_draw_lcd_small();
|
||||||
else if ( tiny )
|
else if ( tiny )
|
||||||
|
|
16
src/ui_x11.c
16
src/ui_x11.c
|
@ -2911,19 +2911,19 @@ static inline void draw_nibble( int c, int r, int val )
|
||||||
|
|
||||||
static inline void draw_row( long addr, int row )
|
static inline void draw_row( long addr, int row )
|
||||||
{
|
{
|
||||||
int i, v;
|
int nibble;
|
||||||
int line_length;
|
int line_length = NIBBLES_PER_ROW;
|
||||||
|
|
||||||
line_length = NIBBLES_PER_ROW;
|
|
||||||
if ( ( display.offset > 3 ) && ( row <= display.lines ) )
|
if ( ( display.offset > 3 ) && ( row <= display.lines ) )
|
||||||
line_length += 2;
|
line_length += 2;
|
||||||
for ( i = 0; i < line_length; i++ ) {
|
|
||||||
v = read_nibble( addr + i );
|
for ( int i = 0; i < line_length; i++ ) {
|
||||||
if ( v == lcd_nibbles_buffer[ row ][ i ] )
|
nibble = read_nibble( addr + i );
|
||||||
|
if ( nibble == lcd_nibbles_buffer[ row ][ i ] )
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
lcd_nibbles_buffer[ row ][ i ] = v;
|
lcd_nibbles_buffer[ row ][ i ] = nibble;
|
||||||
draw_nibble( i, row, v );
|
draw_nibble( i, row, nibble );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue