From 4c9b7de04433a11e279bcbe4059534de55a55663 Mon Sep 17 00:00:00 2001 From: Daniel Carbonell Fraj Date: Sat, 7 Jun 2003 18:00:25 +0000 Subject: [PATCH] added a few keyboard shortcuts --- ChangeLog | 9 +++++++++ src/client.c | 2 +- src/commands.c | 14 ++++++++++++++ src/dialogs.c | 2 +- src/gtetrinet.c | 28 ++++++++++++++-------------- src/tetrinet.c | 2 +- 6 files changed, 40 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87f1eac..95e216e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-06-07 Dani Carbonell + + * src/commands.c (make_menus): added keyboard shortcuts to Start, + Pause, Stop, Connect, Disconnect and Change Team menu items. + + * src/tetrinet.c (tetrinet_key): change the default return value + from FALSE to TRUE. This was preventing ctrl+q from working when + the user was in the fields tab. + 2003-06-06 Jordi Mallach * src/config.c (config_loadconfig): load values for new keys. diff --git a/src/client.c b/src/client.c index fc2f3f6..cbf6c8a 100644 --- a/src/client.c +++ b/src/client.c @@ -225,7 +225,7 @@ void client_process (void) while (resolved == 0) { if (gtk_events_pending ()) - gtk_main_iteration (); + gtk_main_iteration (); } if (resolved == -1) { diff --git a/src/commands.c b/src/commands.c index 8bb0471..d38fb34 100644 --- a/src/commands.c +++ b/src/commands.c @@ -98,6 +98,20 @@ void make_menus (GnomeApp *app) { gnome_app_create_menus (app, menubar); + gtk_accel_map_add_entry ("/Game/Start", gdk_keyval_from_name ("n"), GDK_CONTROL_MASK); + gtk_accel_map_add_entry ("/Game/Pause", gdk_keyval_from_name ("p"), GDK_CONTROL_MASK); + gtk_accel_map_add_entry ("/Game/Stop", gdk_keyval_from_name ("s"), GDK_CONTROL_MASK); + gtk_accel_map_add_entry ("/Game/Connect", gdk_keyval_from_name ("c"), GDK_CONTROL_MASK); + gtk_accel_map_add_entry ("/Game/Disconnect", gdk_keyval_from_name ("d"), GDK_CONTROL_MASK); + gtk_accel_map_add_entry ("/Game/Change_Team", gdk_keyval_from_name ("t"), GDK_CONTROL_MASK); + + gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[0].widget), "/Game/Connect"); + gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[1].widget), "/Game/Disconnect"); + gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[3].widget), "/Game/Change_Team"); + gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[5].widget), "/Game/Start"); + gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[6].widget), "/Game/Pause"); + gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[7].widget), "/Game/Stop"); + gnome_app_create_toolbar (app, toolbar); gtk_widget_hide (toolbar[4].widget); } diff --git a/src/dialogs.c b/src/dialogs.c index 96483a0..42a9839 100644 --- a/src/dialogs.c +++ b/src/dialogs.c @@ -154,7 +154,7 @@ void teamdialog_new (void) } team_dialog = gtk_dialog_new_with_buttons (_("Change team"), - 0, + GTK_WINDOW (app), GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CLOSE, GTK_STOCK_OK, GTK_RESPONSE_OK, diff --git a/src/gtetrinet.c b/src/gtetrinet.c index f1568be..31ee1eb 100644 --- a/src/gtetrinet.c +++ b/src/gtetrinet.c @@ -109,8 +109,8 @@ int main (int argc, char *argv[]) srand (time(NULL)); gnome_program_init (APPID, APPVERSION, LIBGNOMEUI_MODULE, - argc, argv, GNOME_PARAM_POPT_TABLE, options, - GNOME_PARAM_NONE); + argc, argv, GNOME_PARAM_POPT_TABLE, options, + GNOME_PARAM_NONE); textbox_setup (); /* needs to be done before text boxes are created */ @@ -429,7 +429,7 @@ gint keypress (GtkWidget *widget, GdkEventKey *key) g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event"); return TRUE; } - + if (game_area && (gdk_keyval_to_lower (key->keyval) == keys[K_GAMEMSG])) { g_signal_handler_block (app, keypress_signal); @@ -482,18 +482,18 @@ gint keyrelease (GtkWidget *widget, GdkEventKey *key) */ static int gtetrinet_key (int keyval, int mod) { - if (mod != GDK_MOD1_MASK) - return (FALSE); + if (mod != GDK_MOD1_MASK) + return FALSE; - switch (keyval) - { - case GDK_1: gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), 0); break; - case GDK_2: gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), 1); break; - case GDK_3: gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), 2); break; - default: - return FALSE; - } - return TRUE; + switch (keyval) + { + case GDK_1: gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), 0); break; + case GDK_2: gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), 1); break; + case GDK_3: gtk_notebook_set_current_page (GTK_NOTEBOOK(notebook), 2); break; + default: + return FALSE; + } + return TRUE; } /* funky page detach stuff */ diff --git a/src/tetrinet.c b/src/tetrinet.c index d275744..199c97a 100644 --- a/src/tetrinet.c +++ b/src/tetrinet.c @@ -1768,7 +1768,7 @@ notfieldkey: tetrinet_specialkey(6); } tetris_drawcurrentblock (); - return TRUE; + return FALSE; } void tetrinet_upkey (int keyval) -- 2.50.1