#endif
#include <X11/extensions/xf86vmode.h>
+// get the Uchar type
+#include "utf8lib.h"
+#include "image.h"
+
#include "nexuiz.xpm"
#include "darkplaces.xpm"
Atom net_wm_state_atom;
Atom net_wm_state_hidden_atom;
Atom net_wm_state_fullscreen_atom;
+Atom net_wm_icon;
+Atom cardinal;
#define KEY_MASK (KeyPressMask | KeyReleaseMask)
#define MOUSE_MASK (ButtonPressMask | ButtonReleaseMask | \
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;
/*-----------------------------------------------------------------------*/
+//
-static int XLateKey(XKeyEvent *ev, char *ascii)
+long keysym2ucs(KeySym keysym);
+void DP_Xutf8LookupString(XKeyEvent * ev,
+ Uchar *uch,
+ KeySym * keysym_return,
+ Status * status_return)
+{
+ int rc;
+ KeySym keysym;
+ int codepoint;
+ char buffer[64];
+ int nbytes = sizeof(buffer);
+
+ rc = XLookupString(ev, buffer, nbytes, &keysym, NULL);
+
+ if (rc > 0) {
+ codepoint = buffer[0] & 0xFF;
+ } else {
+ codepoint = keysym2ucs(keysym);
+ }
+
+ if (codepoint < 0) {
+ if (keysym == None) {
+ *status_return = XLookupNone;
+ } else {
+ *status_return = XLookupKeySym;
+ *keysym_return = keysym;
+ }
+ *uch = 0;
+ return;
+ }
+
+ *uch = codepoint;
+
+ if (keysym != None) {
+ *keysym_return = keysym;
+ *status_return = XLookupBoth;
+ } else {
+ *status_return = XLookupChars;
+ }
+}
+static int XLateKey(XKeyEvent *ev, Uchar *ascii)
{
int key = 0;
- char buf[64];
+ //char buf[64];
KeySym keysym, shifted;
+ Status status;
keysym = XLookupKeysym (ev, 0);
- XLookupString(ev, buf, sizeof buf, &shifted, 0);
- *ascii = buf[0];
+ DP_Xutf8LookupString(ev, ascii, &shifted, &status);
switch(keysym)
{
if (fullscreengrab)
{
XGrabPointer(vidx11_display, win, True, 0, GrabModeAsync, GrabModeAsync, win, None, CurrentTime);
- if (vid_grabkeyboard.integer || (vid_isfullscreen && !vid_isnetwmfullscreen))
+ if (vid_grabkeyboard.integer || vid_isoverrideredirect)
XGrabKeyboard(vidx11_display, win, False, GrabModeAsync, GrabModeAsync, CurrentTime);
}
else
{
XEvent event;
int key;
- char ascii;
+ Uchar unicode;
qboolean dowarp = false;
if (!vidx11_display)
{
case KeyPress:
// key pressed
- key = XLateKey (&event.xkey, &ascii);
- Key_Event(key, ascii, true);
+ key = XLateKey (&event.xkey, &unicode);
+ Key_Event(key, unicode, true);
break;
case KeyRelease:
// key released
- key = XLateKey (&event.xkey, &ascii);
- Key_Event(key, ascii, false);
+ key = XLateKey (&event.xkey, &unicode);
+ Key_Event(key, unicode, false);
break;
case MotionNotify:
// 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_isfullscreen && !vid_isnetwmfullscreen)
+ if (vid_isoverrideredirect)
break;
// window restored
vid_hidden = false;
VID_RestoreSystemGamma();
- if(vid_isfullscreen)
+ 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.data.l[3] = 1;
event.xclient.data.l[4] = 0;
XSendEvent(vidx11_display, root, False, SubstructureRedirectMask | SubstructureNotifyMask, &event);
-
- dowarp = true;
}
+ dowarp = true;
+
break;
case UnmapNotify:
- if (vid_isfullscreen && !vid_isnetwmfullscreen)
+ if (vid_isoverrideredirect)
break;
// window iconified/rolledup/whatever
vid_hidden = true;
VID_RestoreSystemGamma();
- if(vid_isfullscreen)
+ if(vid_isvidmodefullscreen)
XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
break;
case FocusIn:
- if (vid_isfullscreen && !vid_isnetwmfullscreen)
+ if (vid_isoverrideredirect)
break;
// window is now the input focus
vid_activewindow = true;
break;
case FocusOut:
- if (vid_isfullscreen && !vid_isnetwmfullscreen)
+ if (vid_isoverrideredirect)
break;
- if(vid_isfullscreen & event.xfocus.mode == NotifyNormal)
+ 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
VID_RestoreSystemGamma();
// FIXME: glXDestroyContext here?
- if (vid_isfullscreen)
+ if (vid_isvidmodefullscreen)
XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
if (win)
XDestroyWindow(vidx11_display, win);
vid_hidden = true;
vid_isfullscreen = false;
vid_isnetwmfullscreen = false;
+ vid_isvidmodefullscreen = false;
+ vid_isoverrideredirect = false;
vidx11_display = NULL;
win = 0;
ctx = NULL;
void VID_Finish (void)
{
- vid_usevsync = vid_vsync.integer && !cls.timedemo && gl_videosyncavailable;
- if (vid_usingvsync != vid_usevsync && gl_videosyncavailable)
+ vid_usevsync = vid_vsync.integer && !cls.timedemo && qglXSwapIntervalSGI;
+ if (vid_usingvsync != vid_usevsync)
{
vid_usingvsync = vid_usevsync;
if (qglXSwapIntervalSGI (vid_usevsync))
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");
}
- if (r_render.integer)
+ if (!vid_hidden)
{
CHECKGLERROR
- if (r_speeds.integer || gl_finish.integer)
+ if (r_speeds.integer == 2 || gl_finish.integer)
{
qglFinish();CHECKGLERROR
}
*attrib++ = None;
}
-int VID_InitMode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer, int samples)
+qboolean VID_InitMode(viddef_mode_t *mode)
{
- int i;
+ int i, j;
int attrib[32];
XSetWindowAttributes attr;
XClassHint *clshints;
XVisualInfo *visinfo;
int MajorVersion, MinorVersion;
const char *drivername;
+ char *xpm;
+ char **idata;
+ unsigned char *data;
+
+ vid_isfullscreen = false;
+ vid_isnetwmfullscreen = false;
+ vid_isvidmodefullscreen = false;
+ vid_isoverrideredirect = false;
#if defined(__APPLE__) && defined(__MACH__)
drivername = "/usr/X11R6/lib/libGL.1.dylib";
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);
+ net_wm_icon = XInternAtom(vidx11_display, "_NET_WM_ICON", false);
+ cardinal = XInternAtom(vidx11_display, "CARDINAL", false);
// make autorepeat send keypress/keypress/.../keyrelease instead of intervening keyrelease
XkbSetDetectableAutoRepeat(vidx11_display, true, NULL);
return false;
}
- VID_BuildGLXAttrib(attrib, bpp == 32, stereobuffer, samples);
+ VID_BuildGLXAttrib(attrib, mode->bitsperpixel == 32, mode->stereobuffer, mode->samples);
visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
if (!visinfo)
{
return false;
}
- if (vidmode_ext)
+ if (mode->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;
for (i = 0; i < num_vidmodes; i++)
{
- if (width > vidmodes[i]->hdisplay || height > vidmodes[i]->vdisplay)
+ if (mode->width > vidmodes[i]->hdisplay || mode->height > vidmodes[i]->vdisplay)
continue;
- x = width - vidmodes[i]->hdisplay;
- y = height - vidmodes[i]->vdisplay;
+ x = mode->width - vidmodes[i]->hdisplay;
+ y = mode->height - vidmodes[i]->vdisplay;
dist = (x * x) + (y * y);
if (best_fit == -1 || dist < best_dist)
{
// 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;
+ mode->width = vidmodes[best_fit]->hdisplay;
+ mode->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", mode->width, mode->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
+ mode->width = DisplayWidth(vidx11_display, vidx11_screen);
+ mode->height = DisplayHeight(vidx11_display, vidx11_screen);
+ Con_DPrintf("Using X11 fullscreen mode at %dx%d\n", mode->width, mode->height);
+ }
}
// LordHavoc: save the visual for use in gamma ramp settings later
vidx11_colormap = attr.colormap = XCreateColormap(vidx11_display, root, visinfo->visual, AllocNone);
attr.event_mask = X_MASK;
- if (vid_isfullscreen)
+ if (mode->fullscreen)
{
- if(vid_netwmfullscreen.integer)
+ if(vid_isnetwmfullscreen)
{
mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask;
attr.backing_store = NotUseful;
attr.save_under = False;
- vid_isnetwmfullscreen = true;
}
else
{
attr.override_redirect = True;
attr.backing_store = NotUseful;
attr.save_under = False;
- vid_isnetwmfullscreen = false;
+ vid_isoverrideredirect = true; // so it knows to grab
}
}
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);
+ win = XCreateWindow(vidx11_display, root, 0, 0, mode->width, mode->height, 0, visinfo->depth, InputOutput, visinfo->visual, mask, &attr);
+
+ data = loadimagepixelsbgra("darkplaces-icon", false, false, false, NULL);
+ if(data)
+ {
+ // use _NET_WM_ICON too
+ static long netwm_icon[MAX_NETWM_ICON];
+ int pos = 0;
+ int i = 1;
+
+ while(data)
+ {
+ if(pos + 2 * image_width * image_height < MAX_NETWM_ICON)
+ {
+ netwm_icon[pos++] = image_width;
+ netwm_icon[pos++] = image_height;
+ for(i = 0; i < image_height; ++i)
+ for(j = 0; j < image_width; ++j)
+ netwm_icon[pos++] = BuffLittleLong(&data[(i*image_width+j)*4]);
+ }
+ else
+ {
+ Con_Printf("Skipping NETWM icon #%d because there is no space left\n", i);
+ }
+ ++i;
+ Mem_Free(data);
+ data = loadimagepixelsbgra(va("darkplaces-icon%d", i), false, false, false, NULL);
+ }
+ XChangeProperty(vidx11_display, win, net_wm_icon, cardinal, 32, PropModeReplace, (const unsigned char *) netwm_icon, pos);
+ }
+
+ // fallthrough for old window managers
+ xpm = (char *) FS_LoadFile("darkplaces-icon.xpm", tempmempool, false, NULL);
+ idata = NULL;
+ if(xpm)
+ idata = XPM_DecodeString(xpm);
+ if(!idata)
+ idata = ENGINE_ICON;
wmhints = XAllocWMHints();
if(XpmCreatePixmapFromData(vidx11_display, win,
- (gamemode == GAME_NEXUIZ) ? nexuiz_xpm : darkplaces_xpm,
+ idata,
&wmhints->icon_pixmap, &wmhints->icon_mask, NULL) == XpmSuccess)
wmhints->flags |= IconPixmapHint | IconMaskHint;
+ if(xpm)
+ Mem_Free(xpm);
+
clshints = XAllocClassHint();
clshints->res_name = strdup(gamename);
clshints->res_class = strdup("DarkPlaces");
szhints = XAllocSizeHints();
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 = mode->width;
+ szhints->min_height = szhints->max_height = mode->height;
szhints->flags |= PMinSize | PMaxSize;
}
XmbSetWMProperties(vidx11_display, win, gamename, gamename, (char **) com_argv, com_argc, szhints, wmhints, clshints);
+ // strdup() allocates using malloc(), should be freed with free()
+ free(clshints->res_name);
+ free(clshints->res_class);
XFree(clshints);
XFree(wmhints);
XFree(szhints);
XSetWMProtocols(vidx11_display, win, &wm_delete_window_atom, 1);
- if (vid_isfullscreen && !vid_isnetwmfullscreen)
+ 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);
}
//XSync(vidx11_display, False);
ctx = qglXCreateContext(vidx11_display, visinfo, NULL, True);
+ XFree(visinfo); // glXChooseVisual man page says to use XFree to free visinfo
if (!ctx)
{
Con_Printf ("glXCreateContext failed\n");
gl_platform = "GLX";
gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen);
- gl_videosyncavailable = false;
-
// COMMANDLINEOPTION: Linux GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
// COMMANDLINEOPTION: BSD GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
// COMMANDLINEOPTION: MacOSX GLX: -nogetprocaddress disables GLX_ARB_get_proc_address (not required, more formal method of getting extension functions)
// COMMANDLINEOPTION: Linux GLX: -novideosync disables GLX_SGI_swap_control
// COMMANDLINEOPTION: BSD GLX: -novideosync disables GLX_SGI_swap_control
// COMMANDLINEOPTION: MacOSX GLX: -novideosync disables GLX_SGI_swap_control
- gl_videosyncavailable = GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
+ GL_CheckExtension("GLX_SGI_swap_control", swapcontrolfuncs, "-novideosync", false);
vid_usingmousegrab = false;
vid_usingmouse = false;
if (!vid_x11_dgasupported)
Con_Print( "Failed to detect XF86DGA Mouse extension\n" );
#endif
+
GL_Init();
return true;
}
static qboolean sound_active = true;
// enable/disable sound on focus gain/loss
- if (!vid_hidden && (vid_activewindow || !snd_mutewhenidle.integer))
+ if ((!vid_hidden && vid_activewindow) || !snd_mutewhenidle.integer)
{
if (!sound_active)
{
void IN_Move (void)
{
}
+
+size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
+{
+ if(vidmode_ext)
+ {
+ int i, bpp;
+ size_t k;
+ XF86VidModeModeInfo **vidmodes;
+ int num_vidmodes;
+
+ XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes);
+ k = 0;
+ for (i = 0; i < num_vidmodes; i++)
+ {
+ if(k >= maxcount)
+ break;
+ // we don't get bpp info, so let's just assume all of 8, 15, 16, 24, 32 work
+ for(bpp = 8; bpp <= 32; bpp = ((bpp == 8) ? 15 : (bpp & 0xF8) + 8))
+ {
+ if(k >= maxcount)
+ break;
+ modes[k].width = vidmodes[i]->hdisplay;
+ modes[k].height = vidmodes[i]->vdisplay;
+ modes[k].bpp = 8;
+ if(vidmodes[i]->dotclock && vidmodes[i]->htotal && vidmodes[i]->vtotal)
+ modes[k].refreshrate = vidmodes[i]->dotclock / vidmodes[i]->htotal / vidmodes[i]->vtotal;
+ else
+ modes[k].refreshrate = 60;
+ modes[k].pixelheight_num = 1;
+ modes[k].pixelheight_denom = 1; // xvidmode does not provide this
+ ++k;
+ }
+ }
+ // manpage of XF86VidModeGetAllModeLines says it should be freed by the caller
+ XFree(vidmodes);
+ return k;
+ }
+ return 0; // FIXME implement this
+}
projects / xonotic / darkplaces.git / blobdiff