Merge lp:~townsend/libertine/xmir-enable-rootless into lp:libertine

[Christopher Townsend]

Enable Xmir '-rootless' mode by default and remove using Matchbox for the window manager.

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:394
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/373/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/715
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/586
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/586
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/586
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/586
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/725
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/706
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/706/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/706
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/706/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/706
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/706/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/706
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/706/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/373/rebuild

review: Approve (continuous-integration)

[Larry Price (larryprice)]

code looks good... i'll figure out a way to test it here shortly...

[Larry Price (larryprice)]

Tested it out, and things are starting to look really good! I checked things out like the filepicker from leafpad and everything in the GIMP. A couple of things:

* I get some very noticeable lag after initially clicking a libertine app from the dash, and then again when it's just about to actually display. Have you noticed this as well?
* As far as legacy, non-libertine apps goes, it's extremely hit or miss. A lot of them complain about not finding the X display server. I'm fairly certain this was the behavior before but I just wanted to check your feelings about it.

review: Needs Information

[Larry Price (larryprice)]

answers:

* lag is caused by mir 0.26, reportedly fixed in mir 0.26.1
* behavior is unchanged

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-01-31 20:14:44 +0000
+++ debian/control	2017-02-07 16:44:13 +0000
@@ -103,7 +103,6 @@
          libqt5core5a,
          libqt5gui5,
          libqt5widgets5,
-         matchbox-window-manager,
          xmir [amd64 armhf arm64 i386],
          ${misc:Depends},
          ${python3:Depends},

=== modified file 'python/libertine/ChrootContainer.py'
--- python/libertine/ChrootContainer.py	2017-01-24 18:00:57 +0000
+++ python/libertine/ChrootContainer.py	2017-02-07 16:44:13 +0000
@@ -49,7 +49,6 @@
 
     def __init__(self, container_id, config):
         super().__init__(container_id, 'chroot', config)
-        self._window_manager = None
         # FIXME: Disabling seccomp is a temporary measure until we fully understand why we need
         #        it or figure out when we need it.
         os.environ['PROOT_NO_SECCOMP'] = '1'
@@ -226,15 +225,10 @@
         proot_cmd = self._build_proot_command()
 
         args = shlex.split(proot_cmd)
-        args.extend(self.setup_window_manager(enable_toolbars=True))
-        self._window_manager = psutil.Popen(args, env=environ)
-
-        args = shlex.split(proot_cmd)
         args.extend(app_exec_line)
         return psutil.Popen(args, env=environ)
 
     def finish_application(self, app):
-        utils.terminate_window_manager(self._window_manager)
         app.wait()
 
     def _run_ldconfig(self):

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2017-02-07 15:17:30 +0000
+++ python/libertine/Libertine.py	2017-02-07 16:44:13 +0000
@@ -86,8 +86,7 @@
         self.root_path = utils.get_libertine_container_rootfs_path(self.container_id)
         self.locale = self._config.get_container_locale(container_id)
         self.language = self._get_language_from_locale()
