#include "wx/wxprec.h"
#ifdef __BORLANDC__
- #pragma hdrstop
+ #pragma hdrstop
#endif
+#if wxUSE_DISPLAY
+
#include "wx/display.h"
-#include "wx/display_impl.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. */
operator const XineramaScreenInfo *() const { return m_screens; }
- size_t GetCount() const { return wx_static_cast(size_t, m_num); }
+ unsigned GetCount() const { return static_cast<unsigned>(m_num); }
private:
XineramaScreenInfo *m_screens;
class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl
{
public:
- wxDisplayImplX11(size_t n, const XineramaScreenInfo& info)
+ wxDisplayImplX11(unsigned 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 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;
wxRect m_rect;
int m_depth;
- DECLARE_NO_COPY_CLASS(wxDisplayImplX11)
+ wxDECLARE_NO_COPY_CLASS(wxDisplayImplX11);
};
class wxDisplayFactoryX11 : public wxDisplayFactory
{
public:
- wxDisplayFactoryX11();
+ wxDisplayFactoryX11() { }
- virtual wxDisplayImpl *CreateDisplay(size_t n);
- virtual size_t GetCount();
+ virtual wxDisplayImpl *CreateDisplay(unsigned n);
+ virtual unsigned GetCount();
virtual int GetFromPoint(const wxPoint& pt);
protected:
- DECLARE_NO_COPY_CLASS(wxDisplayFactoryX11)
+ wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryX11);
};
// ============================================================================
// wxDisplayFactoryX11 implementation
// ============================================================================
-size_t wxDisplayFactoryX11::GetCount()
+unsigned wxDisplayFactoryX11::GetCount()
{
return ScreensInfo().GetCount();
}
{
ScreensInfo screens;
- const size_t numscreens(screens.GetCount());
- for ( size_t i = 0; i < numscreens; ++i )
+ 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 &&
return wxNOT_FOUND;
}
-wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(size_t n)
+wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n)
{
ScreensInfo screens;
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()),
#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
-wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
+wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const
{
int count_return;
int* depths = XListDepths((Display*)wxGetDisplay(), 0, &count_return);
{
for ( int x = 0; x < count_return; ++x )
{
- modes.Add(wxVideoMode(m_rect.GetWidth(), m_rect.GetHeight(), depths[x]));
+ wxVideoMode mode(m_rect.GetWidth(), m_rect.GetHeight(), depths[x]);
+ if ( mode.Matches(modeMatch) )
+ {
+ modes.Add(modeMatch);
+ }
}
XFree(depths);
return wxVideoMode();
}
-bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
+bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
{
// Not implemented
return false;
}
#endif /* wxUSE_DISPLAY */
+
+#include "wx/utils.h"
+
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+
+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 <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+// 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") );
+
+ 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"));
+ 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
projects / wxWidgets.git / blobdiff