Merge from trunk.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1624

1 files changed, 225 insertions, 20 deletions

diff --git a/setup/keyboard.c b/setup/keyboard.c
index 3a7ccb8f..79cb90e7 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -18,6 +18,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 // 02111-1307, USA.
 //
+
 #include "textscreen.h"
 #include "doomtype.h"
 
@@ -38,13 +39,89 @@ int key_use = ' ';
 int key_strafe = KEY_RALT;
 int key_speed = KEY_RSHIFT;
 
+int key_pause = KEY_PAUSE;
+
+// Menu keys:
+
+int key_menu_activate  = KEY_ESCAPE;
+int key_menu_up        = KEY_UPARROW;
+int key_menu_down      = KEY_DOWNARROW;
+int key_menu_left      = KEY_LEFTARROW;
+int key_menu_right     = KEY_RIGHTARROW;
+int key_menu_back      = KEY_BACKSPACE;
+int key_menu_forward   = KEY_ENTER;
+int key_menu_confirm   = 'y';
+int key_menu_abort     = 'n';
+
+int key_menu_help      = KEY_F1;
+int key_menu_save      = KEY_F2;
+int key_menu_load      = KEY_F3;
+int key_menu_volume    = KEY_F4;
+int key_menu_detail    = KEY_F5;
+int key_menu_qsave     = KEY_F6;
+int key_menu_endgame   = KEY_F7;
+int key_menu_messages  = KEY_F8;
+int key_menu_qload     = KEY_F9;
+int key_menu_quit      = KEY_F10;
+int key_menu_gamma     = KEY_F11;
+
+int key_menu_incscreen = KEY_EQUALS;
+int key_menu_decscreen = KEY_MINUS;
+
+int key_map_north      = KEY_UPARROW;
+int key_map_south      = KEY_DOWNARROW;
+int key_map_east       = KEY_RIGHTARROW;
+int key_map_west       = KEY_LEFTARROW;
+int key_map_zoomin     = '=';
+int key_map_zoomout    = '-';
+int key_map_toggle     = KEY_TAB;
+int key_map_maxzoom    = '0';
+int key_map_follow     = 'f';
+int key_map_grid       = 'g';
+int key_map_mark       = 'm';
+int key_map_clearmark  = 'c';
+
+int key_weapon1        = '1';
+int key_weapon2        = '2';
+int key_weapon3        = '3';
+int key_weapon4        = '4';
+int key_weapon5        = '5';
+int key_weapon6        = '6';
+int key_weapon7        = '7';
+int key_weapon8        = '8';
+
+int key_message_refresh = KEY_ENTER;
+
 int vanilla_keyboard_mapping = 1;
 
 static int always_run = 0;
 
-static int *allkeys[] = {&key_left, &key_right, &key_up, &key_down, 
-                         &key_strafeleft, &key_straferight, &key_fire, 
-                         &key_use, &key_strafe, &key_speed};
+// Keys within these groups cannot have the same value.
+
+static int *controls[] = { &key_left, &key_right, &key_up, &key_down,
+                           &key_strafeleft, &key_straferight, &key_fire,
+                           &key_use, &key_strafe, &key_speed, 
+                           &key_pause,
+                           &key_weapon1, &key_weapon2, &key_weapon3,
+                           &key_weapon4, &key_weapon5, &key_weapon6,
+                           &key_weapon7, &key_weapon8, NULL };
+
+static int *menu_nav[] = { &key_menu_activate, &key_menu_up, &key_menu_down,
+                           &key_menu_left, &key_menu_right, &key_menu_back,
+                           &key_menu_forward, NULL };
+
+static int *shortcuts[] = { &key_menu_help, &key_menu_save, &key_menu_load,
+                            &key_menu_volume, &key_menu_detail, &key_menu_qsave,
+                            &key_menu_endgame, &key_menu_messages,
+                            &key_menu_qload, &key_menu_quit, &key_menu_gamma,
+                            &key_menu_incscreen, &key_menu_decscreen, 
+                            &key_message_refresh, NULL };
+
+static int *map_keys[] = { &key_map_north, &key_map_south, &key_map_east,
+                           &key_map_west, &key_map_zoomin, &key_map_zoomout,
+                           &key_map_toggle, &key_map_maxzoom, &key_map_follow,
+                           &key_map_grid, &key_map_mark, &key_map_clearmark,
+                           NULL };
 
 static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
 {
@@ -66,26 +143,61 @@ static void UpdateJoybSpeed(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(var))
     }
 }
 