-        self.default_packages = ['matchbox-window-manager',
-                                 'libnss-extrausers',
+        self.default_packages = ['libnss-extrausers',
                                  'humanity-icon-theme',
                                  'maliit-inputcontext-gtk2',
                                  'maliit-inputcontext-gtk3',
@@ -122,16 +121,6 @@
             utils.get_logger().error("%s" % e)
             return False
 
-    def setup_window_manager(self, enable_toolbars=False):
-        if self._binary_exists('matchbox-window-manager'):
-            if enable_toolbars:
-                return ['matchbox-window-manager']
-
-            return ['matchbox-window-manager', '-use_titlebar', 'no']
-        else:
-            return ['compiz']
-
-
     def check_language_support(self):
         if not self._binary_exists('check-language-support'):
             self.install_package('language-selector-common', update_cache=False)

=== modified file 'python/libertine/LxcContainer.py'
--- python/libertine/LxcContainer.py	2017-02-06 16:01:22 +0000
+++ python/libertine/LxcContainer.py	2017-02-07 16:44:13 +0000
@@ -164,7 +164,6 @@
         super().__init__(container_id, 'lxc', config)
         self.container = lxc_container(container_id)
         self.lxc_manager_interface = None
-        self.window_manager = None
         self.host_info = HostInfo.HostInfo()
         self._freeze_on_stop = config.get_freeze_on_stop(self.container_id)
 
@@ -414,9 +413,6 @@
             self.lxc_manager_interface.container_stopped(self.container_id)
             return
 
-        self.window_manager = self.container.attach(lxc.attach_run_command,
-                                                    self.setup_window_manager())
-
         app_launch_cmd = "sudo -E -u " + os.environ['USER'] + " env PATH=" + os.environ['PATH']
         cmd = shlex.split(app_launch_cmd)
         app = self.container.attach(lxc.attach_run_command,
@@ -426,6 +422,4 @@
     def finish_application(self, app):
         os.waitpid(app.pid, 0)
 
-        utils.terminate_window_manager(psutil.Process(self.window_manager))
-
         self.stop_container()

=== modified file 'python/libertine/LxdContainer.py'
--- python/libertine/LxdContainer.py	2017-02-07 14:17:30 +0000
+++ python/libertine/LxdContainer.py	2017-02-07 16:44:13 +0000
@@ -295,7 +295,6 @@
         super().__init__(name, 'lxd', config)
         self._host_info = HostInfo.HostInfo()
         self._container = None
-        self._matchbox_pid = None
         self._manager = None
         self._freeze_on_stop = config.get_freeze_on_stop(self.container_id)
 
@@ -303,7 +302,6 @@
             raise Exception("Failed to setup lxd.")
 
         self._client = pylxd.Client()
-        self._window_manager = None
 
         try:
             if utils.set_session_dbus_env_var():
@@ -476,30 +474,6 @@
         self._freeze_on_stop = orig_freeze
         return self.stop_container(wait=True)
  
-    def _get_matchbox_pids(self):
-        p = subprocess.Popen(self._lxc_args('pgrep matchbox'), stdout=subprocess.PIPE)
-        out, err = p.communicate()
-        return out.decode('utf-8').split('\n')
-
-    # FIXME: Remove once window management logic has been moved to the host
-    def _start_window_manager(self, args):
-        args.extend(self.setup_window_manager())
-
-        if 'matchbox-window-manager' in args:
-            pids = self._get_matchbox_pids()
-
-        self._window_manager = psutil.Popen(args)
-
-        time.sleep(.25) # Give matchbox a moment to start in the container
-        if self._window_manager.poll() is not None:
-            utils.get_logger().warning("Window manager terminated prematurely with exit code '{}'".format(
-                                       self._window_manager.returncode))
-            self._window_manager = None
-        elif 'matchbox-window-manager' in args:
-            after_pids = self._get_matchbox_pids()
-            if len(after_pids) > len(pids):
-                self._matchbox_pid = (set(after_pids) - set(pids)).pop()
-
     def start_application(self, app_exec_line, environ):
         if not self._try_get_container():
             utils.get_logger().error("Could not get container '{}'".format(self.container_id))
@@ -513,23 +487,10 @@
 
         args = self._lxc_args("sudo -E -u {} env PATH={}".format(environ['USER'], environ['PATH']), environ)
 
-        self._start_window_manager(args.copy())
-
         args.extend(app_exec_line)
         return psutil.Popen(args)
 
     def finish_application(self, app):
-        if self._window_manager is not None:
-            utils.terminate_window_manager(self._window_manager)
-            self._window_manager = None
-
-            # This is a workaround for an issue on xenial where the process
-            # running the window manager is not killed with the application
-            if self._matchbox_pid is not None:
-                utils.get_logger().debug("Manually killing matchbox-window-manager")
-                self.run_in_container("kill -9 {}".format(self._matchbox_pid))
-                self._matchbox_pid = None
-
         app.wait()
 
         self.stop_container()

=== modified file 'python/libertine/launcher/config.py'
--- python/libertine/launcher/config.py	2016-12-05 18:33:47 +0000
+++ python/libertine/launcher/config.py	2017-02-07 16:44:13 +0000
@@ -1,4 +1,4 @@
-# Copyright 2016 Canonical Ltd.
+# Copyright 2016-2017 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 published
@@ -215,9 +215,6 @@
         tasks = []
         tasks.append(TaskConfig(TaskType.LAUNCH_SERVICE, ["pasted"]))
 
-        if self.container_id is None:
-            tasks.append(TaskConfig(TaskType.LAUNCH_SERVICE, ['matchbox-window-manager', '-use_titlebar', 'no']))
-
         return tasks
 
     def _create_socket_bridges(self):

=== modified file 'python/libertine/utils.py'
--- python/libertine/utils.py	2017-02-06 09:37:41 +0000
+++ python/libertine/utils.py	2017-02-07 16:44:13 +0000
@@ -145,15 +145,6 @@
     return os.path.join(get_libertine_runtime_dir(), 'pulse_socket')
 
 
-def terminate_window_manager(window_manager):
-    for child in window_manager.children():
-        child.terminate()
-        child.wait()
-
-    window_manager.terminate()
-    window_manager.wait()
-
-
 def refresh_libertine_scope():
     scopes_object_path = "/com/canonical/unity/scopes"
     invalidate_signal = "com.canonical.unity.scopes.InvalidateResults"

=== modified file 'tools/libertine-xmir'
--- tools/libertine-xmir	2016-02-18 15:49:20 +0000
+++ tools/libertine-xmir	2017-02-07 16:44:13 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2016 Canonical Ltd.
+# Copyright (C) 2016-2017 Canonical Ltd.
 # Author: Christopher Townsend <[e-mail]>
 
 # This program is free software: you can redistribute it and/or modify
@@ -16,4 +16,4 @@
 
 
 # Add and/or remove Xmir options here
-exec Xmir -title @ $@
+exec Xmir -rootless $@