X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/816e36172a6958b95833a82cb39ccc472dab027f..6f026b5b63fe7ccb025e84509886f74772b9df13:/src/unix/displayx11.cpp?ds=sidebyside diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 08cf56f9f0..87dedfc530 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -1,161 +1,225 @@ /////////////////////////////////////////////////////////////////////////// -// 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) wxWindows team +// Copyright: (c) wxWidgets team // 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 -} +#ifdef __WXGTK20__ + #include + #include -class wxDisplayUnixPriv + // 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 storing information about all screens +// ---------------------------------------------------------------------------- + +// the base class provides access to ScreenInfo array, derived class +// initializes it using either GTK+ or Xinerama functions +class ScreensInfoBase { - public: - wxRect m_rect; - int m_depth; +public: + operator const ScreenInfo *() const { return m_screens; } + + unsigned GetCount() const { return static_cast(m_num); } + +protected: + ScreenInfo *m_screens; + int m_num; }; -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; - } -} +#ifdef __WXGTK20__ -int wxDisplayBase::GetFromPoint(const wxPoint &p) +class ScreensInfo : public ScreensInfoBase { - Display *disp = (Display*)wxGetDisplay(); +public: + ScreensInfo() + { + GdkScreen * const screen = gdk_screen_get_default(); - if ( XineramaIsActive(disp) ) - { - int which_screen = -1; - XineramaScreenInfo *screenarr; - int numscreens; - screenarr = XineramaQueryScreens(disp, &numscreens); + 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; + } + } - int i; - for (i = 0; i < numscreens; ++i) + ~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; - } + delete [] m_screens; } +}; + +#else // Xinerama - XFree(screenarr); - return which_screen; - } - else - { - wxSize size = wxGetDisplaySize(); - if (p.x >= 0 && - p.x < size.GetWidth() && - p.y >= 0 && - p.y < size.GetHeight()) +class ScreensInfo : public ScreensInfoBase +{ +public: + ScreensInfo() { - return 0; + m_screens = XineramaQueryScreens((Display *)wxGetDisplay(), &m_num); } - return -1; - } -} + ~ScreensInfo() + { + XFree(m_screens); + } +}; + +#endif // GTK+/Xinerama -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(unsigned n, const ScreenInfo& info) + : wxDisplayImpl(n), + m_rect(info.x_org, info.y_org, info.width, info.height) + { + } + + virtual wxRect GetGeometry() const { return m_rect; } + virtual wxRect GetClientArea() const + { + // 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; + } + + virtual wxString GetName() const { return wxString(); } + + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const; + virtual wxVideoMode GetCurrentMode() const; + virtual bool ChangeMode(const wxVideoMode& mode); -wxDisplay::~wxDisplay() +private: + wxRect m_rect; + int m_depth; + + wxDECLARE_NO_COPY_CLASS(wxDisplayImplX11); +}; + +class wxDisplayFactoryX11 : public wxDisplayFactory { - delete m_priv; -} +public: + wxDisplayFactoryX11() { } -wxRect wxDisplay::GetGeometry() const + virtual wxDisplayImpl *CreateDisplay(unsigned n); + virtual unsigned GetCount(); + virtual int GetFromPoint(const wxPoint& pt); + +protected: + wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryX11); +}; + +// ============================================================================ +// wxDisplayFactoryX11 implementation +// ============================================================================ + +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 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 ) + { + 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 +#include + // // See (http://www.xfree86.org/4.2.0/XF86VidModeDeleteModeLine.3.html) for more // info about xf86 video mode extensions @@ -164,13 +228,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 +268,7 @@ wxArrayVideoModes wxDisplay::GetModes(const wxVideoMode& mode) const return Modes; } -wxVideoMode wxDisplay::GetCurrentMode() const +wxVideoMode wxDisplayImplX11::GetCurrentMode() const { XF86VidModeModeLine VM; int nDotClock; @@ -214,84 +278,83 @@ 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) { - if (mode == wxDefaultVideoMode) + wxClearXVM((*ppXModes[i])); + // XFree(ppXModes[i]); //supposed to free? + } + } + else + { + for (int i = 0; i < nNumModes; ++i) + { + if (!bRet && + ppXModes[i]->hdisplay == mode.GetWidth() && + ppXModes[i]->vdisplay == mode.GetHeight() && + wxCRR((*ppXModes[i])) == mode.GetRefresh()) { + //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; - } - 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? + ppXModes[i]) == TRUE; } - 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& 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; @@ -299,4 +362,144 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode) #endif // !HAVE_X11_EXTENSIONS_XF86VMODE_H +// ============================================================================ +// wxDisplay::CreateFactory() +// ============================================================================ + +/* static */ wxDisplayFactory *wxDisplay::CreateFactory() +{ + // GTK+ screen functions are always available, no need to check for them +#ifndef __WXGTK20__ + if ( !XineramaIsActive((Display*)wxGetDisplay()) ) + return new wxDisplayFactorySingle; +#endif + + return new wxDisplayFactoryX11; +} + #endif /* wxUSE_DISPLAY */ + +#include "wx/utils.h" + +#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 || !defined(GDK_WINDOWING_X11) + +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 || !wxUSE_LIBHILDON2 + +#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; + + wxDECLARE_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, wxT("can't be called before initializing the GUI") ); + + wxRect rectClient; + + 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(wxT("XGetWindowProperty(\"_NET_WORKAREA\") failed")); + } + else + { + rectClient = wxRect(workareas[0], workareas[1], + workareas[2], 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 + + 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 ( x ) + *x = rectClient.x; + if ( y ) + *y = rectClient.y; + if ( width ) + *width = rectClient.width; + if ( height ) + *height = rectClient.height; +} + +#endif // wxUSE_LIBHILDON/!wxUSE_LIBHILDON