Merge lp:~agateau/ubiquity/kde-no-fullscreen into lp:ubiquity

[Aurélien Gâteau]

When running in greeter mode, do not start in fullscreen, as it looks a bit dull and empty.

[lp:~agateau/ubiquity/kde-no-fullscreen]

6106. By Aurélien Gâteau on 2014-01-31

Improve logging support

6107. By Aurélien Gâteau on 2014-01-31

Hide all KWin buttons but the maximize/restore button

6108. By Aurélien Gâteau on 2014-01-31

Bring back default wallpaper behind Ubiquity window

The wallpaper has problem not been drawn for a long time but it went
unnoticed because the installer was fullscreen.

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2013-12-17 18:08:56 +0000
+++ bin/ubiquity-dm	2014-01-31 14:04:22 +0000
@@ -11,6 +11,7 @@
 import signal
 import subprocess
 import sys
+import traceback
 import time
 
 import debconf
@@ -25,6 +26,13 @@
 from ubiquity.misc import create_bool, utf8
 
 
+logfile = None
+
+
+def log(msg):
+    print('ubiquity-dm: ' + msg, file=logfile, flush=True)
+
+
 def _pam_conv(auth, query_list, userData):
     resp = []
     for query, type in query_list:
@@ -73,9 +81,13 @@
     with open('/etc/locale.gen', 'w') as locale_gen:
         print('%s UTF-8' % locale, file=locale_gen)
 
-    with open('/var/log/installer/dm', 'a') as logfile:
-        subprocess.call(['/usr/sbin/locale-gen', locale],
-                        stdout=logfile, stderr=logfile)
+    subprocess.call(['/usr/sbin/locale-gen', locale],
+                    stdout=logfile, stderr=logfile)
+
+
+def add_ubiquity_kdedir():
+    os.environ['KDEDIRS'] = '/usr/share/ubiquity/qt:' + \
+        os.environ.get('KDEDIRS', '')
 
 
 class XStartupError(EnvironmentError):
@@ -166,10 +178,9 @@
                      if '.' not in entry]
             for hookentry in hooks:
                 hook = os.path.join(hookdir, hookentry)
-                with open('/var/log/installer/dm', 'a') as logfile:
-                    subprocess.call(
-                        hook, stdout=logfile, stderr=logfile,
-                        preexec_fn=self.drop_privileges)
+                subprocess.call(
+                    hook, stdout=logfile, stderr=logfile,
+                    preexec_fn=self.drop_privileges)
 
     def pam_open_session(self):
             self.auth.start('su')
@@ -206,7 +217,7 @@
             # be happy if someone already created the path
             if e.errno != errno.EEXIST:
                 raise
-        logfile = open('/var/log/installer/dm', 'w')
+        log('starting')
 
         signal.signal(signal.SIGUSR1, self.sigusr1_handler)
         signal.signal(signal.SIGTTIN, signal.SIG_IGN)
@@ -214,6 +225,7 @@
 
         servercommand = ['X', '-br', '-ac', '-noreset', '-nolisten', 'tcp']
 
+        log('plymouth')
         try:
             plymouth_running = subprocess.call(['plymouth', '--ping']) == 0
         except OSError:
@@ -229,6 +241,7 @@
 
         servercommand.extend([self.vt, self.display])
 
+        log('start X {}'.format(servercommand))
         for attempt in ('main', 'fbdev', 'vesa'):
             command = list(servercommand)
             if attempt == 'main' and self.force_failsafe:
@@ -298,6 +311,7 @@
             if self.server_started:
                 break
 
+        log('set vars')
         os.environ['DISPLAY'] = self.display
         os.environ['HOME'] = self.homedir
         # Give ubiquity a UID and GID that it can drop privileges to.
@@ -306,19 +320,23 @@
         # Overlay scrollbars are now a gtk module
         os.environ['GTK_MODULES'] = 'overlay-scrollbar'
 
+        log('pam_open_session')
         self.pam_open_session()
 
         # run simple, custom scripts during install time
         if program_basename == 'ubiquity':
+            log('dm-scripts')
             self.run_hooks('/usr/lib/ubiquity/dm-scripts/install')
 
         # run simple, custom scripts during  oem-config
         if program_basename == 'oem-config-wrapper':
+            log('oem dm-scripts')
             self.run_hooks('/usr/lib/ubiquity/dm-scripts/oem')
 
         # Session bus, apparently needed by most interfaces now
         if ('DBUS_SESSION_BUS_ADDRESS' not in os.environ and
                 osextras.find_on_path('dbus-launch')):
