Merge ~3v1n0/unity:decorations-empty-shape-fix into unity:impish

[Marco Trevisan (Treviño)]

c7c912c... by Marco Trevisan (Treviño) on 2021-10-26

Update changelog

109e176... by Marco Trevisan (Treviño) on 2021-10-26

dummy-xorg-test-runner: Use command -v instead of deprecated which

d7c6424... by Marco Trevisan (Treviño) on 2021-10-26

TestSwitchController: Do not define FakeApplicationWindow as NiceMock twice

It's already used as ::Nice later, no need to define it initially,
otherwise newer gtest won't compile

Unmerged commits

c7c912c... by Marco Trevisan (Treviño) on 2021-10-26

Update changelog

d7c6424... by Marco Trevisan (Treviño) on 2021-10-26

TestSwitchController: Do not define FakeApplicationWindow as NiceMock twice

It's already used as ::Nice later, no need to define it initially,
otherwise newer gtest won't compile

109e176... by Marco Trevisan (Treviño) on 2021-10-26

dummy-xorg-test-runner: Use command -v instead of deprecated which

54b016c... by Marco Trevisan (Treviño) on 2021-10-26

DecorationsShape: Initialize parameters on missing rectangles

In such case the shape should just be empty, but we didn't really handle
the case properly.

eb67abc... by Uladzislau Nikalayevich on 2021-10-18

DecoratedWindow: Do not try to use shaped shadows on empty quads

Windows may have no shaped rectangles, but we're still trying to set
them. This is because we might not initialize the shape size, leading
to invalid values.

LP: #1904337

diff --git a/debian/changelog b/debian/changelog
index cc2e91c..4758188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+unity (7.5.1+22.04.20211026-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Uladzislau Nikalayevich ]
+  * DecoratedWindow: Do not try to use shaped shadows on empty quads.
+    Windows may have no shaped rectangles, but we're still trying to set
+    them. This is because we might not initialize the shape size, leading
+    to invalid values. (LP: #1904337)
+
+  [ Marco Trevisan (Treviño) ]
+  * DecorationsShape: Initialize parameters on missing rectangles.
+    In such case the shape should just be empty, but we didn't really handle
+    the case properly.
+  * dummy-xorg-test-runner: Use command -v instead of deprecated which
+  * TestSwitchController: Do not define FakeApplicationWindow as NiceMock twice.
+    It's already used as ::Nice later, no need to define it initially,
+    otherwise newer gtest won't compile
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 26 Oct 2021 19:19:56 +0200
+
 unity (7.5.1+21.10.20210601.1-0ubuntu1) impish; urgency=medium
 
   * New upstream release
diff --git a/decorations/DecoratedWindow.cpp b/decorations/DecoratedWindow.cpp
index ed5548f..21f192c 100644
--- a/decorations/DecoratedWindow.cpp
+++ b/decorations/DecoratedWindow.cpp
@@ -750,6 +750,12 @@ void Window::Impl::ComputeShapedShadowQuad()
   unsigned int radius = active() ? manager_->active_shadow_radius() : manager_->inactive_shadow_radius();
 
   Shape shape(win_->id());
+  if (shape.GetRectangles().empty())
+  {
+    shaped_shadow_pixmap_.reset();
+    return;
+  }
+
   auto const& border = win_->borderRect();
   auto const& shadow_offset = manager_->shadow_offset();
 
diff --git a/decorations/DecorationsShape.cpp b/decorations/DecorationsShape.cpp
index bd827d7..0c5395e 100644
--- a/decorations/DecorationsShape.cpp
+++ b/decorations/DecorationsShape.cpp
@@ -61,6 +61,11 @@ Shape::Shape(Window xid)
   }
   else
   {
+    width_ = 0;
+    height_ = 0;
+    xoffs_ = 0;
+    yoffs_ = 0;
+
     LOG_ERROR(logger) << "XShapeQueryExtend returned no extents";
     return;
   }
diff --git a/tests/dummy-xorg-test-runner.sh b/tests/dummy-xorg-test-runner.sh
index a4808f8..3909ecd 100755
--- a/tests/dummy-xorg-test-runner.sh
+++ b/tests/dummy-xorg-test-runner.sh
@@ -17,7 +17,7 @@
 
 MAX_WAIT=10
 
-binary=$(which $1)
+binary=$(command -v $1)
 
 if [ -z "$binary" ]; then
   if [ -z "$1" ]; then
diff --git a/tests/test_switcher_controller.h b/tests/test_switcher_controller.h
index 5e35b2e..cacde1d 100644
--- a/tests/test_switcher_controller.h
+++ b/tests/test_switcher_controller.h
@@ -49,7 +49,7 @@ const unsigned TICK_DURATION = 10 * 1000;
 /**
  * A fake ApplicationWindow for verifying selection of the switcher.
  */
-struct FakeApplicationWindow : public ::testmocks::MockApplicationWindow::Nice
+struct FakeApplicationWindow : public ::testmocks::MockApplicationWindow
 {
   typedef NiceMock<FakeApplicationWindow> Nice;
   FakeApplicationWindow(Window xid, uint64_t active_number = 0);
diff --git a/tests/test_switcher_controller_class.cpp b/tests/test_switcher_controller_class.cpp
index 807a239..bea4d88 100644
--- a/tests/test_switcher_controller_class.cpp
+++ b/tests/test_switcher_controller_class.cpp
@@ -26,7 +26,7 @@ using namespace unity::switcher;
 using namespace std::chrono;
 
 FakeApplicationWindow::FakeApplicationWindow(Window xid, uint64_t active_number)
-  : MockApplicationWindow::Nice(xid)
+  : MockApplicationWindow(xid)
 {
   SetMonitor(-1);
   auto standalone_window = std::make_shared<StandaloneWindow>(window_id());