qboolean vid_supportrefreshrate = false;
cvar_t joy_detected = {CVAR_READONLY, "joy_detected", "0", "number of joysticks detected by engine"};
-cvar_t joy_enable = {0, "joy_enable", "1", "enables joystick support"};
+cvar_t joy_enable = {CVAR_SAVE, "joy_enable", "0", "enables joystick support"};
cvar_t joy_index = {0, "joy_index", "0", "selects which joystick to use if you have multiple"};
cvar_t joy_axisforward = {0, "joy_axisforward", "1", "which joystick axis to query for forward/backward movement"};
cvar_t joy_axisside = {0, "joy_axisside", "0", "which joystick axis to query for right/left movement"};
return tbl_sdltoquake[ sdlkey ];
}
-static void IN_Activate( qboolean grab )
+void VID_GrabMouse(qboolean grab)
{
//SDL_WM_GrabInput( SDL_GRAB_OFF );
//Con_Printf("< Turning off input-grabbing. --blub\n");
if (!vid_usingmouse)
{
vid_usingmouse = true;
- cl_ignoremousemove = true;
- if(vid_grabkeyboard.integer) {
- SDL_WM_GrabInput( SDL_GRAB_ON );
- }
+ cl_ignoremousemoves = 2;
+ SDL_WM_GrabInput( SDL_GRAB_ON );
SDL_ShowCursor( SDL_DISABLE );
- }
+ }
}
else
{
if (vid_usingmouse)
{
vid_usingmouse = false;
- cl_ignoremousemove = true;
- if(vid_grabkeyboard.integer) {
- SDL_WM_GrabInput( SDL_GRAB_OFF );
- }
+ cl_ignoremousemoves = 2;
+ SDL_WM_GrabInput( SDL_GRAB_OFF );
SDL_ShowCursor( SDL_ENABLE );
}
}
{
// have the mouse stuck in the middle, example use: prevent expose effect of beryl during the game when not using
// window grabbing. --blub
-
+
// we need 2 frames to initialize the center position
if(!stuck)
{
static int Sys_EventFilter( SDL_Event *event )
{
//TODO: Add a quit query in linux, too - though linux user are more likely to know what they do
+ if (event->type == SDL_QUIT)
+ {
#ifdef WIN32
- if( event->type == SDL_QUIT && MessageBox( NULL, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION ) == IDNO )
- return 0;
- else
- return 1;
-#else
- return 1;
+ if (MessageBox( NULL, "Are you sure you want to quit?", "Confirm Exit", MB_YESNO | MB_SETFOREGROUND | MB_ICONQUESTION ) == IDNO)
+ return 0;
#endif
+ }
+ return 1;
}
static keynum_t buttonremap[18] =
icon = LoadIcon( GetModuleHandle( NULL ), MAKEINTRESOURCE( IDI_ICON1 ) );
#ifndef _W64 //If Windows 64bit data types don't exist
+#ifndef SetClassLongPtr
#define SetClassLongPtr SetClassLong
+#endif
+#ifndef GCLP_HICON
#define GCLP_HICON GCL_HICON
+#endif
+#ifndef LONG_PTR
#define LONG_PTR LONG
+#endif
#endif
SetClassLongPtr( info.window, GCLP_HICON, (LONG_PTR)icon );
}
* Somewhat restricted XPM reader. Only supports XPMs saved by GIMP 2.4 at
* default settings with less than 91 colors and transparency.
*/
-
+
int width, height, colors, isize, i, j;
int thenone = -1;
static SDL_Color palette[256];
unsigned short palenc[256]; // store color id by char
-
+
char **idata = ENGINE_ICON;
char *data = idata[0];
Con_Printf("This XPM's palette is either huge or idiotically unoptimized. It's key size is %i\n", isize);
return;
}
-
+
for(i = 0; i < colors; ++i)
{
int r, g, b;
data[j * width + i] = palenc[((unsigned char*)idata[colors+j+1])[i]];
}
}
-
+
if(icon != NULL)
{
// SDL_FreeSurface should free the data too
icon->pixels = data;
SDL_SetPalette(icon, SDL_PHYSPAL|SDL_LOGPAL, palette, 0, colors);
SDL_SetColorKey(icon, SDL_SRCCOLORKEY, thenone);
-
+
SDL_WM_SetIcon(icon, NULL);
}
version->major, version->minor, version->patch );
}
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)
+int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples)
{
int i;
static int notfirstvideomode = false;
Con_Printf("Unable to load GL driver \"%s\": %s\n", drivername, SDL_GetError());
return false;
}
-
+
if ((qglGetString = (const GLubyte* (GLAPIENTRY *)(GLenum name))GL_GetProcAddress("glGetString")) == NULL)
{
VID_Shutdown();
}
else
{
- SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 1);
- SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 1);
- SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 1);
+ SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
+ SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
+ SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
}
if (stereobuffer)
SDL_GL_SetAttribute (SDL_GL_STEREO, 1);
+ if (vid_vsync.integer)
+ SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
+ else
+ SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 0);
+ if (samples > 1)
+ {
+ SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
+ SDL_GL_SetAttribute (SDL_GL_MULTISAMPLESAMPLES, samples);
+ }
video_bpp = bpp;
video_flags = flags;
VID_SetIcon();
screen = SDL_SetVideoMode(width, height, bpp, flags);
-
+
if (screen == NULL)
{
Con_Printf("Failed to set video mode to %ix%i: %s\n", width, height, SDL_GetError());
// enable key repeat since everyone expects it
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
- gl_renderer = (const char *)qglGetString(GL_RENDERER);
- gl_vendor = (const char *)qglGetString(GL_VENDOR);
- gl_version = (const char *)qglGetString(GL_VERSION);
- gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
gl_platform = "SDL";
- // Knghtbrd: should assign platform-specific extensions here
- //TODO: maybe ;)
gl_platformextensions = "";
- gl_videosyncavailable = false;
+ gl_videosyncavailable = true;
GL_Init();
vid_activewindow = false;
vid_usingmouse = false;
- if(!vid_grabkeyboard.integer)
- SDL_WM_GrabInput(SDL_GRAB_OFF);
+ SDL_WM_GrabInput(SDL_GRAB_OFF);
return true;
}
void VID_Shutdown (void)
{
- // this is needed to retry gamma after a vid_restart
+ VID_GrabMouse(false);
VID_RestoreSystemGamma();
- IN_Activate(false);
SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+ gl_driver[0] = 0;
+ gl_extensions = "";
+ gl_platform = "";
+ gl_platformextensions = "";
}
int VID_SetGamma (unsigned short *ramps, int rampsize)
return !SDL_GetGammaRamp (ramps, ramps + rampsize, ramps + rampsize*2);
}
-void VID_Finish (qboolean allowmousegrab)
+void VID_Finish (void)
{
Uint8 appstate;
- qboolean vid_usemouse;
//react on appstate changes
appstate = SDL_GetAppState();
else
vid_activewindow = true;
- vid_usemouse = false;
- if( allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback) )
- vid_usemouse = true;
- if( vid_isfullscreen )
- vid_usemouse = true;
- if( !vid_activewindow )
- vid_usemouse = false;
-
- IN_Activate(vid_usemouse);
-
VID_UpdateGamma(false, 256);
if (r_render.integer && !vid_hidden)
projects / xonotic / darkplaces.git / blobdiff