From f1dc00e380439078c93d00af2f85d138a9400b2e Mon Sep 17 00:00:00 2001
From: hurikhan <m4r10.5ch14ck@gmail.com>
Date: Sat, 17 Jan 2015 19:43:12 +0900
Subject: [PATCH] * cleanup window state handling * first attemps in handling
 ALT+TABa (WIP)

---
 demos/misc/window_management/control.gd       |  28 ++++----
 .../window_management/window_management.scn   | Bin 4111 -> 4052 bytes
 platform/x11/os_x11.cpp                       |  62 +++++++++---------
 3 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/demos/misc/window_management/control.gd b/demos/misc/window_management/control.gd
index fd746cf036f..4929b1376cb 100644
--- a/demos/misc/window_management/control.gd
+++ b/demos/misc/window_management/control.gd
@@ -25,9 +25,9 @@ func _fixed_process(delta):
 	
 	get_node("Label_Size").set_text(str("Size:\n", OS.get_window_size() ) )
 	
-	get_node("Label_Screen_Count").set_text( str("Screens:\n", OS.get_screen_count() ) )
+	get_node("Label_Screen_Count").set_text( str("Screen_Count:\n", OS.get_screen_count() ) )
 	
-	get_node("Label_Screen_Current").set_text( str("Current:\n", OS.get_screen() ) )
+	get_node("Label_Screen_Current").set_text( str("Screen:\n", OS.get_screen() ) )
 	
 	get_node("Label_Screen0_Resolution").set_text( str("Screen0 Resolution:\n", OS.get_screen_size() ) )
 	
@@ -35,12 +35,14 @@ func _fixed_process(delta):
 	
 	
 	if(OS.get_screen_count() > 1):
+		get_node("Button_Screen0").show()
 		get_node("Button_Screen1").show()
 		get_node("Label_Screen1_Resolution").show()
 		get_node("Label_Screen1_Position").show()
 		get_node("Label_Screen1_Resolution").set_text( str("Screen1 Resolution:\n", OS.get_screen_size(1) ) )
 		get_node("Label_Screen1_Position").set_text( str("Screen1 Position:\n", OS.get_screen_position(1) ) )
 	else:
+		get_node("Button_Screen0").hide()
 		get_node("Button_Screen1").hide()
 		get_node("Label_Screen1_Resolution").hide()
 		get_node("Label_Screen1_Position").hide()
@@ -57,21 +59,16 @@ func _fixed_process(delta):
 	if( Input.is_action_pressed("ui_down")):
 		OS.set_fullscreen(false)
 		
+	get_node("Button_Fullscreen").set_pressed( OS.is_fullscreen() )
 	get_node("Button_FixedSize").set_pressed( !OS.is_resizable() )
 	get_node("Button_Minimized").set_pressed( OS.is_minimized() )
 	get_node("Button_Maximized").set_pressed( OS.is_maximized() )
-	
+
+
 func _ready():
 	set_fixed_process(true)
 
 
-func _on_Fullscreen_toggled( pressed ):
-	if(pressed):
-		OS.set_fullscreen(true)
-	else:
-		OS.set_fullscreen(false)
-
-
 func _on_Button_MoveTo_pressed():
 	OS.set_window_position( Vector2(100,100) )
 
@@ -88,12 +85,18 @@ func _on_Button_Screen1_pressed():
 	OS.set_screen(1)
 
 
+func _on_Button_Fullscreen_pressed():
+	if(OS.is_fullscreen()):
+		OS.set_fullscreen(false)
+	else:
+		OS.set_fullscreen(true)
+
+
 func _on_Button_FixedSize_pressed():
 	if(OS.is_resizable()):
 		OS.set_resizable(false)
 	else:
 		OS.set_resizable(true)
-		
 
 
 func _on_Button_Minimized_pressed():
@@ -108,3 +111,6 @@ func _on_Button_Maximized_pressed():
 		OS.set_maximized(false)
 	else:
 		OS.set_maximized(true)
+
+
+
diff --git a/demos/misc/window_management/window_management.scn b/demos/misc/window_management/window_management.scn
index 635f6f6f28ba59ae2a8af372b4d8e9d43f5e397d..3d62d4ecc14d44d7cc6d425432a75a4460d991a4 100644
GIT binary patch
delta 2212
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
C0H$F8

