Merge lp:~unity-team/unity/unity.fix_787277 into lp:unity

[Sam Spilsbury]

Fixes LP#787277

Track when windows set decoration hints and take this into account when undecorating and redecorating windows

[Alex Launi (alexlauni)]

I merged this branch but the behavior did not go away. The problem remains.

review: Needs Fixing

Unmerged revisions

1209. By Sam Spilsbury on 2011-06-04

Track windows that decorate and undecorate themselves and factor this into
the decision to decorate and undecorate windows on maximize. Fixes LP#787277

=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-06-01 23:46:41 +0000
+++ src/PanelMenuView.cpp	2011-06-04 06:25:38 +0000
@@ -120,6 +120,8 @@
 
   _on_window_maximized_connection = win_manager->window_maximized.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowMaximized));
   _on_window_restored_connection = win_manager->window_restored.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowRestored));
+  _on_window_undecorated_connection = win_manager->window_undecorated.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowUndecorated));
+  _on_window_decorated_connection = win_manager->window_decorated.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowDecorated));
   _on_window_unmapped_connection = win_manager->window_unmapped.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowUnmapped));
   _on_window_moved_connection = win_manager->window_moved.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowMoved));
 
@@ -155,6 +157,8 @@
   _on_window_unmapped_connection.disconnect ();
   _on_window_moved_connection.disconnect ();
   _on_panelstyle_changed_connection.disconnect ();
+  _on_window_decorated_connection.disconnect ();
+  _on_window_undecorated_connection.disconnect ();
 
   if (_name_changed_callback_id)
       g_signal_handler_disconnect (_name_changed_callback_instance,
@@ -823,6 +827,7 @@
   
   if (_decor_map[xid])
   {
+    _pending_maximize_set.insert (xid);
     WindowManager::Default ()->Undecorate (xid);
   }
 
@@ -833,6 +838,26 @@
 }
 
 void
+PanelMenuView::OnWindowDecorated (guint xid)
+{
+  /* Skip undecoration from recent maximize */
+  if (!_decor_map[xid] && _pending_maximize_set.find (xid) == _pending_maximize_set.end ())
+    _decor_map[xid] = true;
+
+  _pending_maximize_set.erase (xid);
+}
+
+void
+PanelMenuView::OnWindowUndecorated (guint xid)
+{
+  /* Skip undecoration from recent unmaximize */
+  if (_decor_map[xid] && _pending_maximize_set.find (xid) == _pending_maximize_set.end ())
+    _decor_map[xid] = false;
+
+  _pending_maximize_set.erase (xid);
+}
+
+void
 PanelMenuView::OnWindowRestored (guint xid)
 {
   BamfWindow *window;
@@ -845,9 +870,10 @@
 
   if (_decor_map[xid])
   {
+    _pending_maximize_set.insert (xid);
     WindowManager::Default ()->Decorate (xid);
   }
-  
+
   _maximized_set.erase (xid);
 
   Refresh ();
 
=== modified file 'src/PanelMenuView.h'
--- src/PanelMenuView.h	2011-05-29 22:18:50 +0000
+++ src/PanelMenuView.h	2011-06-04 06:25:38 +0000
@@ -75,6 +75,8 @@
   void OnWindowMaximized (guint32 xid);
   void OnWindowRestored  (guint32 xid);
   void OnWindowMoved (guint32 xid);
+  void OnWindowDecorated (guint32 xid);
+  void OnWindowUndecorated (guint32 xid);
 
   guint32 GetMaximizedWindow ();
 
@@ -126,6 +128,7 @@
 
   std::map<guint32, bool> _decor_map;
   std::set<guint32> _maximized_set;
+  std::set<guint32> _pending_maximize_set;
   int _padding;
   gpointer _name_changed_callback_instance;
   gulong _name_changed_callback_id;
@@ -155,6 +158,8 @@
   sigc::connection _on_window_terminatespread_connection;
   sigc::connection _on_window_maximized_connection;
   sigc::connection _on_window_restored_connection;
+  sigc::connection _on_window_decorated_connection;
+  sigc::connection _on_window_undecorated_connection;
   sigc::connection _on_window_unmapped_connection;
   sigc::connection _on_window_moved_connection;
   sigc::connection _on_panelstyle_changed_connection;
 
=== modified file 'src/WindowManager.h'
--- src/WindowManager.h	2011-04-18 17:39:17 +0000
+++ src/WindowManager.h	2011-06-04 06:25:38 +0000
@@ -83,6 +83,8 @@
   sigc::signal<void, guint32> window_resized;
   sigc::signal<void, guint32> window_moved;
   sigc::signal<void, guint32> window_focus_changed;
+  sigc::signal<void, guint32> window_decorated;
+  sigc::signal<void, guint32> window_undecorated;
   
   sigc::signal<void> initiate_spread;
   sigc::signal<void> terminate_spread;
 
=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-06-02 17:27:06 +0000
+++ src/unityshell.cpp	2011-06-04 06:25:38 +0000
@@ -285,6 +285,33 @@
   if (!skip_other_plugins)
     screen->handleEvent (event);
 
+  if (event->type == PropertyNotify)
+  {
+    if (event->xproperty.atom == Atoms::mwmHints)
+    {
+      CompWindow *w = screen->findWindow (event->xproperty.window);
+
+      if (w)
+      {
+        UnityWindow *uw = UnityWindow::get (w);
+
+        if (w->mwmDecor () != uw->mOldMwmDecor)
+        {
+          if (w->mwmDecor () & (MwmDecorAll | MwmDecorTitle))
+	  {
+            WindowManager::Default ()->window_decorated.emit (w->id ());
+	  }
+          else
+	  {
+            WindowManager::Default ()->window_undecorated.emit (w->id ());
+	  }
+
+          uw->mOldMwmDecor = w->mwmDecor ();
+        }
+      }
+    }
+  }
+
   if (!skip_other_plugins && screen->otherGrabExist ("deco", "move", "switcher", "resize", NULL))
   {
     wt->ProcessForeignEvent (event, NULL);
@@ -1086,7 +1113,8 @@
 UnityWindow::UnityWindow (CompWindow *window) :
     PluginClassHandler <UnityWindow, CompWindow> (window),
     window (window),
-    gWindow (GLWindow::get (window))
+    gWindow (GLWindow::get (window)),
+    mOldMwmDecor (window->mwmDecor ())
 {
   WindowInterface::setHandler (window);
   GLWindowInterface::setHandler (gWindow);
 
=== modified file 'src/unityshell.h'
--- src/unityshell.h	2011-05-31 03:28:29 +0000
+++ src/unityshell.h	2011-06-04 06:25:38 +0000
@@ -260,6 +260,8 @@
 	CompWindow      *window;
 	GLWindow	*gWindow;
 
+	unsigned int    mOldMwmDecor;
+
 	/* basic window draw function */
 	bool
 	glDraw (const GLMatrix 	&matrix,