Merge lp:~gala-dev/gala/hotcorners into lp:gala

[Tom Beckmann]

[lp:~gala-dev/gala/hotcorners]

177. By Tom Beckmann on 2012-07-26

Add action system for hot corner configuration

178. By Tom Beckmann on 2012-07-27

Remove workspace related actions

179. By Rico Tzschichholz on 2012-07-28

Some refactoring and clean up

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'data/org.pantheon.desktop.gala.gschema.xml'
--- data/org.pantheon.desktop.gala.gschema.xml	2012-07-26 07:04:03 +0000
+++ data/org.pantheon.desktop.gala.gschema.xml	2012-07-28 06:42:17 +0000
@@ -1,10 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
+	<enum id="GalaActionType">
+		<value nick='none' value="0" />
+		<value nick="show-workspace-view" value="1" />
+		<value nick="maximize-current" value="2" />
+		<value nick="minimize-current" value="3" />
+		<value nick="open-launcher" value="4" />
+		<value nick="custom-command" value="5" />
+	</enum>
+	
 	<schema path="/org/pantheon/desktop/gala/behavior/" id="org.pantheon.desktop.gala.behavior" gettext-domain="gala">
-		<key type="b" name="enable-manager-corner">
-			<default>false</default>
-			<summary>Make the lower right a hot corner to reveal the manager</summary>
-			<description>This turns the lower right corner to a hot corner, showing some icons allowing you to do tasks like window tiling</description>
+		<key enum="GalaActionType" name="hotcorner-topleft">
+			<default>'none'</default>
+			<summary>Action for the top left corner</summary>
+			<description></description>
+		</key>
+		<key enum="GalaActionType" name="hotcorner-topright">
+			<default>'none'</default>
+			<summary>Action for the top right corner</summary>
+			<description></description>
+		</key>
+		<key enum="GalaActionType" name="hotcorner-bottomleft">
+			<default>'none'</default>
+			<summary>Action for the bottom left corner</summary>
+			<description></description>
+		</key>
+		<key enum="GalaActionType" name="hotcorner-bottomright">
+			<default>'none'</default>
+			<summary>Action for the bottom right corner</summary>
+			<description></description>
+		</key>
+		<key type="s" name="hotcorner-custom-command">
+			<default>''</default>
+			<summary>The command that will be executed for the hotcorner action 'custom-command'</summary>
+			<description></description>
 		</key>
 		<key type="b" name="edge-tiling">
 			<default>true</default>

