added R_Mesh_Draw_ShowTris function which draws a triangle mesh as lines

[xonotic/darkplaces.git] / vid_wgl.c

diff --git a/vid_wgl.c b/vid_wgl.c
index ac5dd9dca7727652a30462999999abcb36d6fd00..2f98be1f892a09de617dceec9834be36167f3ee6 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -436,7 +436,7 @@ void ClearAllStates (void)
 // 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_Event (i, 0, false);
        }
 
        Key_ClearStates ();
@@ -513,6 +513,11 @@ LONG WINAPI MainWndProc (HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM lParam)
 {
        LONG    lRet = 1;
        int             fActive, fMinimized, temp;
+       char    state[256];
+       short   ascchar;
+       int             vkey;
+       qboolean down = false;
+
        extern unsigned int uiWheelMessage;
 
        if ( uMsg == uiWheelMessage )
@@ -533,15 +538,16 @@ 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);
+                       ToAscii (wParam, vkey, state, &ascchar, 0);
+                       Key_Event (vkey, (char)(ascchar & 0xFF), down);
                        break;
 
                case WM_SYSCHAR:
@@ -599,11 +605,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;
 
@@ -1287,13 +1293,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);
                        }
                }
 
@@ -1318,6 +1324,7 @@ void IN_MouseMove (usercmd_t *cmd)
        {
                GetCursorPos (&current_pos);
                ui_mouseupdate(current_pos.x - window_x, current_pos.y - window_y);
+               in_mouse_x = in_mouse_y = 0;
                return;
        }
 
@@ -1385,13 +1392,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);
                        }
                }
 
@@ -1635,7 +1642,6 @@ void Joy_AdvancedUpdate_f (void)
        }
 }
 
-
 /*
 ===========
 IN_Commands
@@ -1660,13 +1666,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;
@@ -1693,12 +1699,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;