slitaz-configs rev 244 5.5.5

refactoring xinitrc
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Sun Sep 21 00:56:08 2014 +0000 (2014-09-21)
parents 9aa1efb49a58
children bbffdea7d165
files rootfs/etc/skel/.Xdefaults rootfs/etc/skel/.xinitrc rootfs/root/.Xdefaults rootfs/root/.xinitrc rootfs/usr/share/applications/defaults.list
line diff
     1.1 --- a/rootfs/etc/skel/.Xdefaults	Fri Aug 22 03:24:57 2014 +0000
     1.2 +++ b/rootfs/etc/skel/.Xdefaults	Sun Sep 21 00:56:08 2014 +0000
     1.3 @@ -12,15 +12,16 @@
     1.4  xterm*cursorColor:	#d66018
     1.5  xterm*scrollBar:	off
     1.6  xterm*faceSize:		11
     1.7 -xterm*faceName:		xft:DejaVu Sans Mono:autohint=true
     1.8 +xterm*faceName:		xft:Monospace:autohint=true
     1.9  xterm*faceNameDoublesize: WenQuanYi WenQuanYi Micro Hei Mono-11
    1.10  xterm*deleteIsDEL:	false
    1.11 +xterm*metaSendsEscape:	true
    1.12  xterm*eightBitInput:	true
    1.13  xterm*utf8:		2
    1.14 -xterm*metaSendsEscape:	true
    1.15 -xterm*oldXtermFKeys:	true
    1.16  xterm*termName:		xterm-256color
    1.17  xterm*saveLines:	8192
    1.18 +
    1.19 +!xterm*oldXtermFKeys:	true
    1.20  !xterm*cursorBlink:	true
    1.21  
    1.22  ! Xload settings
     2.1 --- a/rootfs/etc/skel/.xinitrc	Fri Aug 22 03:24:57 2014 +0000
     2.2 +++ b/rootfs/etc/skel/.xinitrc	Sun Sep 21 00:56:08 2014 +0000
     2.3 @@ -6,14 +6,22 @@
     2.4  
     2.5  [ "$1" ] && WINDOW_MANAGER="$1"
     2.6  
     2.7 +EXEC="exec dbus-launch --sh-syntax --exit-with-session"
     2.8 +S="/tmp/X-output" #	http://root:root@tazpanel:82/boot.cgi?log#slim
     2.9 +
    2.10 +LOG=0;	case "$LOG" in
    2.11 +	0) X="/dev/null"; echo WM_stdout '>' $X in $HOME/.xinitrc >$S ;W=$X ;;
    2.12 +	1) X=$S ; W=$X ; rm -f $W ;;
    2.13 +	2) X=$S ; W="$HOME/.wm_debug+warnings" ; rm -f $W $X ;;
    2.14 +esac
    2.15 +
    2.16  case "$WINDOW_MANAGER" in
    2.17  	openbox|lxde*|lxqt*|xfce4|compiz|karmen|dwm|fluxbox*)
    2.18 -		exec dbus-launch --sh-syntax --exit-with-session \
    2.19 -		${WINDOW_MANAGER%-session}-session ;;
    2.20 +		$EXEC ${WINDOW_MANAGER%-session}-session ;;
    2.21  	razor*)
    2.22 -		exec razor-session ;;
    2.23 +		$EXEC razor-session ;;
    2.24  	enlightenment)
    2.25 -		exec enlightenment_start ;;
    2.26 +		$EXEC enlightenment_start ;;
    2.27  	*)
    2.28 -		exec $WINDOW_MANAGER ;;
    2.29 -esac
    2.30 +		$EXEC $WINDOW_MANAGER ;;
    2.31 +esac	2>>$W >>$X
     3.1 --- a/rootfs/root/.Xdefaults	Fri Aug 22 03:24:57 2014 +0000
     3.2 +++ b/rootfs/root/.Xdefaults	Sun Sep 21 00:56:08 2014 +0000
     3.3 @@ -12,7 +12,7 @@
     3.4  xterm*cursorColor:	      #d66018
     3.5  xterm*scrollBar:	      off
     3.6  xterm*faceSize:		      11
     3.7 -xterm*faceName:		      DejaVu Sans Mono
     3.8 +xterm*faceName:		      xft:DejaVu Sans Mono:autohint=true
     3.9  xterm*faceNameDoublesize: WenQuanYi WenQuanYi Micro Hei Mono-11
    3.10  xterm*eightBitInput:	  true
    3.11  xterm*utf8:		          2
     4.1 --- a/rootfs/root/.xinitrc	Fri Aug 22 03:24:57 2014 +0000
     4.2 +++ b/rootfs/root/.xinitrc	Sun Sep 21 00:56:08 2014 +0000
     4.3 @@ -4,17 +4,24 @@
     4.4  #
     4.5  . /etc/slitaz/applications.conf
     4.6  
     4.7 -case $1 in
     4.8 -	openbox|lxde*|xfce4|compiz|karmen|dwm) 
     4.9 -		exec ${1%-session}-session ;;
    4.10 -	razor*) 
    4.11 -		exec razor-session ;;
    4.12 +[ "$1" ] && WINDOW_MANAGER="$1"
    4.13 +
    4.14 +EXEC="exec dbus-launch --sh-syntax --exit-with-session"
    4.15 +S="/tmp/X-output" #	http://root:root@tazpanel:82/boot.cgi?log#slim
    4.16 +
    4.17 +LOG=2;	case "$LOG" in
    4.18 +	0) X="/dev/null"; echo WM_stdout '>' $X in $HOME/.xinitrc >$S ;W=$X ;;
    4.19 +	1) X=$S ; W=$X ; rm -f $W ;;
    4.20 +	2) X=$S ; W="$HOME/.wm_debug+warnings" ; rm -f $W $X ;;
    4.21 +esac
    4.22 +
    4.23 +case "$WINDOW_MANAGER" in
    4.24 +	openbox|lxde*|lxqt*|xfce4|compiz|karmen|dwm|fluxbox*)
    4.25 +		$EXEC ${WINDOW_MANAGER%-session}-session ;;
    4.26 +	razor*)
    4.27 +		$EXEC razor-session ;;
    4.28  	enlightenment)
    4.29 -		exec enlightenment_start ;;
    4.30 -	fluxbox)
    4.31 -		exec start${1} ;;
    4.32 -	jwm|awesome|pekwm) 
    4.33 -		exec $1 ;;
    4.34 -	*) 
    4.35 -		exec $WINDOW_MANAGER ;;
    4.36 -esac
    4.37 +		$EXEC enlightenment_start ;;
    4.38 +	*)
    4.39 +		$EXEC $WINDOW_MANAGER ;;
    4.40 +esac	2>>$W >>$X
     5.1 --- a/rootfs/usr/share/applications/defaults.list	Fri Aug 22 03:24:57 2014 +0000
     5.2 +++ b/rootfs/usr/share/applications/defaults.list	Sun Sep 21 00:56:08 2014 +0000
     5.3 @@ -13,6 +13,6 @@
     5.4  text/plain=leafpad.desktop
     5.5  text/html=midori.desktop
     5.6  
     5.7 -image/x-ico=viewnior.desktop
     5.8 -image/png=viewnior.desktop
     5.9 -image/jpeg=viewnior.desktop
    5.10 +image/x-ico=gpicview.desktop
    5.11 +image/png=gpicview.desktop
    5.12 +image/jpeg=gpicview.desktop