reenabled vid_grabkeyboard by default until the focus issue is figured out

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6994 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/darkplaces.txt b/darkplaces.txt
index 3b246d4134d3c5312b8019c80e57fbba46be5ed9..07864dd38ee8a885000ca24886b83bea4e18f0ca 100644 (file)
--- a/darkplaces.txt
+++ b/darkplaces.txt
@@ -957,7 +957,7 @@ vid_conwidth                                      640                 virtual wi
 vid_dga                                           1                   make use of DGA mouse input\r
 vid_dga_mouseaccel                                1                   speed of mouse when using DGA mouse input\r
 vid_fullscreen                                    1                   use fullscreen (1) or windowed (0)\r
 vid_dga                                           1                   make use of DGA mouse input\r
 vid_dga_mouseaccel                                1                   speed of mouse when using DGA mouse input\r
 vid_fullscreen                                    1                   use fullscreen (1) or windowed (0)\r

-vid_grabkeyboard                                  0                   whether to grab the keyboard when mouse is active (prevents use of volume control keys, music player keys, etc on some keyboards)\r
+vid_grabkeyboard                                  1                   whether to grab the keyboard when mouse is active (prevents use of volume control keys, music player keys, etc on some keyboards)\r

 vid_hardwaregammasupported                        1                   indicates whether hardware gamma is supported (updated by attempts to set hardware gamma ramps)\r
 vid_height                                        480                 resolution\r
 vid_minheight                                     0                   minimum vid_height that is acceptable (to be set in default.cfg in mods)\r
 vid_hardwaregammasupported                        1                   indicates whether hardware gamma is supported (updated by attempts to set hardware gamma ramps)\r
 vid_height                                        480                 resolution\r
 vid_minheight                                     0                   minimum vid_height that is acceptable (to be set in default.cfg in mods)\r

diff --git a/vid_shared.c b/vid_shared.c
index d5457a2a8580db8414594951fb17a486dbb690e3..d15856b333045a649f3298e4f04ccd5ccdb283d3 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -83,7 +83,7 @@ cvar_t vid_stereobuffer = {CVAR_SAVE, "vid_stereobuffer", "0", "enables 'quad-bu
 
 cvar_t vid_vsync = {CVAR_SAVE, "vid_vsync", "0", "sync to vertical blank, prevents 'tearing' (seeing part of one frame and part of another on the screen at the same time), automatically disabled when doing timedemo benchmarks"};
 cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1", "whether to use the mouse in windowed mode (fullscreen always does)"};
 
 cvar_t vid_vsync = {CVAR_SAVE, "vid_vsync", "0", "sync to vertical blank, prevents 'tearing' (seeing part of one frame and part of another on the screen at the same time), automatically disabled when doing timedemo benchmarks"};
 cvar_t vid_mouse = {CVAR_SAVE, "vid_mouse", "1", "whether to use the mouse in windowed mode (fullscreen always does)"};

-cvar_t vid_grabkeyboard = {CVAR_SAVE, "vid_grabkeyboard", "0", "whether to grab the keyboard when mouse is active (prevents use of volume control keys, music player keys, etc on some keyboards)"};
+cvar_t vid_grabkeyboard = {CVAR_SAVE, "vid_grabkeyboard", "1", "whether to grab the keyboard when mouse is active (prevents use of volume control keys, music player keys, etc on some keyboards)"};

 cvar_t vid_minwidth = {0, "vid_minwidth", "0", "minimum vid_width that is acceptable (to be set in default.cfg in mods)"};
 cvar_t vid_minheight = {0, "vid_minheight", "0", "minimum vid_height that is acceptable (to be set in default.cfg in mods)"};
 cvar_t gl_combine = {0, "gl_combine", "1", "faster rendering by using GL_ARB_texture_env_combine extension (part of OpenGL 1.3 and above)"};
 cvar_t vid_minwidth = {0, "vid_minwidth", "0", "minimum vid_width that is acceptable (to be set in default.cfg in mods)"};
 cvar_t vid_minheight = {0, "vid_minheight", "0", "minimum vid_height that is acceptable (to be set in default.cfg in mods)"};
 cvar_t gl_combine = {0, "gl_combine", "1", "faster rendering by using GL_ARB_texture_env_combine extension (part of OpenGL 1.3 and above)"};