Merge lp:~3v1n0/unity/deco-get-proper-shadow-texture into lp:unity

[Marco Trevisan (Treviño)]

DecoratedWindow: avoid deferencing an invalid shadow texture ptr, and split functions

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2016-07-27 10:17:42 +0000
+++ decorations/DecoratedWindow.cpp	2016-08-01 13:49:29 +0000
@@ -493,6 +493,12 @@
   return deco_elements_ & cu::DecorationElement::SHADOW;
 }
 
+bool Window::Impl::ShapedShadowDecorated() const
+{
+  return deco_elements_ & cu::DecorationElement::SHADOW &&
+         deco_elements_ & cu::DecorationElement::SHAPED;
+}
+
 bool Window::Impl::FullyDecorated() const
 {
   return deco_elements_ & cu::DecorationElement::BORDER;
@@ -503,16 +509,16 @@
   return (win_->frame() || win_->hasUnmapReference()) && FullyDecorated();
 }
 
-bool Window::Impl::IsRectangular() const
-{
-  return win_->region().numRects() == 1;
-}
-
 GLTexture* Window::Impl::ShadowTexture() const
 {
-  if (!IsRectangular())
+  if (shaped_shadow_pixmap_)
     return shaped_shadow_pixmap_->texture();
 
+  return SharedShadowTexture();
+}
+
+GLTexture* Window::Impl::SharedShadowTexture() const
+{
   auto const& mi = manager_->impl_;
   if (active() || parent_->scaled())
     return mi->active_shadow_pixmap_->texture();
@@ -578,10 +584,22 @@
     if (!last_shadow_rect_.isEmpty())
       last_shadow_rect_.setGeometry(0, 0, 0, 0);
 
-    return;
-  }
+    shaped_shadow_pixmap_.reset();
+  }
+  else if (deco_elements_ & cu::DecorationElement::SHAPED)
+  {
+    ComputeShapedShadowQuad();
+  }
+  else
+  {
+    shaped_shadow_pixmap_.reset();
+    ComputeGenericShadowQuads();
+  }
+}
 
