From: Jordi Albornoz <jordi@src.gnome.org>
Date: Fri, 10 Jan 2003 19:59:23 +0000 (+0000)
Subject: use gdk_keyval_to_lower instead of gdk_keyval_to_upper, so gtetrinet 0.5.2 configurat... 
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=38956236c8dba8607e4b76e802892fe8e963a100;p=gtetrinet

use gdk_keyval_to_lower instead of gdk_keyval_to_upper, so gtetrinet 0.5.2 configurations are usable with older versions.
---

diff --git a/ChangeLog b/ChangeLog
index 16788d8..0423c84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-10  Jordi Mallach  <jordi@sindominio.net>
+
+	* src/config.c (config_loadconfig): use gdk_keyval_to_lower instead of
+	gdk_keyval_to_upper, so gtetrinet 0.5.2 configurations are usable with
+	older versions.
+	* src/dialogs.c (key_dialog_callback): likewise.
+	* src/gtetrinet.c (keypress): likewise.
+	* src/tetrinet.c (tetrinet_key): likewise.
+
 2003-01-10  Dani Carbonell  <bocata@panete.net>
 
 	* src/dialogs.c (connectdialog_connected): hide the window only if
diff --git a/src/config.c b/src/config.c
index b607b0d..cbd98f5 100644
--- a/src/config.c
+++ b/src/config.c
@@ -197,21 +197,21 @@ void config_loadconfig (void)
     }
 
     k = gnome_config_get_int ("Keys/Right");
-    keys[K_RIGHT] = gdk_keyval_to_upper (k ? k : defaultkeys[K_RIGHT]);
+    keys[K_RIGHT] = gdk_keyval_to_lower (k ? k : defaultkeys[K_RIGHT]);
     k = gnome_config_get_int ("Keys/Left");
-    keys[K_LEFT] = gdk_keyval_to_upper (k ? k : defaultkeys[K_LEFT]);
+    keys[K_LEFT] = gdk_keyval_to_lower (k ? k : defaultkeys[K_LEFT]);
     k = gnome_config_get_int ("Keys/RotateRight");
-    keys[K_ROTRIGHT] = gdk_keyval_to_upper (k ? k : defaultkeys[K_ROTRIGHT]);
+    keys[K_ROTRIGHT] = gdk_keyval_to_lower (k ? k : defaultkeys[K_ROTRIGHT]);
     k = gnome_config_get_int ("Keys/RotateLeft");
-    keys[K_ROTLEFT] = gdk_keyval_to_upper (k ? k : defaultkeys[K_ROTLEFT]);
+    keys[K_ROTLEFT] = gdk_keyval_to_lower (k ? k : defaultkeys[K_ROTLEFT]);
     k = gnome_config_get_int ("Keys/Down");
-    keys[K_DOWN] = gdk_keyval_to_upper (k ? k : defaultkeys[K_DOWN]);
+    keys[K_DOWN] = gdk_keyval_to_lower (k ? k : defaultkeys[K_DOWN]);
     k = gnome_config_get_int ("Keys/Drop");
-    keys[K_DROP] = gdk_keyval_to_upper (k ? k : defaultkeys[K_DROP]);
+    keys[K_DROP] = gdk_keyval_to_lower (k ? k : defaultkeys[K_DROP]);
     k = gnome_config_get_int ("Keys/Discard");
-    keys[K_DISCARD] = gdk_keyval_to_upper (k ? k : defaultkeys[K_DISCARD]);
+    keys[K_DISCARD] = gdk_keyval_to_lower (k ? k : defaultkeys[K_DISCARD]);
     k = gnome_config_get_int ("Keys/Message");
-    keys[K_GAMEMSG] = gdk_keyval_to_upper (k ? k : defaultkeys[K_GAMEMSG]);
+    keys[K_GAMEMSG] = gdk_keyval_to_lower (k ? k : defaultkeys[K_GAMEMSG]);
 
     gnome_config_pop_prefix ();
 
