made the main gtetrinet window resizable, fixed the CTRL bug

diff --git a/ChangeLog b/ChangeLog
index 3280daa91e93abf51296f2b723ef3467a5407522..61174f4d291261a424198d037fba2ce33dfd7bc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-04-12  Dani Carbonell  <bocata@panete.net>
+
+       * src/gtetrinet.c (keypress): Return only when Alt+1, +2 or +3 is
+       pressed. This fixes the bug reported by Christian Kröner :)
+
+       * src/fields.c (fields_page_contents): Changed the game's messages
+       widget to expand instead of shrink. Enlarged its height up to 70
+       pixels.
+
+       * src/gtetrinet.c (main): Made the GTetrinet main window
+       resizable. This doesn't mean that the fields will resize ;)
+
 2004-03-30  Adam Weinberger  <adamw@gnome.org>
 
        * configure.in: Added en_CA to ALL_LINGUAS.

diff --git a/src/fields.c b/src/fields.c
index 98c1be130f5a2aa46273573dfcb446e58906e219..ce63467b206c2bfb98dcc6333e2e1b404cea0ee0 100644 (file)
--- a/src/fields.c
+++ b/src/fields.c
@@ -303,7 +303,7 @@ GtkWidget *fields_page_contents (void)
                                     GTK_POLICY_AUTOMATIC);
     gtk_container_add (GTK_CONTAINER(scroll), gmsgtext);
     gtk_table_attach (GTK_TABLE(table2), scroll, 0, 1, 0, 1,
-                      GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_SHRINK,
+                      GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
                       0, 0);
     gmsginput = gtk_entry_new ();
     gtk_entry_set_max_length (GTK_ENTRY (gmsginput), 128);
@@ -312,7 +312,7 @@ GtkWidget *fields_page_contents (void)
                         GTK_SIGNAL_FUNC(gmsginput_activate), NULL);
     gtk_table_attach (GTK_TABLE(table2), gmsginput, 0, 1, 1, 2,
                       GTK_FILL | GTK_EXPAND, 0, 0, 0);
-    gtk_widget_set_size_request (table2, -1, 48);
+    gtk_widget_set_size_request (table2, -1, 70);
     
     align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
     gtk_container_add (GTK_CONTAINER (align), table);

diff --git a/src/gtetrinet.c b/src/gtetrinet.c
index 564d77fb9b28c6bc47b02f29f6588f95e5a38b6a..e113fbaa385c973a4c2af5c114ceb9a55949965e 100644 (file)
--- a/src/gtetrinet.c
+++ b/src/gtetrinet.c
@@ -238,7 +238,7 @@ int main (int argc, char *argv[])
                         GTK_SIGNAL_FUNC(keyrelease), NULL);
     gtk_widget_set_events (app, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
 
-    gtk_window_set_resizable (GTK_WINDOW (app), FALSE);
+    gtk_window_set_resizable (GTK_WINDOW (app), TRUE);
     
     /* create and set the window icon */
     icon_pixbuf = gdk_pixbuf_new_from_file (PIXMAPSDIR "/gtetrinet.png", NULL);
@@ -422,16 +422,15 @@ gint keypress (GtkWidget *widget, GdkEventKey *key)
         gtk_timeout_remove (keytimeoutid);
     }
 
-    if (gtetrinet_key(key->keyval, key->state & (GDK_MOD1_MASK |
-                                                 GDK_CONTROL_MASK |
-                                                 GDK_SHIFT_MASK)))
+    /* Check if it's a GTetrinet key */
+    if (gtetrinet_key (key->keyval, key->state & (GDK_MOD1_MASK)))
     {
       g_signal_stop_emission_by_name (G_OBJECT(widget), "key-press-event");
       return TRUE;
     }
 
-    if ((key->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK)) > 0)
-      return FALSE;
+/*    if ((key->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK)) > 0)
+    return FALSE;*/
     
     if (game_area && ingame && (gdk_keyval_to_lower (key->keyval) == keys[K_GAMEMSG]))
     {