added a few keyboard shortcuts

diff --git a/ChangeLog b/ChangeLog
index 87f1eacebc14d19ef8be6691f0fa27cae9a6120f..95e216ed577fbff6190b940cb7a8420014a01e2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-07  Dani Carbonell  <bocata@panete.net>
+
+       * 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  <jordi@sindominio.net>
 
        * src/config.c (config_loadconfig): load values for new keys.

diff --git a/src/client.c b/src/client.c
index fc2f3f6a96119a9917a0b93c51c8c3f860fa45fa..cbf6c8aff433f426ac8bf7b772a536d054e6e2b7 100644 (file)
--- 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 8bb0471773768ae315c26db98a907e813480e1da..d38fb3487a29f39a4be6b4eb6d3cb8fab5648976 100644 (file)
--- 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 ("<GTetrinet-Main>/Game/Start", gdk_keyval_from_name ("n"), GDK_CONTROL_MASK);
+  gtk_accel_map_add_entry ("<GTetrinet-Main>/Game/Pause", gdk_keyval_from_name ("p"), GDK_CONTROL_MASK);
+  gtk_accel_map_add_entry ("<GTetrinet-Main>/Game/Stop", gdk_keyval_from_name ("s"), GDK_CONTROL_MASK);
+  gtk_accel_map_add_entry ("<GTetrinet-Main>/Game/Connect", gdk_keyval_from_name ("c"), GDK_CONTROL_MASK);
+  gtk_accel_map_add_entry ("<GTetrinet-Main>/Game/Disconnect", gdk_keyval_from_name ("d"), GDK_CONTROL_MASK);
+  gtk_accel_map_add_entry ("<GTetrinet-Main>/Game/Change_Team", gdk_keyval_from_name ("t"), GDK_CONTROL_MASK);
+  
+  gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[0].widget), "<GTetrinet-Main>/Game/Connect");
+  gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[1].widget), "<GTetrinet-Main>/Game/Disconnect");
+  gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[3].widget), "<GTetrinet-Main>/Game/Change_Team");
+  gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[5].widget), "<GTetrinet-Main>/Game/Start");
+  gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[6].widget), "<GTetrinet-Main>/Game/Pause");
+  gtk_menu_item_set_accel_path (GTK_MENU_ITEM (gamemenu[7].widget), "<GTetrinet-Main>/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 96483a013af5efb62737f79c95be5d60c5a27ac8..42a983997b029b38ce692ba1bff3ffedce2de232 100644 (file)
--- 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 f1568beb4a03e7ab3fea6357bc61e49b94bcc0de..31ee1ebadf95e204199a2af9a4e3396eda4c8e82 100644 (file)
--- 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 d275744c3121139e80e68e2233b45aa919713cf0..199c97a6b5ba7833a03c14681ae83e8ea892a72b 100644 (file)
--- 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)