=== modified file 'src/Plugin.vala'
--- src/Plugin.vala	2012-07-26 22:39:40 +0000
+++ src/Plugin.vala	2012-07-28 06:42:17 +0000
@@ -19,6 +19,22 @@
 
 namespace Gala
 {
+	public enum ActionType
+	{
+		NONE = 0,
+		SHOW_WORKSPACE_VIEW,
+		MAXIMIZE_CURRENT,
+		MINIMIZE_CURRENT,
+		OPEN_LAUNCHER,
+		CUSTOM_COMMAND
+	}
+	
+	public enum InputArea {
+		NONE,
+		FULLSCREEN,
+		HOT_CORNER
+	}
+	
 	public class Plugin : Meta.Plugin
 	{
 		WindowSwitcher winswitcher;
@@ -116,38 +132,50 @@
 			Utils.reload_shadow ();
 			ShadowSettings.get_default ().notify.connect (Utils.reload_shadow);
 			
-			/*hot corner*/
+			/*hot corner, getting enum values from GraniteServicesSettings did not work, so we use GSettings directly*/
 			var geometry = screen.get_monitor_geometry (screen.get_primary_monitor ());
 			
-			var hot_corner = new Clutter.Rectangle ();
-			hot_corner.x = geometry.x + geometry.width - 1;
-			hot_corner.y = geometry.y + geometry.height - 1;
+			add_hotcorner (geometry.x, geometry.y, "hotcorner-topleft");
+			add_hotcorner (geometry.x + geometry.width - 1, geometry.y, "hotcorner-topright");
+			add_hotcorner (geometry.x, geometry.y + geometry.height - 1, "hotcorner-bottomleft");
+			add_hotcorner (geometry.x + geometry.width - 1, geometry.y + geometry.height - 1, "hotcorner-bottomright");
+			
+			update_input_area ();
+			
+			BehaviorSettings.get_default ().schema.changed.connect ((key) => update_input_area ());
+		}
+		
+		void add_hotcorner (float x, float y, string key)
+		{
+			var hot_corner = new Clutter.Actor ();
+			hot_corner.x = x;
+			hot_corner.y = y;
 			hot_corner.width = 1;
 			hot_corner.height = 1;
 			hot_corner.opacity = 0;
 			hot_corner.reactive = true;
 			
+			Compositor.get_stage_for_screen (get_screen ()).add_child (hot_corner);
+			
 			hot_corner.enter_event.connect (() => {
-				workspace_view.show ();
+				perform_action ((ActionType)BehaviorSettings.get_default ().schema.get_enum (key));
 				return false;
 			});
-			
-			stage.add_child (hot_corner);
-			
-			update_input_area ();
-			
-			BehaviorSettings.get_default ().notify["enable-manager-corner"].connect (update_input_area);
 		}
 		
 		public void update_input_area ()
 		{
-			if (BehaviorSettings.get_default ().enable_manager_corner)
-				Utils.set_input_area (get_screen (), Utils.InputArea.HOT_CORNER);
+			var schema = BehaviorSettings.get_default ().schema;
+			
+			if (schema.get_enum ("hotcorner-topleft") != ActionType.NONE ||
+				schema.get_enum ("hotcorner-topright") != ActionType.NONE ||
+				schema.get_enum ("hotcorner-bottomleft") != ActionType.NONE ||
+				schema.get_enum ("hotcorner-bottomright") != ActionType.NONE)
+				Utils.set_input_area (get_screen (), InputArea.HOT_CORNER);
 			else
-				Utils.set_input_area (get_screen (), Utils.InputArea.NONE);
+				Utils.set_input_area (get_screen (), InputArea.NONE);
 		}
 		
-		
 		public void move_window (Window? window, MotionDirection direction)
 		{
 			if (window == null)
@@ -213,6 +241,48 @@
 				win.clear_effects ();*/
 		}
 		
+		public void perform_action (ActionType type)
+		{
+			var screen = get_screen ();
+			var display = screen.get_display ();
+			var current = display.get_focus_window ();
+			
+			switch (type) {
+				case ActionType.SHOW_WORKSPACE_VIEW:
+					workspace_view.show ();
+					break;
+				case ActionType.MAXIMIZE_CURRENT:
+					if (current == null)
+						break;
+					if (current.get_maximized () == (MaximizeFlags.HORIZONTAL | MaximizeFlags.VERTICAL))
+						current.unmaximize (MaximizeFlags.HORIZONTAL | MaximizeFlags.VERTICAL);
+					else
+						current.maximize (MaximizeFlags.HORIZONTAL | MaximizeFlags.VERTICAL);
+					break;
+				case ActionType.MINIMIZE_CURRENT:
+					if (current != null)
+						current.minimize ();
+					break;
+				case ActionType.OPEN_LAUNCHER:
+					try {
+						Process.spawn_command_line_async (BehaviorSettings.get_default ().panel_main_menu_action);
+					} catch (Error e) {
+						warning (e.message);
+					}
+					break;
+				case ActionType.CUSTOM_COMMAND:
+					try {
+						Process.spawn_command_line_async (BehaviorSettings.get_default ().hotcorner_custom_command);
+					} catch (Error e) {
+						warning (e.message);
+					}
+					break;
+				default:
+					warning ("Trying to run unknown action");
+					break;
+			}
+		}
+		
 		/*
 		 * effects
 		 */

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2012-07-26 07:04:03 +0000
+++ src/Settings.vala	2012-07-28 06:42:17 +0000
@@ -23,7 +23,12 @@
 		public string panel_main_menu_action { get; set; }
 		public string toggle_recording_action { get; set; }
 		public string overlay_action { get; set; }
-		public bool enable_manager_corner { get; set; }
+		public string hotcorner_custom_command { get; set; }
+		
+		public ActionType hotcorner_topleft { get; set; }
+		public ActionType hotcorner_topright { get; set; }
+		public ActionType hotcorner_bottomleft { get; set; }
+		public ActionType hotcorner_bottomright { get; set; }
 		
 		static BehaviorSettings? instance = null;
 		

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2012-07-26 07:04:03 +0000
+++ src/Utils.vala	2012-07-28 06:42:17 +0000
@@ -1,14 +1,9 @@
 using Meta;
 
+using Gala;
+
 namespace Gala.Utils
 {
-	
-	public enum InputArea {
-		NONE,
-		FULLSCREEN,
-		HOT_CORNER
-	}
-	
 	/*
 	 * Reload shadow settings
 	 */
@@ -105,24 +100,39 @@
 	{
 		var display = screen.get_display ();
 		
-		X.Xrectangle rect;
+		X.Xrectangle[] rects = {};
 		int width, height;
 		screen.get_size (out width, out height);
 		var geometry = screen.get_monitor_geometry (screen.get_primary_monitor ());
 		
 		switch (area) {
 			case InputArea.FULLSCREEN:
-				rect = {0, 0, (ushort)width, (ushort)height};
-				break;
-			case InputArea.HOT_CORNER: //leave one pix in the bottom left
-				rect = {(short)(geometry.x + geometry.width - 1), (short)(geometry.y + geometry.height - 1), 1, 1};
-				break;
+				X.Xrectangle rect = {0, 0, (ushort)width, (ushort)height};
+				rects = {rect};
+				break;
+			case InputArea.HOT_CORNER:
+				var schema = BehaviorSettings.get_default ().schema;
+				
+				// if ActionType is NONE make it 0 sized
+				ushort tl_size = (schema.get_enum ("hotcorner-topleft") != ActionType.NONE ? 1 : 0);
+				ushort tr_size = (schema.get_enum ("hotcorner-topright") != ActionType.NONE ? 1 : 0);
+				ushort bl_size = (schema.get_enum ("hotcorner-bottomleft") != ActionType.NONE ? 1 : 0);
+				ushort br_size = (schema.get_enum ("hotcorner-bottomright") != ActionType.NONE ? 1 : 0);
+				
+				X.Xrectangle topleft = {(short)geometry.x, (short)geometry.y, tl_size, tl_size};
+				X.Xrectangle topright = {(short)(geometry.x + geometry.width - 1), (short)geometry.y, tr_size, tr_size};
+				X.Xrectangle bottomleft = {(short)geometry.x, (short)(geometry.y + geometry.height - 1), bl_size, bl_size};
+				X.Xrectangle bottomright = {(short)(geometry.x + geometry.width - 1), (short)(geometry.y + geometry.height - 1), br_size, br_size};
+				
+				rects = {topleft, topright, bottomleft, bottomright};
+				break;
+			case InputArea.NONE:
 			default:
 				Util.empty_stage_input_region (screen);
 				return;
 		}
 		
-		var xregion = X.Fixes.create_region (display.get_xdisplay (), {rect});
+		var xregion = X.Fixes.create_region (display.get_xdisplay (), rects);
 		Util.set_stage_input_region (screen, xregion);
 	}
 	

=== modified file 'src/Widgets/WorkspaceView.vala'
--- src/Widgets/WorkspaceView.vala	2012-07-26 07:04:03 +0000
+++ src/Widgets/WorkspaceView.vala	2012-07-28 06:42:17 +0000
@@ -294,7 +294,7 @@
 			
 			var screen = plugin.get_screen ();
 			
-			Utils.set_input_area (screen, Utils.InputArea.FULLSCREEN);
+			Utils.set_input_area (screen, InputArea.FULLSCREEN);
 			plugin.begin_modal ();
 			
 			visible = true;