# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1411260968 0
# Node ID 2987498eeab89e4d7ddeec0ed903bbfe2db2a329
# Parent  9aa1efb49a5865f15a323af3f0e9e641517a0971
refactoring xinitrc

diff -r 9aa1efb49a58 -r 2987498eeab8 rootfs/etc/skel/.Xdefaults
--- a/rootfs/etc/skel/.Xdefaults	Fri Aug 22 03:24:57 2014 +0000
+++ b/rootfs/etc/skel/.Xdefaults	Sun Sep 21 00:56:08 2014 +0000
@@ -12,15 +12,16 @@
 xterm*cursorColor:	#d66018
 xterm*scrollBar:	off
 xterm*faceSize:		11
-xterm*faceName:		xft:DejaVu Sans Mono:autohint=true
+xterm*faceName:		xft:Monospace:autohint=true
 xterm*faceNameDoublesize: WenQuanYi WenQuanYi Micro Hei Mono-11
 xterm*deleteIsDEL:	false
+xterm*metaSendsEscape:	true
 xterm*eightBitInput:	true
 xterm*utf8:		2
-xterm*metaSendsEscape:	true
-xterm*oldXtermFKeys:	true
 xterm*termName:		xterm-256color
 xterm*saveLines:	8192
+
+!xterm*oldXtermFKeys:	true
 !xterm*cursorBlink:	true
 
 ! Xload settings
diff -r 9aa1efb49a58 -r 2987498eeab8 rootfs/etc/skel/.xinitrc
--- a/rootfs/etc/skel/.xinitrc	Fri Aug 22 03:24:57 2014 +0000
+++ b/rootfs/etc/skel/.xinitrc	Sun Sep 21 00:56:08 2014 +0000
@@ -6,14 +6,22 @@
 
 [ "$1" ] && WINDOW_MANAGER="$1"
 
+EXEC="exec dbus-launch --sh-syntax --exit-with-session"
+S="/tmp/X-output" #	http://root:root@tazpanel:82/boot.cgi?log#slim
+
+LOG=0;	case "$LOG" in
+	0) X="/dev/null"; echo WM_stdout '>' $X in $HOME/.xinitrc >$S ;W=$X ;;
+	1) X=$S ; W=$X ; rm -f $W ;;
+	2) X=$S ; W="$HOME/.wm_debug+warnings" ; rm -f $W $X ;;
+esac
+
 case "$WINDOW_MANAGER" in
 	openbox|lxde*|lxqt*|xfce4|compiz|karmen|dwm|fluxbox*)
-		exec dbus-launch --sh-syntax --exit-with-session \
-		${WINDOW_MANAGER%-session}-session ;;
+		$EXEC ${WINDOW_MANAGER%-session}-session ;;
 	razor*)
-		exec razor-session ;;
+		$EXEC razor-session ;;
 	enlightenment)
-		exec enlightenment_start ;;
+		$EXEC enlightenment_start ;;
 	*)
-		exec $WINDOW_MANAGER ;;
-esac
+		$EXEC $WINDOW_MANAGER ;;
+esac	2>>$W >>$X
diff -r 9aa1efb49a58 -r 2987498eeab8 rootfs/root/.Xdefaults
--- a/rootfs/root/.Xdefaults	Fri Aug 22 03:24:57 2014 +0000
+++ b/rootfs/root/.Xdefaults	Sun Sep 21 00:56:08 2014 +0000
@@ -12,7 +12,7 @@
 xterm*cursorColor:	      #d66018
 xterm*scrollBar:	      off
 xterm*faceSize:		      11
-xterm*faceName:		      DejaVu Sans Mono
+xterm*faceName:		      xft:DejaVu Sans Mono:autohint=true
 xterm*faceNameDoublesize: WenQuanYi WenQuanYi Micro Hei Mono-11
 xterm*eightBitInput:	  true
 xterm*utf8:		          2
diff -r 9aa1efb49a58 -r 2987498eeab8 rootfs/root/.xinitrc
--- a/rootfs/root/.xinitrc	Fri Aug 22 03:24:57 2014 +0000
+++ b/rootfs/root/.xinitrc	Sun Sep 21 00:56:08 2014 +0000
@@ -4,17 +4,24 @@
 #
 . /etc/slitaz/applications.conf
 
-case $1 in
-	openbox|lxde*|xfce4|compiz|karmen|dwm) 
-		exec ${1%-session}-session ;;
-	razor*) 
-		exec razor-session ;;
+[ "$1" ] && WINDOW_MANAGER="$1"
+
+EXEC="exec dbus-launch --sh-syntax --exit-with-session"
+S="/tmp/X-output" #	http://root:root@tazpanel:82/boot.cgi?log#slim
+
+LOG=2;	case "$LOG" in
+	0) X="/dev/null"; echo WM_stdout '>' $X in $HOME/.xinitrc >$S ;W=$X ;;
+	1) X=$S ; W=$X ; rm -f $W ;;
+	2) X=$S ; W="$HOME/.wm_debug+warnings" ; rm -f $W $X ;;
+esac
+
+case "$WINDOW_MANAGER" in
+	openbox|lxde*|lxqt*|xfce4|compiz|karmen|dwm|fluxbox*)
+		$EXEC ${WINDOW_MANAGER%-session}-session ;;
+	razor*)
+		$EXEC razor-session ;;
 	enlightenment)
-		exec enlightenment_start ;;
-	fluxbox)
-		exec start${1} ;;
-	jwm|awesome|pekwm) 
-		exec $1 ;;
-	*) 
-		exec $WINDOW_MANAGER ;;
-esac
+		$EXEC enlightenment_start ;;
+	*)
+		$EXEC $WINDOW_MANAGER ;;
+esac	2>>$W >>$X
diff -r 9aa1efb49a58 -r 2987498eeab8 rootfs/usr/share/applications/defaults.list
--- a/rootfs/usr/share/applications/defaults.list	Fri Aug 22 03:24:57 2014 +0000
+++ b/rootfs/usr/share/applications/defaults.list	Sun Sep 21 00:56:08 2014 +0000
@@ -13,6 +13,6 @@
 text/plain=leafpad.desktop
 text/html=midori.desktop
 
-image/x-ico=viewnior.desktop
-image/png=viewnior.desktop
-image/jpeg=viewnior.desktop
+image/x-ico=gpicview.desktop
+image/png=gpicview.desktop
+image/jpeg=gpicview.desktop