along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#undef WIN32_LEAN_AND_MEAN //hush a warning, SDL.h redefines this
#include <SDL.h>
#include <stdio.h>
// Tell startup code that we have a client
int cl_available = true;
+
+qboolean vid_supportrefreshrate = false;
+
static qboolean vid_usingmouse;
static qboolean vid_isfullscreen;
0, //SDLK_LMETA = 310,
0, //SDLK_LSUPER = 311, /* Left "Windows" key */
0, //SDLK_RSUPER = 312, /* Right "Windows" key */
- 0, //SDLK_MODE = 313, /* "Alt Gr" key */
+ K_ALT, //SDLK_MODE = 313, /* "Alt Gr" key */
0, //SDLK_COMPOSE = 314, /* Multi-key compose key */
0, //SDLK_HELP = 315,
0, //SDLK_PRINT = 316,
#endif
}
-static keynum_t buttonremap[16] =
+static keynum_t buttonremap[18] =
{
K_MOUSE1,
K_MOUSE3,
K_MOUSE2,
+ K_MWHEELUP,
+ K_MWHEELDOWN,
K_MOUSE4,
K_MOUSE5,
K_MOUSE6,
}
break;
case SDL_MOUSEBUTTONDOWN:
- if (event.button.button <= 16)
+ if (event.button.button <= 18)
Key_Event( buttonremap[event.button.button - 1], 0, true );
break;
case SDL_MOUSEBUTTONUP:
- if (event.button.button <= 16)
+ if (event.button.button <= 18)
Key_Event( buttonremap[event.button.button - 1], 0, false );
break;
}
return;
icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
- SetClassLong( info.window, GCL_HICON, (LONG) icon );
+#ifndef _W64 //If Windows 64bit data types don't exist
+#define SetClassLongPtr SetClassLong
+#define GCLP_HICON GCL_HICON
+#define LONG_PTR LONG
+#endif
+ SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
}
#else
static void VID_SetCaption()
version->major, version->minor, version->patch );
}
-int VID_InitMode(int fullscreen, int width, int height, int bpp)
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate)
{
int i;
int flags = SDL_OPENGL;
SDL_QuitSubSystem(SDL_INIT_VIDEO);
}
-int VID_SetGamma (unsigned short *ramps)
+int VID_SetGamma (unsigned short *ramps, int rampsize)
{
- return !SDL_SetGammaRamp (ramps, ramps + 256, ramps + 512);
+ return !SDL_SetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
}
-int VID_GetGamma (unsigned short *ramps)
+int VID_GetGamma (unsigned short *ramps, int rampsize)
{
- return !SDL_GetGammaRamp( ramps, ramps + 256, ramps + 512);
+ return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
}
-void VID_Finish (void)
+void VID_Finish (qboolean allowmousegrab)
{
Uint8 appstate;
qboolean vid_usemouse;
- if (r_speeds.integer || gl_finish.integer)
- qglFinish();
- SDL_GL_SwapBuffers();
-
//react on appstate changes
appstate = SDL_GetAppState();
- if( !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) )
+ vid_hidden = !(appstate & SDL_APPACTIVE);
+
+ if( vid_hidden || !( appstate & SDL_APPMOUSEFOCUS ) || !( appstate & SDL_APPINPUTFOCUS ) )
vid_activewindow = false;
else
vid_activewindow = true;
vid_usemouse = false;
- if( vid_mouse.integer && !key_consoleactive && !cls.demoplayback )
+ if( allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback) )
vid_usemouse = true;
if( vid_isfullscreen )
vid_usemouse = true;
vid_usemouse = false;
IN_Activate(vid_usemouse);
+
+ VID_UpdateGamma(false, 256);
+
+ if (r_render.integer && !vid_hidden)
+ {
+ CHECKGLERROR
+ if (r_speeds.integer || gl_finish.integer)
+ {
+ qglFinish();CHECKGLERROR
+ }
+ SDL_GL_SwapBuffers();
+ }
}