From d269344bbd19d9653fff3c2a230261b8fa00d7f6 Mon Sep 17 00:00:00 2001
From: hurikhan <m4r10.5ch14ck@gmail.com>
Date: Thu, 15 Jan 2015 22:50:23 +0900
Subject: [PATCH] WIP -- set_resizable() + is_resizable added

---
 core/bind/core_bind.cpp                       |  11 +++-
 core/bind/core_bind.h                         |   2 +
 core/os/os.h                                  |   2 +
 demos/misc/window_management/control.gd       |  28 ++++++++-
 .../window_management/window_management.scn   | Bin 3787 -> 3897 bytes
 platform/x11/os_x11.cpp                       |  57 +++++++++++++-----
 platform/x11/os_x11.h                         |   9 ++-
 7 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index 48cd43ccdc..1fb6f96e71 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -220,6 +220,14 @@ void _OS::set_fullscreen(bool p_enabled) {
 bool _OS::is_fullscreen() const {
 	return OS::get_singleton()->is_fullscreen();
 }
+
+void _OS::set_resizable(bool p_enabled) {
+	OS::get_singleton()->set_resizable(p_enabled);
+}
+
+bool _OS::is_resizable() const {
+	return OS::get_singleton()->is_resizable();
+}
 #endif
 
 void _OS::set_use_file_access_save_and_swap(bool p_enable) {
@@ -232,7 +240,6 @@ bool _OS::is_video_mode_resizable(int p_screen) const {
 	OS::VideoMode vm;
 	vm = OS::get_singleton()->get_video_mode(p_screen);
 	return vm.resizable;
-
 }
 
 Array _OS::get_fullscreen_mode_list(int p_screen) const {
@@ -690,6 +697,8 @@ void _OS::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_window_size"),&_OS::set_window_size);
 	ObjectTypeDB::bind_method(_MD("set_fullscreen","enabled"),&_OS::set_fullscreen);
 	ObjectTypeDB::bind_method(_MD("is_fullscreen"),&_OS::is_fullscreen);
+	ObjectTypeDB::bind_method(_MD("set_resizable","enabled"),&_OS::set_resizable);
+	ObjectTypeDB::bind_method(_MD("is_resizable"),&_OS::is_resizable);	
 #endif
 
 	ObjectTypeDB::bind_method(_MD("set_iterations_per_second","iterations_per_second"),&_OS::set_iterations_per_second);
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index 99ecb765c7..7ffd7e9e7c 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -120,6 +120,8 @@ public:
 	virtual void set_window_size(const Size2& p_size);
 	void set_fullscreen(bool p_enabled);
 	bool is_fullscreen() const;
+	void set_resizable(bool p_enabled);
+	bool is_resizable() const;
 #endif
 
 	Error native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track);
diff --git a/core/os/os.h b/core/os/os.h
index 2d4e937974..f1a9de1edf 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -162,6 +162,8 @@ public:
 	virtual void set_window_size(const Size2 p_size)=0;
 	virtual void set_fullscreen(bool p_enabled)=0;
 	virtual bool is_fullscreen() const=0;
+	virtual void set_resizable(bool p_enabled)=0;
+	virtual bool is_resizable() const=0;
 #endif	
 
 	virtual void set_iterations_per_second(int p_ips);
diff --git a/demos/misc/window_management/control.gd b/demos/misc/window_management/control.gd
index ce17db6b00..c867bd21db 100644
--- a/demos/misc/window_management/control.gd
+++ b/demos/misc/window_management/control.gd
@@ -2,10 +2,18 @@
 extends Control
 
 func _fixed_process(delta):
+
+	var modetext = "Mode:\n"
+	
 	if(OS.is_fullscreen()):
-		get_node("Label_Fullscreen").set_text("Mode:\nFullscreen")
+		modetext += "Fullscreen\n"
 	else:
-		get_node("Label_Fullscreen").set_text("Mode:\nWindowed")
+		modetext += "Windowed\n"
+		
+	if(!OS.is_resizable()):
+		modetext += "FixedSize\n"
+	
+	get_node("Label_Mode").set_text(modetext)
 	
 	get_node("Label_Position").set_text( str("Position:\n", OS.get_window_position() ) )
 	
@@ -19,6 +27,7 @@ func _fixed_process(delta):
 	
 	get_node("Label_Screen0_Position").set_text(str("Screen0 Position:\n",OS.get_screen_position()))
 	
+	
 	if(OS.get_screen_count() > 1):
 		get_node("Button_Screen1").show()
 		get_node("Label_Screen1_Resolution").show()
@@ -42,6 +51,9 @@ func _fixed_process(delta):
 	if( Input.is_action_pressed("ui_down")):
 		OS.set_fullscreen(false)
 		
+	get_node("Button_FixedSize").set_pressed( !OS.is_resizable() )
+
+
 func _ready():
 	set_fixed_process(true)
 
@@ -67,3 +79,15 @@ func _on_Button_Screen0_pressed():
 
 func _on_Button_Screen1_pressed():
 	OS.set_screen(1)
+
+
+
+
+
+func _on_Button_FixedSize_pressed():
+	if(OS.is_resizable()):
+		OS.set_resizable(false)
+	else:
+		OS.set_resizable(true)
+		
+
diff --git a/demos/misc/window_management/window_management.scn b/demos/misc/window_management/window_management.scn
index 9d55174dcec9ff01ca27f20c4461a89722a12c69..befc177b5e09d4c07cc3657e1cc5da662998c3d3 100644
GIT binary patch
delta 2588
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

delta 2499
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

diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index d395e99210..f33c2556ba 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -223,7 +223,7 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 #endif
 	}
 
-	// disable resizeable window
+	// disable resizable window
 	if (!current_videomode.resizable) {
 		XSizeHints *xsh;
 		xsh = XAllocSizeHints();
@@ -239,7 +239,9 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 		xsh->min_height = xwa.height;
 		xsh->max_height = xwa.height;
 		XSetWMNormalHints(x11_display, x11_window, xsh);
+		XFree(xsh);
 	}
+	current_videomode.resizable;
 
 	AudioDriverManagerSW::get_driver(p_audio_driver)->set_singleton();
 
@@ -277,19 +279,19 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi
 
 	XChangeWindowAttributes(x11_display, x11_window,CWEventMask,&new_attr);
 	
-    XClassHint* classHint;
+	XClassHint* classHint;
 
-    /* set the titlebar name */
-    XStoreName(x11_display, x11_window, "Godot");
+	/* set the titlebar name */
+	XStoreName(x11_display, x11_window, "Godot");
 
-    /* set the name and class hints for the window manager to use */
-    classHint = XAllocClassHint();
-    if (classHint) {
-        classHint->res_name = "Godot";
-        classHint->res_class = "Godot";
-    }
-    XSetClassHint(x11_display, x11_window, classHint);
-    XFree(classHint);
+	/* set the name and class hints for the window manager to use */
+	classHint = XAllocClassHint();
+	if (classHint) {
+		classHint->res_name = "Godot";
+		classHint->res_class = "Godot";
+	}
+	XSetClassHint(x11_display, x11_window, classHint);
+	XFree(classHint);
 
 	wm_delete = XInternAtom(x11_display, "WM_DELETE_WINDOW", true);	
 	XSetWMProtocols(x11_display, x11_window, &wm_delete, 1);
@@ -708,6 +710,9 @@ void OS_X11::set_fullscreen(bool p_enabled) {
 	if(p_enabled && current_videomode.fullscreen)
 		return;
 
+	if(!current_videomode.resizable)
+		set_resizable(true);
+
 	if(p_enabled) {
 		window_data.size = get_window_size();
 		window_data.position = get_window_position();
@@ -734,11 +739,37 @@ void OS_X11::set_fullscreen(bool p_enabled) {
 	}
 
 	visual_server->init();
+
 }
 
 bool OS_X11::is_fullscreen() const {
 	return current_videomode.fullscreen;
 }
+
+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;
+			printf("%d %d\n", xwa.width, xwa.height);
+		}
+		XSetWMNormalHints(x11_display, x11_window, xsh);
+		XFree(xsh);
+		current_videomode.resizable = p_enabled;
+	}
+}
+
+bool OS_X11::is_resizable() const {
+	return current_videomode.resizable;
+}
 #endif
 
 InputModifierState OS_X11::get_key_modifier_state(unsigned int p_x11_state) {
@@ -1688,6 +1719,4 @@ OS_X11::OS_X11() {
 	minimized = false;
 	xim_style=NULL;
 	mouse_mode=MOUSE_MODE_VISIBLE;
-
-
 };
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 72d212c131..d286efe7b8 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -160,10 +160,15 @@ class OS_X11 : public OS_Unix {
 	Joystick joysticks[JOYSTICKS_MAX];
 
 #ifdef EXPERIMENTAL_WM_API
+	// This struct saves the values of the window before going fullscreen
+	// to be able to restore the same state after leaving fullscreen
 	struct {
+		bool resizable;
 		Point2i position;
 		Size2i size;
-	} window_data;
+	} window_data;	
+
+	bool maximized;
 	void set_wm_border(bool p_enabled);
 	void set_wm_fullscreen(bool p_enabled);
 #endif
@@ -234,6 +239,8 @@ public:
 	virtual void set_window_size(const Size2 p_size);
 	virtual void set_fullscreen(bool p_enabled);
 	virtual bool is_fullscreen() const;
+	virtual void set_resizable(bool p_enabled);
+	virtual bool is_resizable() const;
 #endif
 	virtual void move_window_to_foreground();