mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

Linux: Added a check for _NET_WORKAREA property when iterating over the displays using xrandr

Browse source
This commit is contained in:
ed 2019-05-02 15:58:25 +01:00
parent 46a97e1f2c
commit 1c033e410b
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/juce_gui_basics/native/juce_linux_X11_Windowing.cpp
View file

@ -3435,6 +3435,18 @@ void Displays::findDisplays (float masterScale)
if (auto display = xDisplay.display)
{
Atom hints = Atoms::getIfExists (display, "_NET_WORKAREA");
auto getWorkAreaPropertyData = [&] (int screenNum) -> unsigned char*
{
GetXProperty prop (display, RootWindow (display, screenNum), hints, 0, 4, false, XA_CARDINAL);
if (prop.success && prop.actualType == XA_CARDINAL && prop.actualFormat == 32 && prop.numItems == 4)
return prop.data;
return nullptr;
};
#if JUCE_USE_XRANDR
{
int major_opcode, first_event, first_error;
@ -3448,6 +3460,9 @@ void Displays::findDisplays (float masterScale)
for (int i = 0; i < numMonitors; ++i)
{
if (getWorkAreaPropertyData (i) == nullptr)
continue;
if (auto* screens = xrandr.getScreenResources (display, RootWindow (display, i)))
{
for (int j = 0; j < screens->noutput; ++j)
@ -3535,20 +3550,14 @@ void Displays::findDisplays (float masterScale)
if (displays.isEmpty())
#endif
{
Atom hints = Atoms::getIfExists (display, "_NET_WORKAREA");
if (hints != None)
{
auto numMonitors = ScreenCount (display);
for (int i = 0; i < numMonitors; ++i)
{
GetXProperty prop (display, RootWindow (display, i), hints, 0, 4, false, XA_CARDINAL);
if (prop.success && prop.actualType == XA_CARDINAL && prop.actualFormat == 32 && prop.numItems == 4)
if (auto* position = (const long*) getWorkAreaPropertyData (i))
{
auto position = (const long*) prop.data;
Display d;
d.totalArea = Rectangle<int> ((int) position[0], (int) position[1],
(int) position[2], (int) position[3]);