Merge lp:~alan-griffiths/miral/miral-hosted into lp:miral

[Alan Griffiths]

[examples] add miral-app script for launching hosted by an existing desktop

[Alan Griffiths (alan-griffiths)]

This still isn't ideal in the Mir-on-Mir (a.k.a. MirAL-on-Unity8) scenario as the "nested" Mir support tries to be fullscreen.

[lp:~alan-griffiths/miral/miral-hosted]

470. By Alan Griffiths on 2016-12-14

miral-hosted => miral-app

471. By Alan Griffiths on 2016-12-14

miral-hosted => miral-app

[Gerry Boland (gerboland)]

 ~/dev/projects/mir/miral/miral-hosted/miral-shell ⮀ ll
<snip>
-rw-r--r-- 1 gerry gerry 1822 Dec 14 11:25 miral-app.sh
-rwxr-xr-x 1 gerry gerry 1680 Dec 14 11:25 miral-desktop.sh*
-rwxr-xr-x 1 gerry gerry 207 Dec 14 11:25 miral-run.sh*
-rwxr-xr-x 1 gerry gerry 1774 Dec 14 11:25 miral-screencast.sh*
-rwxr-xr-x 1 gerry gerry 241 Dec 14 11:25 miral-xrun.sh*

miral-app.sh doesn't have same permissions out of the box as the other scripts

[Gerry Boland (gerboland)]

Other than that, works ok

review: Approve

[lp:~alan-griffiths/miral/miral-hosted]

472. By Alan Griffiths on 2016-12-14

add execute permission

=== modified file 'debian/miral-examples.install'
--- debian/miral-examples.install	2016-11-16 10:40:15 +0000
+++ debian/miral-examples.install	2016-12-14 11:39:37 +0000
@@ -4,5 +4,6 @@
 usr/bin/miral-xrun
 usr/bin/miral-screencast
 usr/bin/miral-desktop
+usr/bin/miral-app
 usr/share/applications/miral-shell.desktop
 usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
 
=== modified file 'miral-shell/CMakeLists.txt'
--- miral-shell/CMakeLists.txt	2016-11-16 10:40:15 +0000
+++ miral-shell/CMakeLists.txt	2016-12-14 11:39:37 +0000
@@ -33,6 +33,14 @@
     DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
 )
 
+add_custom_target(miral-app ALL
+    cp ${CMAKE_CURRENT_SOURCE_DIR}/miral-app.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-app
+)
+
+install(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/miral-app
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+)
+
 add_executable(miral-shell
     shell_main.cpp
     tiling_window_manager.cpp   tiling_window_manager.h
 
=== modified file 'miral-shell/desktop/CMakeLists.txt'
--- miral-shell/desktop/CMakeLists.txt	2016-04-12 15:59:54 +0000
+++ miral-shell/desktop/CMakeLists.txt	2016-12-14 11:39:37 +0000
@@ -1,5 +1,5 @@
 set(ICON_NAME ubuntu-logo)
-set(PROGRAM_NAME miral-shell)
+set(PROGRAM_NAME miral-app)
 
 configure_file(miral-shell.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/miral-shell.desktop @ONLY)
 
 
=== added file 'miral-shell/miral-app.sh'
--- miral-shell/miral-app.sh	1970-01-01 00:00:00 +0000
+++ miral-shell/miral-app.sh	2016-12-14 11:39:37 +0000
@@ -0,0 +1,51 @@
+#! /bin/bash
+
+miral_server=miral-shell
+launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
+hostsocket=
+bindir=
+
+if [ -n "${MIR_SOCKET}" ]
+then
+  if [ ! -e "${MIR_SOCKET}" ]
+  then
+    echo "Error: Host endpoint '${MIR_SOCKET}' does not exists"; exit 1
+  fi
+  i=0; while [ -e "${XDG_RUNTIME_DIR}/mir_socket{i}" ]; do let i+=1 ;done
+  socket=${XDG_RUNTIME_DIR}/mir_socket{i}
+  hostsocket='--host-socket ${MIR_SOCKET}'
+else
+  socket=${XDG_RUNTIME_DIR}/mir_socket
+fi
+
+while [ $# -gt 0 ]
+do
+  if [ "$1" == "--help" -o "$1" == "-h" ]
+  then
+    echo "$(basename $0) - Handy launch script for a hosted miral \"desktop session\""
+    echo "Usage: $0 [options] [shell options]"
+    echo "Options are:"
+    echo "    -kiosk               use miral-kiosk instead of ${miral_server}"
+    echo "    -launcher <launcher> use <launcher> instead of '${launcher}'"
+    echo "    -socket   <socket>   set the mir socket [${socket}]"
+    echo "    -bindir   <bindir>   path to the miral executable"
+    exit 0
+    elif [ "$1" == "-kiosk" ];              then miral_server=miral-kiosk
+    elif [ "$1" == "-launcher" ];           then shift; launcher=$1
+    elif [ "$1" == "-socket" ];             then shift; socket=$1
+    elif [ "$1" == "-bindir" ];             then shift; bindir=$1/
+    elif [ "${1:0:2}" == "--" ];            then break
+    fi
+    shift
+done
+
+if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
+
+sh -c "${bindir}${miral_server} $* ${hostsocket} --file ${socket} --desktop_file_hint=miral-shell.desktop"&
+
+while [ ! -e "${socket}" ]; do echo "waiting for ${socket}"; sleep 1 ;done
+
+unset QT_QPA_PLATFORMTHEME
+MIR_SOCKET=${socket} GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir dbus-run-session -- ${launcher}
+killall ${bindir}${miral_server}
+