Merge lp:~alan-griffiths/miral/fix-1675115 into lp:miral

[Alan Griffiths]

[miral-examples] Update miral-xrun to match GDK changes (LP: #1675115)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

[Alan Griffiths (alan-griffiths)]

Actually, the existing behaviour of "provide an X11 server and let the app do what it wants" isn't completely useless.

Maybe, a "-force-x11" switch would be better?

review: Needs Information

[lp:~alan-griffiths/miral/fix-1675115]

544. By Alan Griffiths on 2017-03-24

Option to force toolkits through Xmir

[Alan Griffiths (alan-griffiths)]

review: Abstain

[Cemil Azizoglu (cemil-azizoglu)]

lgtm

review: Approve

[Andreas Pokorny (andreas-pokorny)]

Ok

review: Approve

=== modified file 'miral-shell/miral-xrun.sh'
--- miral-shell/miral-xrun.sh	2016-10-06 15:36:15 +0000
+++ miral-shell/miral-xrun.sh	2017-03-24 13:04:12 +0000
@@ -9,6 +9,26 @@
 unset GDK_BACKEND
 unset QT_QPA_PLATFORM
 unset SDL_VIDEODRIVER
+
+while [ $# -gt 0 ]
+do
+  if [ "$1" == "--help" -o "$1" == "-h" ]
+  then
+    echo "$(basename $0) - Handy launch script for providing an Xmir X11 server"
+    echo "Usage: $(basename $0) [options] command"
+    echo "Options are:"
+    echo "    -force  set toolkit environment variables to force X11 use"
+    exit 0
+  elif [ "$1" == "-force" ];
+  then
+    export GDK_BACKEND=x11
+    export QT_QPA_PLATFORM=xcb
+    export SDL_VIDEODRIVER=x11
+  else break
+  fi
+  shift
+done
+
 Xmir -rootless :${port} & pid=$!
 DISPLAY=:${port} "$@"
 kill ${pid}