-  const auto* texture = ShadowTexture();
+void Window::Impl::ComputeGenericShadowQuads()
+{
+  const auto* texture = SharedShadowTexture();
 
   if (!texture || !texture->width() || !texture->height())
     return;
@@ -707,14 +725,6 @@
 
 void Window::Impl::ComputeShapedShadowQuad()
 {
-  if (!(deco_elements_ & cu::DecorationElement::SHADOW))
-  {
-    if (!last_shadow_rect_.isEmpty())
-      last_shadow_rect_.setGeometry(0, 0, 0, 0);
-
-    return;
-  }
-
   nux::Color color = active() ? manager_->active_shadow_color() : manager_->inactive_shadow_color();
   unsigned int radius = active() ? manager_->active_shadow_radius() : manager_->inactive_shadow_radius();
 
@@ -793,7 +803,7 @@
 
   glwin_->vertexBuffer()->begin();
 
-  unsigned int num_quads = IsRectangular() ? shadow_quads_.size() : 1;
+  unsigned int num_quads = ShapedShadowDecorated() ? 1 : shadow_quads_.size();
   for (unsigned int i = 0; i < num_quads; ++i)
   {
     auto& quad = shadow_quads_[Quads::Pos(i)];
@@ -1035,7 +1045,7 @@
 void Window::UpdateDecorationPosition()
 {
   impl_->UpdateMonitor();
-  impl_->IsRectangular() ? impl_->ComputeShadowQuads() : impl_->ComputeShapedShadowQuad();
+  impl_->ComputeShadowQuads();
   impl_->UpdateWindowEdgesGeo();
   impl_->UpdateDecorationTextures();
   impl_->UpdateForceQuitDialogPosition();
 
=== modified file 'decorations/DecorationsForceQuitDialog.cpp'
--- decorations/DecorationsForceQuitDialog.cpp	2016-03-22 15:29:31 +0000
+++ decorations/DecorationsForceQuitDialog.cpp	2016-08-01 13:49:29 +0000
@@ -384,7 +384,6 @@
 {
   auto* self = GTK_WIDGET(g_object_new(close_button_get_type(), nullptr));
   gtk_button_set_relief(GTK_BUTTON(self), GTK_RELIEF_NONE);
-  gtk_button_set_focus_on_click(GTK_BUTTON(self), FALSE);
   gtk_widget_set_can_focus(self, FALSE);
   gtk_widget_set_halign(self, GTK_ALIGN_START);
 
 
=== modified file 'decorations/DecorationsPriv.h'
--- decorations/DecorationsPriv.h	2016-07-26 11:33:50 +0000
+++ decorations/DecorationsPriv.h	2016-08-01 13:49:29 +0000
@@ -90,6 +90,7 @@
   bool IsMaximized() const;
   bool FullyDecorated() const;
   bool ShadowDecorated() const;
+  bool ShapedShadowDecorated() const;
   void RedrawDecorations();
   void Damage();
   void SetupAppMenu();
@@ -118,12 +119,13 @@
   void SyncXShapeWithFrameRegion();
   void SyncMenusGeometries() const;
   bool ShouldBeDecorated() const;
-  bool IsRectangular() const;
   GLTexture* ShadowTexture() const;
+  GLTexture* SharedShadowTexture() const;
   unsigned ShadowRadius() const;
   std::string const& GetMenusPanelID() const;
 
   void ComputeShadowQuads();
+  void ComputeGenericShadowQuads();
   void ComputeShapedShadowQuad();
   void UpdateDecorationTextures();
   void UpdateWindowEdgesGeo();
 
=== modified file 'unity-shared/CompizUtils.cpp'
--- unity-shared/CompizUtils.cpp	2016-07-26 11:33:50 +0000
+++ unity-shared/CompizUtils.cpp	2016-08-01 13:49:29 +0000
@@ -190,7 +190,11 @@
   if (win->wmType() & (CompWindowTypeDockMask | CompWindowTypeDesktopMask))
     return elements;
 
-  if (win->alpha())
+  auto const& region = win->region();
+  bool rectangular = (region.numRects() == 1);
+  bool alpha = win->alpha();
+
+  if (alpha)
   {
     if (wf == WindowFilter::CLIENTSIDE_DECORATED)
     {
@@ -201,7 +205,7 @@
 
       return elements;
     }
-    else if (win->region().numRects() != 1) // Non-rectangular windows with alpha channel
+    else if (!rectangular) // Non-rectangular windows with alpha channel
     {
       return elements;
     }
@@ -209,6 +213,9 @@
 
   elements |= DecorationElement::SHADOW;
 
+  if (!rectangular)
+    elements |= DecorationElement::SHAPED;
+
   if (!win->overrideRedirect() &&
       (win->type() & DECORABLE_WINDOW_TYPES) &&
       (win->frame() || win->hasUnmapReference() || wf == WindowFilter::UNMAPPED))
@@ -216,14 +223,11 @@
     if (win->actions() & CompWindowActionResizeMask)
       elements |= DecorationElement::EDGE;
 
-    auto const& region = win->region();
-    bool rectangular = (region.numRects() == 1);
-
     if (rectangular && (win->mwmDecor() & (MwmDecorAll | MwmDecorTitle)))
       elements |= DecorationElement::BORDER;
   }
 
-  if (win->alpha() && !(elements & DecorationElement::BORDER) && !(win->mwmDecor() & MwmDecorBorder))
+  if (alpha && !(elements & DecorationElement::BORDER) && !(win->mwmDecor() & MwmDecorBorder))
     elements &= ~DecorationElement::SHADOW;
 
   return elements;
 
=== modified file 'unity-shared/CompizUtils.h'
--- unity-shared/CompizUtils.h	2015-11-02 14:58:01 +0000
+++ unity-shared/CompizUtils.h	2016-08-01 13:49:29 +0000
@@ -133,7 +133,8 @@
   NONE = 0,
   EDGE = (1 << 0),
   SHADOW = (1 << 1),
-  BORDER = (1 << 2),
+  SHAPED = (1 << 2),
+  BORDER = (1 << 3),
   FULL = EDGE|SHADOW|BORDER
 };
 }