fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added hardware gamma, fixed alt-tab issue where alt was still held.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@826 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-01-24 03:07:16 +00:00
parent a1a71ab87b
commit a1b3f4746e
1 changed files with 58 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
engine/gl/gl_vidlinuxglx.c
View file

@ -74,6 +74,9 @@ static qboolean vidmode_ext = false;
static XF86VidModeModeInfo **vidmodes; static XF86VidModeModeInfo **vidmodes;
static int num_vidmodes; static int num_vidmodes;
static qboolean vidmode_active = false; static qboolean vidmode_active = false;
unsigned short origionalramps[3][256];
qboolean origionalapplied;
#endif #endif
extern cvar_t _windowed_mouse; extern cvar_t _windowed_mouse;
@ -107,7 +110,7 @@ qboolean is8bit = false;
qboolean isPermedia = false; qboolean isPermedia = false;
float vid_gamma = 1.0; float vid_gamma = 1.0;
qboolean mouseactive = false; qboolean mouseactive = false;
qboolean has_focus = false; qboolean ActiveApp = false;
int gl_canstencil; int gl_canstencil;
@ -344,6 +347,20 @@ static void uninstall_grabs(void)
// XSync(vid_dpy, True); // XSync(vid_dpy, True);
} }
void ClearAllStates (void)
{
int i;
// send an up event for each key, to make sure the server clears them all
for (i=0 ; i<256 ; i++)
{
Key_Event (i, false);
}
Key_ClearStates ();
// IN_ClearStates ();
}
static void GetEvent(void) static void GetEvent(void)
{ {
XEvent event; XEvent event;
@ -418,15 +435,21 @@ static void GetEvent(void)
break; break;
case FocusIn: case FocusIn:
has_focus = true; v_gamma.modified = true;
ActiveApp = true;
break; break;
case FocusOut: case FocusOut:
has_focus = false; #ifdef WITH_VMODE
if (origionalapplied)
XF86VidModeSetGammaRamp(vid_dpy, scrnum, 256, origionalramps[0], origionalramps[1], origionalramps[2]);
#endif
ActiveApp = false;
ClearAllStates();
break; break;
} }
wantwindowed = !!_windowed_mouse.value; wantwindowed = !!_windowed_mouse.value;
if (!has_focus) if (!ActiveApp)
wantwindowed = false; wantwindowed = false;
if (key_dest == key_console) if (key_dest == key_console)
wantwindowed = false; wantwindowed = false;
@ -460,6 +483,12 @@ printf("GLVID_Shutdown");
uninstall_grabs(); uninstall_grabs();
qglXDestroyContext(vid_dpy, ctx); qglXDestroyContext(vid_dpy, ctx);
#ifdef WITH_VMODE
if (origionalapplied)
XF86VidModeSetGammaRamp(vid_dpy, scrnum, 256, origionalramps[0], origionalramps[1], origionalramps[2]);
#endif
if (vid_window) if (vid_window)
XDestroyWindow(vid_dpy, vid_window); XDestroyWindow(vid_dpy, vid_window);
#ifdef WITH_VMODE #ifdef WITH_VMODE
@ -525,9 +554,27 @@ static Cursor CreateNullCursor(Display *display, Window root)
return cursor; return cursor;
} }
void GLVID_ShiftPalette(unsigned char *p) void GLVID_ShiftPalette (unsigned char *palette)
{ {
// VID_SetPalette(p); #ifdef WITH_VMODE
extern qboolean gammaworks;
extern cvar_t vid_hardwaregamma;
extern unsigned short ramps[3][256];
// VID_SetPalette (palette);
if (ActiveApp && vid_hardwaregamma.value) //this is needed because ATI drivers don't work properly (or when task-switched out).
{
if (gammaworks)
{ //we have hardware gamma applied - if we're doing a BF, we don't want to reset to the default gamma (yuck)
XF86VidModeSetGammaRamp (vid_dpy, scrnum, 256, ramps[0], ramps[1], ramps[2]);
return;
}
gammaworks = !!XF86VidModeSetGammaRamp (vid_dpy, scrnum, 256, ramps[0], ramps[1], ramps[2]);
}
else
gammaworks = false;
#endif
} }
void GLVID_SetPalette (unsigned char *palette) void GLVID_SetPalette (unsigned char *palette)
@ -747,7 +794,7 @@ qboolean GLVID_Init (rendererstate_t *info, unsigned char *palette)
} }
#endif #endif
has_focus = false; ActiveApp = false;
vid_window = XCreateWindow(vid_dpy, root, 0, 0, info->width, info->height, vid_window = XCreateWindow(vid_dpy, root, 0, 0, info->width, info->height,
0, visinfo->depth, InputOutput, 0, visinfo->depth, InputOutput,
visinfo->visual, mask, &attr); visinfo->visual, mask, &attr);
@ -769,6 +816,10 @@ qboolean GLVID_Init (rendererstate_t *info, unsigned char *palette)
XDefineCursor(vid_dpy, vid_window, CreateNullCursor(vid_dpy, vid_window)); XDefineCursor(vid_dpy, vid_window, CreateNullCursor(vid_dpy, vid_window));
XFlush(vid_dpy); XFlush(vid_dpy);
#ifdef WITH_VMODE
origionalapplied = XF86VidModeGetGammaRamp(vid_dpy, scrnum, 256, origionalramps[0], origionalramps[1], origionalramps[2]);
#endif
ctx = qglXCreateContext(vid_dpy, visinfo, NULL, True); ctx = qglXCreateContext(vid_dpy, visinfo, NULL, True);