+            log('dbus')
             dbus_subp = subprocess.Popen(
                 ['dbus-launch', '--exit-with-session'],
                 stdin=null, stdout=subprocess.PIPE, stderr=logfile,
@@ -334,6 +352,7 @@
 
         # dconf writer
         if os.path.exists("/usr/lib/dconf/dconf-service"):
+            log('dconf-service')
             extras.append(subprocess.Popen(
                 ['/usr/lib/dconf/dconf-service'],
                 stdin=null, stdout=logfile, stderr=logfile,
@@ -344,6 +363,7 @@
         with open('/proc/cmdline', 'r') as fp:
             proc_cmdline = fp.readline().split()
 
+        log('start frontend {}'.format(self.frontend))
         if self.frontend == 'gtk_ui':
             # Set a desktop wallpaper.
             visual_a11y = 'access=v' in proc_cmdline
@@ -518,39 +538,26 @@
                             stdin=null, stdout=logfile, stderr=logfile,
                             preexec_fn=self.drop_privileges))
         elif self.frontend == 'kde_ui':
-            # Don't show the background image in v1 accessibility profile.
-            os.setegid(self.gid)
-            os.seteuid(self.uid)
-            path = '/usr/share/wallpapers/kde-default.png'
-            if (os.access(path, os.R_OK) and not 'access=v1' in proc_cmdline):
-                # Draw a background image for the install progress window.
-                from PyQt4.QtCore import Qt
-                from PyQt4 import QtGui
-                a = QtGui.QApplication(sys.argv)
-                root_win = a.desktop()
-                wallpaper = QtGui.QPixmap(path)
-                wallpaper = wallpaper.scaled(
-                    root_win.width(), root_win.height(),
-                    Qt.KeepAspectRatioByExpanding, Qt.SmoothTransformation)
-                palette = QtGui.QPalette()
-                palette.setBrush(root_win.backgroundRole(),
-                                 QtGui.QBrush(wallpaper))
-                root_win.setPalette(palette)
-                root_win.setCursor(Qt.ArrowCursor)
-                a.processEvents()
-                # Force garbage collection so we don't end up with stray X
-                # resources when we kill the X server (LP: #556555).
-                del a
-            os.seteuid(0)
-            os.setegid(0)
+            if not 'access=v1' in proc_cmdline:
+                log('paint background')
+                path = '/usr/share/wallpapers/kde-default.png'
+                extras.append(subprocess.Popen(
+                    ['ubiquity-qtsetbg', path],
+                    stdin=null, stdout=logfile, stderr=logfile,
+                    preexec_fn=self.drop_privileges))
 
+            log("add_ubiquity_kdedir")
+            add_ubiquity_kdedir()
+            log('start kwin')
             wm = subprocess.Popen(
                 'kwin', stdin=null, stdout=logfile, stderr=logfile,
                 preexec_fn=self.drop_privileges)
 
+        log('start greeter')
         greeter = subprocess.Popen(
             program, stdin=null, stdout=logfile, stderr=logfile)
         ret = greeter.wait()
+        log('greeter exited with code {}'.format(ret))
 
         reboot = False
         if ret != 0:
@@ -649,7 +656,6 @@
         kill_if_exists(server.pid, signal.SIGTERM)
         server.wait()
 
-        logfile.close()
         null.close()
 
         if reboot:
@@ -660,18 +666,37 @@
             return 1
 
 
-if len(sys.argv) < 4:
-    sys.stderr.write('Usage: %s <vt[1-N]> <:[0-N]> <username> <program> '
-                     '[<arguments>]\n' % sys.argv[0])
-    sys.exit(1)
-
-vt, display, username = sys.argv[1:4]
-try:
-    dm = DM(vt, display, username)
-except XStartupError:
-    sys.exit(1)
-ret = dm.run(*sys.argv[4:])
-if ret == 0:
-    set_locale()
-dm.pam_close_session()
-sys.exit(ret)
+def run(vt, display, username):
+    try:
+        dm = DM(vt, display, username)
+    except XStartupError:
+        log("XStartupError")
+        return 1
+    ret = dm.run(*sys.argv[4:])
+    if ret == 0:
+        log("set_locale")
+        set_locale()
+    dm.pam_close_session()
+    return ret
+
+
+def main():
+    global logfile
+
+    if len(sys.argv) < 4:
+        sys.stderr.write('Usage: %s <vt[1-N]> <:[0-N]> <username> <program> '
+                         '[<arguments>]\n' % sys.argv[0])
+        return 1
+    vt, display, username = sys.argv[1:4]
+
+    logfile = open('/var/log/installer/dm', 'w')
+    try:
+        ret = run(vt, display, username)
+        log('Exiting with code {}'.format(ret))
+    except Exception:
+        log('Failed with an exception:')
+        log(traceback.format_exc())
+        return 1
+
+if __name__ == '__main__':
+    sys.exit(main())
 
=== added file 'bin/ubiquity-qtsetbg'
--- bin/ubiquity-qtsetbg	1970-01-01 00:00:00 +0000
+++ bin/ubiquity-qtsetbg	2014-01-31 14:04:22 +0000
@@ -0,0 +1,56 @@
+#!/usr/bin/python3
+
+'''
+Helper program to draw a background image on each screen of the system.
+'''
+
+import sys
+
+from PyQt4.QtCore import Qt
+from PyQt4 import QtGui
+
+
+def die(msg):
+    print(msg, file=sys.stderr)
+    sys.exit(1)
+
+
+def create_window(wallpaper, geometry):
+    win = QtGui.QWidget()
+
+    wallpaper = wallpaper.scaled(geometry.size(),
+                                 Qt.KeepAspectRatioByExpanding,
+                                 Qt.SmoothTransformation)
+    palette = QtGui.QPalette()
+    palette.setBrush(win.backgroundRole(), QtGui.QBrush(wallpaper))
+
+    win.setPalette(palette)
+    win.setAttribute(Qt.WA_X11NetWmWindowTypeDesktop)
+    win.setGeometry(geometry)
+    win.show()
+    return win
+
+
+def main():
+    if len(sys.argv) != 2:
+        die('usage: {} <path/to/wallpaper.png>'.format(sys.argv[0]))
+    path = sys.argv[1]
+
+    app = QtGui.QApplication(sys.argv)
+    wallpaper = QtGui.QPixmap(path)
+    if wallpaper.isNull():
+        die('Failed to load {}'.format(path))
+
+    desktop = app.desktop()
+    # Keep a trace of the windows to ensure they are not garbage collected
+    windows = []
+    for idx in range(desktop.screenCount()):
+        geometry = desktop.screenGeometry(idx)
+        win = create_window(wallpaper, geometry)
+        windows.append(win)
+
+    return app.exec_()
+
+
+if __name__ == '__main__':
+    main()
 
=== modified file 'debian/ubiquity-frontend-kde.install'
--- debian/ubiquity-frontend-kde.install	2013-07-11 18:23:07 +0000
+++ debian/ubiquity-frontend-kde.install	2014-01-31 14:04:22 +0000
@@ -1,3 +1,4 @@
+bin/ubiquity-qtsetbg usr/bin
 data/ubiquity-kdeui.desktop usr/share/applications/kde4
 gui/qt usr/share/ubiquity
 ubiquity/frontend/kde* usr/lib/ubiquity/ubiquity/frontend
 
=== added directory 'gui/qt/share'
=== added file 'gui/qt/share/README'
--- gui/qt/share/README	1970-01-01 00:00:00 +0000
+++ gui/qt/share/README	2014-01-31 14:04:22 +0000
@@ -0,0 +1,1 @@
+This folder is used by ubiquity-dm to customize some of KDE settings.
 
=== added directory 'gui/qt/share/config'
=== added file 'gui/qt/share/config/kwinrc'
--- gui/qt/share/config/kwinrc	1970-01-01 00:00:00 +0000
+++ gui/qt/share/config/kwinrc	2014-01-31 14:04:22 +0000
@@ -0,0 +1,5 @@
+# Disable all buttons but maximize/restore
+[Style]
+CustomButtonPositions=true
+ButtonsOnLeft=
+ButtonsOnRight=A
 
=== modified file 'ubiquity/frontend/kde_ui.py'
--- ubiquity/frontend/kde_ui.py	2013-12-11 15:05:41 +0000
+++ ubiquity/frontend/kde_ui.py	2014-01-31 14:04:22 +0000
@@ -180,8 +180,11 @@
         self.ui.content_widget.setVisible(False)
 
         if 'UBIQUITY_GREETER' in os.environ:
-            self.ui.setWindowState(
-                self.ui.windowState() ^ QtCore.Qt.WindowFullScreen)
+            self.ui.setWindowFlags(
+                    QtCore.Qt.Dialog
+                    | QtCore.Qt.CustomizeWindowHint
+                    | QtCore.Qt.WindowTitleHint
+                    )
 
         self.ui.setWizard(self)