#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>
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 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;
static int win_x, win_y;
-static XF86VidModeModeInfo init_vidmode;
+static XF86VidModeModeInfo init_vidmode, game_vidmode;
static qboolean vid_isfullscreen = false;
+static qboolean vid_isnetwmfullscreen = false;
static Visual *vidx11_visual;
static Colormap vidx11_colormap;
if (fullscreengrab)
{
XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
- if (vid_grabkeyboard.integer || vid_isfullscreen)
+ if (vid_grabkeyboard.integer || (vid_isfullscreen && !vid_isnetwmfullscreen))
XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
}
else
Sys_Quit(0);
break;
case MapNotify:
- if (vid.fullscreen)
+ if (vid_isfullscreen && !vid_isnetwmfullscreen)
break;
// window restored
vid_hidden = false;
VID_RestoreSystemGamma();
+
+ if(vid_isfullscreen)
+ {
+ // set our video mode
+ XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &game_vidmode);
+
+ // Move the viewport to top left
+ XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
+
+ // 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.fullscreen)
+ if (vid_isfullscreen && !vid_isnetwmfullscreen)
break;
// window iconified/rolledup/whatever
vid_hidden = true;
VID_RestoreSystemGamma();
+
+ if(vid_isfullscreen)
+ XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
+
break;
case FocusIn:
- if (vid.fullscreen)
+ if (vid_isfullscreen && !vid_isnetwmfullscreen)
break;
// window is now the input focus
vid_activewindow = true;
break;
case FocusOut:
- if (vid.fullscreen)
+ if (vid_isfullscreen && !vid_isnetwmfullscreen)
break;
+
+ if(vid_isfullscreen && 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
vid_hidden = true;
vid_isfullscreen = false;
+ vid_isnetwmfullscreen = false;
vidx11_display = NULL;
win = 0;
ctx = NULL;
#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"))
XWMHints *wmhints;
XSizeHints *szhints;
unsigned long mask;
- Window root;
XVisualInfo *visinfo;
int MajorVersion, MinorVersion;
const char *drivername;
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);
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++)
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;
// change to the mode
XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]);
+ memcpy(&game_vidmode, vidmodes[best_fit], sizeof(game_vidmode));
vid_isfullscreen = true;
// Move the viewport to top left
// 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)
{
- 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;
+ vid_isnetwmfullscreen = true;
+ }
+ else
+ {
+ mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect;
+ attr.override_redirect = True;
+ attr.backing_store = NotUseful;
+ attr.save_under = False;
+ vid_isnetwmfullscreen = false;
+ }
}
else
+ {
mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
+ vid_isnetwmfullscreen = false;
+ }
win = XCreateWindow(vidx11_display, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
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;
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_isfullscreen && !vid_isnetwmfullscreen)
{
XMoveWindow(vidx11_display, win, 0, 0);
XRaiseWindow(vidx11_display, win);
projects / xonotic / darkplaces.git / blobdiff