gwh/x50ng
1
0
Fork 0
forked from Miroirs/x49gp
Code Pull requests Activity

ignore s3c2410.h in make pretty-code

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-11-05 13:48:44 +01:00
parent 5246fcb0fd
commit 567771cbcc
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.clang-format
View file

@ -1,4 +1,3 @@
---
Language: Cpp Language: Cpp
ColumnLimit: 140 ColumnLimit: 140
IndentWidth: 4 IndentWidth: 4
@ -56,4 +55,3 @@ BraceWrapping:
SplitEmptyFunction: true SplitEmptyFunction: true
SplitEmptyRecord: true SplitEmptyRecord: true
SplitEmptyNamespace: true SplitEmptyNamespace: true
...

2
Makefile
View file

@ -194,7 +194,7 @@ mrproper: distclean
# auto-format code # auto-format code
pretty-code: pretty-code:
clang-format -i ./src/x49gpng/*.c ./src/x49gpng/*.h clang-format -i ./src/x49gpng/*.c $(shell ls ./src/x49gpng/*.h | grep -v s3c2410.h) ## s3c2410.h triggers an error
# Populate dist/firmware/ from hpcalc.org # Populate dist/firmware/ from hpcalc.org
pull-firmware: pull-firmware:

16
src/x49gpng/ui.c
View file

@ -1711,7 +1711,7 @@ static int draw_faceplate( GtkWidget* ui_background, GdkEventConfigure* event, g
int dl = 0, dr = 0; int dl = 0, dr = 0;
int faceplate_color; int faceplate_color;
GdkPixmap* bg_pixmap; /* FIXME */ GdkPixmap* bg_pixmap; /* FIXME */
if ( ui->calculator == UI_CALCULATOR_HP49GP || ui->calculator == UI_CALCULATOR_HP49GP_NEWRPL ) if ( ui->calculator == UI_CALCULATOR_HP49GP || ui->calculator == UI_CALCULATOR_HP49GP_NEWRPL )
faceplate_color = UI_COLOR_FACEPLATE_49GP; faceplate_color = UI_COLOR_FACEPLATE_49GP;
@ -1765,8 +1765,8 @@ static int draw_faceplate( GtkWidget* ui_background, GdkEventConfigure* event, g
tiny_font_measure_text( key->right, &wr, &hr, &a, &dr ); tiny_font_measure_text( key->right, &wr, &hr, &a, &dr );
if ( !key->left ) { if ( !key->left ) {
xr = key->x + ( key->width - wr ) / 2; xr = key->x + ( key->width - wr ) / 2;
tiny_font_draw_text( bg_pixmap, &ui->colors[ right_color ], ui->kb_x_offset + xr, tiny_font_draw_text( bg_pixmap, &ui->colors[ right_color ], ui->kb_x_offset + xr, ui->kb_y_offset + key->y - hr + dr + 1,
ui->kb_y_offset + key->y - hr + dr + 1, key->right ); key->right );
} }
} }
@ -1799,8 +1799,8 @@ static int draw_faceplate( GtkWidget* ui_background, GdkEventConfigure* event, g
tiny_font_measure_text( key->below, &wl, &hl, &a, &dl ); tiny_font_measure_text( key->below, &wl, &hl, &a, &dl );
xl = key->x + ( key->width - wl ) / 2; xl = key->x + ( key->width - wl ) / 2;
tiny_font_draw_text( bg_pixmap, &ui->colors[ below_color ], ui->kb_x_offset + xl, tiny_font_draw_text( bg_pixmap, &ui->colors[ below_color ], ui->kb_x_offset + xl, ui->kb_y_offset + key->y + key->height + 2,
ui->kb_y_offset + key->y + key->height + 2, key->below ); key->below );
} }
#if DEBUG_LAYOUT /* Debug Button Layout */ #if DEBUG_LAYOUT /* Debug Button Layout */
@ -2117,9 +2117,9 @@ static int ui_load( x49gp_module_t* module, GKeyFile* keyfile )
gtk_event_box_set_above_child( GTK_EVENT_BOX( button->box ), false ); gtk_event_box_set_above_child( GTK_EVENT_BOX( button->box ), false );
gtk_container_add( GTK_CONTAINER( button->box ), button->button ); gtk_container_add( GTK_CONTAINER( button->box ), button->button );
gtk_widget_set_size_request( button->box, ui_keys[ i ].width, ui_keys[ i ].height ); gtk_widget_set_size_request( button->box, ui_keys[ i ].width, ui_keys[ i ].height );
gtk_fixed_put( GTK_FIXED( fixed_widgets_container ), button->box, ui->kb_x_offset + ui_keys[ i ].x, gtk_fixed_put( GTK_FIXED( fixed_widgets_container ), button->box, ui->kb_x_offset + ui_keys[ i ].x,
ui->kb_y_offset + ui_keys[ i ].y ); ui->kb_y_offset + ui_keys[ i ].y );
g_signal_connect( G_OBJECT( button->button ), "button-press-event", G_CALLBACK( react_to_button_press ), button ); g_signal_connect( G_OBJECT( button->button ), "button-press-event", G_CALLBACK( react_to_button_press ), button );
g_signal_connect( G_OBJECT( button->button ), "button-release-event", G_CALLBACK( react_to_button_release ), button ); g_signal_connect( G_OBJECT( button->button ), "button-release-event", G_CALLBACK( react_to_button_release ), button );

2
src/x49gpng/ui.h
View file

@ -117,7 +117,7 @@ struct __x49gp_ui_s__ {
gint lcd_annunciators_height; gint lcd_annunciators_height;
}; };
void gui_update_lcd(x49gp_t *x49gp); void gui_update_lcd( x49gp_t* x49gp );
int gui_init( x49gp_t* x49gp ); int gui_init( x49gp_t* x49gp );
void gui_show_error( x49gp_t* x49gp, const char* text ); void gui_show_error( x49gp_t* x49gp, const char* text );