Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Add X mode setting when fullscreen

Browse source
This commit is contained in:
Thibaut Girka 2010-05-22 12:54:26 +02:00
parent 212febb048
commit e9afbd69b3
1 changed files with 46 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
code/nel/src/3d/driver/opengl/driver_opengl.cpp
View file

@ -1096,22 +1096,7 @@ bool CDriverGL::setDisplay(void *wnd, const GfxMode &mode, bool show, bool resiz
XSetWindowAttributes attr; XSetWindowAttributes attr;
attr.colormap = cmap; attr.colormap = cmap;
attr.background_pixel = BlackPixel(dpy, DefaultScreen(dpy)); attr.background_pixel = BlackPixel(dpy, DefaultScreen(dpy));
#ifdef XF86VIDMODE
// If we're going to attempt fullscreen, we need to set redirect to True,
// This basically places the window with no borders in the top left
// corner of the screen.
if (mode.Windowed)
{
attr.override_redirect = False;
}
else
{
attr.override_redirect = True;
}
#else
attr.override_redirect = False; attr.override_redirect = False;
#endif
int attr_flags = CWOverrideRedirect | CWColormap | CWBackPixel; int attr_flags = CWOverrideRedirect | CWColormap | CWBackPixel;
@ -1615,6 +1600,52 @@ bool CDriverGL::setMode(const GfxMode& mode)
#elif defined(NL_OS_UNIX) // NL_OS_WINDOWS #elif defined(NL_OS_UNIX) // NL_OS_WINDOWS
#ifdef XF86VIDMODE
if (!mode.Windowed)
{
if (mode.Windowed == _FullScreen)
{
memset(&_OldScreenMode, 0, sizeof(_OldScreenMode));
XF86VidModeGetModeLine(dpy, DefaultScreen(dpy), &_OldDotClock, &_OldScreenMode);
XF86VidModeGetViewPort(dpy, DefaultScreen(dpy), &_OldX, &_OldY);
}
XF86VidModeModeInfo **modes;
int nmodes;
if (XF86VidModeGetAllModeLines(dpy, DefaultScreen(dpy), &nmodes, &modes))
{
for (int i = 0; i < nmodes; i++)
{
nldebug("3D: Available mode - %dx%d", modes[i]->hdisplay, modes[i]->vdisplay);
if(modes[i]->hdisplay == mode.Width && modes[i]->vdisplay == mode.Height)
{
if(XF86VidModeSwitchToMode(dpy, DefaultScreen(dpy), modes[i]))
{
nlinfo("3D: Switching to mode %dx%d", modes[i]->hdisplay, modes[i]->vdisplay);
XF86VidModeSetViewPort(dpy, DefaultScreen(dpy), 0, 0);
}
break;
}
}
}
}
else if (mode.Windowed == _FullScreen)
{
XF86VidModeModeInfo info;
nlinfo("3D: Switching back to original mode");
// This is a bit ugly - a quick hack to copy the ModeLine structure
// into the modeInfo structure.
memcpy((XF86VidModeModeLine *)((char *)&info + sizeof(info.dotclock)),&_OldScreenMode, sizeof(XF86VidModeModeLine));
info.dotclock = _OldDotClock;
nlinfo("3D: Switching back mode to %dx%d", info.hdisplay, info.vdisplay);
XF86VidModeSwitchToMode(dpy, DefaultScreen(dpy), &info);
nlinfo("3D: Switching back viewport to %d,%d",_OldX, _OldY);
XF86VidModeSetViewPort(dpy, DefaultScreen(dpy), _OldX, _OldY);
}
#endif // XF86VIDMODE
// Update WM hints (update size and disallow resizing) // Update WM hints (update size and disallow resizing)
XSizeHints size_hints; XSizeHints size_hints;
size_hints.x = 0; size_hints.x = 0;
@ -1642,8 +1673,6 @@ bool CDriverGL::setMode(const GfxMode& mode)
xev.xclient.data.l[1] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", false); xev.xclient.data.l[1] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", false);
xev.xclient.data.l[2] = 0; xev.xclient.data.l[2] = 0;
XSendEvent(dpy, DefaultRootWindow(dpy), false, SubstructureNotifyMask, &xev); XSendEvent(dpy, DefaultRootWindow(dpy), false, SubstructureNotifyMask, &xev);
//TODO: Change X display mode
} }
_FullScreen = !mode.Windowed; _FullScreen = !mode.Windowed;