fix the failure mode for vid_fullscreen 1

This commit is contained in:
Bill Currie 2001-02-10 05:08:25 +00:00
parent 0ffba7e3da
commit 911d38e5e5

View file

@ -376,7 +376,7 @@ x11_create_window (int width, int height)
aWMDelete = XInternAtom (x_disp, "WM_DELETE_WINDOW", False); aWMDelete = XInternAtom (x_disp, "WM_DELETE_WINDOW", False);
XSetWMProtocols (x_disp, x_win, &aWMDelete, 1); XSetWMProtocols (x_disp, x_win, &aWMDelete, 1);
if (vid_fullscreen->int_val) { if (vidmode_active && vid_fullscreen->int_val) {
XMoveWindow (x_disp, x_win, 0, 0); XMoveWindow (x_disp, x_win, 0, 0);
XWarpPointer (x_disp, None, x_win, 0, 0, 0, 0, XWarpPointer (x_disp, None, x_win, 0, 0, 0, 0,
vid.width + 2, vid.height + 2); vid.width + 2, vid.height + 2);
@ -384,7 +384,7 @@ x11_create_window (int width, int height)
} }
XMapWindow (x_disp, x_win); XMapWindow (x_disp, x_win);
if (vid_fullscreen->int_val) { if (vidmode_active && vid_fullscreen->int_val) {
XGrabPointer (x_disp, x_win, True, 0, GrabModeAsync, GrabModeAsync, x_win, None, CurrentTime); XGrabPointer (x_disp, x_win, True, 0, GrabModeAsync, GrabModeAsync, x_win, None, CurrentTime);
} }
XRaiseWindow (x_disp, x_win); XRaiseWindow (x_disp, x_win);
@ -428,7 +428,7 @@ x11_force_view_port (void)
#ifdef HAVE_VIDMODE #ifdef HAVE_VIDMODE
int x, y; int x, y;
if (vid_fullscreen->int_val) { if (vidmode_active && vid_fullscreen->int_val) {
do { do {
XF86VidModeSetViewPort (x_disp, x_screen, 0, 0); XF86VidModeSetViewPort (x_disp, x_screen, 0, 0);
poll (0, 0, 50); poll (0, 0, 50);