diff --git a/src/dialogs.c b/src/dialogs.c
index 993a9f3..c4ba5a2 100644
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -444,7 +444,7 @@ gint keydialog_key;
 
 void key_dialog_callback (GtkWidget *widget, GdkEventKey *key)
 {
-    keydialog_key = gdk_keyval_to_upper (key->keyval);
+    keydialog_key = gdk_keyval_to_lower(key->keyval);
     gnome_dialog_close (GNOME_DIALOG(widget));
 }
 
diff --git a/src/gtetrinet.c b/src/gtetrinet.c
index 2518704..718fbf6 100644
--- a/src/gtetrinet.c
+++ b/src/gtetrinet.c
@@ -350,7 +350,7 @@ gint keypress (GtkWidget *widget, GdkEventKey *key)
       return TRUE;
     }
     
-    if (game_area && (gdk_keyval_to_upper (key->keyval) == keys[K_GAMEMSG]))
+    if (game_area && (gdk_keyval_to_lower (key->keyval) == keys[K_GAMEMSG]))
     {
       g_signal_handler_block (app, keypress_signal);
       fields_gmsginputactivate (TRUE);
diff --git a/src/tetrinet.c b/src/tetrinet.c
index 919cd63..3c160ee 100644
--- a/src/tetrinet.c
+++ b/src/tetrinet.c
@@ -1558,37 +1558,37 @@ notfieldkey:
         }
         return TRUE;
     }*/
-    if (gdk_keyval_to_upper (keyval) == keys[K_GAMEMSG]) {
+    if (gdk_keyval_to_lower (keyval) == keys[K_GAMEMSG]) {
         fields_gmsginput (TRUE);
         gmsgstate = 1;
         return TRUE;
     }
     if (paused || !playing) return FALSE;
     /* game keys */
-    if (gdk_keyval_to_upper (keyval) == keys[K_ROTRIGHT]) {
+    if (gdk_keyval_to_lower (keyval) == keys[K_ROTRIGHT]) {
         if (!nextblocktimeout)
             sound_playsound (S_ROTATE);
         tetris_blockrotate (1);
     }
-    else if (gdk_keyval_to_upper (keyval) == keys[K_ROTLEFT]) {
+    else if (gdk_keyval_to_lower (keyval) == keys[K_ROTLEFT]) {
         if (!nextblocktimeout)
             sound_playsound (S_ROTATE);
         tetris_blockrotate (-1);
     }
-    else if (gdk_keyval_to_upper (keyval) == keys[K_RIGHT]) {
+    else if (gdk_keyval_to_lower (keyval) == keys[K_RIGHT]) {
         tetris_blockmove (1);
     }
-    else if (gdk_keyval_to_upper (keyval) == keys[K_LEFT]) {
+    else if (gdk_keyval_to_lower (keyval) == keys[K_LEFT]) {
         tetris_blockmove (-1);
     }
-    else if (gdk_keyval_to_upper (keyval) == keys[K_DOWN]) {
+    else if (gdk_keyval_to_lower (keyval) == keys[K_DOWN]) {
         if (!downpressed) {
             tetrinet_timeout ();
             downpressed = 1;
             tetrinet_settimeout (DOWNDELAY);
         }
     }
-    else if (gdk_keyval_to_upper (keyval) == keys[K_DROP]) {
+    else if (gdk_keyval_to_lower (keyval) == keys[K_DROP]) {
         int sound;
         if (!nextblocktimeout) {
             tetris_blockdrop ();
@@ -1600,7 +1600,7 @@ notfieldkey:
             tetrinet_sendfield (0);
         }
     }
-    else if (gdk_keyval_to_upper (keyval) == keys[K_DISCARD]) {
+    else if (gdk_keyval_to_lower (keyval) == keys[K_DISCARD]) {
         tetrinet_specialkey(-1);
     }
     else switch (keyval) {
@@ -1620,7 +1620,7 @@ notfieldkey:
 void tetrinet_upkey (int keyval)
 {
     if (!playing) return;
-    if (gdk_keyval_to_upper (keyval) == keys[K_DOWN]) {
+    if (gdk_keyval_to_lower (keyval) == keys[K_DOWN]) {
          /* if it is a quick press, nudge it down one more step */
         if (downpressed == 1) tetrinet_timeout ();
         downpressed = 0;