From 908f75c23fdd285523aeae3631b654f9b49c7b59 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Sun, 3 Jan 2016 18:52:42 -0300
Subject: [PATCH] having active items is pointless in input map

---
 drivers/unix/semaphore_posix.cpp  |  2 +-
 platform/x11/os_x11.cpp           | 12 +++++++++++-
 tools/editor/project_settings.cpp |  6 ++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/unix/semaphore_posix.cpp b/drivers/unix/semaphore_posix.cpp
index f1f50b03814..3ae94ae5d9c 100644
--- a/drivers/unix/semaphore_posix.cpp
+++ b/drivers/unix/semaphore_posix.cpp
@@ -42,7 +42,7 @@ Error SemaphorePosix::wait() {
 			errno=0;
 			continue;
 		} else {
-perror("sem waiting");
+			perror("sem waiting");
 			return ERR_BUSY;
 		}
 	}
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp
index 0887fd9df24..75ec9fd5de1 100644
--- a/platform/x11/os_x11.cpp
+++ b/platform/x11/os_x11.cpp
@@ -619,6 +619,7 @@ void OS_X11::set_wm_fullscreen(bool p_enabled) {
 	xev.xclient.data.l[2] = 0;
 
 	XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev);
+
 }
 
 int OS_X11::get_screen_count() const {
@@ -887,7 +888,16 @@ void OS_X11::set_window_maximized(bool p_enabled) {
 	XGetWindowAttributes(x11_display,DefaultRootWindow(x11_display),&xwa);
 	current_videomode.width = xwa.width;
 	current_videomode.height = xwa.height;
-*/
+//*/
+
+//	current_videomode.width = wm_max_horz;
+//	current_videomode.height = wm_max_vert;
+
+	//Size2 ss = get_screen_size(get_current_screen());
+	//current_videomode.width=ss.width;
+	//current_videomode.height=ss.height;
+
+
 	maximized = p_enabled;
 }
 
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp
index 174ec66f241..370b91cbba8 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -107,6 +107,8 @@ void ProjectSettings::_action_persist_toggle() {
 	String name="input/"+ti->get_text(0);
 
 	bool prev = Globals::get_singleton()->is_persisting(name);
+	print_line("prev persist: "+itos(prev));
+	print_line("new persist: "+itos(ti->is_checked(0)));
 	if (prev==ti->is_checked(0))
 		return;
 
@@ -428,7 +430,7 @@ void ProjectSettings::_update_actions() {
 			continue;
 
 		TreeItem *item=input_editor->create_item(root);
-		item->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
+		//item->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
 		item->set_text(0,name);
 		item->add_button(0,get_icon("Add","EditorIcons"),1);
 		if (!Globals::get_singleton()->get_input_presets().find(pi.name)) {
@@ -437,7 +439,7 @@ void ProjectSettings::_update_actions() {
 		}
 		item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
 		item->set_editable(0,true);
-		item->set_checked(0,pi.usage&PROPERTY_USAGE_CHECKED);
+		//item->set_checked(0,pi.usage&PROPERTY_USAGE_CHECKED);