static qboolean vid_isdesktopfullscreen = false;
static qboolean vid_isoverrideredirect = false;
+static vid_mode_t desktop_mode;
static Visual *vidx11_visual;
static Colormap vidx11_colormap;
case XK_KP_Subtract: key = K_KP_MINUS; break;
case XK_KP_Divide: key = K_KP_SLASH; break;
+ case XK_Num_Lock: key = K_NUMLOCK; break;
+ case XK_Caps_Lock: key = K_CAPSLOCK; break;
+ case XK_Scroll_Lock: key = K_SCROLLOCK; break;
+
case XK_asciicircum: *ascii = key = '^'; break; // for some reason, XLookupString returns "" on this one for Grunt|2
case XK_section: *ascii = key = '~'; break;
// window changed size/location
win_x = event.xconfigure.x;
win_y = event.xconfigure.y;
+ // HACK on X11, we just request fullscreen mode, but
+ // cannot guess what the window manager will do for us
+ // exactly. That is why we read back the resolution we
+ // actually got here.
+ if(vid_isdesktopfullscreen)
+ {
+ desktop_mode.width = event.xconfigure.width;
+ desktop_mode.height = event.xconfigure.height;
+ }
if((vid_resizable.integer < 2 || vid_isdesktopfullscreen) && (vid.width != event.xconfigure.width || vid.height != event.xconfigure.height))
{
vid.width = event.xconfigure.width;
else
Con_DPrintf("Updating to ConfigureNotify resolution %dx%d\n", vid.width, vid.height);
- DPSOFTRAST_Flush();
-
- if(vid.softdepthpixels)
- free(vid.softdepthpixels);
-
- DestroyXImages();
- XSync(vidx11_display, False);
- if(!BuildXImages(vid.width, vid.height))
- return;
- XSync(vidx11_display, False);
-
- vid.softpixels = (unsigned int *) vidx11_ximage[vidx11_ximage_pos]->data;
- vid.softdepthpixels = (unsigned int *)calloc(4, vid.width * vid.height);
+ if(vid.renderpath == RENDERPATH_SOFT)
+ {
+ DPSOFTRAST_Flush();
+ if(vid.softdepthpixels)
+ free(vid.softdepthpixels);
+ DestroyXImages();
+ XSync(vidx11_display, False);
+ if(!BuildXImages(vid.width, vid.height))
+ return;
+ XSync(vidx11_display, False);
+ vid.softpixels = (unsigned int *) vidx11_ximage[vidx11_ximage_pos]->data;
+ vid.softdepthpixels = (unsigned int *)calloc(4, vid.width * vid.height);
+ }
}
break;
case DestroyNotify:
vidx11_screen = DefaultScreen(vidx11_display);
root = RootWindow(vidx11_display, vidx11_screen);
+ desktop_mode.width = DisplayWidth(vidx11_display, vidx11_screen);
+ desktop_mode.height = DisplayHeight(vidx11_display, vidx11_screen);
+ desktop_mode.bpp = DefaultDepth(vidx11_display, vidx11_screen);
+ desktop_mode.refreshrate = 60; // FIXME
+ desktop_mode.pixelheight_num = 1; // FIXME
+ desktop_mode.pixelheight_denom = 1; // FIXME
+
// Get video mode list
MajorVersion = MinorVersion = 0;
if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
vidx11_screen = DefaultScreen(vidx11_display);
root = RootWindow(vidx11_display, vidx11_screen);
+ desktop_mode.width = DisplayWidth(vidx11_display, vidx11_screen);
+ desktop_mode.height = DisplayHeight(vidx11_display, vidx11_screen);
+ desktop_mode.bpp = DefaultDepth(vidx11_display, vidx11_screen);
+ desktop_mode.refreshrate = 60; // FIXME
+ desktop_mode.pixelheight_num = 1; // FIXME
+ desktop_mode.pixelheight_denom = 1; // FIXME
+
// Get video mode list
MajorVersion = MinorVersion = 0;
if (!XF86VidModeQueryVersion(vidx11_display, &MajorVersion, &MinorVersion))
VID_ApplyJoyState(&joystate);
}
+vid_mode_t *VID_GetDesktopMode(void)
+{
+ return &desktop_mode;
+}
+
size_t VID_ListModes(vid_mode_t *modes, size_t maxcount)
{
if(vidmode_ext)