From fd32485983e33591dc36815a1db7c08c8b5d4d4c Mon Sep 17 00:00:00 2001 From: evilynux Date: Wed, 17 Jan 2007 20:43:48 +0000 Subject: [PATCH] Use lookup_key() on keyboard events. --- desmume/src/gtk/main.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/desmume/src/gtk/main.c b/desmume/src/gtk/main.c index 4ec709799..4e4f68b53 100644 --- a/desmume/src/gtk/main.c +++ b/desmume/src/gtk/main.c @@ -368,35 +368,18 @@ static u16 Cur_Keypad = 0; static gint Key_Press(GtkWidget *w, GdkEventKey *e) { - int i; - u16 Key = 0; - - for(i = 0; i < NB_KEYS; i++) - if(e->keyval == keyboard_cfg[i]) break; - - if(i < NB_KEYS) - { - ADD_KEY( Cur_Keypad, KEYMASK_(i) ); - if(desmume_running()) update_keypad(Cur_Keypad); - } - - return 1; + u16 Key = lookup_key(e->keyval); + ADD_KEY( Cur_Keypad, Key ); + if(desmume_running()) update_keypad(Cur_Keypad); + return 1; } + static gint Key_Release(GtkWidget *w, GdkEventKey *e) { - int i; - u16 Key = 0; - - for(i = 0; i < NB_KEYS; i++) - if(e->keyval == keyboard_cfg[i]) break; - - if(i < NB_KEYS) - { - RM_KEY( Cur_Keypad, KEYMASK_(i) ); - if(desmume_running()) update_keypad(Cur_Keypad); - } - - return 1; + u16 Key = lookup_key(e->keyval); + RM_KEY( Cur_Keypad, Key ); + if(desmume_running()) update_keypad(Cur_Keypad); + return 1; } /////////////////////////////// CONTROLS EDIT //////////////////////////////////////