From 73b89f700787922fd35c16b09fe4f0c5c73519ce Mon Sep 17 00:00:00 2001 From: Ryan Norton Date: Sat, 13 Dec 2003 07:29:57 +0000 Subject: [PATCH] Implemented resolution changing using X11 video extentions\nBe sure to link with the appropriate libs (-lXxf86vm -lXinerama) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/unix/displayx11.cpp | 121 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 113 insertions(+), 8 deletions(-) diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index ae0a57d139..15c2c468d8 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -21,6 +21,7 @@ #endif #include "wx/display.h" +#include "wx/log.h" #ifndef WX_PRECOMP #include "wx/dynarray.h" @@ -37,13 +38,21 @@ extern "C" { #include #include #include + #include } +//free private data common to x (usually s3) servers +#define wxClearXVM(vm) if(vm.privsize) XFree(vm.c_private) class wxDisplayUnixPriv { public: wxRect m_rect; int m_depth; + XF86VidModeModeInfo m_DefaultVidMode; + ~wxDisplayUnixPriv() + { + wxClearXVM(m_DefaultVidMode); + } }; size_t wxDisplayBase::GetCount() @@ -103,6 +112,7 @@ int wxDisplayBase::GetFromPoint(const wxPoint &p) return -1; } + } wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisplayUnixPriv ) @@ -125,6 +135,30 @@ wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisp m_priv->m_rect = wxRect(0, 0, size.GetWidth(), size.GetHeight()); m_priv->m_depth = wxDisplayDepth(); } + + + XF86VidModeModeLine VM; + int nDotClock; + + XF86VidModeGetModeLine((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), + &nDotClock, &VM); + + //A XF86VidModeModeLine is a XF86ModeModeInfo without the dotclock + //field. It would be nice to mayby use a memcpy() here instead of + //all this? + m_priv->m_DefaultVidMode.dotclock = nDotClock; + m_priv->m_DefaultVidMode.hdisplay = VM.hdisplay; + m_priv->m_DefaultVidMode.hsyncstart = VM.hsyncstart; + m_priv->m_DefaultVidMode.hsyncend = VM.hsyncend; + m_priv->m_DefaultVidMode.htotal = VM.htotal; + m_priv->m_DefaultVidMode.hskew = VM.hskew; + m_priv->m_DefaultVidMode.vdisplay = VM.vdisplay; + m_priv->m_DefaultVidMode.vsyncstart = VM.vsyncstart; + m_priv->m_DefaultVidMode.vsyncend = VM.vsyncend; + m_priv->m_DefaultVidMode.vtotal = VM.vtotal; + m_priv->m_DefaultVidMode.flags = VM.flags; + m_priv->m_DefaultVidMode.privsize = VM.privsize; + m_priv->m_DefaultVidMode.c_private = VM.c_private; } wxDisplay::~wxDisplay() @@ -147,23 +181,94 @@ wxString wxDisplay::GetName() const return wxEmptyString; } - wxArrayVideoModes - wxDisplay::GetModes(const wxVideoMode& mode) const +// +// See (http://www.xfree86.org/4.2.0/XF86VidModeDeleteModeLine.3.html) for more +// info about xf86 video mode extensions +// + +#define wxCVM(v) wxVideoMode(v.hdisplay, v.vdisplay, v.dotclock /*BPP in X? */,((v.hsyncstart + v.vsyncstart) / 2) ) +#define wxCVM2(v) wxVideoMode(v.hdisplay, v.vdisplay, 0 /*BPP in X? */,((v.hsyncstart + v.vsyncstart) / 2) ) + +wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const { - // Not implemented - return wxArrayVideoModes(); + //Convenience... + Display* pDisplay = (Display*) wxGetDisplay(); //default display + int nScreen = DefaultScreen(pDisplay); //default screen of (default) display... + + //Some variables.. + XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :)) + int nNumModes; //Number of modes enumerated.... + + wxArrayVideoModes Modes; //modes to return... + + if (XF86VidModeGetAllModeLines(pDisplay, nScreen, &nNumModes, &ppXModes) == TRUE) + { + for (int i = 0; i < nNumModes; ++i) + { + if (mode == wxDefaultVideoMode || //According to display.h All modes valid if dafault mode... + mode.Matches(wxCVM2((*ppXModes[i]))) ) //...? + { + Modes.Add(wxCVM2((*ppXModes[i]))); + } + wxClearXVM((*ppXModes[i])); + // XFree(ppXModes[i]); //supposed to free? + } + XFree(ppXModes); + } + else //OOPS! + { + wxLogSysError("XF86VidModeGetAllModeLines Failed in wxX11Display::GetModes()!"); + } + + return Modes; } wxVideoMode wxDisplay::GetCurrentMode() const { - // Not implemented - return wxVideoMode(); + return wxCVM2(m_priv->m_DefaultVidMode); } bool wxDisplay::ChangeMode(const wxVideoMode& mode) { - // Not implemented - return false; + if (mode == wxDefaultVideoMode) + { + return XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), + &m_priv->m_DefaultVidMode) == TRUE; + } + else //This gets kind of tricky AND complicated :) :\ :( :) + { + bool bRet = false; + //Some variables.. + XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :)) + int nNumModes; //Number of modes enumerated.... + + if(XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) == TRUE) + { + for (int i = 0; i < nNumModes; ++i) + { + if (!bRet && + ppXModes[i]->hdisplay == mode.w && + ppXModes[i]->vdisplay == mode.h && + ((ppXModes[i]->hsyncstart + ppXModes[i]->vsyncstart) / 2) == mode.refresh) + { + //switch! + bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), + ppXModes[i]) == TRUE; + } + wxClearXVM((*ppXModes[i])); + // XFree(ppXModes[i]); //supposed to free? + } + XFree(ppXModes); + + return bRet; + } + else //OOPS! + { + wxLogSysError("XF86VidModeGetAllModeLines Failed in wxX11Display::ChangeMode()!"); + return false; + } + } } + #endif /* wxUSE_DISPLAY */ -- 2.45.2