From 11af5396a479d804045ce3286c9c34eddf1fd7b7 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 19 Sep 2006 21:26:52 +0000
Subject: Move the grab mouse setting to the mouse config dialog.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 622
---
 setup/display.c | 4 ----
 setup/mouse.c   | 8 ++++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'setup')

diff --git a/setup/display.c b/setup/display.c
index f30debd8..41669271 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -47,7 +47,6 @@ static vidmode_t modes[] =
 static int vidmode = 0;
 static int fullscreen = 0;
 static int screenmult = 1;
-static int grabmouse = 1;
 
 // Given the video settings (fullscreen, screenmult, etc), find the
 // current video mode
@@ -117,8 +116,5 @@ void ConfigDisplay(void)
     }
 
     TXT_AddWidget(window, table);
-
-    TXT_AddWidget(window, TXT_NewSeparator(NULL));
-    TXT_AddWidget(window, TXT_NewCheckBox("Grab mouse", &grabmouse));
 }
 
diff --git a/setup/mouse.c b/setup/mouse.c
index 63c1ef4d..f214004c 100644
--- a/setup/mouse.c
+++ b/setup/mouse.c
@@ -28,6 +28,7 @@ int novert;
 int speed;
 int accel;
 int threshold;
+int grabmouse = 1;
 
 int mouseb_fire = 0;
 int mouseb_forward = 1;
@@ -97,12 +98,15 @@ void ConfigMouse(void)
     AddMouseControl(table, "Strafe on", &mouseb_strafe);
     
     TXT_AddWidget(window, table);
-    
-    TXT_AddWidget(window, TXT_NewSeparator(NULL));
+
+    TXT_AddWidget(window, TXT_NewSeparator("Misc."));
 
     TXT_AddWidget(window, 
                   TXT_NewInvertedCheckBox("Allow vertical mouse movement", 
                                           &novert));
+    TXT_AddWidget(window, TXT_NewCheckBox("Grab mouse in windowed mode", 
+                                          &grabmouse));
 
+    
 }
 
-- 
cgit v1.2.3