Merge lp:~unity-team/compiz/x-sru1 into lp:compiz/xenial

[Marco Trevisan (Treviño)]

Backported fixes for the first Xenial SRU

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-15 05:30:50 +0000
+++ debian/changelog	2016-05-26 00:07:16 +0000
@@ -1,3 +1,30 @@
+compiz (1:0.9.12.2+16.04.20160415-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Andrea Azzarone ]
+  * Add an option to notify that a key press is actually an "auto
+    repeat" one. (LP: #1572241)
+
+  [ Alberts Muktupāvels ]
+  * OpenGL: use the number of Opaque windows around to decide whether
+    paint the bg or not (LP: #1574866)
+
+  [ Marco Trevisan (Treviño) ]
+  * Scale: use the selectedWindow as starting point when focusing a
+    window (LP: #1575168)
+  * Scale: allow to iterate through windows using Tab key
+  * Window: call stateChangeNotify when compiz state changed but before
+    changing the WM state (LP: #1521302)
+
+  [ Eleni Maria Stea ]
+  * Expo, Scale: add support for bottom offsets (LP: #1562346, LP:
+    #1573897)
+
+  [ handsome_feng ]
+  * Add a YBottomOffset value when stretch maximized windows。 (LP:
+    #1562348)
+
+ -- Andrea Azzarone <[e-mail]>  Thu, 26 May 2016 01:56:18 +0200
+
 compiz (1:0.9.12.2+16.04.20160415-0ubuntu1) xenial; urgency=medium
 
   [ Martin Wimpress ]

=== modified file 'include/core/screen.h'
--- include/core/screen.h	2015-10-20 22:43:42 +0000
+++ include/core/screen.h	2016-05-26 00:07:16 +0000
@@ -169,8 +169,11 @@
 {
 public:
     virtual void incrementDesktopWindowCount() = 0;
+    virtual void incrementOpaqueDesktopWindowCount() = 0;
     virtual void decrementDesktopWindowCount() = 0;
+    virtual void decrementOpaqueDesktopWindowCount() = 0;
     virtual int desktopWindowCount() = 0;
+    virtual int opaqueDesktopWindowCount() = 0;
 protected:
     ~DesktopWindowCount() {}
 };

=== modified file 'plugins/expo/expo.xml.in'
--- plugins/expo/expo.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/expo/expo.xml.in	2016-05-26 00:07:16 +0000
@@ -149,6 +149,12 @@
 		    <_long>Vertical offset (in pixels).</_long>
 		    <default>24</default>
 		</option>
+		<option name="y_bottom_offset" type="int">
+		    <_short>Y Bottom Offset</_short>
+		    <_long>Vertical offset from the bottom (in pixels).</_long>
+		    <default>0</default>
+		    <min>0</min>
+		</option>
 		<option name="distance" type="float">
 		    <_short>Camera Distance</_short>
 		    <_long>The distance between the camera and the exposed viewports.</_long>

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2015-10-20 15:12:34 +0000
+++ plugins/expo/src/expo.cpp	2016-05-26 00:07:16 +0000
@@ -921,6 +921,8 @@
     /* translate expo to center */
     sTransform.translate (vpSize.x () * sx * -0.5 + offsetInWorldCoordX,
 			  vpSize.y () * sy *  0.5 - offsetInWorldCoordY, 0.0f);
+
+    worldScaleFactorY -= (float)optionGetYBottomOffset () / (float)output->height ();
     sTransform.scale (worldScaleFactorX, worldScaleFactorY, 1.0f);
 
 
@@ -1503,7 +1505,7 @@
 	    float yS = 1.0 + ((o->height () / (float) window->height ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
 	    float xS = 1.0 + ((o->width () / (float) window->width ()) - 1.0f) * sigmoidProgress (eScreen->expoCam);
 	    wTransform.translate (window->x () + window->width (),
-				  window->y () + window->height (),
+				  window->y () + window->height () + eScreen->optionGetYBottomOffset (),
 				  0.0f);
 	    wTransform.scale (xS, yS, 1.0f);
 	    wTransform.translate (-(window->x () + window->width ()),

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2015-04-07 14:20:32 +0000
+++ plugins/opengl/src/paint.cpp	2016-05-26 00:07:16 +0000
@@ -86,7 +86,7 @@
     if (!nBox)
 	return;
 
-    if (screen->desktopWindowCount ())
+    if (screen->opaqueDesktopWindowCount ())
     {
 	if (!backgroundTextures.empty ())
 	{

=== modified file 'plugins/scale/include/scale/scale.h'
--- plugins/scale/include/scale/scale.h	2014-04-15 16:47:09 +0000
+++ plugins/scale/include/scale/scale.h	2016-05-26 00:07:16 +0000
@@ -137,7 +137,7 @@
     public:
 	ScaleWindow (CompWindow *w);
 	~ScaleWindow ();
-	
+
 	CompWindow	*window;
 
 	bool hasSlot () const;

=== modified file 'plugins/scale/scale.xml.in'
--- plugins/scale/scale.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/scale/scale.xml.in	2016-05-26 00:07:16 +0000
@@ -33,7 +33,13 @@
 			</option>
 			<option name="y_offset" type="int">
 				<_short>Y Offset</_short>
-				<_long>Vertical offset (in pixels).</_long>
+				<_long>Vertical offset from the top (in pixels).</_long>
+				<min>0</min>
+				<default>0</default>
+			</option>
+			<option name="y_bottom_offset" type="int">
+				<_short>Y Bottom Offset</_short>
+				<_long>Vertical offset from the bottom (in pixels).</_long>)
 				<min>0</min>
 				<default>0</default>
 			</option>

=== 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-05-26 00:07:16 +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	2015-11-16 12:14:14 +0000
+++ plugins/scale/src/scale.cpp	2016-05-26 00:07:16 +0000
@@ -509,7 +509,7 @@
     int nSlots  = 0;
 
     y      = optionGetYOffset() + workArea.y () + spacing;
-    height = (workArea.height () - optionGetYOffset() - (lines + 1) * spacing) / lines;
+    height = (workArea.height () - optionGetYOffset () - optionGetYBottomOffset () - (lines + 1) * spacing) / lines;
 
     for (int i = 0; i < lines; i++)
     {
@@ -1528,13 +1528,67 @@
 }
 
 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)
 {
     CompWindow *active;
     CompWindow *focus = NULL;
 
-    active = screen->findWindow (screen->activeWindow ());
+    active = screen->findWindow (selectedWindow ? selectedWindow : screen->activeWindow ());
     if (active)
     {
 	SCALE_WINDOW (active);
@@ -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;
@@ -1752,6 +1821,7 @@
 		    CompRect  workArea (screen->currentOutputDev ().workArea ());
 		    workArea.setX (workArea.x() + optionGetXOffset ());
 		    workArea.setY (workArea.y() + optionGetYOffset ());
+		    workArea.setBottom (workArea.bottom () + optionGetYBottomOffset ());
 
 		    if (workArea.contains (pointer))
 		    {
@@ -1962,11 +2032,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));

=== modified file 'src/event.cpp'
--- src/event.cpp	2015-10-13 11:33:31 +0000
+++ src/event.cpp	2016-05-26 00:07:16 +0000
@@ -855,7 +855,7 @@
 
     if (o.empty ())
     {
-	o.resize (8);
+	o.resize (9);
 	o[0].setName ("event_window", CompOption::TypeInt);
 	o[1].setName ("window", CompOption::TypeInt);
 	o[2].setName ("modifiers", CompOption::TypeInt);
@@ -867,6 +867,7 @@
     {
 	o[6].reset ();
 	o[7].reset ();
+	o[8].reset ();
     }
 
     switch (event->type) {
@@ -936,10 +937,14 @@
 
 	o[6].setName ("keycode", CompOption::TypeInt);
 	o[7].setName ("time", CompOption::TypeInt);
+	o[8].setName ("is_repeated", CompOption::TypeBool);
 
 	o[6].value ().set ((int) event->xkey.keycode);
 	o[7].value ().set ((int) event->xkey.time);
 
+	o[8].value ().set (nextKeyPressIsRepeated_);
+	nextKeyPressIsRepeated_ = false;
+
 	eventManager.resetPossibleTap();
 	foreach (CompPlugin *p, CompPlugin::getPlugins ())
 	{
@@ -966,6 +971,19 @@
 
 	bool handled = false;
 
+	nextKeyPressIsRepeated_ = false;
+	if (XEventsQueued (dpy, QueuedAfterReading))
+	{
+	    XEvent nev;
+	    XPeekEvent (dpy, &nev);
+
+	    if (nev.type == KeyPress && nev.xkey.time == event->xkey.time &&
+		nev.xkey.keycode == event->xkey.keycode)
+	    {
+		nextKeyPressIsRepeated_ = true;
+	    }
+	}
+
 	foreach (CompPlugin *p, CompPlugin::getPlugins ())
 	{
 	    CompOption::Vector &options = p->vTable->getOptions ();
@@ -1679,9 +1697,17 @@
 		    if (w->isViewable ())
 		    {
 			if (w->type () == CompWindowTypeDesktopMask)
-			    decrementDesktopWindowCount();
+			{
+			    decrementDesktopWindowCount ();
+			    if (!w->alpha ())
+			        decrementOpaqueDesktopWindowCount ();
+			}
 			else if (type == CompWindowTypeDesktopMask)
-			    incrementDesktopWindowCount();
+			{
+			    incrementDesktopWindowCount ();
+			    if (!w->alpha ())
+			        incrementOpaqueDesktopWindowCount ();
+			}
 		    }
 
 		    w->wmType () = type;

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2015-10-26 17:15:50 +0000
+++ src/privatescreen.h	2016-05-26 00:07:16 +0000
@@ -542,10 +542,14 @@
     DesktopWindowCount();
     virtual ~DesktopWindowCount() {}
     virtual void incrementDesktopWindowCount();
+    virtual void incrementOpaqueDesktopWindowCount();
     virtual void decrementDesktopWindowCount();
+    virtual void decrementOpaqueDesktopWindowCount();
     virtual int desktopWindowCount();
+    virtual int opaqueDesktopWindowCount();
 private:
-    int       count;
+    int       countAll;
+    int       countOpaque;
 };
 
 class MapNum :
@@ -818,6 +822,8 @@
     compiz::private_screen::PluginManager pluginManager;
     compiz::private_screen::WindowManager& windowManager;
     CompOption::Vector resourceManager;
+
+    bool nextKeyPressIsRepeated_;
 };
 
 class CompManager

=== modified file 'src/privatescreen/tests/test-privatescreen.cpp'
--- src/privatescreen/tests/test-privatescreen.cpp	2015-10-26 17:15:50 +0000
+++ src/privatescreen/tests/test-privatescreen.cpp	2016-05-26 00:07:16 +0000
@@ -145,6 +145,7 @@
 				CompSize   &size,
 				void       *&data));
     MOCK_METHOD0(desktopWindowCount, int ());
+    MOCK_METHOD0(opaqueDesktopWindowCount, int ());
     MOCK_METHOD0(attrib, XWindowAttributes ());
     MOCK_CONST_METHOD0(defaultIcon, CompIcon *());
     virtual bool otherGrabExist (const char *, ...) { return false; }  // TODO How to mock?
@@ -183,7 +184,9 @@
     MOCK_METHOD0(snDisplay, SnDisplay * ());
     MOCK_CONST_METHOD0(createFailed, bool ());
     MOCK_METHOD0(incrementDesktopWindowCount, void ());
+    MOCK_METHOD0(incrementOpaqueDesktopWindowCount, void ());
     MOCK_METHOD0(decrementDesktopWindowCount, void ());
+    MOCK_METHOD0(decrementOpaqueDesktopWindowCount, void ());
     MOCK_METHOD0(nextMapNum, unsigned int ());
     MOCK_CONST_METHOD0(updatePassiveKeyGrabs, void ());
     MOCK_METHOD1(updatePassiveButtonGrabs, void (Window serverFrame));

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2015-10-26 17:15:50 +0000
+++ src/screen.cpp	2016-05-26 00:07:16 +0000
@@ -4565,7 +4565,13 @@
 int
 cps::DesktopWindowCount::desktopWindowCount ()
 {
-    return count;
+    return countAll;
+}
+
+int
+cps::DesktopWindowCount::opaqueDesktopWindowCount ()
+{
+    return countOpaque;
 }
 
 unsigned int
@@ -4879,19 +4885,32 @@
 }
 
 cps::DesktopWindowCount::DesktopWindowCount() :
-count(0)
+countAll(0), countOpaque(0)
 {
 }
 
 void
 cps::DesktopWindowCount::incrementDesktopWindowCount()
 {
-    count++;
-}
+    countAll++;
+}
+
+void
+cps::DesktopWindowCount::incrementOpaqueDesktopWindowCount()
+{
+    countOpaque++;
+}
+
 void
 cps::DesktopWindowCount::decrementDesktopWindowCount()
 {
-    count--;
+    countAll--;
+}
+
+void
+cps::DesktopWindowCount::decrementOpaqueDesktopWindowCount()
+{
+    countOpaque--;
 }
 
 cps::MapNum::MapNum() :
@@ -5451,7 +5470,8 @@
     edgeWindow (None),
     edgeDelayTimer (),
     xdndWindow (None),
-    windowManager(windowManager)
+    windowManager(windowManager),
+    nextKeyPressIsRepeated_(false)
 {
     for (int i = 0; i < SCREEN_EDGE_NUM; i++)
     {

=== modified file 'src/window.cpp'
--- src/window.cpp	2015-08-05 11:26:30 +0000
+++ src/window.cpp	2016-05-26 00:07:16 +0000
@@ -543,11 +543,11 @@
 
     recalcType ();
     recalcActions ();
+    stateChangeNotify (oldState);
 
     if (priv->managed)
 	screen->setWindowState (priv->state, priv->id);
 
-    stateChangeNotify (oldState);
     screen->matchPropertyChanged (this);
 }
 
@@ -1372,7 +1372,11 @@
 	screen->updateClientList ();
 
 	if (priv->type & CompWindowTypeDesktopMask)
-	    screen->incrementDesktopWindowCount();
+	{
+	    screen->incrementDesktopWindowCount ();
+	    if (!alpha ())
+	        screen->incrementOpaqueDesktopWindowCount ();
+	}
 
 	if (priv->protocols & CompWindowProtocolSyncRequestMask)
 	{
@@ -1456,7 +1460,11 @@
 	return;
 
     if (priv->type == CompWindowTypeDesktopMask)
-	screen->decrementDesktopWindowCount();
+    {
+	screen->decrementDesktopWindowCount ();
+	if (!alpha ())
+	    screen->decrementOpaqueDesktopWindowCount ();
+    }
 
     priv->attrib.map_state = IsUnmapped;
     priv->invisible        = true;
@@ -6333,7 +6341,11 @@
     if (priv->attrib.map_state == IsViewable)
     {
 	if (priv->type == CompWindowTypeDesktopMask)
+	{
 	    screen->decrementDesktopWindowCount ();
+	    if (!alpha ())
+	        screen->decrementOpaqueDesktopWindowCount ();
+	}
 
 	if (priv->destroyed && priv->struts)
 	    screen->updateWorkarea ();