dee05929ba
Under Unix we could return client display rectangle that was bigger than the entire display size as it corresponded to the total screen size when _NET_WORKAREA was not supported or was not correctly implemented by the WM. Fix this by explicitly intersecting the client rect with the total one. Closes #14419. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
507 lines
14 KiB
C++
507 lines
14 KiB
C++
///////////////////////////////////////////////////////////////////////////
|
|
// Name: src/unix/displayx11.cpp
|
|
// Purpose: Unix/X11 implementation of wxDisplay class
|
|
// Author: Brian Victor, Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 12/05/02
|
|
// RCS-ID: $Id$
|
|
// Copyright: (c) wxWidgets team
|
|
// Licence: wxWindows licence
|
|
/////////////////////////////////////////////////////////////////////////////
|
|
|
|
// ============================================================================
|
|
// declarations
|
|
// ============================================================================
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// headers
|
|
// ----------------------------------------------------------------------------
|
|
|
|
// For compilers that support precompilation, includes "wx.h".
|
|
#include "wx/wxprec.h"
|
|
|
|
#ifdef __BORLANDC__
|
|
#pragma hdrstop
|
|
#endif
|
|
|
|
#if wxUSE_DISPLAY
|
|
|
|
#include "wx/display.h"
|
|
|
|
#ifndef WX_PRECOMP
|
|
#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 */
|
|
|
|
#include "wx/display_impl.h"
|
|
|
|
#ifdef __WXGTK20__
|
|
#include <gdk/gdk.h>
|
|
#include <gdk/gdkx.h>
|
|
|
|
// 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 <X11/Xlib.h>
|
|
#include <X11/Xlibint.h>
|
|
|
|
#include <X11/extensions/Xinerama.h>
|
|
}
|
|
|
|
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:
|
|
operator const ScreenInfo *() const { return m_screens; }
|
|
|
|
unsigned GetCount() const { return static_cast<unsigned>(m_num); }
|
|
|
|
protected:
|
|
ScreenInfo *m_screens;
|
|
int m_num;
|
|
};
|
|
|
|
#ifdef __WXGTK20__
|
|
|
|
class ScreensInfo : public ScreensInfoBase
|
|
{
|
|
public:
|
|
ScreensInfo()
|
|
{
|
|
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()
|
|
{
|
|
delete [] m_screens;
|
|
}
|
|
};
|
|
|
|
#else // Xinerama
|
|
|
|
class ScreensInfo : public ScreensInfoBase
|
|
{
|
|
public:
|
|
ScreensInfo()
|
|
{
|
|
m_screens = XineramaQueryScreens((Display *)wxGetDisplay(), &m_num);
|
|
}
|
|
|
|
~ScreensInfo()
|
|
{
|
|
XFree(m_screens);
|
|
}
|
|
};
|
|
|
|
#endif // GTK+/Xinerama
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// display and display factory classes
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLEXPORT wxDisplayImplX11 : public wxDisplayImpl
|
|
{
|
|
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);
|
|
|
|
private:
|
|
wxRect m_rect;
|
|
int m_depth;
|
|
|
|
wxDECLARE_NO_COPY_CLASS(wxDisplayImplX11);
|
|
};
|
|
|
|
class wxDisplayFactoryX11 : public wxDisplayFactory
|
|
{
|
|
public:
|
|
wxDisplayFactoryX11() { }
|
|
|
|
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 ScreensInfo().GetCount();
|
|
}
|
|
|
|
int wxDisplayFactoryX11::GetFromPoint(const wxPoint& p)
|
|
{
|
|
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;
|
|
}
|
|
|
|
wxDisplayImpl *wxDisplayFactoryX11::CreateDisplay(unsigned n)
|
|
{
|
|
ScreensInfo screens;
|
|
|
|
return n < screens.GetCount() ? new wxDisplayImplX11(n, screens[n]) : NULL;
|
|
}
|
|
|
|
// ============================================================================
|
|
// wxDisplayImplX11 implementation
|
|
// ============================================================================
|
|
|
|
#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
|
|
|
|
#include <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
|
|
#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 wxDisplayImplX11::GetModes(const wxVideoMode& mode) const
|
|
{
|
|
//Convenience...
|
|
Display* pDisplay = (Display*) wxGetDisplay(); //default display
|
|
int nScreen = DefaultScreen(pDisplay); //default screen of (default) display...
|
|
|
|
//Some variables..
|
|
XF86VidModeModeInfo** ppXModes; //Enumerated Modes (Don't forget XFree() :))
|
|
int nNumModes; //Number of modes enumerated....
|
|
|
|
wxArrayVideoModes Modes; //modes to return...
|
|
|
|
if (XF86VidModeGetAllModeLines(pDisplay, nScreen, &nNumModes, &ppXModes) == TRUE)
|
|
{
|
|
for (int i = 0; i < nNumModes; ++i)
|
|
{
|
|
if (mode == wxDefaultVideoMode || //According to display.h All modes valid if dafault mode...
|
|
mode.Matches(wxCVM((*ppXModes[i]))) ) //...?
|
|
{
|
|
Modes.Add(wxCVM((*ppXModes[i])));
|
|
}
|
|
wxClearXVM((*ppXModes[i]));
|
|
// XFree(ppXModes[i]); //supposed to free?
|
|
}
|
|
XFree(ppXModes);
|
|
}
|
|
else //OOPS!
|
|
{
|
|
wxLogSysError(_("Failed to enumerate video modes"));
|
|
}
|
|
|
|
return Modes;
|
|
}
|
|
|
|
wxVideoMode wxDisplayImplX11::GetCurrentMode() const
|
|
{
|
|
XF86VidModeModeLine VM;
|
|
int nDotClock;
|
|
XF86VidModeGetModeLine((Display*)wxGetDisplay(), DefaultScreen((Display*)wxGetDisplay()),
|
|
&nDotClock, &VM);
|
|
wxClearXVM(VM);
|
|
return wxCVM2(VM, nDotClock);
|
|
}
|
|
|
|
bool wxDisplayImplX11::ChangeMode(const wxVideoMode& mode)
|
|
{
|
|
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)
|
|
{
|
|
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?
|
|
}
|
|
}
|
|
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[i]) == TRUE;
|
|
}
|
|
wxClearXVM((*ppXModes[i]));
|
|
// XFree(ppXModes[i]); //supposed to free?
|
|
}
|
|
}
|
|
|
|
XFree(ppXModes);
|
|
|
|
return bRet;
|
|
}
|
|
|
|
|
|
#else // !HAVE_X11_EXTENSIONS_XF86VMODE_H
|
|
|
|
wxArrayVideoModes wxDisplayImplX11::GetModes(const wxVideoMode& modeMatch) const
|
|
{
|
|
int count_return;
|
|
int* depths = XListDepths((Display*)wxGetDisplay(), 0, &count_return);
|
|
wxArrayVideoModes modes;
|
|
if ( depths )
|
|
{
|
|
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;
|
|
}
|
|
|
|
wxVideoMode wxDisplayImplX11::GetCurrentMode() const
|
|
{
|
|
// Not implemented
|
|
return wxVideoMode();
|
|
}
|
|
|
|
bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
|
|
{
|
|
// Not implemented
|
|
return false;
|
|
}
|
|
|
|
#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 <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") );
|
|
|
|
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
|