diff options
| -rw-r--r-- | kanotix-lxde-extra/debian/changelog | 6 | ||||
| -rw-r--r-- | kanotix-lxde-extra/kanotix-start-compiz | 73 |
2 files changed, 40 insertions, 39 deletions
diff --git a/kanotix-lxde-extra/debian/changelog b/kanotix-lxde-extra/debian/changelog index e187190..908e372 100644 --- a/kanotix-lxde-extra/debian/changelog +++ b/kanotix-lxde-extra/debian/changelog @@ -1,3 +1,9 @@ +kanotix-lxde-extra (0.2.6) unstable; urgency=low + + * changes to compi start + + -- Holger Paradies <retabell@gmx.de> Tue, 31 Dec 2013 18:33:26 +0100 + kanotix-lxde-extra (0.2.5) unstable; urgency=low * disable compiz if llvmpipe is found diff --git a/kanotix-lxde-extra/kanotix-start-compiz b/kanotix-lxde-extra/kanotix-start-compiz index f1b35b3..7e3d478 100644 --- a/kanotix-lxde-extra/kanotix-start-compiz +++ b/kanotix-lxde-extra/kanotix-start-compiz @@ -1,49 +1,12 @@ #!/bin/sh - # kanotix-start-copmpiz 0.1-3 rc1 + # kanotix-start-copmpiz 20131231 # Start compiz via fusion-icon ! [ -x /usr/bin/compiz ] && exit 1 # check for compiz [ "$(id -u)" = "0" ] && exit 2 # do not run as root ! [ -x /usr/sbin/lightdm ] && exit 3 # only start in lxde with ligthdm -if ps ax |grep -q [f]usion-icon; then - echo "ERROR fusion-icon already running, this should not happen, killing" >&2 - pkill -9 fusion-icon -fi - -if ! [ -e ~/.config/compiz/fusion-icon ]; then - # write default config for fusion-icon, this is default, also - # this can go to etcskel, but better keep here -cat <<"_EOF_" > ~/.config/compiz/fusion-icon -[compiz options] -loose binding = false -indirect rendering = false - -[window manager] -active wm = compiz - - -_EOF_ -fi - -# force nocompiz with llvmpipe -if glxinfo|grep -q llvmpipe; then -echo "disable compiz on llvmpipe" >&2 -sed -i s/"active wm = compiz"/"active wm = openbox-lxde"/ ~/.config/compiz/fusion-icon -#cat <<"_EOF_" > ~/.config/compiz/fusion-icon -#[compiz options] -#loose binding = false -#indirect rendering = false - -#[window manager] -#active wm = openbox-lxde - - -#_EOF_ - -fi - if [ -e ~/.nocompiz ]; then # write openbox-config and start openbox # keep care we have this config in case fusion-icon is started from @@ -67,12 +30,44 @@ fi exit 4 fi +# startup +if ! [ -e ~/.config/compiz/fusion-icon ]; then + # write default config for fusion-icon, this is default, also + # this can go to etcskel, but better keep here +cat <<"_EOF_" > ~/.config/compiz/fusion-icon +[compiz options] +loose binding = false +indirect rendering = false + +[window manager] +active wm = compiz + + +_EOF_ +fi +STARTFLAG="" +# catch if system is already running +if ps ax |grep -q [f]usion-icon; then + echo "ERROR fusion-icon already running, this should not happen, killing" >&2 + pkill -9 fusion-icon + fusion-icon $STARTFLAG >/dev/null 2>&1 & + exit 5 +fi +# force no compiz start with llvmpipe +if glxinfo|grep -q llvmpipe; then +echo "disable compiz on llvmpipe" >&2 +sed -i s/"active wm = compiz"/"active wm = openbox-lxde"/ ~/.config/compiz/fusion-icon +STARTFLAG="-n" +fi # start compiz/openbox choosen from config +if grep "openbox-lxde" ~/.config/compiz/fusion-icon; then +STARTFLAG="-n" +fi if glxinfo|grep -q GLX_EXT_texture_from_pixmap; then if [ -x /usr/bin/fusion-icon ]; then echo "starte fusion-icon" - fusion-icon >/dev/null 2>&1 & # start and reload windowmanager + fusion-icon $STARTFLAG >/dev/null 2>&1 & # start and reload windowmanager else echo "ERROR fusion-icon not found, starting default" >&2 fi |