Merge lp:~townsend/unity/no-window-decorations-5.0 into lp:unity/5.0

[Christopher Townsend]

Partial backport of Unity trunk revno. 2901 to fix where window decorations are being drawn when they should not be.

This is partial backport of http://bazaar.launchpad.net/~unity-team/unity/trunk/revision/2901 and fixes the issue where a window that is created without decorations will have decorations when quickly maximizing and then un-maximizing the window.

The fix has been in trunk for some time with no regressions.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-5.0-autolanding/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-5.0-precise-amd64-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2415
http://jenkins.qa.ubuntu.com/job/unity-5.0-ci/1/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-5.0-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[Martin Mrazik (mrazik)]

Can you please merge manually (as far as I can see some older MP were merged manually anyway)?

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-5.0-autolanding/2/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/unity-5.0-precise-amd64-autolanding/2/console

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2012-04-16 12:12:05 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2013-03-22 14:41:21 +0000
@@ -1083,7 +1083,7 @@
       // if we've just started tracking this window and it is maximized, let's
       // make sure it's undecorated just in case it slipped by us earlier
       // (I'm looking at you, Chromium!)
-      if (_is_maximized && wm->IsWindowDecorated(xid))
+      if (_is_maximized && wm->HasWindowDecorations(xid))
       {
         wm->Undecorate(xid);
         _maximized_set.insert(xid);
@@ -1222,7 +1222,7 @@
   }
 
   // update the state of the window in the _decor_map
-  _decor_map[xid] = WindowManager::Default()->IsWindowDecorated(xid);
+  _decor_map[xid] = WindowManager::Default()->HasWindowDecorations(xid);
 
   if (_decor_map[xid])
     WindowManager::Default()->Undecorate(xid);
