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

++

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-11-14 13:32:56 +01:00
parent e29b38693f
commit 092b7f49af
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/x49gpng/ui.c
View file

@ -21,8 +21,6 @@
#include "gdbstub.h" #include "gdbstub.h"
#define NB_KEYS 51
#define FONT_SIZE_KEY opt.font_size #define FONT_SIZE_KEY opt.font_size
#define FONT_SIZE_SYMBOL ( 2 * opt.font_size ) #define FONT_SIZE_SYMBOL ( 2 * opt.font_size )
#define FONT_SIZE_NUMBER ( ( int )( 1.75 * opt.font_size ) ) #define FONT_SIZE_NUMBER ( ( int )( 1.75 * opt.font_size ) )
@ -1140,11 +1138,11 @@ static gboolean react_to_display_click( GtkWidget* widget, GdkEventButton* event
x49gp_t* x49gp = user_data; x49gp_t* x49gp = user_data;
x49gp_ui_t* ui = x49gp->ui; x49gp_ui_t* ui = x49gp->ui;
#if GTK_MAJOR_VERSION == 3 # if GTK_MAJOR_VERSION == 3
gtk_widget_set_sensitive( ui->menu_unmount, s3c2410_sdi_is_mounted( x49gp ) ); gtk_widget_set_sensitive( ui->menu_unmount, s3c2410_sdi_is_mounted( x49gp ) );
if ( ui->menu_debug ) if ( ui->menu_debug )
gtk_widget_set_sensitive( ui->menu_debug, !gdbserver_isactive() ); gtk_widget_set_sensitive( ui->menu_debug, !gdbserver_isactive() );
#endif # endif
if ( event->type != GDK_BUTTON_PRESS ) if ( event->type != GDK_BUTTON_PRESS )
return GDK_EVENT_PROPAGATE; return GDK_EVENT_PROPAGATE;
@ -1159,11 +1157,11 @@ static gboolean react_to_display_click( GtkWidget* widget, GdkEventButton* event
fprintf( stderr, "clipboard: %s\n", text ); fprintf( stderr, "clipboard: %s\n", text );
return GDK_EVENT_STOP; return GDK_EVENT_STOP;
case 3: // right click case 3: // right click
#if GTK_MAJOR_VERSION == 3 # if GTK_MAJOR_VERSION == 3
gtk_menu_popup_at_pointer( GTK_MENU( ui->menu ), NULL ); gtk_menu_popup_at_pointer( GTK_MENU( ui->menu ), NULL );
#else # else
fprintf( stderr, "menu not implemented in gtk4 yet.\n" ); fprintf( stderr, "menu not implemented in gtk4 yet.\n" );
#endif # endif
return GDK_EVENT_STOP; return GDK_EVENT_STOP;
default: default:
break; break;

4
src/x49gpng/ui.h
View file

@ -29,9 +29,7 @@ typedef enum {
typedef enum { typedef enum {
UI_CALCULATOR_HP49GP = 0, UI_CALCULATOR_HP49GP = 0,
UI_CALCULATOR_HP49GP_NEWRPL,
UI_CALCULATOR_HP50G, UI_CALCULATOR_HP50G,
UI_CALCULATOR_HP50G_NEWRPL
} x49gp_ui_calculator_t; } x49gp_ui_calculator_t;
typedef enum { typedef enum {
@ -95,6 +93,8 @@ typedef enum {
HPKEY_PERIOD, HPKEY_PERIOD,
HPKEY_SPACE, HPKEY_SPACE,
HPKEY_ENTER, /* 50 */ HPKEY_ENTER, /* 50 */
NB_KEYS
} x49gp_ui_hpkey_t; } x49gp_ui_hpkey_t;
typedef struct { typedef struct {