From e63814eb18bdbb48a7e6bf79b17d79d6a9ca56d6 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Wed, 18 Jul 2018 09:09:35 +0200 Subject: [PATCH] sandbox: Use matchbox-window-manager instead of openbox --- sandbox/sandbox | 4 ++-- sandbox/sandbox.8 | 2 +- sandbox/sandboxX.sh | 14 -------------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/sandbox/sandbox b/sandbox/sandbox index 16c43b51eaaa..7709a6585665 100644 --- a/sandbox/sandbox +++ b/sandbox/sandbox @@ -268,7 +268,7 @@ class Sandbox: copyfile(f, "/tmp", self.__tmpdir) copyfile(f, "/var/tmp", self.__tmpdir) - def __setup_sandboxrc(self, wm="/usr/bin/openbox"): + def __setup_sandboxrc(self, wm="/usr/bin/matchbox-window-manager"): execfile = self.__homedir + "/.sandboxrc" fd = open(execfile, "w+") if self.__options.session: @@ -362,7 +362,7 @@ sandbox [-h] [-l level ] [-[X|M] [-H homedir] [-T tempdir]] [-I includefile ] [- parser.add_option("-W", "--windowmanager", dest="wm", type="string", - default="/usr/bin/openbox", + default="/usr/bin/matchbox-window-manager", help=_("alternate window manager")) parser.add_option("-l", "--level", dest="level", diff --git a/sandbox/sandbox.8 b/sandbox/sandbox.8 index d83fee76f335..90ef4951c8c2 100644 --- a/sandbox/sandbox.8 +++ b/sandbox/sandbox.8 @@ -77,7 +77,7 @@ Specifies the windowsize when creating an X based Sandbox. The default windowsiz \fB\-W\fR \fB\-\-windowmanager\fR Select alternative window manager to run within .B sandbox \-X. -Default to /usr/bin/openbox. +Default to /usr/bin/matchbox-window-manager. .TP \fB\-X\fR Create an X based Sandbox for gui apps, temporary files for diff --git a/sandbox/sandboxX.sh b/sandbox/sandboxX.sh index 4774528027ef..c211ebc14549 100644 --- a/sandbox/sandboxX.sh +++ b/sandbox/sandboxX.sh @@ -6,20 +6,6 @@ export TITLE="Sandbox $context -- `grep ^#TITLE: ~/.sandboxrc | /usr/bin/cut -b8 [ -z $2 ] && export DPI="96" || export DPI="$2" trap "exit 0" HUP -mkdir -p ~/.config/openbox -cat > ~/.config/openbox/rc.xml << EOF - - - - no - all - yes - - - -EOF - (/usr/bin/Xephyr -resizeable -title "$TITLE" -terminate -reset -screen $SCREENSIZE -dpi $DPI -nolisten tcp -displayfd 5 5>&1 2>/dev/null) | while read D; do export DISPLAY=:$D cat > ~/seremote << __EOF -- 2.29.0