handle funky ToAscii values (shift/ctrl/alt sometimes produce ascii values for no...

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index 31507a422875e509757acd1c20e7aeca177c9bff..4b72f7744e43a60359816cbf52e741730ef80b3e 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -24,6 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "resource.h"
 #include <commctrl.h>
 
+// Tell startup code that we have a client
 int cl_available = true;
 
 int (WINAPI *qwglChoosePixelFormat)(HDC, CONST PIXELFORMATDESCRIPTOR *);
@@ -431,14 +432,6 @@ ClearAllStates
 */
 void ClearAllStates (void)
 {
-       int             i;
-
-// send an up event for each key, to make sure the server clears them all
-       for (i=0 ; i<256 ; i++)
-       {
-               Key_Event (i, false);
-       }
-
        Key_ClearStates ();
        IN_ClearStates ();
 }
@@ -476,7 +469,6 @@ void AppActivate(BOOL fActive, BOOL minimize)
 
        if (fActive)
        {
-               vid_allowhwgamma = true;
                if (vid_isfullscreen)
                {
                        if (vid_wassuspended)
@@ -493,7 +485,6 @@ void AppActivate(BOOL fActive, BOOL minimize)
 
        if (!fActive)
        {
-               vid_allowhwgamma = false;
                vid_usingmouse = false;
                IN_DeactivateMouse ();
                IN_ShowMouse ();
@@ -513,6 +504,11 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 {
        LONG    lRet = 1;
        int             fActive, fMinimized, temp;
+       char    state[256];
+       char    asciichar[4];
+       int             vkey;
+       qboolean down = false;
+
        extern unsigned int uiWheelMessage;
 
        if ( uMsg == uiWheelMessage )
@@ -533,15 +529,19 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                        window_y = (int) HIWORD(lParam);
                        VID_UpdateWindowStatus ();
                        break;
-
+       
                case WM_KEYDOWN:
                case WM_SYSKEYDOWN:
-                       Key_Event (MapKey(lParam, wParam), true);
-                       break;
-
+                       down = true;
                case WM_KEYUP:
                case WM_SYSKEYUP:
-                       Key_Event (MapKey(lParam, wParam), false);
+                       vkey = MapKey(lParam, wParam);
+                       GetKeyboardState (state);
+                       // alt/ctrl/shift tend to produce funky ToAscii values,
+                       // and if it's not a single character we don't know care about it
+                       if (vkey == K_ALT || vkey == K_CTRL || vkey == K_SHIFT || ToAscii (wParam, lParam >> 16, state, asciichar, 0) != 1)
+                               asciichar[0] = 0;
+                       Key_Event (vkey, asciichar[0], down);
                        break;
 
                case WM_SYSCHAR:
@@ -599,11 +599,11 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
                // Event.
                case WM_MOUSEWHEEL:
                        if ((short) HIWORD(wParam) > 0) {
-                               Key_Event(K_MWHEELUP, true);
-                               Key_Event(K_MWHEELUP, false);
+                               Key_Event(K_MWHEELUP, 0, true);
+                               Key_Event(K_MWHEELUP, 0, false);
                        } else {
-                               Key_Event(K_MWHEELDOWN, true);
-                               Key_Event(K_MWHEELDOWN, false);
+                               Key_Event(K_MWHEELDOWN, 0, true);
+                               Key_Event(K_MWHEELDOWN, 0, false);
                        }
                        break;
 
@@ -722,7 +722,7 @@ void VID_Init(void)
        IN_Init();
 }
 
-int VID_InitMode (int fullscreen, int width, int height, int bpp, int stencil)
+int VID_InitMode (int fullscreen, int width, int height, int bpp)
 {
        int i;
        HDC hdc;
@@ -754,12 +754,13 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int stencil)
        HGLRC baseRC;
        int CenterX, CenterY;
        const char *gldrivername;
+       int depth;
 
        if (vid_initialized)
                Sys_Error("VID_InitMode called when video is already initialised\n");
 
        // if stencil is enabled, ask for alpha too
-       if (stencil)
+       if (bpp >= 32)
        {
                pfd.cStencilBits = 8;
                pfd.cAlphaBits = 8;
@@ -805,6 +806,7 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int stencil)
        {
                hdc = GetDC (NULL);
                i = GetDeviceCaps(hdc, RASTERCAPS);
+               depth = GetDeviceCaps(hdc, PLANES) * GetDeviceCaps(hdc, BITSPIXEL);
                ReleaseDC (NULL, hdc);
                if (i & RC_PALETTE)
                {
@@ -812,6 +814,12 @@ int VID_InitMode (int fullscreen, int width, int height, int bpp, int stencil)
                        Con_Printf ("Can't run in non-RGB mode\n");
                        return false;
                }
+               if (bpp > depth)
+               {
+                       VID_Shutdown();
+                       Con_Printf ("A higher desktop depth is required to run this video mode\n");
+                       return false;
+               }
 
                WindowStyle = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX;
                ExWindowStyle = 0;
@@ -976,6 +984,9 @@ void VID_Shutdown (void)
        HGLRC hRC = 0;
        HDC hDC = 0;
 
+       if(vid_initialized == false)
+               return;
+
        VID_RestoreSystemGamma();
 
        vid_initialized = false;
@@ -1284,13 +1295,13 @@ void IN_MouseEvent (int mstate)
                        if ( (mstate & (1<<i)) &&
                                !(mouse_oldbuttonstate & (1<<i)) )
                        {
-                               Key_Event (K_MOUSE1 + i, true);
+                               Key_Event (K_MOUSE1 + i, 0, true);
                        }
 
                        if ( !(mstate & (1<<i)) &&
                                (mouse_oldbuttonstate & (1<<i)) )
                        {
-                               Key_Event (K_MOUSE1 + i, false);
+                               Key_Event (K_MOUSE1 + i, 0, false);
                        }
                }
 
@@ -1314,7 +1325,8 @@ void IN_MouseMove (usercmd_t *cmd)
        if (!mouseactive)
        {
                GetCursorPos (&current_pos);
-               ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
+               //ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
+               in_mouse_x = in_mouse_y = 0;
                return;
        }
 
@@ -1382,13 +1394,13 @@ void IN_MouseMove (usercmd_t *cmd)
                        if ( (mstate_di & (1<<i)) &&
                                !(mouse_oldbuttonstate & (1<<i)) )
                        {
-                               Key_Event (K_MOUSE1 + i, true);
+                               Key_Event (K_MOUSE1 + i, 0, true);
                        }
 
                        if ( !(mstate_di & (1<<i)) &&
                                (mouse_oldbuttonstate & (1<<i)) )
                        {
-                               Key_Event (K_MOUSE1 + i, false);
+                               Key_Event (K_MOUSE1 + i, 0, false);
                        }
                }
 
@@ -1632,7 +1644,6 @@ void Joy_AdvancedUpdate_f (void)
        }
 }
 
-
 /*
 ===========
 IN_Commands
@@ -1657,13 +1668,13 @@ void IN_Commands (void)
                if ( (buttonstate & (1<<i)) && !(joy_oldbuttonstate & (1<<i)) )
                {
                        key_index = (i < 4) ? K_JOY1 : K_AUX1;
-                       Key_Event (key_index + i, true);
+                       Key_Event (key_index + i, 0, true);
                }
 
                if ( !(buttonstate & (1<<i)) && (joy_oldbuttonstate & (1<<i)) )
                {
                        key_index = (i < 4) ? K_JOY1 : K_AUX1;
-                       Key_Event (key_index + i, false);
+                       Key_Event (key_index + i, 0, false);
                }
        }
        joy_oldbuttonstate = buttonstate;
@@ -1690,12 +1701,12 @@ void IN_Commands (void)
                {
                        if ( (povstate & (1<<i)) && !(joy_oldpovstate & (1<<i)) )
                        {
-                               Key_Event (K_AUX29 + i, true);
+                               Key_Event (K_AUX29 + i, 0, true);
                        }
 
                        if ( !(povstate & (1<<i)) && (joy_oldpovstate & (1<<i)) )
                        {
-                               Key_Event (K_AUX29 + i, false);
+                               Key_Event (K_AUX29 + i, 0, false);
                        }
                }
                joy_oldpovstate = povstate;