Merge lp:~3v1n0/unity/gtk-border-radius-support into lp:unity

[Marco Trevisan (Treviño)]

DecoratedWindow: move the shadow under the window if we've a client-side decorated window with corners

This requires lp:~3v1n0/gtk/unity-border-radius-support/+merge/288331

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3992
http://jenkins.qa.ubuntu.com/job/unity-ci/1423/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/73

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3995
http://jenkins.qa.ubuntu.com/job/unity-ci/1425/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/75

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2015-08-07 18:54:07 +0000
+++ decorations/DecoratedWindow.cpp	2016-03-09 17:31:58 +0000
@@ -47,6 +47,7 @@
   , monitor_(0)
   , dirty_geo_(true)
   , dirty_frame_(false)
+  , client_decorated_(false)
   , deco_elements_(cu::DecorationElement::NONE)
   , last_mwm_decor_(win_->mwmDecor())
   , last_actions_(win_->actions())
@@ -105,7 +106,8 @@
 
 void Window::Impl::Update()
 {
-  UpdateElements();
+  UpdateClientDecorationsState();
+  UpdateElements(client_decorated_ ? cu::WindowFilter::CLIENTSIDE_DECORATED : cu::WindowFilter::NONE);
 
   if (deco_elements_ & (cu::DecorationElement::EDGE | cu::DecorationElement::BORDER))
     Decorate();
@@ -212,10 +214,10 @@
   if (win_->shaded())
     frame_geo.height = input.top + input.bottom;
 
-  if (!frame_)
+  if (!frame_ && win_->frame())
     CreateFrame(frame_geo);
 
-  if (frame_geo_ != frame_geo)
+  if (frame_ && frame_geo_ != frame_geo)
     UpdateFrameGeo(frame_geo);
 }
 
@@ -431,7 +433,7 @@
   return (win_->state() & MAXIMIZE_STATE) == MAXIMIZE_STATE;
 }
 
-void Window::Impl::UpdateElements(cu::WindowFilter::Value wf)
+void Window::Impl::UpdateElements(cu::WindowFilter wf)
 {
   if (!parent_->scaled() && IsMaximized())
   {
@@ -442,6 +444,31 @@
   deco_elements_ = cu::WindowDecorationElements(win_, wf);
 }
 
+void Window::Impl::UpdateClientDecorationsState()
+{
+  if (win_->alpha())
+  {
+    auto const& corners = WindowManager::Default().GetCardinalProperty(win_->id(), atom::_UNITY_GTK_BORDER_RADIUS);
+
+    if (!corners.empty())
+    {
+      enum Corner { TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT };
+      client_borders_.top = std::max(corners[TOP_LEFT], corners[TOP_RIGHT]);
+      client_borders_.left = std::max(corners[TOP_LEFT], corners[BOTTOM_LEFT]);
+      client_borders_.right = std::max(corners[TOP_RIGHT], corners[BOTTOM_RIGHT]);
+      client_borders_.bottom = std::max(corners[BOTTOM_LEFT], corners[BOTTOM_RIGHT]);
+      client_decorated_ = true;
+      return;
+    }
+  }
+
+  if (client_decorated_)
+  {
+    client_borders_ = CompWindowExtents();
+    client_decorated_ = false;
+  }
+}
+
 bool Window::Impl::ShadowDecorated() const
 {
   return deco_elements_ & cu::DecorationElement::SHADOW;
@@ -613,7 +640,14 @@
 
   if (shadows_rect != last_shadow_rect_)
   {
-    auto const& win_region = win_->region();
+    auto win_region = win_->region();
+
+    if (client_decorated_)
+    {
+      win_region.shrink(client_borders_.left + client_borders_.right, client_borders_.top + client_borders_.bottom);
+      win_region.translate(client_borders_.left - client_borders_.right, client_borders_.top - client_borders_.bottom);
+    }
+
     quads[Quads::Pos::TOP_LEFT].region = CompRegion(quads[Quads::Pos::TOP_LEFT].box) - win_region;
     quads[Quads::Pos::TOP_RIGHT].region = CompRegion(quads[Quads::Pos::TOP_RIGHT].box) - win_region;
     quads[Quads::Pos::BOTTOM_LEFT].region = CompRegion(quads[Quads::Pos::BOTTOM_LEFT].box) - win_region;
@@ -657,6 +691,9 @@
   auto const& clip_region = (mask & PAINT_WINDOW_TRANSFORMED_MASK) ? infiniteRegion : region;
   mask |= PAINT_WINDOW_BLEND_MASK;
 
+  if (win_->alpha() || attrib.opacity != OPAQUE)
+    mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
+
   glwin_->vertexBuffer()->begin();
 
   for (unsigned i = 0; i < shadow_quads_.size(); ++i)
 
=== modified file 'decorations/DecorationsManager.cpp'
--- decorations/DecorationsManager.cpp	2015-08-07 18:54:07 +0000
+++ decorations/DecorationsManager.cpp	2016-03-09 17:31:58 +0000
@@ -31,18 +31,15 @@
 {
 Manager* manager_ = nullptr;
 
-namespace
-{
 namespace atom
 {
 Atom _NET_REQUEST_FRAME_EXTENTS = 0;
 Atom _NET_WM_VISIBLE_NAME = 0;
-}
+Atom _UNITY_GTK_BORDER_RADIUS = 0;
 }
 
 Manager::Impl::Impl(decoration::Manager* parent, menu::Manager::Ptr const& menu)
-  : enable_add_supported_atoms_(true)
-  , data_pool_(DataPool::Get())
+  : data_pool_(DataPool::Get())
   , menu_manager_(menu)
 {
   if (!manager_)
@@ -51,6 +48,7 @@
   Display* dpy = screen->dpy();
   atom::_NET_REQUEST_FRAME_EXTENTS = XInternAtom(dpy, "_NET_REQUEST_FRAME_EXTENTS", False);
   atom::_NET_WM_VISIBLE_NAME = XInternAtom(dpy, "_NET_WM_VISIBLE_NAME", False);
+  atom::_UNITY_GTK_BORDER_RADIUS = XInternAtom(dpy, "_UNITY_GTK_BORDER_RADIUS", False);
 
   auto rebuild_cb = sigc::mem_fun(this, &Impl::OnShadowOptionsChanged);
   manager_->active_shadow_color.changed.connect(sigc::hide(sigc::bind(rebuild_cb, true)));
@@ -65,12 +63,6 @@
   SetupIntegratedMenus();
 }
 
-Manager::Impl::~Impl()
-{
-  enable_add_supported_atoms_ = false;
-  screen->updateSupportedWmHints();
-}
-
 cu::PixmapTexture::Ptr Manager::Impl::BuildShadowTexture(unsigned radius, nux::Color const& color)
 {
   int tex_size = radius * 4;
@@ -279,6 +271,10 @@
           win->title = wm.GetStringProperty(event->xproperty.window, event->xproperty.atom);
         }
       }
+      else if (event->xproperty.atom == atom::_UNITY_GTK_BORDER_RADIUS)
+      {
+        UpdateWindow(event->xproperty.window);
+      }
       break;
     }
     case ConfigureNotify:
@@ -400,8 +396,8 @@
 
 void Manager::AddSupportedAtoms(std::vector<Atom>& atoms) const
 {
-  if (impl_->enable_add_supported_atoms_)
-    atoms.push_back(atom::_NET_REQUEST_FRAME_EXTENTS);
+  atoms.push_back(atom::_UNITY_GTK_BORDER_RADIUS);
+  atoms.push_back(atom::_NET_REQUEST_FRAME_EXTENTS);
 }
 
 bool Manager::HandleEventBefore(XEvent* xevent)
 
=== modified file 'decorations/DecorationsPriv.h'
--- decorations/DecorationsPriv.h	2015-02-03 09:46:48 +0000
+++ decorations/DecorationsPriv.h	2016-03-09 17:31:58 +0000
@@ -50,6 +50,11 @@
 
 namespace cu = compiz_utils;
 
+namespace atom
+{
+extern Atom _UNITY_GTK_BORDER_RADIUS;
+}
+
 struct Quads
 {
   enum class Pos
@@ -93,7 +98,8 @@
 private:
   void UnsetExtents();
   void SetupExtents();
-  void UpdateElements(cu::WindowFilter::Value wf = cu::WindowFilter::NONE);
+  void UpdateElements(cu::WindowFilter wf = cu::WindowFilter::NONE);
+  void UpdateClientDecorationsState();
   void UpdateMonitor();
   void UpdateFrame();
   void CreateFrame(nux::Geometry const&);
@@ -132,6 +138,7 @@
   int monitor_;
   bool dirty_geo_;
   bool dirty_frame_;
+  bool client_decorated_;
   unsigned deco_elements_;
   unsigned last_mwm_decor_;
   unsigned last_actions_;
@@ -140,6 +147,7 @@
   Quads shadow_quads_;
   nux::Geometry frame_geo_;
   CompRegion frame_region_;
+  CompWindowExtents client_borders_;
   connection::Wrapper theme_changed_;
   connection::Wrapper dpi_changed_;
   connection::Wrapper grab_mouse_changed_;
@@ -161,7 +169,6 @@
 struct Manager::Impl : sigc::trackable
 {
   Impl(decoration::Manager*, menu::Manager::Ptr const&);
-  ~Impl();
 
   Window::Ptr HandleWindow(CompWindow* cwin);
   bool HandleEventBefore(XEvent*);
@@ -188,8 +195,6 @@
   friend class Manager;
   friend struct Window::Impl;
 
-  bool enable_add_supported_atoms_;
-
   DataPool::Ptr data_pool_;
   cu::PixmapTexture::Ptr active_shadow_pixmap_;
   cu::PixmapTexture::Ptr inactive_shadow_pixmap_;
 
=== modified file 'plugins/unityshell/src/inputremover.cpp'
--- plugins/unityshell/src/inputremover.cpp	2016-01-24 20:12:20 +0000
+++ plugins/unityshell/src/inputremover.cpp	2016-03-09 17:31:58 +0000
@@ -88,6 +88,7 @@
                                                 Window shapeWindow,
                                                 Window propWindow) :
   mDpy (dpy),
+  mProperty (XInternAtom (mDpy, "_UNITY_SAVED_WINDOW_SHAPE", False)),
   mShapeWindow (shapeWindow),
   mPropWindow (propWindow),
   mShapeMask (0),
@@ -328,7 +329,6 @@
                                            int nInput,
                                            int inputOrdering)
 {
-  Atom prop = XInternAtom (mDpy, "_UNITY_SAVED_WINDOW_SHAPE", FALSE);
   Atom type = XA_CARDINAL;
   int  fmt  = 32;
 
@@ -365,7 +365,7 @@
   /* No need to check return code, always returns 0 */
   XChangeProperty(mDpy,
                   mPropWindow,
-                  prop,
+                  mProperty,
                   type,
                   fmt,
                   PropModeReplace,
@@ -381,7 +381,6 @@
                                           int *inputOrdering)
 
 {
-  Atom prop = XInternAtom (mDpy, "_UNITY_SAVED_WINDOW_SHAPE", FALSE);
   Atom type = XA_CARDINAL;
   int  fmt  = 32;
 
@@ -399,7 +398,7 @@
    * long the rest of the property is going to be */
   if (!XGetWindowProperty(mDpy,
                           mPropWindow,
-                          prop,
+                          mProperty,
                           0L,
                           headerLength,
                           FALSE,
@@ -438,7 +437,7 @@
 
   if (!XGetWindowProperty(mDpy,
                           mPropWindow,
-                          prop,
+                          mProperty,
                           0L,
                           fullLength,
                           FALSE,
@@ -486,9 +485,7 @@
 void
 compiz::WindowInputRemover::clearProperty()
 {
-  Atom prop = XInternAtom (mDpy, "_UNITY_SAVED_WINDOW_SHAPE", FALSE);
-
-  XDeleteProperty(mDpy, mPropWindow, prop);
+  XDeleteProperty(mDpy, mPropWindow, mProperty);
 }
 
 bool
 
=== modified file 'plugins/unityshell/src/inputremover.h'
--- plugins/unityshell/src/inputremover.h	2013-02-25 00:59:23 +0000
+++ plugins/unityshell/src/inputremover.h	2016-03-09 17:31:58 +0000
@@ -97,6 +97,7 @@
   void clearRectangles ();
 
   Display       *mDpy;
+  Atom          mProperty;
   Window        mShapeWindow;
   Window        mPropWindow;
   unsigned long mShapeMask;
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-01-14 12:35:47 +0000
+++ plugins/unityshell/src/unityshell.cpp	2016-03-09 17:31:58 +0000
@@ -175,6 +175,13 @@
 const std::string FIRST_RUN_STAMP = "first_run.stamp";
 const std::string LOCKED_STAMP = "locked.stamp";
 } // namespace local
+
+namespace atom
+{
+Atom _UNITY_SHELL = 0;
+Atom _UNITY_SAVED_WINDOW_SHAPE = 0;
+}
+
 } // anon namespace
 
 UnityScreen::UnityScreen(CompScreen* screen)
@@ -311,6 +318,9 @@
      CompositeScreenInterface::setHandler(cScreen);
      GLScreenInterface::setHandler(gScreen);
      ScaleScreenInterface::setHandler(sScreen);
+
+     atom::_UNITY_SHELL = XInternAtom(screen->dpy(), "_UNITY_SHELL", False);
+     atom::_UNITY_SAVED_WINDOW_SHAPE = XInternAtom(screen->dpy(), "_UNITY_SAVED_WINDOW_SHAPE", False);
      screen->updateSupportedWmHints();
 
      nux::NuxInitialize(0);
@@ -504,8 +514,10 @@
   QuicklistManager::Destroy();
   decoration::DataPool::Reset();
   SaveLockStamp(false);
-
   reset_glib_logging();
+
+  screen->addSupportedAtomsSetEnabled(this, false);
+  screen->updateSupportedWmHints();
 }
 
 void UnityScreen::InitAltTabNextWindow()
@@ -1768,6 +1780,8 @@
 void UnityScreen::addSupportedAtoms(std::vector<Atom>& atoms)
 {
   screen->addSupportedAtoms(atoms);
+  atoms.push_back(atom::_UNITY_SHELL);
+  atoms.push_back(atom::_UNITY_SAVED_WINDOW_SHAPE);
   deco_manager_->AddSupportedAtoms(atoms);
 }
 
@@ -3028,9 +3042,8 @@
     wAttrib.brightness *= 0.75f;
   }
 
-  bool ret = gWindow->glPaint(wAttrib, matrix, region, mask);
   deco_win_->Paint(matrix, wAttrib, region, mask);
-  return ret;
+  return gWindow->glPaint(wAttrib, matrix, region, mask);
 }
 
 /* handle window painting in an opengl context
@@ -3153,8 +3166,8 @@
   if (draw_panel_shadow == DrawPanelShadow::BELOW_WINDOW)
     uScreen->paintPanelShadow(region);
 
+  deco_win_->Draw(matrix, attrib, region, mask);
   bool ret = gWindow->glDraw(matrix, attrib, region, mask);
-  deco_win_->Draw(matrix, attrib, region, mask);
 
   if (draw_panel_shadow == DrawPanelShadow::OVER_WINDOW)
     uScreen->paintPanelShadow(region);
@@ -4181,13 +4194,17 @@
   int n;
   Atom *atoms = XListProperties(d, w, &n);
   bool has_inconsistent_shape = false;
-  static Atom unity_shape_rects_atom = XInternAtom(d, "_UNITY_SAVED_WINDOW_SHAPE", False);
 
   for (int i = 0; i < n; ++i)
-    if (atoms[i] == unity_shape_rects_atom)
+  {
+    if (atoms[i] == atom::_UNITY_SAVED_WINDOW_SHAPE)
+    {
       has_inconsistent_shape = true;
+      break;
+    }
+  }
 
-  XFree (atoms);
+  XFree(atoms);
   return has_inconsistent_shape;
 }
 }
 
=== modified file 'unity-shared/CompizUtils.cpp'
--- unity-shared/CompizUtils.cpp	2015-08-14 18:12:26 +0000
+++ unity-shared/CompizUtils.cpp	2016-03-09 17:31:58 +0000
@@ -177,7 +177,7 @@
 //
 //
 
-unsigned WindowDecorationElements(CompWindow* win, WindowFilter::Value wf)
+unsigned WindowDecorationElements(CompWindow* win, WindowFilter wf)
 {
   unsigned elements = DecorationElement::NONE;
 
@@ -194,8 +194,22 @@
   bool rectangular = (region.numRects() == 1);
   bool alpha = win->alpha();
 
-  if (!rectangular && alpha) // Non-rectangular windows with alpha channel
-    return elements;
+  if (alpha)
+  {
+    if (wf == WindowFilter::CLIENTSIDE_DECORATED)
+    {
+      elements = DecorationElement::SHADOW;
+
+      if (win->actions() & CompWindowActionResizeMask)
+        elements |= DecorationElement::EDGE;
+
+      return elements;
+    }
+    else if (!rectangular) // Non-rectangular windows with alpha channel
+    {
+      return elements;
+    }
+  }
 
   if (region.boundingRect() != win->geometry()) // Shaped windows
     return elements;
 
=== modified file 'unity-shared/CompizUtils.h'
--- unity-shared/CompizUtils.h	2014-10-22 13:58:46 +0000
+++ unity-shared/CompizUtils.h	2016-03-09 17:31:58 +0000
@@ -119,14 +119,12 @@
   cairo_t *cr_;
 };
 
-namespace WindowFilter
-{
-enum Value
+enum class WindowFilter
 {
   NONE,
-  UNMAPPED
+  UNMAPPED,
+  CLIENTSIDE_DECORATED
 };
-}
 
 namespace DecorationElement
 {
@@ -140,7 +138,7 @@
 };
 }
 
-unsigned WindowDecorationElements(CompWindow*, WindowFilter::Value wf = WindowFilter::NONE);
+unsigned WindowDecorationElements(CompWindow*, WindowFilter wf = WindowFilter::NONE);
 
 bool IsWindowEdgeDecorable(CompWindow*);
 bool IsWindowShadowDecorable(CompWindow*);