@@ -1716,7 +1716,7 @@
     {
       Window xid = bamf_window_get_xid(window);
 
-      _decor_map[xid] = WindowManager::Default()->IsWindowDecorated(xid);
+      _decor_map[xid] = WindowManager::Default()->HasWindowDecorations(xid);
 
       if (_decor_map[xid])
         WindowManager::Default()->Undecorate(xid);

=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2012-06-29 22:48:43 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2013-03-22 14:41:21 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -42,7 +42,6 @@
 #define MWM_HINTS_FUNCTIONS     (1L << 0)
 #define MWM_HINTS_DECORATIONS   (1L << 1)
 #define MWM_HINTS_UNDECORATED_UNITY 0x80
-#define _XA_MOTIF_WM_HINTS    "_MOTIF_WM_HINTS"
 
 /* static */
 PluginAdapter*
@@ -151,13 +150,17 @@
 void
 PluginAdapter::NotifyNewDecorationState(guint32 xid)
 {
-  bool wasTracked = (_window_decoration_state.find (xid) != _window_decoration_state.end ());
+  auto deco_state_it = _window_decoration_state.find(xid);
+  bool wasTracked = (deco_state_it != _window_decoration_state.end());
   bool wasDecorated = false;
 
   if (wasTracked)
+  {
     wasDecorated = _window_decoration_state[xid];
+    _window_decoration_state.erase(deco_state_it);
+  }
 
-  bool decorated = IsWindowDecorated (xid);
+  bool decorated = HasWindowDecorations(xid);
 
   if (decorated == wasDecorated)
     return;
@@ -415,44 +418,74 @@
   return false;
 }
 
-bool
-PluginAdapter::IsWindowDecorated(guint32 xid)
+unsigned long
+PluginAdapter::GetMwnDecorations(Window window_id) const
 {
   Display* display = m_Screen->dpy();
-  Window win = xid;
-  Atom hints_atom = None;
   MotifWmHints* hints = NULL;
   Atom type = None;
   gint format;
   gulong nitems;
   gulong bytes_after;
-  bool ret = true;
-
-  hints_atom = XInternAtom(display, _XA_MOTIF_WM_HINTS, false);
-
-  if (XGetWindowProperty(display, win, hints_atom, 0,
+  unsigned long decorations = 0;
+
+  if (XGetWindowProperty(display, window_id, Atoms::mwmHints, 0,
                          sizeof(MotifWmHints) / sizeof(long), False,
-                         hints_atom, &type, &format, &nitems, &bytes_after,
+                         Atoms::mwmHints, &type, &format, &nitems, &bytes_after,
                          (guchar**)&hints) != Success)
-    return false;
+  {
+    return decorations;
+  }
+
+  decorations |= (MwmDecorAll | MwmDecorTitle);
 
   if (!hints)
-    return ret;
+    return decorations;
 
   /* Check for the presence of the high bit
    * if present, it means that we undecorated
    * this window, so don't mark it as undecorated */
-  if (type == hints_atom && format != 0 &&
-      hints->flags & MWM_HINTS_DECORATIONS)
+  if (type == Atoms::mwmHints && format != 0 && hints->flags & MWM_HINTS_DECORATIONS)
   {
-    /* Must have both bits set */
-    _window_decoration_state[xid] = ret =
-          (hints->decorations & (MwmDecorAll | MwmDecorTitle))  ||
-          (hints->decorations & MWM_HINTS_UNDECORATED_UNITY);
+    decorations = hints->decorations;
   }
 
   XFree(hints);
-  return ret;
+  return decorations;
+}
+
+bool
+PluginAdapter::HasWindowDecorations(guint32 xid) const
+{
+  Window window_id = xid;
+  auto deco_state_it = _window_decoration_state.find(window_id);
+
+  if (deco_state_it != _window_decoration_state.end())
+    return deco_state_it->second;
+
+  unsigned long decorations = GetMwnDecorations(window_id);
+
+  /* Must have both bits set */
+  bool decorated = (decorations & (MwmDecorAll | MwmDecorTitle)) ||
+                   (decorations & MWM_HINTS_UNDECORATED_UNITY);
+
+  _window_decoration_state[window_id] = decorated;
+  return decorated;
+}
+
+bool
+PluginAdapter::IsWindowDecorated(guint32 xid)
+{
+  Window window_id = xid;
+
+  bool decorated = GetMwnDecorations(window_id) & (MwmDecorAll | MwmDecorTitle);
+
+  if (decorated && GetCardinalProperty(window_id, Atoms::frameExtents).empty())
+  {
+    decorated = false;
+  }
+
+  return decorated;
 }
 
 bool
@@ -1023,7 +1056,6 @@
 PluginAdapter::SetMwmWindowHints(Window xid, MotifWmHints* new_hints)
 {
   Display* display = m_Screen->dpy();
-  Atom hints_atom = None;
   MotifWmHints* data = NULL;
   MotifWmHints* hints = NULL;
   Atom type = None;
@@ -1031,18 +1063,16 @@
   gulong nitems;
   gulong bytes_after;
 
-  hints_atom = XInternAtom(display, _XA_MOTIF_WM_HINTS, false);
-
   if (XGetWindowProperty(display,
                          xid,
-                         hints_atom, 0, sizeof(MotifWmHints) / sizeof(long),
+                         Atoms::mwmHints, 0, sizeof(MotifWmHints) / sizeof(long),
                          False, AnyPropertyType, &type, &format, &nitems,
                          &bytes_after, (guchar**)&data) != Success)
   {
     return;
   }
 
-  if (type != hints_atom || !data)
+  if (type != Atoms::mwmHints || !data)
   {
     hints = new_hints;
   }
@@ -1064,7 +1094,7 @@
 
   XChangeProperty(display,
                   xid,
-                  hints_atom, hints_atom, 32, PropModeReplace,
+                  Atoms::mwmHints, Atoms::mwmHints, 32, PropModeReplace,
                   (guchar*)hints, sizeof(MotifWmHints) / sizeof(long));
 
   if (data)
@@ -1074,6 +1104,9 @@
 void
 PluginAdapter::Decorate(guint32 xid)
 {
+  if (!HasWindowDecorations(xid))
+    return;
+
   MotifWmHints hints = { 0 };
 
   hints.flags = MWM_HINTS_DECORATIONS;
@@ -1085,6 +1118,9 @@
 void
 PluginAdapter::Undecorate(guint32 xid)
 {
+  if (!IsWindowDecorated(xid))
+    return;
+
   MotifWmHints hints = { 0 };
 
   /* Set the high bit to indicate that we undecorated this
@@ -1319,3 +1355,29 @@
          .add("expo_active", IsExpoActive())
          .add("viewport_switch_running", IsViewPortSwitchStarted());
 }
+
+std::vector<long> PluginAdapter::GetCardinalProperty(Window window_id, Atom atom) const
+{
+  Atom type;
+  int result, format;
+  unsigned long n_items, bytes_after;
+  long *buf = nullptr;
+
+  result = XGetWindowProperty(m_Screen->dpy(), window_id, atom, 0L, 65536, False,
+                              XA_CARDINAL, &type, &format, &n_items, &bytes_after,
+                              reinterpret_cast<unsigned char **>(&buf));
+
+  std::unique_ptr<long[], int(*)(void*)> buffer(buf, XFree);
+
+  if (result == Success && type == XA_CARDINAL && format == 32 && buffer && n_items > 0)
+  {
+    std::vector<long> values(n_items);
+
+    for (unsigned i = 0; i < n_items; ++i)
+      values[i] = buffer[i];
+
+    return values;
+  }
+
+  return std::vector<long>();
+}

=== modified file 'plugins/unityshell/src/PluginAdapter.h'
--- plugins/unityshell/src/PluginAdapter.h	2012-04-26 05:56:55 +0000
+++ plugins/unityshell/src/PluginAdapter.h	2013-03-22 14:41:21 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -125,6 +125,7 @@
   bool IsWindowClosable(guint32 xid);
   bool IsWindowMinimizable(guint32 xid);
   bool IsWindowMaximizable(guint32 xid);
+  bool HasWindowDecorations(guint32 xid) const;
 
   void Restore(guint32 xid);
   void RestoreAt(guint32 xid, int x, int y);
@@ -174,6 +175,9 @@
 
   bool CheckWindowIntersection(nux::Geometry const& region, CompWindow* window);
   void SetMwmWindowHints(Window xid, MotifWmHints* new_hints);
+  unsigned long GetMwnDecorations(Window xid) const;
+
+  std::vector<long> GetCardinalProperty(Window xid, Atom atom) const;
 
   CompScreen* m_Screen;
   MultiActionList m_ExpoActionList;
@@ -193,7 +197,7 @@
   bool _in_show_desktop;
   CompWindow* _last_focused_window;
 
-  std::map<guint32, unsigned int> _window_decoration_state;
+  mutable std::map<guint32, unsigned int> _window_decoration_state;
 
   static PluginAdapter* _default;
 };

=== modified file 'plugins/unityshell/src/WindowManager.cpp'
--- plugins/unityshell/src/WindowManager.cpp	2012-06-15 18:09:57 +0000
+++ plugins/unityshell/src/WindowManager.cpp	2013-03-22 14:41:21 +0000
@@ -58,6 +58,11 @@
     return true;
   }
 
+  bool HasWindowDecorations(guint32 xid) const
+  {
+    return true;
+  }
+
   bool IsWindowOnCurrentDesktop(guint32 xid)
   {
     return true;

=== modified file 'plugins/unityshell/src/WindowManager.h'
--- plugins/unityshell/src/WindowManager.h	2012-06-15 18:09:57 +0000
+++ plugins/unityshell/src/WindowManager.h	2013-03-22 14:41:21 +0000
@@ -61,6 +61,7 @@
   virtual bool IsWindowClosable(guint32 xid) = 0;
   virtual bool IsWindowMinimizable(guint32 xid) = 0;
   virtual bool IsWindowMaximizable(guint32 xid) = 0;
+  virtual bool HasWindowDecorations(guint32 xid) const = 0;
 
   virtual void ShowDesktop() = 0;