implement wxClientDisplayRect() using _NET_WORKAREA WM hint [backport of r49697 and r49700 from trunk]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -93,7 +93,7 @@ Major new features in 2.8 release
|
||||
|
||||
All:
|
||||
|
||||
- Fixed bug with default proxy destruction in wxURL (Axel Gembe)
|
||||
- Fixed bug with default proxy destruction in wxURL (Axel Gembe).
|
||||
|
||||
All (GUI):
|
||||
|
||||
@@ -113,6 +113,7 @@ wxGTK:
|
||||
- wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW) now returns the background
|
||||
colour of text controls.
|
||||
- wxFrame::ShowFullScreen now preserves the menubar's accelerators.
|
||||
- Implemented wxGetClientDisplayRect() correctly for wxGTK and X11-based ports.
|
||||
|
||||
wxMac:
|
||||
|
||||
|
@@ -149,17 +149,6 @@ void wxDisplaySizeMM( int *width, int *height )
|
||||
if (height) *height = gdk_screen_height_mm();
|
||||
}
|
||||
|
||||
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
|
||||
{
|
||||
// This is supposed to return desktop dimensions minus any window
|
||||
// manager panels, menus, taskbars, etc. If there is a way to do that
|
||||
// for this platform please fix this function, otherwise it defaults
|
||||
// to the entire desktop.
|
||||
if (x) *x = 0;
|
||||
if (y) *y = 0;
|
||||
wxDisplaySize(width, height);
|
||||
}
|
||||
|
||||
void wxGetMousePosition( int* x, int* y )
|
||||
{
|
||||
gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
|
||||
|
@@ -103,17 +103,6 @@ void wxDisplaySizeMM( int *width, int *height )
|
||||
if (height) *height = gdk_screen_height_mm();
|
||||
}
|
||||
|
||||
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
|
||||
{
|
||||
// This is supposed to return desktop dimensions minus any window
|
||||
// manager panels, menus, taskbars, etc. If there is a way to do that
|
||||
// for this platform please fix this function, otherwise it defaults
|
||||
// to the entire desktop.
|
||||
if (x) *x = 0;
|
||||
if (y) *y = 0;
|
||||
wxDisplaySize(width, height);
|
||||
}
|
||||
|
||||
void wxGetMousePosition( int* x, int* y )
|
||||
{
|
||||
gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
|
||||
|
@@ -557,18 +557,6 @@ void wxDisplaySizeMM(int *width, int *height)
|
||||
*height = DisplayHeightMM(dpy, DefaultScreen (dpy));
|
||||
}
|
||||
|
||||
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
|
||||
{
|
||||
// This is supposed to return desktop dimensions minus any window
|
||||
// manager panels, menus, taskbars, etc. If there is a way to do that
|
||||
// for this platform please fix this function, otherwise it defaults
|
||||
// to the entire desktop.
|
||||
if (x) *x = 0;
|
||||
if (y) *y = 0;
|
||||
wxDisplaySize(width, height);
|
||||
}
|
||||
|
||||
|
||||
// Configurable display in wxX11 and wxMotif
|
||||
static WXDisplay *gs_currentDisplay = NULL;
|
||||
static wxString gs_displayName;
|
||||
|
@@ -92,6 +92,14 @@ public:
|
||||
}
|
||||
|
||||
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;
|
||||
@@ -315,3 +323,102 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
|
||||
}
|
||||
|
||||
#endif /* wxUSE_DISPLAY */
|
||||
|
||||
#if defined(__WXGTK__) || defined(__X__)
|
||||
|
||||
#include "wx/utils.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;
|
||||
|
||||
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 = (Display *)wxGetDisplay();
|
||||
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);
|
||||
}
|
||||
|
||||
#else // !(wxGTK or X)
|
||||
|
||||
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
|
||||
{
|
||||
if (x)
|
||||
*x = 0;
|
||||
if (y)
|
||||
*y = 0;
|
||||
wxDisplaySize(width, height);
|
||||
}
|
||||
|
||||
#endif // wxGTK or X
|
||||
|
@@ -229,17 +229,6 @@ void wxDisplaySizeMM(int *width, int *height)
|
||||
*height = DisplayHeightMM(dpy, DefaultScreen (dpy));
|
||||
}
|
||||
|
||||
void wxClientDisplayRect(int *x, int *y, int *width, int *height)
|
||||
{
|
||||
// This is supposed to return desktop dimensions minus any window
|
||||
// manager panels, menus, taskbars, etc. If there is a way to do that
|
||||
// for this platform please fix this function, otherwise it defaults
|
||||
// to the entire desktop.
|
||||
if (x) *x = 0;
|
||||
if (y) *y = 0;
|
||||
wxDisplaySize(width, height);
|
||||
}
|
||||
|
||||
wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
|
||||
{
|
||||
return wxGenericFindWindowAtPoint(pt);
|
||||
|
Reference in New Issue
Block a user