X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a90bf709147ab0640d138ba7e34af721bfd717d2..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/unix/displayx11.cpp?ds=inline diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 4736e99523..e74d312163 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////// -// 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$ @@ -9,150 +9,160 @@ // 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) +// ---------------------------------------------------------------------------- +// helper class to automatically free XineramaQueryScreens() return value +// ---------------------------------------------------------------------------- + +class ScreensInfo { - Display *disp = (Display*)wxGetDisplay(); +public: + ScreensInfo() + { + m_screens = XineramaQueryScreens((Display *)wxGetDisplay(), &m_num); + } - if ( XineramaIsActive(disp) ) - { - int which_screen = -1; - XineramaScreenInfo *screenarr; - int numscreens; - screenarr = XineramaQueryScreens(disp, &numscreens); + ~ScreensInfo() + { + XFree(m_screens); + } + + operator const XineramaScreenInfo *() const { return m_screens; } - int i; - for (i = 0; i < numscreens; ++i) + unsigned GetCount() const { return wx_static_cast(unsigned, m_num); } + +private: + XineramaScreenInfo *m_screens; + int m_num; +}; + +// ---------------------------------------------------------------------------- +// display and display factory classes +// ---------------------------------------------------------------------------- + +class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl +{ +public: + wxDisplayImplX11(unsigned n, const XineramaScreenInfo& info) + : wxDisplayImpl(n), + m_rect(info.x_org, info.y_org, info.width, info.height) { - 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; - } } - XFree(screenarr); - return which_screen; - } - else - { - wxSize size = wxGetDisplaySize(); - if (p.x >= 0 && - p.x < size.GetWidth() && - p.y >= 0 && - p.y < size.GetHeight()) + virtual wxRect GetGeometry() const { return m_rect; } + virtual wxRect GetClientArea() const { - return 0; + // we intentionally don't cache the result here because the client + // display area may change (e.g. the user resized or hid a panel) and + // we don't currently react to its changes + return IsPrimary() ? wxGetClientDisplayRect() : m_rect; } - return -1; - } -} + virtual wxString GetName() const { return wxString(); } -wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisplayUnixPriv ) -{ - 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(); - } -} + 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) +}; -wxDisplay::~wxDisplay() +class wxDisplayFactoryX11 : public wxDisplayFactory { - delete m_priv; -} +public: + wxDisplayFactoryX11() { } + + virtual wxDisplayImpl *CreateDisplay(unsigned n); + virtual unsigned GetCount(); + virtual int GetFromPoint(const wxPoint& pt); + +protected: + DECLARE_NO_COPY_CLASS(wxDisplayFactoryX11) +}; + +// ============================================================================ +// wxDisplayFactoryX11 implementation +// ============================================================================ -wxRect wxDisplay::GetGeometry() const +unsigned 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 unsigned numscreens(screens.GetCount()); + for ( unsigned 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(unsigned n) { - return wxEmptyString; + ScreensInfo screens; + + return n < screens.GetCount() ? new wxDisplayImplX11(n, screens[n]) : NULL; } +// ============================================================================ +// wxDisplayImplX11 implementation +// ============================================================================ #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H @@ -170,7 +180,7 @@ wxString wxDisplay::GetName() const #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 +214,7 @@ wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const return Modes; } -wxVideoMode wxDisplay::GetCurrentMode() const +wxVideoMode wxDisplayImplX11::GetCurrentMode() const { XF86VidModeModeLine VM; int nDotClock; @@ -214,7 +224,7 @@ wxVideoMode wxDisplay::GetCurrentMode() const return wxCVM2(VM, nDotClock); } -bool wxDisplay::ChangeMode(const wxVideoMode& mode) +bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode) { XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :)) int nNumModes; //Number of modes enumerated.... @@ -263,30 +273,34 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode) #else // !HAVE_X11_EXTENSIONS_XF86VMODE_H -wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const +wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) 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 ) + { + wxVideoMode mode(m_rect.GetWidth(), m_rect.GetHeight(), depths[x]); + if ( mode.Matches(modeMatch) ) + { + modes.Add(modeMatch); + } + } + + 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& WXUNUSED(mode)) { // Not implemented return false; @@ -294,4 +308,124 @@ 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 */ + +#include "wx/utils.h" + +#if wxUSE_LIBHILDON + +void wxClientDisplayRect(int *x, int *y, int *width, int *height) +{ + // TODO: don't hardcode display size + if ( x ) + *x = 0; + if ( y ) + *y = 0; + if ( width ) + *width = 672; + if ( height ) + *height = 396; +} + +#else // !wxUSE_LIBHILDON + +#include "wx/log.h" + +#include +#include + +// TODO: make this a full-fledged class and move to a public header +class wxX11Ptr +{ +public: + wxX11Ptr(void *ptr = NULL) : m_ptr(ptr) { } + ~wxX11Ptr() { if ( m_ptr ) XFree(m_ptr); } + +private: + void *m_ptr; + + DECLARE_NO_COPY_CLASS(wxX11Ptr) +}; + +// NB: this function is implemented using X11 and not GDK calls as it's shared +// by wxGTK[12], wxX11 and wxMotif ports +void wxClientDisplayRect(int *x, int *y, int *width, int *height) +{ + Display * const dpy = wxGetX11Display(); + wxCHECK_RET( dpy, _T("can't be called before initializing the GUI") ); + + const Atom atomWorkArea = XInternAtom(dpy, "_NET_WORKAREA", True); + if ( atomWorkArea ) + { + long *workareas = NULL; + unsigned long numItems; + unsigned long bytesRemaining; + Atom actualType; + int format; + + if ( XGetWindowProperty + ( + dpy, + XDefaultRootWindow(dpy), + atomWorkArea, + 0, // offset of data to retrieve + 4, // number of items to retrieve + False, // don't delete property + XA_CARDINAL, // type of the items to get + &actualType, + &format, + &numItems, + &bytesRemaining, + (unsigned char **)&workareas + ) == Success && workareas ) + { + wxX11Ptr x11ptr(workareas); // ensure it will be freed + + // check that we retrieved the property of the expected type and + // that we did get back 4 longs (32 is the format for long), as + // requested + if ( actualType != XA_CARDINAL || + format != 32 || + numItems != 4 ) + { + wxLogDebug(_T("XGetWindowProperty(\"_NET_WORKAREA\") failed")); + return; + } + + if ( x ) + *x = workareas[0]; + if ( y ) + *y = workareas[1]; + if ( width ) + *width = workareas[2]; + if ( height ) + *height = workareas[3]; + + return; + } + } + + // if we get here, _NET_WORKAREA is not supported so return the entire + // screen size as fall back + if (x) + *x = 0; + if (y) + *y = 0; + wxDisplaySize(width, height); +} + +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON