Merge lp:~azzar1/unity/fix-1087422 into lp:unity

[Andrea Azzarone]

Fix a race condition with windows that start minimized.

== Problem ==
 Windows that start minimized cannot be opened.

== Fix ==
There is a race condition when a window asks to be iconified immediately after gtk_window_show_*. Attached to the bug report [1] is a sample program to test. Run it like so:
valac --pkg gtk+-3.0 test.vala && ./test

== Tests ==
AP tests added.

[1] https://launchpadlibrarian.net/125054880/test.vala

[Łukasz Zemczak (sil2100)]

Ok, so actually what I would propose is to add such functionality to the python-testapp package. Autopilot in Unity anyway uses python-testapp if available, so if we add an ability to create minimized applications on start, we wouldn't be adding any new dependencies and such. What do you think? I could try adding such functionality to the package.

[Andrea Azzarone (azzar1)]

Sounds good to me just make to add two options: one to call window. Iconify
before window.show and viceversa
 On Jan 10, 2013 5:22 PM, "Łukasz Zemczak" <email address hidden>
wrote:

> Ok, so actually what I would propose is to add such functionality to the
> python-testapp package. Autopilot in Unity anyway uses python-testapp if
> available, so if we add an ability to create minimized applications on
> start, we wouldn't be adding any new dependencies and such. What do you
> think? I could try adding such functionality to the package.
> --
> https://code.launchpad.net/~andyrock/unity/fix-1087422/+merge/142706
> You are the owner of lp:~andyrock/unity/fix-1087422.
>

[Łukasz Zemczak (sil2100)]

Ok, so I proposed a feature for iconifying the testapp [1], but will it be a problem that it is a qt application? Since I see you wrote something regarding to gtk things. Is it gtk specific? If yes, we'll have to add a GTK plugin to the testapp - not a big problem, but more writing ;)

[1] https://code.launchpad.net/~sil2100/testapp/add_minimize_function/+merge/142752

review: Needs Information

[Andrea Azzarone (azzar1)]

> Ok, so I proposed a feature for iconifying the testapp [1], but will it be a
> problem that it is a qt application? Since I see you wrote something regarding
> to gtk things. Is it gtk specific? If yes, we'll have to add a GTK plugin to
> the testapp - not a big problem, but more writing ;)
>
> [1] https://code.launchpad.net/~sil2100/testapp/add_minimize_function/+merge/1
> 42752

No it should not be gtk specific but maybe qt requires a differt code to trigger the bug.

[Thomi Richards (thomir-deactivatedaccount)]

Yeah - use testapp to test this. I've commented on the testapp MP. This is 'Needs Fixing' Until there's either a unit test or autopilot test though :)

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Uniti side looks fine, though

review: Approve

[Andrea Azzarone (azzar1)]

AP tests added.

[Łukasz Zemczak (sil2100)]

Looks OK, I would just - to be sure, add an eventually statement to the Equals() one, e.g.

42 + self.assertThat(window.x_win.get_wm_state()['state'], Equals(Xutil.NormalState))

self.assertThat(lambda: window.x_win.get_wm_state()['state'], Equals(Xutil.NormalState))

[Łukasz Zemczak (sil2100)]

Looking great now, thanks!

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-01-10 22:03:22 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-01-14 11:01:23 +0000
@@ -2668,7 +2668,8 @@
     /* Fall through an re-evaluate wraps on map and unmap too */
     case CompWindowNotifyUnmap:
       if (UnityScreen::get (screen)->optionGetShowMinimizedWindows () &&
-          window->mapNum ())
+          window->mapNum () &&
+          !window->pendingUnmaps())
       {
         bool wasMinimized = window->minimized ();
         if (wasMinimized)

=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2012-11-21 01:35:43 +0000
+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2013-01-14 11:01:23 +0000
@@ -19,6 +19,8 @@
 from unity.emulators.launcher import IconDragType
 from unity.tests.launcher import LauncherTestCase, _make_scenarios
 
+from Xlib import Xutil
+
 logger = logging.getLogger(__name__)
 
 
@@ -219,6 +221,31 @@
 
         self.assertThat(self.window_manager.expo_active, Eventually(Equals(False)))
 
+    def test_unminimize_initially_minimized_windows(self):
+        """Make sure initially minimized windows can be unminimized."""
+        window_spec = {
+            "Title": "Hello",
+            "Minimized": True
+        }
+
+        window = self.launch_test_window(window_spec)
+        icon = self.launcher.model.get_icon(desktop_id=window.application.desktop_file)
+
+        self.launcher_instance.click_launcher_icon(icon)
+        self.assertThat(lambda: window.x_win.get_wm_state()['state'], Eventually(Equals(Xutil.NormalState)))
+
+    def test_unminimize_minimized_immediately_after_show_windows(self):
+        """Make sure minimized-immediately-after-show windows can be unminimized."""
+        window_spec = {
+            "Title": "Hello",
+            "MinimizeImmediatelyAfterShow": True
+        }
+
+        window = self.launch_test_window(window_spec)
+        icon = self.launcher.model.get_icon(desktop_id=window.application.desktop_file)
+
+        self.launcher_instance.click_launcher_icon(icon)
+        self.assertThat(lambda: window.x_win.get_wm_state()['state'], Eventually(Equals(Xutil.NormalState)))
 
 class LauncherDragIconsBehavior(LauncherTestCase):
     """Tests dragging icons around the Launcher."""