static qboolean vid_usinghidecursor = false;
static qboolean vid_usingvsync = false;
static qboolean vid_usevsync = false;
-static qboolean vid_x11_hardwaregammasupported = false;
#ifdef USEDGA
static qboolean vid_x11_dgasupported = false;
#endif
-static int vid_x11_gammarampsize = 0;
#ifdef USEDGA
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 XF86VidModeModeInfo init_vidmode, game_vidmode;
static qboolean vid_isfullscreen = false;
static qboolean vid_isvidmodefullscreen = false;
-static qboolean vid_isnetwmfullscreen = false;
+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;
- if((vid_resizable.integer < 2 || vid_isnetwmfullscreen) && (vid.width != event.xconfigure.width || vid.height != event.xconfigure.height))
+ // 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;
vid.height = event.xconfigure.height;
- if(vid_isnetwmfullscreen)
+ if(vid_isdesktopfullscreen)
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);
- 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:
break;
// window restored
vid_hidden = false;
- VID_RestoreSystemGamma();
if(vid_isvidmodefullscreen)
{
XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
}
- if(vid_isnetwmfullscreen)
+ if(vid_isdesktopfullscreen)
{
// make sure it's fullscreen
XEvent event;
break;
// window iconified/rolledup/whatever
vid_hidden = true;
- VID_RestoreSystemGamma();
if(vid_isvidmodefullscreen)
XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, &init_vidmode);
if (vid_isoverrideredirect)
break;
- if(vid_isnetwmfullscreen && event.xfocus.mode == NotifyNormal)
+ if(vid_isdesktopfullscreen && 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
// window is no longer the input focus
vid_activewindow = false;
- VID_RestoreSystemGamma();
break;
case EnterNotify:
VID_EnableJoystick(false);
VID_SetMouse(false, false, false);
- VID_RestoreSystemGamma();
// FIXME: glXDestroyContext here?
if (vid_isvidmodefullscreen)
vid_hidden = true;
vid_isfullscreen = false;
- vid_isnetwmfullscreen = false;
+ vid_isdesktopfullscreen = false;
vid_isvidmodefullscreen = false;
vid_isoverrideredirect = false;
vidx11_display = NULL;
ctx = NULL;
GL_CloseLibrary();
- Key_ClearStates ();
}
static void signal_handler(int sig)
{
Con_Printf("Received signal %d, exiting...\n", sig);
- VID_RestoreSystemGamma();
Sys_Quit(1);
}
break;
}
- if (vid_x11_hardwaregammasupported)
- VID_UpdateGamma(false, vid_x11_gammarampsize);
-}
-
-int VID_SetGamma(unsigned short *ramps, int rampsize)
-{
- return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2);
-}
-
-int VID_GetGamma(unsigned short *ramps, int rampsize)
-{
- return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, rampsize, ramps, ramps + rampsize, ramps + rampsize*2);
+ VID_UpdateGamma();
}
void VID_Init(void)
#ifdef USEDGA
Cvar_RegisterVariable (&vid_dgamouse);
#endif
- Cvar_RegisterVariable (&vid_netwmfullscreen);
+ Cvar_RegisterVariable (&vid_desktopfullscreen);
InitSig(); // trap evil signals
// COMMANDLINEOPTION: Input: -nomouse disables mouse support (see also vid_mouse cvar)
if (COM_CheckParm ("-nomouse"))
char vabuf[1024];
vid_isfullscreen = false;
- vid_isnetwmfullscreen = false;
+ vid_isdesktopfullscreen = false;
vid_isvidmodefullscreen = false;
vid_isoverrideredirect = false;
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))
if (mode->fullscreen)
{
- if(vid_netwmfullscreen.integer)
+ if(vid_desktopfullscreen.integer)
{
// TODO detect WM support
- vid_isnetwmfullscreen = true;
+ vid_isdesktopfullscreen = true;
vid_isfullscreen = true;
// width and height will be filled in later
Con_DPrintf("Using NetWM fullscreen mode\n");
if (mode->fullscreen)
{
- if(vid_isnetwmfullscreen)
+ if(vid_isdesktopfullscreen)
{
mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask;
attr.backing_store = NotUseful;
clshints->res_class = strdup("DarkPlaces");
szhints = XAllocSizeHints();
- if(vid_resizable.integer == 0 && !vid_isnetwmfullscreen)
+ if(vid_resizable.integer == 0 && !vid_isdesktopfullscreen)
{
szhints->min_width = szhints->max_width = mode->width;
szhints->min_height = szhints->max_height = mode->height;
vid_usingvsync = false;
vid_hidden = false;
vid_activewindow = true;
- vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0;
#ifdef USEDGA
vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion);
if (!vid_x11_dgasupported)
char vabuf[1024];
vid_isfullscreen = false;
- vid_isnetwmfullscreen = false;
+ vid_isdesktopfullscreen = false;
vid_isvidmodefullscreen = false;
vid_isoverrideredirect = false;
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))
if (mode->fullscreen)
{
- if(vid_netwmfullscreen.integer)
+ if(vid_desktopfullscreen.integer)
{
// TODO detect WM support
- vid_isnetwmfullscreen = true;
+ vid_isdesktopfullscreen = true;
vid_isfullscreen = true;
// width and height will be filled in later
Con_DPrintf("Using NetWM fullscreen mode\n");
if (mode->fullscreen)
{
- if(vid_isnetwmfullscreen)
+ if(vid_isdesktopfullscreen)
{
mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask;
attr.backing_store = NotUseful;
clshints->res_class = strdup("DarkPlaces");
szhints = XAllocSizeHints();
- if(vid_resizable.integer == 0 && !vid_isnetwmfullscreen)
+ if(vid_resizable.integer == 0 && !vid_isdesktopfullscreen)
{
szhints->min_width = szhints->max_width = mode->width;
szhints->min_height = szhints->max_height = mode->height;
vid_usingvsync = false;
vid_hidden = false;
vid_activewindow = true;
- vid_x11_hardwaregammasupported = XF86VidModeGetGammaRampSize(vidx11_display, vidx11_screen, &vid_x11_gammarampsize) != 0;
#ifdef USEDGA
vid_x11_dgasupported = XF86DGAQueryVersion(vidx11_display, &MajorVersion, &MinorVersion);
if (!vid_x11_dgasupported)
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)
projects / xonotic / darkplaces.git / blobdiff