]> git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - vid_wgl.c
water moves around again
[xonotic/darkplaces.git] / vid_wgl.c
index 969cfcc088ab38afbb0349332dc6dec8be9b82ac..97a889f8066e597a7dd02c535c2bd888b44061aa 100644 (file)
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -40,7 +40,7 @@ BOOL (WINAPI *qwglMakeCurrent)(HDC, HGLRC);
 BOOL (WINAPI *qwglSwapIntervalEXT)(int interval);
 const char *(WINAPI *qwglGetExtensionsStringARB)(HDC hdc);
 
-static gl_extensionfunctionlist_t wglfuncs[] =
+static dllfunction_t wglfuncs[] =
 {
        {"wglChoosePixelFormat", (void **) &qwglChoosePixelFormat},
        {"wglDescribePixelFormat", (void **) &qwglDescribePixelFormat},
@@ -56,7 +56,7 @@ static gl_extensionfunctionlist_t wglfuncs[] =
        {NULL, NULL}
 };
 
-static gl_extensionfunctionlist_t wglswapintervalfuncs[] =
+static dllfunction_t wglswapintervalfuncs[] =
 {
        {"wglSwapIntervalEXT", (void **) &qwglSwapIntervalEXT},
        {NULL, NULL}
@@ -321,15 +321,15 @@ void VID_Finish (void)
 
 qbyte scantokey[128] =
 {
-//     0           1      2     3     4     5       6       7      8         9      A       B           C     D            E           F
-       0          ,27    ,'1'  ,'2'  ,'3'  ,'4'    ,'5'    ,'6'   ,'7'      ,'8'   ,'9'    ,'0'        ,'-'  ,'='         ,K_BACKSPACE,9     , // 0
-       'q'        ,'w'   ,'e'  ,'r'  ,'t'  ,'y'    ,'u'    ,'i'   ,'o'      ,'p'   ,'['    ,']'        ,13   ,K_CTRL      ,'a'        ,'s'   , // 1
-       'd'        ,'f'   ,'g'  ,'h'  ,'j'  ,'k'    ,'l'    ,';'   ,'\''     ,'`'   ,K_SHIFT,'\\'       ,'z'  ,'x'         ,'c'        ,'v'   , // 2
-       'b'        ,'n'   ,'m'  ,','  ,'.'  ,'/'    ,K_SHIFT,'*'   ,K_ALT    ,' '   ,0      ,K_F1       ,K_F2 ,K_F3        ,K_F4       ,K_F5  , // 3
-       K_F6       ,K_F7  ,K_F8 ,K_F9 ,K_F10,K_PAUSE,0      ,K_HOME,K_UPARROW,K_PGUP,'-'    ,K_LEFTARROW,'5'  ,K_RIGHTARROW,'+'        ,K_END , // 4
-       K_DOWNARROW,K_PGDN,K_INS,K_DEL,0    ,0      ,0      ,K_F11 ,K_F12    ,0     ,0      ,0          ,0    ,0           ,0          ,0     , // 5
-       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0      ,0          ,0    ,0           ,0          ,0     , // 6
-       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0      ,0          ,0    ,0           ,0          ,0       // 7
+//  0           1       2    3     4     5       6       7      8         9      A          B           C       D           E           F
+       0          ,27    ,'1'  ,'2'  ,'3'  ,'4'    ,'5'    ,'6'   ,'7'      ,'8'   ,'9'       ,'0'        ,'-'   ,'='         ,K_BACKSPACE,9    ,//0
+       'q'        ,'w'   ,'e'  ,'r'  ,'t'  ,'y'    ,'u'    ,'i'   ,'o'      ,'p'   ,'['       ,']'        ,13    ,K_CTRL      ,'a'        ,'s'  ,//1
+       'd'        ,'f'   ,'g'  ,'h'  ,'j'  ,'k'    ,'l'    ,';'   ,'\''     ,'`'   ,K_SHIFT   ,'\\'       ,'z'   ,'x'         ,'c'        ,'v'  ,//2
+       'b'        ,'n'   ,'m'  ,','  ,'.'  ,'/'    ,K_SHIFT,'*'   ,K_ALT    ,' '   ,0         ,K_F1       ,K_F2  ,K_F3        ,K_F4       ,K_F5 ,//3
+       K_F6       ,K_F7  ,K_F8 ,K_F9 ,K_F10,K_PAUSE,0      ,K_HOME,K_UPARROW,K_PGUP,K_KP_MINUS,K_LEFTARROW,K_KP_5,K_RIGHTARROW,K_KP_PLUS  ,K_END,//4
+       K_DOWNARROW,K_PGDN,K_INS,K_DEL,0    ,0      ,0      ,K_F11 ,K_F12    ,0     ,0         ,0          ,0     ,0           ,0          ,0    ,//5
+       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0         ,0          ,0     ,0           ,0          ,0    ,//6
+       0          ,0     ,0    ,0    ,0    ,0      ,0      ,0     ,0        ,0     ,0         ,0          ,0     ,0           ,0          ,0     //7
 };
 
 
@@ -342,12 +342,62 @@ Map from windows to quake keynums
 */
 int MapKey (int key, int virtualkey)
 {
-       key = (key>>16)&255;
-       if (key > 127)
-               return 0;
-       if (scantokey[key] == 0)
-               Con_DPrintf("key 0x%02x has no translation\n", key);
-       return scantokey[key];
+       int result;
+       int modified = (key >> 16) & 255;
+       qboolean is_extended = false;
+
+       if (modified < 128 && scantokey[modified])
+               result = scantokey[modified];
+       else
+       {
+               result = 0;
+               Con_DPrintf("key 0x%02x (0x%8x, 0x%8x) has no translation\n", modified, key, virtualkey);
+       }
+
+       if (key & (1 << 24))
+               is_extended = true;
+
+       if ( !is_extended )
+       {
+               switch ( result )
+               {
+               case K_HOME:
+                       return K_KP_HOME;
+               case K_UPARROW:
+                       return K_KP_UPARROW;
+               case K_PGUP:
+                       return K_KP_PGUP;
+               case K_LEFTARROW:
+                       return K_KP_LEFTARROW;
+               case K_RIGHTARROW:
+                       return K_KP_RIGHTARROW;
+               case K_END:
+                       return K_KP_END;
+               case K_DOWNARROW:
+                       return K_KP_DOWNARROW;
+               case K_PGDN:
+                       return K_KP_PGDN;
+               case K_INS:
+                       return K_KP_INS;
+               case K_DEL:
+                       return K_KP_DEL;
+               default:
+                       return result;
+               }
+       }
+       else
+       {
+               switch ( result )
+               {
+               case 0x0D:
+                       return K_KP_ENTER;
+               case 0x2F:
+                       return K_KP_SLASH;
+               case 0xAF:
+                       return K_KP_PLUS;
+               }
+               return result;
+       }
 }
 
 /*
@@ -602,118 +652,6 @@ void VID_RestoreSystemGamma(void)
        ReleaseDC (NULL, hdc);
 }
 
-//========================================================
-// Video menu stuff
-//========================================================
-
-#if 0
-extern void M_Menu_Options_f (void);
-extern void M_Print (float cx, float cy, char *str);
-extern void M_PrintWhite (float cx, float cy, char *str);
-extern void M_DrawCharacter (float cx, float cy, int num);
-extern void M_DrawPic (float cx, float cy, char *picname);
-
-static int vid_wmodes;
-
-typedef struct
-{
-       int modenum;
-       char *desc;
-       int iscur;
-} modedesc_t;
-
-#define MAX_COLUMN_SIZE                9
-#define MODE_AREA_HEIGHT       (MAX_COLUMN_SIZE + 2)
-#define MAX_MODEDESCS          (MAX_COLUMN_SIZE*3)
-
-static modedesc_t modedescs[MAX_MODEDESCS];
-
-/*
-================
-VID_MenuDraw
-================
-*/
-void VID_MenuDraw (void)
-{
-       cachepic_t *p;
-       char *ptr;
-       int lnummodes, i, k, column, row;
-       vmode_t *pv;
-
-       p = Draw_CachePic ("gfx/vidmodes.lmp");
-       M_DrawPic ( (320-p->width)/2, 4, "gfx/vidmodes.lmp");
-
-       vid_wmodes = 0;
-       lnummodes = VID_NumModes ();
-
-       for (i=1 ; (i<lnummodes) && (vid_wmodes < MAX_MODEDESCS) ; i++)
-       {
-               ptr = VID_GetModeDescription (i);
-               pv = VID_GetModePtr (i);
-
-               k = vid_wmodes;
-
-               modedescs[k].modenum = i;
-               modedescs[k].desc = ptr;
-               modedescs[k].iscur = 0;
-
-               if (i == vid_modenum)
-                       modedescs[k].iscur = 1;
-
-               vid_wmodes++;
-
-       }
-
-       if (vid_wmodes > 0)
-       {
-               M_Print (2*8, 36+0*8, "Fullscreen Modes (WIDTHxHEIGHTxBPP)");
-
-               column = 8;
-               row = 36+2*8;
-
-               for (i=0 ; i<vid_wmodes ; i++)
-               {
-                       if (modedescs[i].iscur)
-                               M_PrintWhite (column, row, modedescs[i].desc);
-                       else
-                               M_Print (column, row, modedescs[i].desc);
-
-                       column += 13*8;
-
-                       if ((i % VID_ROW_SIZE) == (VID_ROW_SIZE - 1))
-                       {
-                               column = 8;
-                               row += 8;
-                       }
-               }
-       }
-
-       M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*2, "Video modes must be set from the");
-       M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*3, "command line with -width <width>");
-       M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*4, "and -bpp <bits-per-pixel>");
-       M_Print (3*8, 36 + MODE_AREA_HEIGHT * 8 + 8*6, "Select windowed mode with -window");
-}
-
-
-/*
-================
-VID_MenuKey
-================
-*/
-void VID_MenuKey (int key)
-{
-       switch (key)
-       {
-       case K_ESCAPE:
-               S_LocalSound ("misc/menu1.wav");
-               M_Menu_Options_f ();
-               break;
-
-       default:
-               break;
-       }
-}
-#endif
 
 static HINSTANCE gldll;