Add a fake nonfunctional key bindings configuration menu.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 561

3 files changed, 36 insertions, 3 deletions

diff --git a/setup/Makefile.am b/setup/Makefile.am
index cea77bc1..9e0dbfdb 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -5,5 +5,5 @@ gamesdir = $(prefix)/games
 games_PROGRAMS = chocolate-setup
 
 chocolate_setup_LDADD = @LDFLAGS@ @SDL_LIBS@ ../textscreen/libtextscreen.a
-chocolate_setup_SOURCES = mainmenu.c keyboard.c
+chocolate_setup_SOURCES = mainmenu.c keyboard.c display.c
 
diff --git a/setup/keyboard.c b/setup/keyboard.c
index 2d179316..61b12a97 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -9,8 +9,11 @@ void ConfigKeyboard(void)
 
     window = TXT_NewWindow("Keyboard configuration");
 
+    TXT_AddWidget(window, TXT_NewSeparator("Movement"));
+
     table = TXT_NewTable(2);
-    TXT_AddWidget(window, table);
+    TXT_AddWidget(table, TXT_NewStrut(20, 0));
+    TXT_AddWidget(table, TXT_NewStrut(8, 0));
 
     TXT_AddWidget(table, TXT_NewLabel("Move Forward"));
     TXT_AddWidget(table, TXT_NewIntInputBox(&dummy, 7));
@@ -19,5 +22,29 @@ void ConfigKeyboard(void)
     TXT_AddWidget(table, TXT_NewLabel("Turn Left"));
     TXT_AddWidget(table, TXT_NewIntInputBox(&dummy, 7));
     TXT_AddWidget(table, TXT_NewLabel("Turn Right"));
+    TXT_AddWidget(table, TXT_NewIntInputBox(&dummy, 7));
+    TXT_AddWidget(table, TXT_NewLabel("Strafe Left"));
+    TXT_AddWidget(table, TXT_NewIntInputBox(&dummy, 7));
+    TXT_AddWidget(table, TXT_NewLabel("Strafe Right"));
+    TXT_AddWidget(table, TXT_NewIntInputBox(&dummy, 7));
+    TXT_AddWidget(table, TXT_NewLabel("Speed On"));
+    TXT_AddWidget(table, TXT_NewIntInputBox(&dummy, 7));
+    TXT_AddWidget(table, TXT_NewLabel("Strafe On"));
+    TXT_AddWidget(table, TXT_NewIntInputBox(&dummy, 7));
+
+    TXT_AddWidget(window, table);
+
+    TXT_AddWidget(window, TXT_NewSeparator("Action"));
+
+    table = TXT_NewTable(2);
+    TXT_AddWidget(table, TXT_NewStrut(20, 0));
+    TXT_AddWidget(table, TXT_NewStrut(8, 0));
+
+    TXT_AddWidget(table, TXT_NewLabel("Use"));
+    TXT_AddWidget(table, TXT_NewIntInputBox(&dummy, 7));
+    TXT_AddWidget(table, TXT_NewLabel("Fire"));
+    TXT_AddWidget(table, TXT_NewIntInputBox(&dummy, 7));
+
+    TXT_AddWidget(window, table);
 }
 
diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index 6617060b..4fbea079 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -45,6 +45,7 @@ void QuitConfirm(void *unused1, void *unused2)
     TXT_SignalConnect(button, "pressed", DoQuit, NULL);
 }
 
+extern void ConfigDisplay();
 extern void ConfigKeyboard();
 
 void MainMenu(void)
@@ -54,10 +55,15 @@ void MainMenu(void)
     txt_button_t *button;
 
     window = TXT_NewWindow("Main Menu");
-    TXT_AddWidget(window, TXT_NewButton("Configure display"));
+
+    button = TXT_NewButton("Configure display");
+    TXT_AddWidget(window, button);
+    TXT_SignalConnect(button, "pressed", ConfigDisplay, NULL);
+
     button = TXT_NewButton("Configure keyboard");
     TXT_AddWidget(window, button);
     TXT_SignalConnect(button, "pressed", ConfigKeyboard, NULL);
+
     TXT_AddWidget(window, TXT_NewButton("Configure mouse"));
     TXT_AddWidget(window, TXT_NewButton("Save parameters and launch DOOM"));
     TXT_AddWidget(window, TXT_NewStrut(0, 1));