X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66d0513058b98ac3af419ff31a75622ac071c639..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/unix/displayx11.cpp?ds=sidebyside diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 687329efd2..87dedfc530 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -4,7 +4,6 @@ // Author: Brian Victor, Vadim Zeitlin // Modified by: // Created: 12/05/02 -// RCS-ID: $Id$ // Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -39,45 +38,98 @@ #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 +#ifdef __WXGTK20__ + #include + #include - #include - #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H - #include - #endif -} + // define the struct with the same fields as XineramaScreenInfo (except for + // screen number which we don't need) but which we can use without + // including Xinerama headers + struct ScreenInfo + { + short x_org; + short y_org; + short width; + short height; + }; +#else // use raw Xinerama functions + /* 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 + } + + typedef XineramaScreenInfo ScreenInfo; +#endif // GTK+/Xinerama // ---------------------------------------------------------------------------- -// helper class to automatically free XineramaQueryScreens() return value +// helper class storing information about all screens // ---------------------------------------------------------------------------- -class ScreensInfo +// the base class provides access to ScreenInfo array, derived class +// initializes it using either GTK+ or Xinerama functions +class ScreensInfoBase +{ +public: + operator const ScreenInfo *() const { return m_screens; } + + unsigned GetCount() const { return static_cast(m_num); } + +protected: + ScreenInfo *m_screens; + int m_num; +}; + +#ifdef __WXGTK20__ + +class ScreensInfo : public ScreensInfoBase { public: ScreensInfo() { - m_screens = XineramaQueryScreens((Display *)wxGetDisplay(), &m_num); + GdkScreen * const screen = gdk_screen_get_default(); + + m_num = gdk_screen_get_n_monitors(screen); + m_screens = new ScreenInfo[m_num]; + for ( int i = 0; i < m_num; i++ ) + { + GdkRectangle rect; + gdk_screen_get_monitor_geometry(screen, i, &rect); + m_screens[i].x_org = rect.x; + m_screens[i].y_org = rect.y; + m_screens[i].width = rect.width; + m_screens[i].height = rect.height; + } } ~ScreensInfo() { - XFree(m_screens); + delete [] m_screens; } +}; - operator const XineramaScreenInfo *() const { return m_screens; } +#else // Xinerama - unsigned GetCount() const { return wx_static_cast(unsigned, m_num); } +class ScreensInfo : public ScreensInfoBase +{ +public: + ScreensInfo() + { + m_screens = XineramaQueryScreens((Display *)wxGetDisplay(), &m_num); + } -private: - XineramaScreenInfo *m_screens; - int m_num; + ~ScreensInfo() + { + XFree(m_screens); + } }; +#endif // GTK+/Xinerama + // ---------------------------------------------------------------------------- // display and display factory classes // ---------------------------------------------------------------------------- @@ -85,7 +137,7 @@ private: class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl { public: - wxDisplayImplX11(unsigned n, const XineramaScreenInfo& info) + wxDisplayImplX11(unsigned n, const ScreenInfo& info) : wxDisplayImpl(n), m_rect(info.x_org, info.y_org, info.width, info.height) { @@ -110,7 +162,7 @@ private: wxRect m_rect; int m_depth; - DECLARE_NO_COPY_CLASS(wxDisplayImplX11) + wxDECLARE_NO_COPY_CLASS(wxDisplayImplX11); }; class wxDisplayFactoryX11 : public wxDisplayFactory @@ -123,7 +175,7 @@ public: virtual int GetFromPoint(const wxPoint& pt); protected: - DECLARE_NO_COPY_CLASS(wxDisplayFactoryX11) + wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryX11); }; // ============================================================================ @@ -142,7 +194,7 @@ int wxDisplayFactoryX11::GetFromPoint(const wxPoint& p) const unsigned numscreens(screens.GetCount()); for ( unsigned i = 0; i < numscreens; ++i ) { - const XineramaScreenInfo& s = screens[i]; + const ScreenInfo& 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 ) { @@ -166,6 +218,8 @@ wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n) #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H +#include + // // See (http://www.xfree86.org/4.2.0/XF86VidModeDeleteModeLine.3.html) for more // info about xf86 video mode extensions @@ -252,9 +306,9 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode) for (int i = 0; i < nNumModes; ++i) { if (!bRet && - ppXModes[i]->hdisplay == mode.w && - ppXModes[i]->vdisplay == mode.h && - wxCRR((*ppXModes[i])) == mode.refresh) + ppXModes[i]->hdisplay == mode.GetWidth() && + ppXModes[i]->vdisplay == mode.GetHeight() && + wxCRR((*ppXModes[i])) == mode.GetRefresh()) { //switch! bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()), @@ -314,19 +368,20 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode)) /* static */ wxDisplayFactory *wxDisplay::CreateFactory() { - if ( XineramaIsActive((Display*)wxGetDisplay()) ) - { - return new wxDisplayFactoryX11; - } + // GTK+ screen functions are always available, no need to check for them +#ifndef __WXGTK20__ + if ( !XineramaIsActive((Display*)wxGetDisplay()) ) + return new wxDisplayFactorySingle; +#endif - return new wxDisplayFactorySingle; + return new wxDisplayFactoryX11; } #endif /* wxUSE_DISPLAY */ #include "wx/utils.h" -#if wxUSE_LIBHILDON +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 || !defined(GDK_WINDOWING_X11) void wxClientDisplayRect(int *x, int *y, int *width, int *height) { @@ -341,8 +396,11 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height) *height = 396; } -#else // !wxUSE_LIBHILDON +#else // !wxUSE_LIBHILDON || !wxUSE_LIBHILDON2 + +#include "wx/log.h" +#include #include // TODO: make this a full-fledged class and move to a public header @@ -355,7 +413,7 @@ public: private: void *m_ptr; - DECLARE_NO_COPY_CLASS(wxX11Ptr) + wxDECLARE_NO_COPY_CLASS(wxX11Ptr); }; // NB: this function is implemented using X11 and not GDK calls as it's shared @@ -363,7 +421,9 @@ private: 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") ); + wxCHECK_RET( dpy, wxT("can't be called before initializing the GUI") ); + + wxRect rectClient; const Atom atomWorkArea = XInternAtom(dpy, "_NET_WORKAREA", True); if ( atomWorkArea ) @@ -399,30 +459,47 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height) format != 32 || numItems != 4 ) { - wxLogDebug(_T("XGetWindowProperty(\"_NET_WORKAREA\") failed")); - return; + wxLogDebug(wxT("XGetWindowProperty(\"_NET_WORKAREA\") failed")); } + else + { + rectClient = wxRect(workareas[0], workareas[1], + workareas[2], workareas[3]); + } + } + } - if ( x ) - *x = workareas[0]; - if ( y ) - *y = workareas[1]; - if ( width ) - *width = workareas[2]; - if ( height ) - *height = workareas[3]; + // Although _NET_WORKAREA is supposed to return the client size of the + // screen, not all implementations are conforming, apparently, see #14419, + // so make sure we return a subset of the primary display. + wxRect rectFull; +#if wxUSE_DISPLAY + ScreensInfo screens; + const ScreenInfo& info = screens[0]; + rectFull = wxRect(info.x_org, info.y_org, info.width, info.height); +#else + wxDisplaySize(&rectFull.width, &rectFull.height); +#endif - return; - } + if ( !rectClient.width || !rectClient.height ) + { + // _NET_WORKAREA not available or didn't work, fall back to the total + // display size. + rectClient = rectFull; + } + else + { + rectClient = rectClient.Intersect(rectFull); } - // 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); + if ( x ) + *x = rectClient.x; + if ( y ) + *y = rectClient.y; + if ( width ) + *width = rectClient.width; + if ( height ) + *height = rectClient.height; } #endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON