Merge lp:~3v1n0/compiz/scale-tab-iteration into lp:compiz/0.9.12

[Marco Trevisan (Treviño)]

Scale: allow to iterate through windows using Tab key

[lp:~3v1n0/compiz/scale-tab-iteration]

4013. By Marco Trevisan (Treviño) on 2016-04-26

Scale: allow closing selected window with Ctrl+W

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4012
http://jenkins.qa.ubuntu.com/job/compiz-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-armhf-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-i386-ci/10

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/119/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4013
http://jenkins.qa.ubuntu.com/job/compiz-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/120/rebuild

review: Approve (continuous-integration)

[lp:~3v1n0/compiz/scale-tab-iteration]

4014. By Marco Trevisan (Treviño) on 2016-04-27

Scale: take care only about the half of the maximum tumbs height

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4014
http://jenkins.qa.ubuntu.com/job/compiz-ci/121/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-xenial-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/121/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'plugins/scale/src/privates.h'
--- plugins/scale/src/privates.h	2014-04-17 16:00:05 +0000
+++ plugins/scale/src/privates.h	2016-04-27 09:54:19 +0000
@@ -94,7 +94,9 @@
 	bool selectWindowAt (int x, int y, bool moveInputFocus);
 	bool selectWindowAt (int x, int y);
 
+	void moveFocusWindow (CompWindow *);
 	void moveFocusWindow (int dx, int dy);
+	void moveFocusWindow (int distance);
 
 	void windowRemove (CompWindow *);
 
@@ -117,8 +119,6 @@
 	Window       hoveredWindow;
 	Window       previousActiveWindow;
 
-	KeyCode	 leftKeyCode, rightKeyCode, upKeyCode, downKeyCode;
-
 	bool grab;
 	CompScreen::GrabHandle grabIndex;
 

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2016-04-27 09:54:19 +0000
+++ plugins/scale/src/scale.cpp	2016-04-27 09:54:19 +0000
@@ -1528,6 +1528,60 @@
 }
 
 void
+PrivateScaleScreen::moveFocusWindow (int distance)
+{
+    CompWindow *selected;
+    CompWindow *next;
+
+    next = NULL;
+    selected = screen->findWindow (selectedWindow ? selectedWindow : screen->activeWindow ());
+    auto scaledWindows = windows;
+
+    /* Sort windows to respect the natural grid view */
+    scaledWindows.sort ([] (ScaleWindow *sw1, ScaleWindow *sw2) {
+	if (!sw1->priv->slot)
+	    return !sw2->priv->slot;
+	if (!sw2->priv->slot)
+	    return true;
+
+	int cy1 = (sw1->priv->slot->y1 () + sw1->priv->slot->y2 ()) / 2;
+	int cy2 = (sw2->priv->slot->y1 () + sw2->priv->slot->y2 ()) / 2;
+
+	if (abs (cy1 - cy2) < std::max (sw1->priv->slot->height (), sw2->priv->slot->height ()) / 2)
+	{
+	    int cx1 = (sw1->priv->slot->x1 () + sw1->priv->slot->x2 ()) / 2;
+	    int cx2 = (sw2->priv->slot->x1 () + sw2->priv->slot->x2 ()) / 2;
+	    return cx1 < cx2;
+	}
+
+	return cy1 < cy2;
+    });
+
+    if (selected && !scaledWindows.empty())
+    {
+	SCALE_WINDOW (selected);
+	auto selected_it = std::find (scaledWindows.begin (), scaledWindows.end (), sw);
+
+	if (selected_it != scaledWindows.end ())
+	{
+	    std::advance (selected_it, distance);
+
+	    if (selected_it == scaledWindows.end ())
+	    {
+		if (distance > 0)
+		    selected_it = scaledWindows.begin ();
+		else if (distance < 0)
+		    selected_it = std::prev (scaledWindows.end ());
+	    }
+
+	    next = (*selected_it)->window;
+	}
+    }
+
+    moveFocusWindow (next);
+}
+
+void
 PrivateScaleScreen::moveFocusWindow (int dx,
 				     int dy)
 {
@@ -1547,9 +1601,9 @@
 	    cx = (sw->priv->slot->x1 () + sw->priv->slot->x2 ()) / 2;
 	    cy = (sw->priv->slot->y1 () + sw->priv->slot->y2 ()) / 2;
 
-	    foreach (CompWindow *w, screen->windows ())
+	    foreach (ScaleWindow *w, windows)
 	    {
-		slot = ScaleWindow::get (w)->priv->slot;
+		slot = w->priv->slot;
 		if (!slot)
 		    continue;
 
@@ -1566,23 +1620,29 @@
 			continue;
 
 		    min   = d;
-		    focus = w;
+		    focus = w->window;
 		}
 	    }
 	}
     }
 
+    moveFocusWindow (focus);
+}
+
+void
+PrivateScaleScreen::moveFocusWindow (CompWindow *focus)
+{
     /* move focus to the last focused window if no slot window is currently
        focused */
     if (!focus)
     {
-	foreach (CompWindow *w, screen->windows ())
+	foreach (ScaleWindow *sw, windows)
 	{
-	    if (!ScaleWindow::get (w)->priv->slot)
+	    if (!sw->priv->slot)
 		continue;
 
-	    if (!focus || focus->activeNum () < w->activeNum ())
-		focus = w;
+	    if (!focus || focus->activeNum () < sw->window->activeNum ())
+		focus = sw->window;
 	}
     }
 
@@ -1719,14 +1779,23 @@
 	    {
 		if (grabIndex)
 		{
-		    if (event->xkey.keycode == leftKeyCode)
+		    KeySym keySym = XkbKeycodeToKeysym (event->xany.display,
+							event->xkey.keycode, 0, 0);
+		    if (keySym == XK_Left)
 			moveFocusWindow (-1, 0);
-		    else if (event->xkey.keycode == rightKeyCode)
+		    else if (keySym == XK_Right)
 			moveFocusWindow (1, 0);
-		    else if (event->xkey.keycode == upKeyCode)
+		    else if (keySym == XK_Up)
 			moveFocusWindow (0, -1);
-		    else if (event->xkey.keycode == downKeyCode)
+		    else if (keySym == XK_Down)
 			moveFocusWindow (0, 1);
+		    else if (keySym == XK_Tab)
+			moveFocusWindow (!(event->xkey.state & ShiftMask) ? 1 : -1);
+		    else if (keySym == XK_w && (event->xkey.state & ControlMask))
+		    {
+			if (CompWindow *selected = screen->findWindow (selectedWindow))
+			    selected->close (0);
+		    }
 		}
 	    }
 	    break;
@@ -1962,11 +2031,6 @@
     moreAdjust (false),
     nSlots (0)
 {
-    leftKeyCode  = XKeysymToKeycode (screen->dpy (), XStringToKeysym ("Left"));
-    rightKeyCode = XKeysymToKeycode (screen->dpy (), XStringToKeysym ("Right"));
-    upKeyCode    = XKeysymToKeycode (screen->dpy (), XStringToKeysym ("Up"));
-    downKeyCode  = XKeysymToKeycode (screen->dpy (), XStringToKeysym ("Down"));
-
     opacity = (OPAQUE * optionGetOpacity ()) / 100;
 
     hover.setCallback (boost::bind (&PrivateScaleScreen::hoverTimeout, this));