godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make fullscreen-switching is working with LXDE/Openbox

Browse Source
This commit is contained in:
hurikhan 2015-01-10 21:50:31 +08:00
parent 0d2ec19082
commit 5d9de48d8d
2 changed files with 46 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
platform/x11/os_x11.cpp
View File

@ -182,33 +182,8 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
// borderless fullscreen window mode // borderless fullscreen window mode
if (current_videomode.fullscreen) { if (current_videomode.fullscreen) {
// needed for lxde/openbox, possibly others set_wm_border(false);
Hints hints; set_wm_fullscreen(true);
Atom property;
hints.flags = 2;
hints.decorations = 0;
property = XInternAtom(x11_display, "_MOTIF_WM_HINTS", True);
XChangeProperty(x11_display, x11_window, property, property, 32, PropModeReplace, (unsigned char *)&hints, 5);
XMapRaised(x11_display, x11_window);
XWindowAttributes xwa;
XGetWindowAttributes(x11_display, DefaultRootWindow(x11_display), &xwa);
XMoveResizeWindow(x11_display, x11_window, 0, 0, xwa.width, xwa.height);
// code for netwm-compliants
XEvent xev;
Atom wm_state = XInternAtom(x11_display, "_NET_WM_STATE", False);
Atom fullscreen = XInternAtom(x11_display, "_NET_WM_STATE_FULLSCREEN", False);
memset(&xev, 0, sizeof(xev));
xev.type = ClientMessage;
xev.xclient.window = x11_window;
xev.xclient.message_type = wm_state;
xev.xclient.format = 32;
xev.xclient.data.l[0] = 1;
xev.xclient.data.l[1] = fullscreen;
xev.xclient.data.l[2] = 0;
XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureNotifyMask, &xev);
} }
// disable resizeable window // disable resizeable window
@ -521,34 +496,19 @@ void OS_X11::get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen) cons
} }
void OS_X11::set_fullscreen(bool p_enabled,int p_screen) { void OS_X11::set_wm_border(bool p_enabled) {
long wm_action;
if(p_enabled) {
current_videomode.fullscreen = True;
wm_action = 1;
} else {
current_videomode.fullscreen = False;
wm_action = 0;
}
/*
// MSC: Disabled until I can test it with lxde
//
// needed for lxde/openbox, possibly others // needed for lxde/openbox, possibly others
Hints hints; Hints hints;
Atom property; Atom property;
hints.flags = 2; hints.flags = 2;
hints.decorations = 0; hints.decorations = p_enabled ? 1L : 0L;;
property = XInternAtom(x11_display, "_MOTIF_WM_HINTS", True); property = XInternAtom(x11_display, "_MOTIF_WM_HINTS", True);
XChangeProperty(x11_display, x11_window, property, property, 32, PropModeReplace, (unsigned char *)&hints, 5); XChangeProperty(x11_display, x11_window, property, property, 32, PropModeReplace, (unsigned char *)&hints, 5);
XMapRaised(x11_display, x11_window); XMapRaised(x11_display, x11_window);
XWindowAttributes xwa; XMoveResizeWindow(x11_display, x11_window, 0, 0, current_videomode.width, current_videomode.height);
XGetWindowAttributes(x11_display, DefaultRootWindow(x11_display), &xwa); }
XMoveResizeWindow(x11_display, x11_window, 0, 0, xwa.width, xwa.height);
*/
void OS_X11::set_wm_fullscreen(bool p_enabled) {
// code for netwm-compliants // code for netwm-compliants
XEvent xev; XEvent xev;
Atom wm_state = XInternAtom(x11_display, "_NET_WM_STATE", False); Atom wm_state = XInternAtom(x11_display, "_NET_WM_STATE", False);
@ -559,11 +519,45 @@ void OS_X11::set_fullscreen(bool p_enabled,int p_screen) {
xev.xclient.window = x11_window; xev.xclient.window = x11_window;
xev.xclient.message_type = wm_state; xev.xclient.message_type = wm_state;
xev.xclient.format = 32; xev.xclient.format = 32;
xev.xclient.data.l[0] = wm_action; xev.xclient.data.l[0] = p_enabled ? 1L : 0L;
xev.xclient.data.l[1] = wm_fullscreen; xev.xclient.data.l[1] = wm_fullscreen;
xev.xclient.data.l[2] = 0; xev.xclient.data.l[2] = 0;
XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureNotifyMask, &xev); XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureNotifyMask, &xev);
}
void OS_X11::set_fullscreen(bool p_enabled,int p_screen) {
long wm_action;
long wm_decoration;
if(p_enabled) {
wm_action = 1L;
wm_decoration = 0L; // Removes all decorations
pre_videomode = current_videomode;
// Get Desktop resolutuion
XWindowAttributes xwa;
XGetWindowAttributes(x11_display, DefaultRootWindow(x11_display), &xwa);
current_videomode.fullscreen = True;
current_videomode.width = xwa.width;
current_videomode.height = xwa.height;
set_wm_border(false);
set_wm_fullscreen(true);
} else {
wm_action = 0L;
wm_decoration = 1L; // MWM_DECORE_ALL (1L << 0)
current_videomode.fullscreen = False;
current_videomode.width = pre_videomode.width;
current_videomode.height = pre_videomode.height;
set_wm_fullscreen(false);
set_wm_border(true);
}
visual_server->init(); visual_server->init();
} }

4
platform/x11/os_x11.h
View File

@ -73,6 +73,7 @@ class OS_X11 : public OS_Unix {
Rasterizer *rasterizer; Rasterizer *rasterizer;
VisualServer *visual_server; VisualServer *visual_server;
VideoMode current_videomode; VideoMode current_videomode;
VideoMode pre_videomode;
List<String> args; List<String> args;
Window x11_window; Window x11_window;
MainLoop *main_loop; MainLoop *main_loop;
@ -159,6 +160,8 @@ class OS_X11 : public OS_Unix {
int joystick_count; int joystick_count;
Joystick joysticks[JOYSTICKS_MAX]; Joystick joysticks[JOYSTICKS_MAX];
void set_wm_border(bool p_enabled);
void set_wm_fullscreen(bool p_enabled);
protected: protected:
@ -178,6 +181,7 @@ protected:
void process_joysticks(); void process_joysticks();
void close_joystick(int p_id = -1); void close_joystick(int p_id = -1);
public: public:
virtual String get_name(); virtual String get_name();