#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/XKBlib.h> // TODO possibly ifdef this out on non-supporting systems... Solaris (as always)?
#include <GL/glx.h>
#include "quakedef.h"
static Display *vidx11_display = NULL;
static int vidx11_screen;
-static Window win;
+static Window win, root;
static GLXContext ctx = NULL;
Atom wm_delete_window_atom;
+Atom net_wm_state_atom;
+Atom net_wm_state_hidden_atom;
+Atom net_wm_state_fullscreen_atom;
#define KEY_MASK (KeyPressMask | KeyReleaseMask)
#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
static qboolean mouse_avail = true;
+static qboolean vid_usingmousegrab = false;
static qboolean vid_usingmouse = false;
+static qboolean vid_usinghidecursor = false;
static qboolean vid_usingvsync = false;
static qboolean vid_usevsync = false;
static qboolean vid_x11_hardwaregammasupported = false;
static qboolean vid_x11_dgasupported = false;
static int vid_x11_gammarampsize = 0;
-static float mouse_x, mouse_y;
-static int p_mouse_x, p_mouse_y;
#if !defined(__APPLE__) && !defined(SUNOS)
-cvar_t vid_dgamouse = {CVAR_SAVE, "vid_dgamouse", "1", "make use of DGA mouse input"};
+cvar_t vid_dgamouse = {CVAR_SAVE, "vid_dgamouse", "0", "make use of DGA mouse input"};
+static qboolean vid_usingdgamouse = false;
#endif
+cvar_t vid_netwmfullscreen = {CVAR_SAVE, "vid_netwmfullscreen", "0", "make use _NET_WM_STATE_FULLSCREEN; turn this off if fullscreen does not work for you"};
qboolean vidmode_ext = false;
static int win_x, win_y;
-static XF86VidModeModeInfo init_vidmode;
+static XF86VidModeModeInfo init_vidmode, game_vidmode;
static qboolean vid_isfullscreen = false;
+static qboolean vid_isvidmodefullscreen = false;
+static qboolean vid_isnetwmfullscreen = false;
+static qboolean vid_isoverrideredirect = false;
static Visual *vidx11_visual;
static Colormap vidx11_colormap;
return cursor;
}
-static void IN_Activate (qboolean grab)
+void VID_SetMouse(qboolean fullscreengrab, qboolean relative, qboolean hidecursor)
{
- if (!vidx11_display)
+ static int originalmouseparms_num;
+ static int originalmouseparms_denom;
+ static int originalmouseparms_threshold;
+ static qboolean restore_spi;
+
+#if !defined(__APPLE__) && !defined(SUNOS)
+ qboolean usedgamouse;
+#endif
+
+ if (!vidx11_display || !win)
return;
- if (grab)
+
+ if (relative)
+ fullscreengrab = true;
+
+ if (!mouse_avail)
+ fullscreengrab = relative = hidecursor = false;
+
+#if !defined(__APPLE__) && !defined(SUNOS)
+ usedgamouse = relative && vid_dgamouse.integer;
+ if (!vid_x11_dgasupported)
+ usedgamouse = false;
+ if (fullscreengrab && vid_usingmouse && (vid_usingdgamouse != usedgamouse))
+ VID_SetMouse(false, false, false); // ungrab first!
+#endif
+
+ if (vid_usingmousegrab != fullscreengrab)
{
- if (!vid_usingmouse && mouse_avail && win)
+ vid_usingmousegrab = fullscreengrab;
+ cl_ignoremousemoves = 2;
+ if (fullscreengrab)
+ {
+ XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
+ if (vid_grabkeyboard.integer || vid_isoverrideredirect)
+ XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
+ }
+ else
+ {
+ XUngrabPointer(vidx11_display, CurrentTime);
+ XUngrabKeyboard(vidx11_display, CurrentTime);
+ }
+ }
+
+ if (relative)
+ {
+ if (!vid_usingmouse)
{
XWindowAttributes attribs_1;
XSetWindowAttributes attribs_2;
attribs_2.event_mask = attribs_1.your_event_mask | KEY_MASK | MOUSE_MASK;
XChangeWindowAttributes(vidx11_display, win, CWEventMask, &attribs_2);
- // inviso cursor
- XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win));
-
- XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
-
#if !defined(__APPLE__) && !defined(SUNOS)
- if (vid_dgamouse.integer && vid_x11_dgasupported)
+ vid_usingdgamouse = usedgamouse;
+ if (usedgamouse)
{
XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), XF86DGADirectMouse);
XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
#endif
XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
- if (vid_grabkeyboard.integer || vid_isfullscreen)
- XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
+// COMMANDLINEOPTION: X11 Input: -noforcemparms disables setting of mouse parameters (not used with DGA, windows only)
+#if !defined(__APPLE__) && !defined(SUNOS)
+ if (!COM_CheckParm ("-noforcemparms") && !usedgamouse)
+#else
+ if (!COM_CheckParm ("-noforcemparms"))
+#endif
+ {
+ XGetPointerControl(vidx11_display, &originalmouseparms_num, &originalmouseparms_denom, &originalmouseparms_threshold);
+ XChangePointerControl (vidx11_display, true, false, 1, 1, -1); // TODO maybe change threshold here, or remove this comment
+ restore_spi = true;
+ }
+ else
+ restore_spi = false;
- mouse_x = mouse_y = 0;
- cl_ignoremousemove = true;
+ cl_ignoremousemoves = 2;
vid_usingmouse = true;
}
}
if (vid_usingmouse)
{
#if !defined(__APPLE__) && !defined(SUNOS)
- if (vid_x11_dgasupported)
+ if (vid_usingdgamouse)
XF86DGADirectVideo(vidx11_display, DefaultScreen(vidx11_display), 0);
+ vid_usingdgamouse = false;
#endif
+ cl_ignoremousemoves = 2;
- XUngrabPointer(vidx11_display, CurrentTime);
- XUngrabKeyboard(vidx11_display, CurrentTime);
-
- // inviso cursor
- if (win)
- XUndefineCursor(vidx11_display, win);
+ if (restore_spi)
+ XChangePointerControl (vidx11_display, true, true, originalmouseparms_num, originalmouseparms_denom, originalmouseparms_threshold);
+ restore_spi = false;
- cl_ignoremousemove = true;
vid_usingmouse = false;
}
}
+
+ if (vid_usinghidecursor != hidecursor)
+ {
+ vid_usinghidecursor = hidecursor;
+ if (hidecursor)
+ XDefineCursor(vidx11_display, win, CreateNullCursor(vidx11_display, win));
+ else
+ XUndefineCursor(vidx11_display, win);
+ }
}
static keynum_t buttonremap[18] =
if (vid_usingmouse)
{
#if !defined(__APPLE__) && !defined(SUNOS)
- if (vid_dgamouse.integer == 1 && vid_x11_dgasupported)
+ if (vid_usingdgamouse)
{
- mouse_x += event.xmotion.x_root;
- mouse_y += event.xmotion.y_root;
+ in_mouse_x += event.xmotion.x_root;
+ in_mouse_y += event.xmotion.y_root;
}
else
#endif
{
-
if (!event.xmotion.send_event)
{
- mouse_x += event.xmotion.x - p_mouse_x;
- mouse_y += event.xmotion.y - p_mouse_y;
- if (abs(vid.width/2 - event.xmotion.x) > vid.width / 4 || abs(vid.height/2 - event.xmotion.y) > vid.height / 4)
+ in_mouse_x += event.xmotion.x - in_windowmouse_x;
+ in_mouse_y += event.xmotion.y - in_windowmouse_y;
+ //if (abs(vid.width/2 - event.xmotion.x) + abs(vid.height/2 - event.xmotion.y))
+ if (vid_stick_mouse.integer || abs(vid.width/2 - event.xmotion.x) > vid.width / 4 || abs(vid.height/2 - event.xmotion.y) > vid.height / 4)
dowarp = true;
}
- p_mouse_x = event.xmotion.x;
- p_mouse_y = event.xmotion.y;
}
}
- //else
- // ui_mouseupdate(event.xmotion.x, event.xmotion.y);
+ in_windowmouse_x = event.xmotion.x;
+ in_windowmouse_y = event.xmotion.y;
break;
case ButtonPress:
// window changed size/location
win_x = event.xconfigure.x;
win_y = event.xconfigure.y;
- if(vid_resizable.integer < 2)
+ if(vid_resizable.integer < 2 || vid_isnetwmfullscreen)
{
vid.width = event.xconfigure.width;
vid.height = event.xconfigure.height;
+ if(vid_isnetwmfullscreen)
+ Con_Printf("NetWM fullscreen: actually using resolution %dx%d\n", vid.width, vid.height);
+ else
+ Con_DPrintf("Updating to ConfigureNotify resolution %dx%d\n", vid.width, vid.height);
}
break;
case DestroyNotify:
Sys_Quit(0);
break;
case MapNotify:
+ if (vid_isoverrideredirect)
+ break;
// window restored
vid_hidden = false;
VID_RestoreSystemGamma();
+
+ if(vid_isvidmodefullscreen)
+ {
+ // set our video mode
+ XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &game_vidmode);
+
+ // Move the viewport to top left
+ XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
+ }
+
+ if(vid_isnetwmfullscreen)
+ {
+ // make sure it's fullscreen
+ XEvent event;
+ event.type = ClientMessage;
+ event.xclient.serial = 0;
+ event.xclient.send_event = True;
+ event.xclient.message_type = net_wm_state_atom;
+ event.xclient.window = win;
+ event.xclient.format = 32;
+ event.xclient.data.l[0] = 1;
+ event.xclient.data.l[1] = net_wm_state_fullscreen_atom;
+ event.xclient.data.l[2] = 0;
+ event.xclient.data.l[3] = 1;
+ event.xclient.data.l[4] = 0;
+ XSendEvent(vidx11_display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &event);
+ }
+
+ dowarp = true;
+
break;
case UnmapNotify:
+ if (vid_isoverrideredirect)
+ break;
// window iconified/rolledup/whatever
vid_hidden = true;
VID_RestoreSystemGamma();
+
+ if(vid_isvidmodefullscreen)
+ XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
+
break;
case FocusIn:
+ if (vid_isoverrideredirect)
+ break;
// window is now the input focus
vid_activewindow = true;
break;
case FocusOut:
+ if (vid_isoverrideredirect)
+ break;
+
+ if(vid_isnetwmfullscreen && event.xfocus.mode == NotifyNormal)
+ {
+ // iconify netwm fullscreen window when it loses focus
+ // when the user selects it in the taskbar, the window manager will map it again and send MapNotify
+ XEvent event;
+ event.type = ClientMessage;
+ event.xclient.serial = 0;
+ event.xclient.send_event = True;
+ event.xclient.message_type = net_wm_state_atom;
+ event.xclient.window = win;
+ event.xclient.format = 32;
+ event.xclient.data.l[0] = 1;
+ event.xclient.data.l[1] = net_wm_state_hidden_atom;
+ event.xclient.data.l[2] = 0;
+ event.xclient.data.l[3] = 1;
+ event.xclient.data.l[4] = 0;
+ XSendEvent(vidx11_display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &event);
+ }
+
// window is no longer the input focus
vid_activewindow = false;
VID_RestoreSystemGamma();
+
break;
case EnterNotify:
// mouse entered window
if (dowarp)
{
/* move the mouse to the window center again */
- p_mouse_x = vid.width / 2;
- p_mouse_y = vid.height / 2;
- XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, p_mouse_x, p_mouse_y);
+ // we'll catch the warp motion by its send_event flag, updating the
+ // stored mouse position without adding any delta motion
+ XEvent event;
+ event.type = MotionNotify;
+ event.xmotion.display = vidx11_display;
+ event.xmotion.window = win;
+ event.xmotion.x = vid.width / 2;
+ event.xmotion.y = vid.height / 2;
+ XSendEvent(vidx11_display, win, False, PointerMotionMask, &event);
+ XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, vid.width / 2, vid.height / 2);
}
}
if (!ctx || !vidx11_display)
return;
- if (vidx11_display)
- {
- IN_Activate(false);
- VID_RestoreSystemGamma();
-
- // FIXME: glXDestroyContext here?
- if (vid_isfullscreen)
- XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
- if (win)
- XDestroyWindow(vidx11_display, win);
- XCloseDisplay(vidx11_display);
- }
+ VID_SetMouse(false, false, false);
+ VID_RestoreSystemGamma();
+
+ // FIXME: glXDestroyContext here?
+ if (vid_isvidmodefullscreen)
+ XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
+ if (win)
+ XDestroyWindow(vidx11_display, win);
+ XCloseDisplay(vidx11_display);
+
vid_hidden = true;
vid_isfullscreen = false;
+ vid_isnetwmfullscreen = false;
+ vid_isvidmodefullscreen = false;
+ vid_isoverrideredirect = false;
vidx11_display = NULL;
win = 0;
ctx = NULL;
signal(SIGTERM, signal_handler);
}
-void VID_Finish (qboolean allowmousegrab)
+void VID_Finish (void)
{
- qboolean vid_usemouse;
-
vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
{
Con_Print("glXSwapIntervalSGI didn't accept the vid_vsync change, it will take effect on next vid_restart (GLX_SGI_swap_control does not allow turning off vsync)\n");
}
- // handle the mouse state when windowed if that's changed
- vid_usemouse = false;
- if (allowmousegrab && vid_mouse.integer && !key_consoleactive && (key_dest != key_game || !cls.demoplayback))
- vid_usemouse = true;
- if (!vid_activewindow)
- vid_usemouse = false;
- if (vid_isfullscreen)
- vid_usemouse = true;
- IN_Activate(vid_usemouse);
-
if (r_render.integer)
{
CHECKGLERROR
#if !defined(__APPLE__) && !defined(SUNOS)
Cvar_RegisterVariable (&vid_dgamouse);
#endif
+ Cvar_RegisterVariable (&vid_netwmfullscreen);
InitSig(); // trap evil signals
// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar)
if (COM_CheckParm ("-nomouse"))
mouse_avail = false;
}
-void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer)
+void VID_BuildGLXAttrib(int *attrib, qboolean stencil, qboolean stereobuffer, int samples)
{
*attrib++ = GLX_RGBA;
- *attrib++ = GLX_RED_SIZE;*attrib++ = 1;
- *attrib++ = GLX_GREEN_SIZE;*attrib++ = 1;
- *attrib++ = GLX_BLUE_SIZE;*attrib++ = 1;
+ *attrib++ = GLX_RED_SIZE;*attrib++ = stencil ? 8 : 5;
+ *attrib++ = GLX_GREEN_SIZE;*attrib++ = stencil ? 8 : 5;
+ *attrib++ = GLX_BLUE_SIZE;*attrib++ = stencil ? 8 : 5;
*attrib++ = GLX_DOUBLEBUFFER;
- *attrib++ = GLX_DEPTH_SIZE;*attrib++ = 1;
+ *attrib++ = GLX_DEPTH_SIZE;*attrib++ = stencil ? 24 : 16;
// if stencil is enabled, ask for alpha too
if (stencil)
{
*attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8;
- *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1;
+ *attrib++ = GLX_ALPHA_SIZE;*attrib++ = 8;
}
if (stereobuffer)
*attrib++ = GLX_STEREO;
+ if (samples > 1)
+ {
+ *attrib++ = GLX_SAMPLE_BUFFERS_ARB;
+ *attrib++ = 1;
+ *attrib++ = GLX_SAMPLES_ARB;
+ *attrib++ = samples;
+ }
*attrib++ = None;
}
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)
+int VID_InitMode(int fullscreen, int *width, int *height, int bpp, int refreshrate, int stereobuffer, int samples)
{
int i;
int attrib[32];
XWMHints *wmhints;
XSizeHints *szhints;
unsigned long mask;
- Window root;
XVisualInfo *visinfo;
int MajorVersion, MinorVersion;
const char *drivername;
+ vid_isfullscreen = false;
+ vid_isnetwmfullscreen = false;
+ vid_isvidmodefullscreen = false;
+ vid_isoverrideredirect = false;
+
#if defined(__APPLE__) && defined(__MACH__)
drivername = "/usr/X11R6/lib/libGL.1.dylib";
#else
return false;
}
+ // LordHavoc: making the close button on a window do the right thing
+ // seems to involve this mess, sigh...
+ wm_delete_window_atom = XInternAtom(vidx11_display, "WM_DELETE_WINDOW", false);
+ net_wm_state_atom = XInternAtom(vidx11_display, "_NET_WM_STATE", false);
+ net_wm_state_fullscreen_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_FULLSCREEN", false);
+ net_wm_state_hidden_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_HIDDEN", false);
+
+ // make autorepeat send keypress/keypress/.../keyrelease instead of intervening keyrelease
+ XkbSetDetectableAutoRepeat(vidx11_display, true, NULL);
+
vidx11_screen = DefaultScreen(vidx11_display);
root = RootWindow(vidx11_display, vidx11_screen);
return false;
}
- VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer);
+ VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer, samples);
visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
if (!visinfo)
{
return false;
}
- if (vidmode_ext)
+ if (fullscreen)
{
- int best_fit, best_dist, dist, x, y;
+ if(vid_netwmfullscreen.integer)
+ {
+ // TODO detect WM support
+ vid_isnetwmfullscreen = true;
+ vid_isfullscreen = true;
+ // width and height will be filled in later
+ Con_DPrintf("Using NetWM fullscreen mode\n");
+ }
- // Are we going fullscreen? If so, let's change video mode
- if (fullscreen)
+ if(!vid_isfullscreen && vidmode_ext)
{
+ int best_fit, best_dist, dist, x, y;
+
+ // Are we going fullscreen? If so, let's change video mode
XF86VidModeModeLine *current_vidmode;
XF86VidModeModeInfo **vidmodes;
int num_vidmodes;
XF86VidModeGetModeLine(vidx11_display, vidx11_screen, (int*)&init_vidmode.dotclock, current_vidmode);
XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes);
- best_dist = 9999999;
+ best_dist = 0;
best_fit = -1;
for (i = 0; i < num_vidmodes; i++)
{
- if (width > vidmodes[i]->hdisplay || height > vidmodes[i]->vdisplay)
+ if (*width > vidmodes[i]->hdisplay || *height > vidmodes[i]->vdisplay)
continue;
- x = width - vidmodes[i]->hdisplay;
- y = height - vidmodes[i]->vdisplay;
+ x = *width - vidmodes[i]->hdisplay;
+ y = *height - vidmodes[i]->vdisplay;
dist = (x * x) + (y * y);
- if (dist < best_dist)
+ if (best_fit == -1 || dist < best_dist)
{
best_dist = dist;
best_fit = i;
// LordHavoc: changed from ActualWidth/ActualHeight =,
// to width/height =, so the window will take the full area of
// the mode chosen
- width = vidmodes[best_fit]->hdisplay;
- height = vidmodes[best_fit]->vdisplay;
+ *width = vidmodes[best_fit]->hdisplay;
+ *height = vidmodes[best_fit]->vdisplay;
// change to the mode
XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]);
+ memcpy(&game_vidmode, vidmodes[best_fit], sizeof(game_vidmode));
+ vid_isvidmodefullscreen = true;
vid_isfullscreen = true;
// Move the viewport to top left
XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
+ Con_DPrintf("Using XVidMode fullscreen mode at %dx%d\n", *width, *height);
}
- else
- fullscreen = 0;
free(vidmodes);
}
+
+ if(!vid_isfullscreen)
+ {
+ // sorry, no FS available
+ // use the full desktop resolution
+ vid_isfullscreen = true;
+ // width and height will be filled in later
+ *width = DisplayWidth(vidx11_display, vidx11_screen);
+ *height = DisplayHeight(vidx11_display, vidx11_screen);
+ Con_DPrintf("Using X11 fullscreen mode at %dx%d\n", *width, *height);
+ }
}
// LordHavoc: save the visual for use in gamma ramp settings later
// LordHavoc: save the colormap for later, too
vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, visinfo->visual, AllocNone);
attr.event_mask = X_MASK;
- if (vid_isfullscreen)
+
+ if (fullscreen)
{
- mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect;
- attr.override_redirect = True;
- attr.backing_store = NotUseful;
- attr.save_under = False;
+ if(vid_isnetwmfullscreen)
+ {
+ mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask;
+ attr.backing_store = NotUseful;
+ attr.save_under = False;
+ }
+ else
+ {
+ mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect;
+ attr.override_redirect = True;
+ attr.backing_store = NotUseful;
+ attr.save_under = False;
+ vid_isoverrideredirect = true; // so it knows to grab
+ }
}
else
+ {
mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
+ }
- win = XCreateWindow(vidx11_display, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
+ win = XCreateWindow(vidx11_display, root, 0, 0, *width, *height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
wmhints = XAllocWMHints();
if(XpmCreatePixmapFromData(vidx11_display, win,
clshints->res_class = strdup("DarkPlaces");
szhints = XAllocSizeHints();
- if(vid_resizable.integer == 0)
+ if(vid_resizable.integer == 0 && !vid_isnetwmfullscreen)
{
- szhints->min_width = szhints->max_width = width;
- szhints->min_height = szhints->max_height = height;
+ szhints->min_width = szhints->max_width = *width;
+ szhints->min_height = szhints->max_height = *height;
szhints->flags |= PMinSize | PMaxSize;
}
XFree(clshints);
XFree(wmhints);
XFree(szhints);
+
//XStoreName(vidx11_display, win, gamename);
XMapWindow(vidx11_display, win);
- // LordHavoc: making the close button on a window do the right thing
- // seems to involve this mess, sigh...
- wm_delete_window_atom = XInternAtom(vidx11_display, "WM_DELETE_WINDOW", false);
XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1);
- if (vid_isfullscreen)
+ if (vid_isoverrideredirect)
{
XMoveWindow(vidx11_display, win, 0, 0);
XRaiseWindow(vidx11_display, win);
XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
XFlush(vidx11_display);
+ }
+
+ if(vid_isvidmodefullscreen)
+ {
// Move the viewport to top left
XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
}
return false;
}
- gl_renderer = (const char *)qglGetString(GL_RENDERER);
- gl_vendor = (const char *)qglGetString(GL_VENDOR);
- gl_version = (const char *)qglGetString(GL_VERSION);
gl_extensions = (const char *)qglGetString(GL_EXTENSIONS);
gl_platform = "GLX";
gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen);
// COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_swap_control
gl_videosyncavailable = GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
+ vid_usingmousegrab = false;
vid_usingmouse = false;
+ vid_usinghidecursor = false;
vid_usingvsync = false;
vid_hidden = false;
vid_activewindow = true;
if (!vid_x11_dgasupported)
Con_Print( "Failed to detect XF86DGA Mouse extension\n" );
#endif
+
GL_Init();
return true;
}
void IN_Move (void)
{
- if (mouse_avail)
- {
- in_mouse_x = mouse_x;
- in_mouse_y = mouse_y;
- }
- mouse_x = 0;
- mouse_y = 0;
}
projects / xonotic / darkplaces.git / blobdiff