qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-21 19:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restore gamma properly in X11 targets, regardless of the value of

Browse source 
vid_system_gamma
This commit is contained in:
Jeff Teunissen 2001-05-13 09:07:57 +00:00
parent 1a9db8c2eb
commit 8a4cc8a526
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/context_x11.h
View file

@ -63,6 +63,7 @@ void X11_Init_Cvars (void);
void X11_OpenDisplay (void);
void X11_ProcessEvent (void);
void X11_ProcessEvents (void);
void X11_RestoreGamma (void);
void X11_RestoreVidMode (void);
void X11_SetCaption (char *);
void X11_SetVidMode (int, int);

29
source/context_x11.c
View file

@ -97,11 +97,11 @@ static int original_mode = 0;
static qboolean vidmode_avail = false;
static qboolean vidmode_active = false;
cvar_t *vid_fullscreen;
cvar_t *vid_system_gamma;
qboolean vid_gamma_avail;
qboolean vid_fullscreen_active;
cvar_t *vid_fullscreen;
cvar_t *vid_system_gamma;
qboolean vid_fullscreen_active;
static double x_gamma;
extern qboolean vid_gamma_avail;
static int xss_timeout;
static int xss_interval;
@ -323,7 +323,7 @@ X11_Init_Cvars (void)
{
vid_fullscreen = Cvar_Get ("vid_fullscreen", "0", CVAR_ROM, NULL,
"Toggles fullscreen game mode");
vid_system_gamma = Cvar_Get ("vid_system_gamma", "1", CVAR_ARCHIVE, NULL,
vid_system_gamma = Cvar_Get ("vid_system_gamma", "0", CVAR_ARCHIVE, NULL,
"Use system gamma control if available");
}
@ -406,7 +406,7 @@ X11_RestoreVidMode (void)
#ifdef HAVE_VIDMODE
if (vidmode_active) {
X11_SetGamma (x_gamma);
X11_RestoreGamma ();
XF86VidModeSwitchToMode (x_disp, x_screen, vidmodes[original_mode]);
XFree (vidmodes);
}
@ -471,7 +471,7 @@ X11_SetGamma (double gamma)
# ifdef X_XF86VidModeSetGamma
XF86VidModeGamma xgamma;
if (vidmode_avail && vid_system_gamma->int_val) {
if (vid_gamma_avail && vid_system_gamma->int_val) {
xgamma.red = xgamma.green = xgamma.blue = (float) gamma;
if (XF86VidModeSetGamma (x_disp, x_screen, &xgamma))
return true;
@ -480,3 +480,18 @@ X11_SetGamma (double gamma)
#endif
return false;
}
void
X11_RestoreGamma (void)
{
#ifdef HAVE_VIDMODE
# ifdef X_XF86VidModeSetGamma
XF86VidModeGamma xgamma;
if (vid_gamma_avail) {
xgamma.red = xgamma.green = xgamma.blue = (float) x_gamma;
XF86VidModeSetGamma (x_disp, x_screen, &xgamma);
}
# endif
#endif
}