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>
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,
return;
icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
-#ifndef SetClassLongPtr
+#ifndef _W64 //If Windows 64bit data types don't exist
#define SetClassLongPtr SetClassLong
-#endif
-#ifndef GCLP_HICON
#define GCLP_HICON GCL_HICON
+#define LONG_PTR LONG
#endif
SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
}
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;
+ CHECKGLERROR
if (r_speeds.integer || gl_finish.integer)
- qglFinish();
+ {
+ qglFinish();CHECKGLERROR
+ }
SDL_GL_SwapBuffers();
//react on appstate changes
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);
}