Fixes: NB#177840 - Window manager brings only the first transient (WM_TRANSIENT_FOR) window foreground if application has multiple transient windows open.

- fix regressions in the quick sort function
- mark window NormalState in positionWindow() when raising it
- add a new Python test for NB#177840

2 files changed, 129 insertions, 0 deletions

diff --git a/tests/functional/test18.py b/tests/functional/test18.py
new file mode 100755
index 0000000..9ce5a7f
--- /dev/null
+++ b/tests/functional/test18.py
@@ -0,0 +1,114 @@
+#!/usr/bin/python
+
+# Check that two transient dialogs on the same level maintain their order.
+# (Written for NB#177840)
+
+#* Test steps
+#  * show an application window
+#  * create and show a dialog window that is transient for the application
+#  * create and show a dialog window that is transient for the application
+#  * check that the transient dialogs have the right order
+#  * activate the duihome window
+#  * activate the application window
+#* Post-conditions
+#  * the transient dialogs have maintained their mutual order
+
+import os, re, sys, time
+
+if os.system('/sbin/mcetool --unblank-screen --set-tklock-mode=unlocked --set-inhibit-mode=stay-on'):
+  print 'mcetool is missing!'
+
+if os.system('pidof mcompositor'):
+  print 'mcompositor is not running'
+  sys.exit(1)
+
+fd = os.popen('windowstack m')
+s = fd.read(5000)
+win_re = re.compile('^0x[0-9a-f]+')
+home_win = 0
+for l in s.splitlines():
+  if re.search(' DESKTOP viewable ', l.strip()):
+    home_win = win_re.match(l.strip()).group()
+
+if home_win == 0:
+  print 'FAIL: desktop window not found'
+  sys.exit(1)
+
+# create application and transient dialog windows
+fd = os.popen('windowctl kn')
+app_win = fd.readline().strip()
+time.sleep(1)
+fd = os.popen("windowctl kd %s" % app_win)
+lower_dlg = fd.readline().strip()
+time.sleep(1)
+fd = os.popen("windowctl kd %s" % app_win)
+upper_dlg = fd.readline().strip()
+time.sleep(1)
+
+# check the order of the windows
+ret = upper_found = 0
+fd = os.popen('windowstack m')
+s = fd.read(5000)
+for l in s.splitlines():
+  if re.search("%s DIALOG" % upper_dlg, l.strip()):
+    print upper_dlg, 'found'
+    upper_found = 1
+  elif re.search("%s DIALOG" % lower_dlg, l.strip()) and upper_found:
+    print lower_dlg, 'found'
+    break
+  elif re.search("%s DIALOG" % lower_dlg, l.strip()):
+    print 'FAIL: dialog order is wrong'
+    print 'Failed stack:\n', s
+    ret = 1
+    break
+  elif re.search("%s " % app_win, l.strip()):
+    print 'FAIL: app is not stacked after the dialogs'
+    print 'Failed stack:\n', s
+    ret = 1
+    break
+  elif re.search("%s " % home_win, l.strip()):
+    print 'FAIL: home is stacked before app'
+    print 'Failed stack:\n', s
+    ret = 1
+    break
+
+# activate duihome
+os.popen("windowctl A %s" % home_win)
+time.sleep(1)
+
+# activate the application (this should raise the dialogs too)
+os.popen("windowctl A %s" % app_win)
+time.sleep(2)
+
+# check the order of the windows
+upper_found = 0
+fd = os.popen('windowstack m')
+s = fd.read(5000)
+for l in s.splitlines():
+  if re.search("%s DIALOG" % upper_dlg, l.strip()):
+    print upper_dlg, 'found'
+    upper_found = 1
+  elif re.search("%s DIALOG" % lower_dlg, l.strip()) and upper_found:
+    print lower_dlg, 'found'
+    break
+  elif re.search("%s DIALOG" % lower_dlg, l.strip()):
+    print 'FAIL: dialog order is wrong'
+    print 'Failed stack:\n', s
+    ret = 1
+    break
+  elif re.search("%s " % app_win, l.strip()):
+    print 'FAIL: app is not stacked after the dialogs'
+    print 'Failed stack:\n', s
+    ret = 1
+    break
+  elif re.search("%s " % home_win, l.strip()):
+    print 'FAIL: home is stacked before app'
+    print 'Failed stack:\n', s
+    ret = 1
+    break
+
+# cleanup
+os.popen('pkill windowctl')
+time.sleep(1)
+
+sys.exit(ret)
diff --git a/tests/functional/test18.py.testdata b/tests/functional/test18.py.testdata
new file mode 100644
index 0000000..2fc5e53
--- /dev/null
+++ b/tests/functional/test18.py.testdata
@@ -0,0 +1,15 @@
+CaseName="verify_stacking_of_sibling_transient_dialogs"
+CaseRequirement="NONE"
+CaseTimeout="360"
+CaseDescription="Check that two transient dialogs on the same level maintain their order.\n
+(Written for NB#177840)\n
+\n
+- Test steps\n
+\t- show an application window\n
+\t- create and show a dialog window that is transient for the application\n
+\t- create and show a dialog window that is transient for the application\n
+\t- check that the transient dialogs have the right order\n
+\t- activate the duihome window\n
+\t- activate the application window\n
+- Post-conditions\n
+\t- the transient dialogs have maintained their mutual order\n"