#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 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 int vid_x11_gammarampsize = 0;
#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;
return cursor;
}
-void VID_GrabMouse(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)
- if(vid_usingmouse && (vid_usingdgamouse != !!vid_dgamouse.integer))
- VID_GrabMouse(false); // ungrab first!
+ 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_usingmouse && mouse_avail && win)
+
+ if (vid_usingmousegrab != fullscreengrab)
+ {
+ vid_usingmousegrab = fullscreengrab;
+ cl_ignoremousemoves = 2;
+ if (fullscreengrab)
+ {
+ XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
+ if (vid_grabkeyboard.integer || (vid_isfullscreen && !vid_netwmfullscreen.integer))
+ 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;
cl_ignoremousemoves = 2;
vid_usingmouse = true;
-#if !defined(__APPLE__) && !defined(SUNOS)
- vid_usingdgamouse = !!vid_dgamouse.integer;
-#endif
}
}
else
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_ignoremousemoves = 2;
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)
{
in_mouse_x += event.xmotion.x_root;
in_mouse_y += event.xmotion.y_root;
{
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) > vid.width / 4 || abs(vid.height/2 - event.xmotion.y) > vid.height / 4)
+ //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;
}
}
VID_RestoreSystemGamma();
break;
case FocusIn:
- if (vid.fullscreen)
+ if (vid.fullscreen && !vid_netwmfullscreen.integer)
break;
// window is now the input focus
vid_activewindow = true;
break;
case FocusOut:
- if (vid.fullscreen)
+ if (vid.fullscreen && !vid_netwmfullscreen.integer)
break;
// window is no longer the input focus
vid_activewindow = false;
if (dowarp)
{
/* move the mouse to the window center again */
- in_windowmouse_x = (int)(vid.width / 2);
- in_windowmouse_y = (int)(vid.height / 2);
- XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, (int)in_windowmouse_x, (int)in_windowmouse_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;
- VID_GrabMouse(false);
+ VID_SetMouse(false, false, false);
VID_RestoreSystemGamma();
// FIXME: glXDestroyContext here?
#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"))
return 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);
VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer, samples);
visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
- if (!visinfo && (samples == 1))
- {
- /* Some Mesa drivers reject sample buffers with 1 sample, so try
- * entirely without one */
- VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer, 0);
- visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
- }
if (!visinfo)
{
Con_Print("Couldn't get an RGB, Double-buffered, Depth visual\n");
attr.event_mask = X_MASK;
if (vid_isfullscreen)
{
- mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect;
- attr.override_redirect = True;
- attr.backing_store = NotUseful;
- attr.save_under = False;
+ if(vid_netwmfullscreen.integer)
+ {
+ 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;
+ }
}
else
mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
XFree(clshints);
XFree(wmhints);
XFree(szhints);
+
+ if(vid_isfullscreen && vid_netwmfullscreen.integer)
+ {
+ Atom net_wm_state_atom = XInternAtom(vidx11_display, "_NET_WM_STATE", false);
+ Atom net_wm_state_fullscreen_atom = XInternAtom(vidx11_display, "_NET_WM_STATE_FULLSCREEN", false);
+ XChangeProperty(vidx11_display, win, net_wm_state_atom, XA_ATOM, 32, PropModeReplace, (unsigned char *) &net_wm_state_fullscreen_atom, 1);
+ }
+
//XStoreName(vidx11_display, win, gamename);
XMapWindow(vidx11_display, win);
// 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;
projects / xonotic / darkplaces.git / blobdiff