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

Merge pull request #62543 from Rubonnek/x11-fullscreen

Browse source
This commit is contained in:
Rémi Verschelde 2022-06-30 11:58:05 +02:00 committed by GitHub
commit e681755cda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
platform/x11/os_x11.cpp
View file

@ -1814,6 +1814,49 @@ bool OS_X11::window_maximize_check(const char *p_atom_name) const {
return retval;
}
bool OS_X11::window_fullscreen_check() const {
// Using EWMH -- Extended Window Manager Hints
Atom property = XInternAtom(x11_display, "_NET_WM_STATE", False);
Atom type;
int format;
unsigned long len;
unsigned long remaining;
unsigned char *data = nullptr;
bool retval = false;
if (property == None) {
return retval;
}
int result = XGetWindowProperty(
x11_display,
x11_window,
property,
0,
1024,
False,
XA_ATOM,
&type,
&format,
&len,
&remaining,
&data);
if (result == Success) {
Atom *atoms = (Atom *)data;
Atom wm_fullscreen = XInternAtom(x11_display, "_NET_WM_STATE_FULLSCREEN", False);
for (uint64_t i = 0; i < len; i++) {
if (atoms[i] == wm_fullscreen) {
retval = true;
break;
}
}
XFree(data);
}
return retval;
}
bool OS_X11::is_window_maximize_allowed() const {
return window_maximize_check("_NET_WM_ALLOWED_ACTIONS");
}
@ -2663,6 +2706,7 @@ void OS_X11::process_xevents() {
switch (event.type) {
case Expose: {
DEBUG_LOG_X11("[%u] Expose window=%lu, count='%u' \n", frame, event.xexpose.window, event.xexpose.count);
current_videomode.fullscreen = window_fullscreen_check();
Main::force_redraw();
} break;

1
platform/x11/os_x11.h
View file

@ -247,6 +247,7 @@ protected:
void _window_changed(XEvent *event);
bool window_maximize_check(const char *p_atom_name) const;
bool window_fullscreen_check() const;
bool is_window_maximize_allowed() const;
public: