///////////////////////////////////////////////////////////////////////////
-// 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/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 <X11/Xlib.h>
- #include <X11/Xlibint.h>
- #include <X11/extensions/Xinerama.h>
- #include <X11/extensions/xf86vmode.h>
-}
-
-class wxDisplayUnixPriv
+extern "C"
{
- public:
- wxRect m_rect;
- int m_depth;
-};
+ #include <X11/Xlib.h>
+ #include <X11/Xlibint.h>
-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 <X11/extensions/Xinerama.h>
+ #ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
+ #include <X11/extensions/xf86vmode.h>
+ #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); }
-wxDisplay::wxDisplay(size_t index) : wxDisplayBase ( index ), m_priv( new wxDisplayUnixPriv )
+private:
+ XineramaScreenInfo *m_screens;
+ int m_num;
+};
+
+// ----------------------------------------------------------------------------
+// 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)
+ {
+ }
-wxDisplay::~wxDisplay()
+ virtual wxRect GetGeometry() const { return 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);
+
+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
+
//
// See (http://www.xfree86.org/4.2.0/XF86VidModeDeleteModeLine.3.html) for more
// info about xf86 video mode extensions
//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
}
else //OOPS!
{
- wxLogSysError("XF86VidModeGetAllModeLines Failed in wxX11Display::GetModes()!");
+ wxLogSysError(_("Failed to enumerate video modes"));
}
return Modes;
}
-wxVideoMode wxDisplay::GetCurrentMode() const
+wxVideoMode wxDisplayImplX11::GetCurrentMode() const
{
XF86VidModeModeLine VM;
int nDotClock;
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.w &&
+ ppXModes[i]->vdisplay == mode.h &&
+ wxCRR((*ppXModes[i])) == mode.refresh)
{
+ //switch!
bRet = XF86VidModeSwitchToMode((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
- ppXModes[0]) == TRUE;
+ ppXModes[i]) == TRUE;
+ }
+ wxClearXVM((*ppXModes[i]));
+ // XFree(ppXModes[i]); //supposed to free?
+ }
+ }
- for (int i = 0; i < nNumModes; ++i)
- {
- wxClearXVM((*ppXModes[i]));
- // XFree(ppXModes[i]); //supposed to free?
- }
- XFree(ppXModes);
+ 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?
- }
- XFree(ppXModes);
+ return bRet;
+}
- return bRet;
- }
- else //OOPS!
+
+#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
+
+wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
+{
+ int count_return;
+ int* depths = XListDepths((Display*)wxGetDisplay(), 0, &count_return);
+ wxArrayVideoModes modes;
+ if ( depths )
+ {
+ for ( int x = 0; x < count_return; ++x )
{
- wxLogSysError("XF86VidModeGetAllModeLines Failed in wxX11Display::ChangeMode()!");
- return false;
+ modes.Add(wxVideoMode(m_rect.GetWidth(), m_rect.GetHeight(), depths[x]));
}
+
+ XFree(depths);
}
- /*
- //Brian Victor's patch (X11 can't change bit depth yet), here for reference
- 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)
+ return modes;
+}
+
+wxVideoMode wxDisplayImplX11::GetCurrentMode() const
+{
+ // Not implemented
+ return wxVideoMode();
+}
+
+bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
+{
+ // Not implemented
+ return false;
+}
+
+#endif // !HAVE_X11_EXTENSIONS_XF86VMODE_H
+
+// ============================================================================
+// wxDisplay::CreateFactory()
+// ============================================================================
+
+/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
+{
+ if ( XineramaIsActive((Display*)wxGetDisplay()) )
{
- modes.Add(wxVideoMode(m_priv->m_rect.GetWidth(), m_priv->m_rect.GetHeight(), depths[x]));
+ return new wxDisplayFactoryX11;
}
- }
- return modes;
- */
+
+ return new wxDisplayFactorySingle;
}
#endif /* wxUSE_DISPLAY */
-
projects / wxWidgets.git / blobdiff