Add key and mouse input widgets for selecting keys and mouse buttons.

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

1 files changed, 56 insertions, 4 deletions

diff --git a/setup/mouse.c b/setup/mouse.c
index f87eb390..e60868fc 100644
--- a/setup/mouse.c
+++ b/setup/mouse.c
@@ -2,11 +2,50 @@
 #include <stdlib.h>
 #include "textscreen.h"
 
+#include "txt_mouseinput.h"
+
 int novert;
 int speed;
 int accel;
 int threshold;
 
+int mouseb_fire;
+int mouseb_strafe;
+int mouseb_forward;
+
+static int *all_mouse_buttons[] = {&mouseb_fire, &mouseb_strafe, 
+                                   &mouseb_forward};
+
+static void MouseSetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
+{
+    TXT_CAST_ARG(int, variable);
+    int i;
+
+    // Check if the same mouse button is used for a different action
+    // If so, set the other action(s) to -1 (unset)
+
+    for (i=0; i<sizeof(all_mouse_buttons) / sizeof(*all_mouse_buttons); ++i)
+    {
+        if (*all_mouse_buttons[i] == *variable
+         && all_mouse_buttons[i] != variable)
+        {
+            *all_mouse_buttons[i] = -1;
+        }
+    }
+}
+
+static void AddMouseControl(txt_table_t *table, char *label, int *var)
+{
+    txt_mouse_input_t *mouse_input;
+
+    TXT_AddWidget(table, TXT_NewLabel(label));
+
+    mouse_input = TXT_NewMouseInput(var);
+    TXT_AddWidget(table, mouse_input);
+
+    TXT_SignalConnect(mouse_input, "set", MouseSetCallback, var);
+}
+
 void ConfigMouse(void)
 {
     txt_window_t *window;
@@ -18,19 +57,32 @@ void ConfigMouse(void)
 
     table = TXT_NewTable(2);
 
-    TXT_AddWidget(table, TXT_NewLabel("Speed: "));
+    TXT_SetColumnWidths(table, 25, 10);
+    TXT_AddWidget(table, TXT_NewLabel("Speed"));
     TXT_AddWidget(table, TXT_NewIntInputBox(&speed, 8));
-    TXT_AddWidget(table, TXT_NewLabel("Acceleration: "));
+    TXT_AddWidget(table, TXT_NewLabel("Acceleration"));
     TXT_AddWidget(table, TXT_NewIntInputBox(&accel, 8));
-    TXT_AddWidget(table, TXT_NewLabel("Acceleration threshold: "));
+    TXT_AddWidget(table, TXT_NewLabel("Acceleration threshold"));
     TXT_AddWidget(table, TXT_NewIntInputBox(&threshold, 8));
+
+    TXT_AddWidget(window, table);
+    
+    TXT_AddWidget(window, TXT_NewSeparator("Mouse buttons"));
+
+    table = TXT_NewTable(2);
+
+    TXT_SetColumnWidths(table, 25, 10);
+    AddMouseControl(table, "Fire weapon", &mouseb_fire);
+    AddMouseControl(table, "Move forward", &mouseb_forward);
+    AddMouseControl(table, "Strafe on", &mouseb_strafe);
     
     TXT_AddWidget(window, table);
     
     TXT_AddWidget(window, TXT_NewSeparator(NULL));
 
     TXT_AddWidget(window, 
-                  TXT_NewInvertedCheckBox("Allow vertical mouse movement", &novert));
+                  TXT_NewInvertedCheckBox("Allow vertical mouse movement", 
+                                          &novert));
 
 }