qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-02-02 12:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update XFree86 VidMode extension handling. We no longer try to go

Browse source 
fullscreen if the video mode we want isn't known to X.
This commit is contained in:
Jeff Teunissen 2001-02-09 21:50:42 +00:00
parent 44c9371b4f
commit 5fe2ff158d
1 changed files with 30 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
source/context_x11.c
View file

@ -93,7 +93,8 @@ static Atom aWMDelete = 0;
static XF86VidModeModeInfo **vidmodes; static XF86VidModeModeInfo **vidmodes;
static int nummodes; static int nummodes;
#endif #endif
static int hasvidmode = 0; static qboolean vidmode_avail = false;
static qboolean vidmode_active = false;
cvar_t *vid_fullscreen; cvar_t *vid_fullscreen;
qboolean vid_fullscreen_active; qboolean vid_fullscreen_active;
@ -255,44 +256,44 @@ x11_set_vidmode (int width, int height)
{ {
const char *str = getenv ("MESA_GLX_FX"); const char *str = getenv ("MESA_GLX_FX");
if (str && *str != 'd') { if (str && (tolower (*str) == 'f')) {
if (tolower (*str) == 'w') { Cvar_Set (vid_fullscreen, "1");
Cvar_Set (vid_fullscreen, "0");
} else {
Cvar_Set (vid_fullscreen, "1");
}
} }
XGetScreenSaver (x_disp, &xss_timeout, &xss_interval, &xss_blanking, XGetScreenSaver (x_disp, &xss_timeout, &xss_interval, &xss_blanking,
&xss_exposures); &xss_exposures);
XSetScreenSaver (x_disp, 0, xss_interval, xss_blanking, xss_exposures);
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
if (!(hasvidmode = VID_CheckVMode (x_disp, NULL, NULL))) { vidmode_avail = VID_CheckVMode (x_disp, NULL, NULL);
Cvar_Set (vid_fullscreen, "0");
return;
}
XF86VidModeGetAllModeLines (x_disp, x_screen, &nummodes, &vidmodes); XF86VidModeGetAllModeLines (x_disp, x_screen, &nummodes, &vidmodes);
if (vid_fullscreen->int_val) { if (vid_fullscreen->int_val && vidmode_avail) {
int i;
int best_mode = 0, best_x = INT_MAX, best_y = INT_MAX; int i;
int best_mode = 0;
qboolean found_mode = false;
for (i = 0; i < nummodes; i++) { for (i = 0; i < nummodes; i++) {
if ((best_x > vidmodes[i]->hdisplay) || if ((vidmodes[i]->hdisplay == vid.width) &&
(best_y > vidmodes[i]->vdisplay)) { (vidmodes[i]->vdisplay == vid.height)) {
if ((vidmodes[i]->hdisplay >= width) && found_mode = true;
(vidmodes[i]->vdisplay >= height)) { best_mode = i;
best_mode = i; break;
best_x = vidmodes[i]->hdisplay;
best_y = vidmodes[i]->vdisplay;
}
} }
printf ("%dx%d\n", vidmodes[i]->hdisplay, vidmodes[i]->vdisplay);
} }
XF86VidModeSwitchToMode (x_disp, x_screen, vidmodes[best_mode]);
x11_force_view_port (); if (found_mode) {
Con_Printf ("VID: Chose video mode: %dx%d\n", vid.width, vid.height);
XSetScreenSaver (x_disp, 0, xss_interval, xss_blanking, xss_exposures);
XF86VidModeSwitchToMode (x_disp, x_screen, vidmodes[best_mode]);
x11_force_view_port ();
vidmode_active = true;
} else {
Con_Printf ("VID: Mode %dx%d can't go fullscreen.\n", vid.width, vid.height);
vidmode_avail = vidmode_active = false;
}
} }
#endif #endif
} }
@ -320,7 +321,7 @@ x11_create_window (int width, int height)
attr.event_mask = X_MASK; attr.event_mask = X_MASK;
mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
if (hasvidmode && vid_fullscreen->int_val) { if (vidmode_active && vid_fullscreen->int_val) {
attr.override_redirect = 1; attr.override_redirect = 1;
mask |= CWOverrideRedirect; mask |= CWOverrideRedirect;
} }
@ -382,7 +383,7 @@ x11_restore_vidmode (void)
xss_exposures); xss_exposures);
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
if (hasvidmode) { if (vidmode_active) {
XF86VidModeSwitchToMode (x_disp, x_screen, vidmodes[0]); XF86VidModeSwitchToMode (x_disp, x_screen, vidmodes[0]);
XFree (vidmodes); XFree (vidmodes);
} }
@ -393,7 +394,7 @@ void
x11_grab_keyboard (void) x11_grab_keyboard (void)
{ {
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
if (hasvidmode && vid_fullscreen->int_val) { if (vidmode_active && vid_fullscreen->int_val) {
XGrabKeyboard (x_disp, x_win, 1, GrabModeAsync, GrabModeAsync, XGrabKeyboard (x_disp, x_win, 1, GrabModeAsync, GrabModeAsync,
CurrentTime); CurrentTime);
} }