asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

[Linux/X11] Fallback to the X server root window to get screen rects, if Xinerama is not available.

Browse source
This commit is contained in:
bruvzg 2022-02-18 13:29:10 +02:00
parent 887d4bd0d9
commit 372e24265a
No known key found for this signature in database
GPG key ID: 7960FCF39844EC38
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
platform/linuxbsd/display_server_x11.cpp
View file

@ -661,17 +661,17 @@ void DisplayServerX11::_clipboard_transfer_ownership(Atom p_source, Window x11_w
int DisplayServerX11::get_screen_count() const { int DisplayServerX11::get_screen_count() const {
_THREAD_SAFE_METHOD_ _THREAD_SAFE_METHOD_
int count = 0;
// Using Xinerama Extension // Using Xinerama Extension
int event_base, error_base; int event_base, error_base;
const Bool ext_okay = XineramaQueryExtension(x11_display, &event_base, &error_base); if (XineramaQueryExtension(x11_display, &event_base, &error_base)) {
if (!ext_okay) { XineramaScreenInfo *xsi = XineramaQueryScreens(x11_display, &count);
return 0; XFree(xsi);
} else {
count = XScreenCount(x11_display);
} }
int count;
XineramaScreenInfo *xsi = XineramaQueryScreens(x11_display, &count);
XFree(xsi);
return count; return count;
} }
@ -703,6 +703,19 @@ Rect2i DisplayServerX11::_screen_get_rect(int p_screen) const {
if (xsi) { if (xsi) {
XFree(xsi); XFree(xsi);
} }
} else {
int count = XScreenCount(x11_display);
if (p_screen < count) {
Window root = XRootWindow(x11_display, p_screen);
XWindowAttributes xwa;
XGetWindowAttributes(x11_display, root, &xwa);
rect.position.x = xwa.x;
rect.position.y = xwa.y;
rect.size.width = xwa.width;
rect.size.height = xwa.height;
} else {
ERR_PRINT("Invalid screen index: " + itos(p_screen) + "(count: " + itos(count) + ").");
}
} }
return rect; return rect;