X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..9c8cfcb9c56798ebd29184e40227451a194c0c49:/src/unix/displayx11.cpp diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 12c84cb796..1d71c7f038 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -1,158 +1,160 @@ /////////////////////////////////////////////////////////////////////////// -// Name: displayx11.cpp +// Name: src/unix/displayx11.cpp // Purpose: Unix/X11 implementation of wxDisplay class -// Author: Brian Victor +// Author: Brian Victor, Vadim Zeitlin // Modified by: // Created: 12/05/02 // RCS-ID: $Id$ // Copyright: (c) wxWidgets team -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "display.h" -#endif +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_DISPLAY + #include "wx/display.h" -#include "wx/intl.h" -#include "wx/log.h" #ifndef WX_PRECOMP - #include "wx/dynarray.h" - #include "wx/gdicmn.h" - #include "wx/string.h" - #include "wx/utils.h" + #include "wx/dynarray.h" + #include "wx/gdicmn.h" + #include "wx/string.h" + #include "wx/utils.h" + #include "wx/intl.h" + #include "wx/log.h" #endif /* WX_PRECOMP */ -#if wxUSE_DISPLAY +#include "wx/display_impl.h" /* These must be included after the wx files. Otherwise the Data macro in * Xlibint.h conflicts with a function declaration in wx/list.h. */ -extern "C" { - #include - #include - #include -#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H - #include -#endif -} - -class wxDisplayUnixPriv +extern "C" { - public: - wxRect m_rect; - int m_depth; -}; + #include + #include -size_t wxDisplayBase::GetCount() -{ - Display *disp = (Display*)wxGetDisplay(); - - if ( XineramaIsActive(disp) ) - { - XineramaScreenInfo *screenarr; - int numscreens; - screenarr = XineramaQueryScreens(disp, &numscreens); - XFree(screenarr); - return numscreens; - } - else - { - return 1; - } + #include + #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H + #include + #endif } -int wxDisplayBase::GetFromPoint(const wxPoint &p) -{ - Display *disp = (Display*)wxGetDisplay(); - - if ( XineramaIsActive(disp) ) - { - int which_screen = -1; - XineramaScreenInfo *screenarr; - int numscreens; - screenarr = XineramaQueryScreens(disp, &numscreens); +// ---------------------------------------------------------------------------- +// helper class to automatically free XineramaQueryScreens() return value +// ---------------------------------------------------------------------------- - int i; - for (i = 0; i < numscreens; ++i) +class ScreensInfo +{ +public: + ScreensInfo() { - if (p.x >= screenarr[i].x_org && - p.x < screenarr[i].x_org + screenarr[i].width && - p.y >= screenarr[i].y_org && - p.y < screenarr[i].y_org + screenarr[i].height) - { - which_screen = i; - } + m_screens = XineramaQueryScreens((Display *)wxGetDisplay(), &m_num); } - XFree(screenarr); - return which_screen; - } - else - { - wxSize size = wxGetDisplaySize(); - if (p.x >= 0 && - p.x < size.GetWidth() && - p.y >= 0 && - p.y < size.GetHeight()) + ~ScreensInfo() { - return 0; + XFree(m_screens); } - return -1; - } -} + operator const XineramaScreenInfo *() const { return m_screens; } + + size_t GetCount() const { return wx_static_cast(size_t, m_num); } + +private: + XineramaScreenInfo *m_screens; + int m_num; +}; -wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisplayUnixPriv ) +// ---------------------------------------------------------------------------- +// display and display factory classes +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl { - Display *disp = (Display*)wxGetDisplay(); - - if ( XineramaIsActive(disp) ) - { - XineramaScreenInfo *screenarr; - int numscreens; - screenarr = XineramaQueryScreens(disp, &numscreens); - - m_priv->m_rect = wxRect(screenarr[index].x_org, screenarr[index].y_org, - screenarr[index].width, screenarr[index].height); - m_priv->m_depth = DefaultDepth(disp, DefaultScreen(disp)); - XFree(screenarr); - } - else - { - wxSize size = wxGetDisplaySize(); - m_priv->m_rect = wxRect(0, 0, size.GetWidth(), size.GetHeight()); - m_priv->m_depth = wxDisplayDepth(); - } -} +public: + wxDisplayImplX11(size_t n, const XineramaScreenInfo& info) + : wxDisplayImpl(n), + m_rect(info.x_org, info.y_org, info.width, info.height) + { + } + + virtual wxRect GetGeometry() const { return m_rect; } + virtual wxString GetName() const { return wxString(); } -wxDisplay::~wxDisplay() + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const; + virtual wxVideoMode GetCurrentMode() const; + virtual bool ChangeMode(const wxVideoMode& mode); + +private: + wxRect m_rect; + int m_depth; + + DECLARE_NO_COPY_CLASS(wxDisplayImplX11) +}; + +class wxDisplayFactoryX11 : public wxDisplayFactory { - delete m_priv; -} +public: + wxDisplayFactoryX11() { } + + virtual wxDisplayImpl *CreateDisplay(size_t n); + virtual size_t GetCount(); + virtual int GetFromPoint(const wxPoint& pt); + +protected: + DECLARE_NO_COPY_CLASS(wxDisplayFactoryX11) +}; -wxRect wxDisplay::GetGeometry() const +// ============================================================================ +// wxDisplayFactoryX11 implementation +// ============================================================================ + +size_t wxDisplayFactoryX11::GetCount() { - return m_priv->m_rect; + return ScreensInfo().GetCount(); } -int wxDisplay::GetDepth() const +int wxDisplayFactoryX11::GetFromPoint(const wxPoint& p) { - return m_priv->m_depth; + ScreensInfo screens; + + const size_t numscreens(screens.GetCount()); + for ( size_t i = 0; i < numscreens; ++i ) + { + const XineramaScreenInfo& s = screens[i]; + if ( p.x >= s.x_org && p.x < s.x_org + s.width && + p.y >= s.y_org && p.y < s.y_org + s.height ) + { + return i; + } + } + + return wxNOT_FOUND; } -wxString wxDisplay::GetName() const +wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(size_t n) { - return wxEmptyString; + ScreensInfo screens; + + return n < screens.GetCount() ? new wxDisplayImplX11(n, screens[n]) : NULL; } +// ============================================================================ +// wxDisplayImplX11 implementation +// ============================================================================ #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H @@ -164,13 +166,13 @@ wxString wxDisplay::GetName() const //free private data common to x (usually s3) servers #define wxClearXVM(vm) if(vm.privsize) XFree(vm.c_private) -//Correct res rate from GLFW, which probably has the perfect license :) +// Correct res rate from GLFW #define wxCRR2(v,dc) (int) (((1000.0f * (float) dc) /*PIXELS PER SECOND */) / ((float) v.htotal * v.vtotal /*PIXELS PER FRAME*/) + 0.5f) #define wxCRR(v) wxCRR2(v,v.dotclock) #define wxCVM2(v, dc) wxVideoMode(v.hdisplay, v.vdisplay, DefaultDepth((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay())), wxCRR2(v,dc)) #define wxCVM(v) wxCVM2(v, v.dotclock) -wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const +wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const { //Convenience... Display* pDisplay = (Display*) wxGetDisplay(); //default display @@ -204,7 +206,7 @@ wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const return Modes; } -wxVideoMode wxDisplay::GetCurrentMode() const +wxVideoMode wxDisplayImplX11::GetCurrentMode() const { XF86VidModeModeLine VM; int nDotClock; @@ -214,84 +216,79 @@ wxVideoMode wxDisplay::GetCurrentMode() const return wxCVM2(VM, nDotClock); } -bool wxDisplay::ChangeMode(const wxVideoMode& mode) +bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode) { - //This gets kind of tricky AND complicated :) :\ :( :) + XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :)) + int nNumModes; //Number of modes enumerated.... + + if( !XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) ) + { + wxLogSysError(_("Failed to change video mode")); + return false; + } + + bool bRet = false; + if (mode == wxDefaultVideoMode) { - bool bRet = false; - //Some variables.. - XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :)) - int nNumModes; //Number of modes enumerated.... + bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), + ppXModes[0]) == TRUE; - if(XF86VidModeGetAllModeLines((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), &nNumModes, &ppXModes) == TRUE) + for (int i = 0; i < nNumModes; ++i) + { + wxClearXVM((*ppXModes[i])); + // XFree(ppXModes[i]); //supposed to free? + } + } + else + { + for (int i = 0; i < nNumModes; ++i) { - if (mode == wxDefaultVideoMode) + if (!bRet && + ppXModes[i]->hdisplay == mode.w && + ppXModes[i]->vdisplay == mode.h && + wxCRR((*ppXModes[i])) == mode.refresh) { + //switch! bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), - ppXModes[0]) == TRUE; - - for (int i = 0; i < nNumModes; ++i) - { - wxClearXVM((*ppXModes[i])); - // XFree(ppXModes[i]); //supposed to free? - } - XFree(ppXModes); - - return bRet; + ppXModes[i]) == TRUE; } - for (int i = 0; i < nNumModes; ++i) - { - if (!bRet && - ppXModes[i]->hdisplay == mode.w && - ppXModes[i]->vdisplay == mode.h && - wxCRR((*ppXModes[i])) == 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(_("Failed to change video mode")); - return false; + wxClearXVM((*ppXModes[i])); + // XFree(ppXModes[i]); //supposed to free? } } + + XFree(ppXModes); + + return bRet; } #else // !HAVE_X11_EXTENSIONS_XF86VMODE_H -wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const +wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const { - Display *disp = (Display*)wxGetDisplay(); - int count_return; - int* depths = XListDepths(disp, 0, &count_return); - wxArrayVideoModes modes; - if (depths) - { - int x; - for (x = 0; x < count_return; ++x) + int count_return; + int* depths = XListDepths((Display*)wxGetDisplay(), 0, &count_return); + wxArrayVideoModes modes; + if ( depths ) { - modes.Add(wxVideoMode(m_priv->m_rect.GetWidth(), m_priv->m_rect.GetHeight(), depths[x])); + for ( int x = 0; x < count_return; ++x ) + { + modes.Add(wxVideoMode(m_rect.GetWidth(), m_rect.GetHeight(), depths[x])); + } + + XFree(depths); } - } - return modes; + return modes; } -wxVideoMode wxDisplay::GetCurrentMode() const +wxVideoMode wxDisplayImplX11::GetCurrentMode() const { // Not implemented return wxVideoMode(); } -bool wxDisplay::ChangeMode(const wxVideoMode& mode) +bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode) { // Not implemented return false; @@ -299,4 +296,18 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode) #endif // !HAVE_X11_EXTENSIONS_XF86VMODE_H +// ============================================================================ +// wxDisplay::CreateFactory() +// ============================================================================ + +/* static */ wxDisplayFactory *wxDisplay::CreateFactory() +{ + if ( XineramaIsActive((Display*)wxGetDisplay()) ) + { + return new wxDisplayFactoryX11; + } + + return new wxDisplayFactorySingle; +} + #endif /* wxUSE_DISPLAY */