qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-10 22:30:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix the misaligned fullscreen window once and for all (fingers crossed:)

Browse source
This commit is contained in:
Bill Currie 2000-10-22 07:14:47 +00:00
parent c43b9161c5
commit 1abb6fe74c
3 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
source/context_x11.c
View file

@ -50,6 +50,7 @@
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <sys/poll.h>
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
# include <X11/extensions/xf86vmode.h> # include <X11/extensions/xf86vmode.h>
@ -96,6 +97,8 @@ static int xss_interval;
static int xss_blanking; static int xss_blanking;
static int xss_exposures; static int xss_exposures;
static int need_screen_warp;
qboolean qboolean
x11_add_event (int event, void (*event_handler) (XEvent *)) x11_add_event (int event, void (*event_handler) (XEvent *))
{ {
@ -134,6 +137,17 @@ x11_process_event (void)
oktodraw = 1; oktodraw = 1;
return; return;
} }
#ifdef xHAVE_VIDMODE
if (need_screen_warp) {
int x, y;
XF86VidModeGetViewPort (x_disp, x_screen, &x, &y);
if (x || y) {
XF86VidModeSetViewPort (x_disp, x_screen, 0, 0);
} else {
need_screen_warp = 0;
}
}
#endif
if (event_handlers[x_event.type]) if (event_handlers[x_event.type])
event_handlers[x_event.type] (&x_event); event_handlers[x_event.type] (&x_event);
} }
@ -263,7 +277,7 @@ x11_set_vidmode(int width, int height)
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
hasvidmode = VID_CheckVMode(x_disp, NULL, NULL); hasvidmode = VID_CheckVMode(x_disp, NULL, NULL);
if (hasvidmode) { if (hasvidmode) {
if (! XF86VidModeGetAllModeLines(x_disp, DefaultScreen(x_disp), if (! XF86VidModeGetAllModeLines(x_disp, x_screen,
&nummodes, &vidmodes) &nummodes, &vidmodes)
|| nummodes <= 0) { || nummodes <= 0) {
hasvidmode = 0; hasvidmode = 0;
@ -289,12 +303,11 @@ x11_set_vidmode(int width, int height)
i=(i?i-1:nummodes-1)) { i=(i?i-1:nummodes-1)) {
if (vidmodes[i]->hdisplay>=width if (vidmodes[i]->hdisplay>=width
&& vidmodes[i]->vdisplay>=height) { && vidmodes[i]->vdisplay>=height) {
XF86VidModeSwitchToMode (x_disp, DefaultScreen (x_disp), XF86VidModeSwitchToMode (x_disp, x_screen, vidmodes[i]);
vidmodes[i]);
break; break;
} }
} }
XF86VidModeSetViewPort (x_disp, DefaultScreen (x_disp), 0, 0); XF86VidModeSetViewPort (x_disp, x_screen, 0, 0);
_windowed_mouse = Cvar_Get ("_windowed_mouse","1",CVAR_ARCHIVE|CVAR_ROM,"None"); _windowed_mouse = Cvar_Get ("_windowed_mouse","1",CVAR_ARCHIVE|CVAR_ROM,"None");
} else } else
#endif #endif
@ -362,6 +375,19 @@ x11_create_window (int width, int height)
XMapWindow (x_disp, x_win); XMapWindow (x_disp, x_win);
XRaiseWindow (x_disp, x_win); XRaiseWindow (x_disp, x_win);
if (vid_fullscreen->int_val) {
int x, y;
XWarpPointer(x_disp, None, x_win, 0, 0, 0, 0,
vid.width+2, vid.height+2);
need_screen_warp = 1;
do {
XF86VidModeSetViewPort (x_disp, x_screen, 0, 0);
poll (0, 0, 50);
XF86VidModeGetViewPort (x_disp, x_screen, &x, &y);
} while (x || y);
}
} }
void void
@ -372,7 +398,7 @@ x11_restore_vidmode (void)
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
if (hasvidmode) { if (hasvidmode) {
XF86VidModeSwitchToMode (x_disp, DefaultScreen (x_disp), XF86VidModeSwitchToMode (x_disp, x_screen,
vidmodes[0]); vidmodes[0]);
XFree(vidmodes); XFree(vidmodes);
} }

3
source/vid_glx.c
View file

@ -530,9 +530,6 @@ void VID_Init(unsigned char *palette)
/* Invisible cursor */ /* Invisible cursor */
x11_create_null_cursor(); x11_create_null_cursor();
XWarpPointer(x_disp, None, x_win, 0, 0, 0, 0,
vid.width+2, vid.height+2);
x11_grab_keyboard(); x11_grab_keyboard();
XSync(x_disp, 0); XSync(x_disp, 0);

3
source/vid_x11.c
View file

@ -566,9 +566,6 @@ void VID_Init (unsigned char *palette)
x_gc = XCreateGC(x_disp, x_win, valuemask, &xgcvalues ); x_gc = XCreateGC(x_disp, x_win, valuemask, &xgcvalues );
} }
// map the window
XMapWindow(x_disp, x_win);
XRaiseWindow(x_disp, x_win);
x11_grab_keyboard(); x11_grab_keyboard();
// wait for first exposure event // wait for first exposure event