delta 2291
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
R$)w-)`qSFhD(QbZ{{nadx5@wj

diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index fd2470a37ab..d4328d9da35 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -229,7 +229,7 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 		window_data.position.y = 0;
 		window_data.size.width = 800;
 		window_data.size.height = 600;
-		set_wm_border(false);
+		//set_wm_border(false);
 		set_wm_fullscreen(true);
 #endif
 	}
@@ -574,7 +574,7 @@ void OS_X11::set_wm_fullscreen(bool p_enabled) {
 	xev.xclient.data.l[1] = wm_fullscreen;
 	xev.xclient.data.l[2] = 0;
 
-	XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureNotifyMask, &xev);
+	XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);
 }
 
 int OS_X11::get_screen_count() const {
@@ -661,10 +661,6 @@ Point2 OS_X11::get_window_position() const {
 }
 
 void OS_X11::set_window_position(const Point2& p_position) {
-
-	if( current_videomode.fullscreen )
-		return;
-
 	// Using EWMH -- Extended Window Manager Hints
 	// to get the size of the decoration 
 	Atom property = XInternAtom(x11_display,"_NET_FRAME_EXTENTS", True);
@@ -712,14 +708,12 @@ Size2 OS_X11::get_window_size() const {
 }
 
 void OS_X11::set_window_size(const Size2 p_size) {
-	if( current_videomode.fullscreen )
-		return;
-
 	XResizeWindow(x11_display, x11_window, p_size.x, p_size.y);
 }
 
 void OS_X11::set_fullscreen(bool p_enabled) {
 
+#if 0
 	if(p_enabled && current_videomode.fullscreen)
 		return;
 
@@ -750,6 +744,9 @@ void OS_X11::set_fullscreen(bool p_enabled) {
 
 		current_videomode.fullscreen = False;
 	}
+#endif
+	set_wm_fullscreen(p_enabled);
+	current_videomode.fullscreen = p_enabled;
 
 	visual_server->init();
 
@@ -760,23 +757,20 @@ bool OS_X11::is_fullscreen() const {
 }
 
 void OS_X11::set_resizable(bool p_enabled) {
-
-	if(!current_videomode.fullscreen) {
-		XSizeHints *xsh;
-		xsh = XAllocSizeHints();
-		xsh->flags = p_enabled ? 0L : PMinSize | PMaxSize;
-		if(!p_enabled) {
-			XWindowAttributes xwa;
-			XGetWindowAttributes(x11_display,x11_window,&xwa);
-			xsh->min_width = xwa.width; 
-			xsh->max_width = xwa.width;
-			xsh->min_height = xwa.height;
-			xsh->max_height = xwa.height;
-		}
-		XSetWMNormalHints(x11_display, x11_window, xsh);
-		XFree(xsh);
-		current_videomode.resizable = p_enabled;
+	XSizeHints *xsh;
+	xsh = XAllocSizeHints();
+	xsh->flags = p_enabled ? 0L : PMinSize | PMaxSize;
+	if(!p_enabled) {
+		XWindowAttributes xwa;
+		XGetWindowAttributes(x11_display,x11_window,&xwa);
+		xsh->min_width = xwa.width; 
+		xsh->max_width = xwa.width;
+		xsh->min_height = xwa.height;
+		xsh->max_height = xwa.height;
 	}
+	XSetWMNormalHints(x11_display, x11_window, xsh);
+	XFree(xsh);
+	current_videomode.resizable = p_enabled;
 }
 
 bool OS_X11::is_resizable() const {
@@ -784,10 +778,6 @@ bool OS_X11::is_resizable() const {
 }
 
 void OS_X11::set_minimized(bool p_enabled) {
-
-	if( is_fullscreen() )
-		set_fullscreen(false);
-
         // Using ICCCM -- Inter-Client Communication Conventions Manual
         XEvent xev;
         Atom wm_change = XInternAtom(x11_display, "WM_CHANGE_STATE", False);
@@ -799,7 +789,7 @@ void OS_X11::set_minimized(bool p_enabled) {
         xev.xclient.format = 32;
         xev.xclient.data.l[0] = p_enabled ? WM_IconicState : WM_NormalState;
 
-        XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureNotifyMask, &xev);
+        XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);
 	
         //XEvent xev;
 	Atom wm_state     =  XInternAtom(x11_display, "_NET_WM_STATE", False);
@@ -1152,13 +1142,16 @@ void OS_X11::process_xevents() {
 			break;
 
 		case VisibilityNotify: {
-
 			XVisibilityEvent * visibility = (XVisibilityEvent *)&event;
 			minimized = (visibility->state == VisibilityFullyObscured);
-
 		} break;
 
 		case FocusIn:
+			if(current_videomode.fullscreen) {
+				set_minimized(false);
+				set_wm_fullscreen(true);
+				visual_server->init();
+			}
 			main_loop->notification(MainLoop::NOTIFICATION_WM_FOCUS_IN);
 			if (mouse_mode==MOUSE_MODE_CAPTURED) {
 				XGrabPointer(x11_display, x11_window, True,
@@ -1169,6 +1162,11 @@ void OS_X11::process_xevents() {
 			break;
 
 		case FocusOut:
+			if(current_videomode.fullscreen) {
+				set_wm_fullscreen(false);
+				set_minimized(true);
+				visual_server->init();
+			}
 			main_loop->notification(MainLoop::NOTIFICATION_WM_FOCUS_OUT);
 			if (mouse_mode==MOUSE_MODE_CAPTURED) {
 				//dear X11, I try, I really try, but you never work, you do whathever you want.