-// Callback invoked when a key control is set
+static int VarInGroup(int *variable, int **group)
+{
+    unsigned int i;
 
-static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
+    for (i=0; group[i] != NULL; ++i)
+    {
+        if (group[i] == variable)
+        {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+static void CheckKeyGroup(int *variable, int **group)
 {
-    TXT_CAST_ARG(int, variable);
     unsigned int i;
 
-    for (i=0; i<arrlen(allkeys); ++i)
+    // Don't check unless the variable is in this group.
+
+    if (!VarInGroup(variable, group))
+    {
+        return;
+    }
+
+    // If another variable has the same value as the new value, reset it.
+
+    for (i=0; group[i] != NULL; ++i)
     {
-        if (*variable == *allkeys[i] && allkeys[i] != variable)
+        if (*variable == *group[i] && group[i] != variable)
         {
             // A different key has the same value.  Clear the existing
             // value. This ensures that no two keys can have the same
             // value.
 
-            *allkeys[i] = 0;
+            *group[i] = 0;
         }
     }
 }
 
+// Callback invoked when a key control is set
+
+static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
+{
+    TXT_CAST_ARG(int, variable);
+
+    CheckKeyGroup(variable, controls);
+    CheckKeyGroup(variable, menu_nav);
+    CheckKeyGroup(variable, shortcuts);
+    CheckKeyGroup(variable, map_keys);
+}
+
+// Add a label and keyboard input to the specified table.
+
 static void AddKeyControl(txt_table_t *table, char *name, int *var)
 {
     txt_key_input_t *key_input;
@@ -93,9 +205,99 @@ static void AddKeyControl(txt_table_t *table, char *name, int *var)
     TXT_AddWidget(table, TXT_NewLabel(name));
     key_input = TXT_NewKeyInput(var);
     TXT_AddWidget(table, key_input);
+
     TXT_SignalConnect(key_input, "set", KeySetCallback, var);
 }
 
+static void OtherKeysDialog(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(unused))
+{
+    txt_window_t *window;
+    txt_table_t *table;
+    txt_scrollpane_t *scrollpane;
+
+    window = TXT_NewWindow("Other keys");
+
+    table = TXT_NewTable(2);
+
+    TXT_SetColumnWidths(table, 25, 10);
+
+    TXT_AddWidgets(table, TXT_NewLabel(" - Weapons - "),
+                          TXT_NewStrut(0, 0),
+                          NULL);
+
+    AddKeyControl(table, "Weapon 1",              &key_weapon1);
+    AddKeyControl(table, "Weapon 2",              &key_weapon2);
+    AddKeyControl(table, "Weapon 3",              &key_weapon3);
+    AddKeyControl(table, "Weapon 4",              &key_weapon4);
+    AddKeyControl(table, "Weapon 5",              &key_weapon5);
+    AddKeyControl(table, "Weapon 6",              &key_weapon6);
+    AddKeyControl(table, "Weapon 7",              &key_weapon7);
+    AddKeyControl(table, "Weapon 8",              &key_weapon8);
+
+    TXT_AddWidgets(table, TXT_NewStrut(0, 1),
+                          TXT_NewStrut(0, 1),
+                          TXT_NewLabel(" - Menu navigation - "),
+                          TXT_NewStrut(0, 0),
+                          NULL);
+
+    AddKeyControl(table, "Activate menu",         &key_menu_activate);
+    AddKeyControl(table, "Move cursor up",        &key_menu_up);
+    AddKeyControl(table, "Move cursor down",      &key_menu_down);
+    AddKeyControl(table, "Move slider left",      &key_menu_left);
+    AddKeyControl(table, "Move slider right",     &key_menu_right);
+    AddKeyControl(table, "Go to previous menu",   &key_menu_back);
+    AddKeyControl(table, "Activate menu item",    &key_menu_forward);
+    AddKeyControl(table, "Confirm action",        &key_menu_confirm);
+    AddKeyControl(table, "Cancel action",         &key_menu_abort);
+
+    TXT_AddWidgets(table, TXT_NewStrut(0, 1),
+                          TXT_NewStrut(0, 1),
+                          TXT_NewLabel(" - Shortcut keys - "),
+                          TXT_NewStrut(0, 0),
+                          NULL);
+
+    AddKeyControl(table, "Pause game",            &key_pause);
+    AddKeyControl(table, "Help screen",           &key_menu_help);
+    AddKeyControl(table, "Save game",             &key_menu_save);
+    AddKeyControl(table, "Load game",             &key_menu_load);
+    AddKeyControl(table, "Sound volume",          &key_menu_volume);
+    AddKeyControl(table, "Toggle detail",         &key_menu_detail);
+    AddKeyControl(table, "Quick save",            &key_menu_qsave);
+    AddKeyControl(table, "End game",              &key_menu_endgame);
+    AddKeyControl(table, "Toggle messages",       &key_menu_messages);
+    AddKeyControl(table, "Quick load",            &key_menu_qload);
+    AddKeyControl(table, "Quit game",             &key_menu_quit);
+    AddKeyControl(table, "Toggle gamma",          &key_menu_gamma);
+
+    AddKeyControl(table, "Increase screen size",  &key_menu_incscreen);
+    AddKeyControl(table, "Decrease screen size",  &key_menu_decscreen);
+
+    AddKeyControl(table, "Display last message",  &key_message_refresh);
+
+    TXT_AddWidgets(table, TXT_NewStrut(0, 1),
+                          TXT_NewStrut(0, 1),
+                          TXT_NewLabel(" - Map - "),
+                          TXT_NewStrut(0, 0),
+                          NULL);
+
+    AddKeyControl(table, "Toggle map",            &key_map_toggle);
+    AddKeyControl(table, "Zoom in",               &key_map_zoomin);
+    AddKeyControl(table, "Zoom out",              &key_map_zoomout);
+    AddKeyControl(table, "Maximum zoom out",      &key_map_maxzoom);
+    AddKeyControl(table, "Follow mode",           &key_map_follow);
+    AddKeyControl(table, "Pan north",             &key_map_north);
+    AddKeyControl(table, "Pan south",             &key_map_south);
+    AddKeyControl(table, "Pan east",              &key_map_east);
+    AddKeyControl(table, "Pan west",              &key_map_west);
+    AddKeyControl(table, "Toggle grid",           &key_map_grid);
+    AddKeyControl(table, "Mark location",         &key_map_mark);
+    AddKeyControl(table, "Clear all marks",       &key_map_clearmark);
+
+    scrollpane = TXT_NewScrollPane(0, 12, table);
+
+    TXT_AddWidget(window, scrollpane);
+}
+
 void ConfigKeyboard(void)
 {
     txt_window_t *window;
@@ -107,36 +309,39 @@ void ConfigKeyboard(void)
 
     window = TXT_NewWindow("Keyboard configuration");
 
-    TXT_AddWidgets(window, 
+    TXT_AddWidgets(window,
                    TXT_NewSeparator("Movement"),
-                   movement_table = TXT_NewTable(2),
+                   movement_table = TXT_NewTable(4),
 
                    TXT_NewSeparator("Action"),
-                   action_table = TXT_NewTable(2),
+                   action_table = TXT_NewTable(4),
+                   TXT_NewButton2("Other keys...", OtherKeysDialog, NULL),
+                   NULL);
 
+    TXT_AddWidgets(window,
                    TXT_NewSeparator("Misc."),
                    run_control = TXT_NewCheckBox("Always run", &always_run),
                    TXT_NewInvertedCheckBox("Use native keyboard mapping", 
                                            &vanilla_keyboard_mapping),
                    NULL);
 
-    TXT_SetColumnWidths(movement_table, 20, 8);
+    TXT_SetColumnWidths(movement_table, 15, 4, 15, 4);
 
     TXT_SignalConnect(run_control, "changed", UpdateJoybSpeed, NULL);
 
     AddKeyControl(movement_table, "Move Forward", &key_up);
+    AddKeyControl(movement_table, " Strafe Left", &key_strafeleft);
     AddKeyControl(movement_table, "Move Backward", &key_down);
+    AddKeyControl(movement_table, " Strafe Right", &key_straferight);
     AddKeyControl(movement_table, "Turn Left", &key_left);
+    AddKeyControl(movement_table, " Speed On", &key_speed);
     AddKeyControl(movement_table, "Turn Right", &key_right);
-    AddKeyControl(movement_table, "Strafe Left", &key_strafeleft);
-    AddKeyControl(movement_table, "Strafe Right", &key_straferight);
-    AddKeyControl(movement_table, "Speed On", &key_speed);
-    AddKeyControl(movement_table, "Strafe On", &key_strafe);
+    AddKeyControl(movement_table, " Strafe On", &key_strafe);
 
-    TXT_SetColumnWidths(action_table, 20, 8);
+    TXT_SetColumnWidths(action_table, 15, 4, 15, 4);
 
-    AddKeyControl(action_table, "Use", &key_use);
-    AddKeyControl(action_table, "Fire", &key_fire);
+    AddKeyControl(action_table, "Fire/Attack", &key_fire);
+    AddKeyControl(action_table, " Use", &key_use);
 
     TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction());
 }