ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert Cur_Keypad to a local variable

This commit is contained in:
riccardom 2009-01-05 13:16:31 +00:00
parent 671ec49d8d
commit 4f4b7278c3
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
desmume/src/gtk/main.cpp
View File

@ -930,10 +930,9 @@ static gboolean Stylus_Release(GtkWidget *w, GdkEventButton *e, gpointer data)
return TRUE; return TRUE;
} }
static u16 Cur_Keypad; static gint Key_Press(GtkWidget *w, GdkEventKey *e, gpointer data)
static gint Key_Press(GtkWidget *w, GdkEventKey *e)
{ {
u16 Cur_Keypad = (u16) (long) data;
u16 Key = lookup_key(e->keyval); u16 Key = lookup_key(e->keyval);
ADD_KEY( Cur_Keypad, Key ); ADD_KEY( Cur_Keypad, Key );
if(desmume_running()) update_keypad(Cur_Keypad); if(desmume_running()) update_keypad(Cur_Keypad);
@ -946,8 +945,9 @@ static gint Key_Press(GtkWidget *w, GdkEventKey *e)
return 1; return 1;
} }
static gint Key_Release(GtkWidget *w, GdkEventKey *e) static gint Key_Release(GtkWidget *w, GdkEventKey *e, gpointer data)
{ {
u16 Cur_Keypad = (u16) (long) data;
u16 Key = lookup_key(e->keyval); u16 Key = lookup_key(e->keyval);
RM_KEY( Cur_Keypad, Key ); RM_KEY( Cur_Keypad, Key );
if(desmume_running()) update_keypad(Cur_Keypad); if(desmume_running()) update_keypad(Cur_Keypad);
@ -1629,6 +1629,7 @@ common_gtk_main( struct configured_features *my_config)
{ {
SDL_TimerID limiter_timer = NULL; SDL_TimerID limiter_timer = NULL;
gchar *config_file; gchar *config_file;
u16 Cur_Keypad = 0;
GtkAccelGroup * accel_group; GtkAccelGroup * accel_group;
GtkWidget *pVBox; GtkWidget *pVBox;
@ -1751,8 +1752,8 @@ common_gtk_main( struct configured_features *my_config)
gtk_window_set_icon(GTK_WINDOW (pWindow), gdk_pixbuf_new_from_xpm_data(DeSmuME_xpm)); gtk_window_set_icon(GTK_WINDOW (pWindow), gdk_pixbuf_new_from_xpm_data(DeSmuME_xpm));
g_signal_connect(G_OBJECT(pWindow), "destroy", G_CALLBACK(gtk_main_quit), NULL); g_signal_connect(G_OBJECT(pWindow), "destroy", G_CALLBACK(gtk_main_quit), NULL);
g_signal_connect(G_OBJECT(pWindow), "key_press_event", G_CALLBACK(Key_Press), NULL); g_signal_connect(G_OBJECT(pWindow), "key_press_event", G_CALLBACK(Key_Press), (void *) (long) Cur_Keypad);
g_signal_connect(G_OBJECT(pWindow), "key_release_event", G_CALLBACK(Key_Release), NULL); g_signal_connect(G_OBJECT(pWindow), "key_release_event", G_CALLBACK(Key_Release), (void *) (long) Cur_Keypad);
/* Creation de la GtkVBox */ /* Creation de la GtkVBox */
pVBox = gtk_vbox_new(FALSE, 0); pVBox = gtk_vbox_new(FALSE, 0);