Merge lp:~gala-dev/gala/advanced-window-tiling into lp:gala

[Tom Beckmann]

This adds compiz-like window tiling methods overriding the default keyboard handlers for move-to-*. The window's are tiled to a 4/8, then to 3/8 and 2/8, then to 6/8 and 5/8 and finally back to 4/8 of the screen.

[Cody Garver (codygarver)]

gala/src/Plugin.vala:333.15-333.95: error: 1 extra arguments for `Meta.Rectangle Meta.Workspace.get_work_area_all_monitors ()'
   var geom = screen.get_active_workspace ().get_work_area_all_monitors (active.get_monitor ());
              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Compilation failed: 1 error(s), 0 warning(s)
make[2]: *** [src/DBus.c] Error 1
make[1]: *** [CMakeFiles/gala.dir/all] Error 2
make: *** [all] Error 2

review: Needs Fixing

[lp:~gala-dev/gala/advanced-window-tiling]

348. By Tom Beckmann on 2013-07-29

fix build error for systems with mutter < 3.8

[Tom Beckmann (tombeckmann)]

Fixed it.

[Cody Garver (codygarver)]

Needs trunk merged in a conflicts resolved

Unmerged revisions

348. By Tom Beckmann on 2013-07-29

fix build error for systems with mutter < 3.8

347. By Tom Beckmann on 2013-07-15

plugin: override move_to_* keybindings to provide more advanced tiling options

=== modified file 'src/Plugin.vala'
--- src/Plugin.vala	2013-07-14 17:20:53 +0000
+++ src/Plugin.vala	2013-07-29 21:16:26 +0000
@@ -191,6 +191,16 @@
 			
 			KeyBinding.set_custom_handler ("switch-group", () => {});
 			KeyBinding.set_custom_handler ("switch-group-backward", () => {});
+
+			KeyBinding.set_custom_handler ("move-to-corner-nw", () => place_window (KeyBindingAction.MOVE_TO_CORNER_NW) );
+			KeyBinding.set_custom_handler ("move-to-corner-ne", () => place_window (KeyBindingAction.MOVE_TO_CORNER_NE) );
+			KeyBinding.set_custom_handler ("move-to-corner-sw", () => place_window (KeyBindingAction.MOVE_TO_CORNER_SW) );
+			KeyBinding.set_custom_handler ("move-to-corner-se", () => place_window (KeyBindingAction.MOVE_TO_CORNER_SE) );
+			KeyBinding.set_custom_handler ("move-to-side-n", () => place_window (KeyBindingAction.MOVE_TO_SIDE_N) );
+			KeyBinding.set_custom_handler ("move-to-side-s", () => place_window (KeyBindingAction.MOVE_TO_SIDE_S) );
+			KeyBinding.set_custom_handler ("move-to-side-e", () => place_window (KeyBindingAction.MOVE_TO_SIDE_E) );
+			KeyBinding.set_custom_handler ("move-to-side-w", () => place_window (KeyBindingAction.MOVE_TO_SIDE_W) );
+			KeyBinding.set_custom_handler ("move-to-center", () => place_window (KeyBindingAction.MOVE_TO_CENTER) );
 			
 			/*shadows*/
 			Utils.reload_shadow ();
@@ -308,6 +318,111 @@
 			
 			next.activate_with_focus (window, display.get_current_time ());
 		}
+
+		/**
+		 * place a window on a place on the screen. If pressed again,
+		 * we decrease the space two times by 1/8th and then increase it to 6/8th
+		 */
+		void place_window (KeyBindingAction direction)
+		{
+			var screen = get_screen ();
+			var active = screen.get_display ().get_focus_window ();
+#if HAS_MUTTER38
+			var geom = screen.get_active_workspace ().get_work_area_for_monitor (active.get_monitor ());
+#else
+			var geom = screen.get_active_workspace ().get_work_area_all_monitors ();
+#endif
+
+			var current_dim = active.get_outer_rect ();
+			current_dim.x -= geom.x;
+			current_dim.y -= geom.y;
+			Meta.Rectangle dim = {};
+
+			if (active.maximized_horizontally || active.maximized_vertically) {
+				active.unmaximize (MaximizeFlags.HORIZONTAL | MaximizeFlags.VERTICAL);
+				// as we want to have this toggle, we're done here
+				if (direction == KeyBindingAction.MOVE_TO_CENTER)
+					return;
+			}
+
+			switch (direction) {
+				case KeyBindingAction.MOVE_TO_CORNER_NW:
+					dim = {0, 0, geom.width / 2, geom.height / 2};
+					break;
+				case KeyBindingAction.MOVE_TO_CORNER_NE:
+					dim = {geom.width / 2, 0, geom.width / 2, geom.height / 2};
+					break;
+				case KeyBindingAction.MOVE_TO_CORNER_SW:
+					dim = {0, geom.height / 2, geom.width / 2, geom.height / 2};
+					break;
+				case KeyBindingAction.MOVE_TO_CORNER_SE:
+					dim = {geom.width / 2, 0 + geom.height / 2, geom.width / 2, geom.height / 2};
+					break;
+				case KeyBindingAction.MOVE_TO_SIDE_N:
+					dim = {0, 0, geom.width, geom.height / 2};
+					break;
+				case KeyBindingAction.MOVE_TO_SIDE_S:
+					dim = {0, geom.height / 2, geom.width, geom.height / 2};
+					break;
+				case KeyBindingAction.MOVE_TO_SIDE_E:
+					dim = {geom.width / 2, 0, geom.width / 2, geom.height};
+					break;
+				case KeyBindingAction.MOVE_TO_SIDE_W:
+					dim = {0, 0, geom.width / 2, geom.height};
+					break;
+				case KeyBindingAction.MOVE_TO_CENTER:
+					active.maximize (MaximizeFlags.HORIZONTAL | MaximizeFlags.VERTICAL);
+					return;
+				default:
+					assert_not_reached ();
+			}
+
+			var vertical = direction == KeyBindingAction.MOVE_TO_SIDE_N
+				|| direction == KeyBindingAction.MOVE_TO_SIDE_S;
+			var opposite = direction == KeyBindingAction.MOVE_TO_CORNER_NE
+				|| direction == KeyBindingAction.MOVE_TO_CORNER_SE
+				|| direction == KeyBindingAction.MOVE_TO_SIDE_E
+				|| direction == KeyBindingAction.MOVE_TO_SIDE_S;
+			dim = get_multiplied (dim, current_dim, vertical, opposite);
+			active.move_resize_frame (true, dim.x + geom.x, dim.y + geom.y, dim.width, dim.height);
+		}
+
+		const double[] MULT_ORDER = {1, 0.75, 0.5, 1.5, 1.25};
+		const double[] MULT_ORDER_OPPOSITE = {1, 1.25, 1.5, 0.5, 0.75};
+		Meta.Rectangle get_multiplied (Meta.Rectangle dest_dim, Meta.Rectangle current_dim,
+			bool vertical, bool opposite)
+		{
+			bool matches = false;
+			int i;
+			var multipliers_pos = opposite ? MULT_ORDER_OPPOSITE : MULT_ORDER;
+			var multipliers_size = MULT_ORDER;
+			for (i = 0; i < multipliers_pos.length; i++) {
+				Meta.Rectangle test_dim = {
+					(int)Math.floor (dest_dim.x * (vertical ? 1 : multipliers_pos[i])),
+					(int)Math.floor (dest_dim.y * (vertical ? multipliers_pos[i] : 1)),
+					(int)Math.floor (dest_dim.width * (vertical ? 1 : multipliers_size[i])),
+					(int)Math.floor (dest_dim.height * (vertical ? multipliers_size[i] : 1))
+				};
+
+				if (test_dim.equal (current_dim)) {
+					matches = true;
+					break;
+				}
+			}
+
+			if (!matches)
+				return dest_dim;
+
+			if (++i >= multipliers_pos.length)
+				i = 0;
+
+			return {
+				(int)Math.floor (dest_dim.x * (vertical ? 1 : multipliers_pos[i])),
+				(int)Math.floor (dest_dim.y * (vertical ? multipliers_pos[i] : 1)),
+				(int)Math.floor (dest_dim.width * (vertical ? 1 : multipliers_size[i])),
+				(int)Math.floor (dest_dim.height * (vertical ? multipliers_size[i] : 1))
+			};
+		}
 		
 		public new void begin_modal ()
 		{