SOURCES: entrance.Xsession - put failsafe xterm in upper left corn...

sparky sparky at pld-linux.org
Sun Oct 30 17:27:28 CET 2005


Author: sparky                       Date: Sun Oct 30 16:27:28 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- put failsafe xterm in upper left corner
- thrown black magic thing

---- Files affected:
SOURCES:
   entrance.Xsession (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/entrance.Xsession
diff -u SOURCES/entrance.Xsession:1.1 SOURCES/entrance.Xsession:1.2
--- SOURCES/entrance.Xsession:1.1	Sat Jan  8 20:11:51 2005
+++ SOURCES/entrance.Xsession	Sun Oct 30 17:27:23 2005
@@ -39,17 +39,6 @@
     XKB_IN_USE=yes
 fi
 
-if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
-	if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 \
-    			&& [ -f /etc/X11/XF86Config ]; then
-		xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-		if [ -n "$xkbsymbols" ]; then
-			setxkbmap -symbols "$xkbsymbols"
-			XKB_IN_USE=yes
-		fi
-	fi
-fi
-
 # xkb and xmodmap don't play nice together
 if [ -z "$XKB_IN_USE" ]; then
 	[ -f "$sysmodmap" ] && xmodmap "$sysmodmap"
@@ -69,16 +58,10 @@
 case $# in
     1) case $1 in
 	failsafe)
-		exec xterm -geometry 80x24-0-0
+		exec xterm -geometry 80x24+0+0
 		;;
 	gnome)
 		exec gnome-session
-		;;
-	kde|kde1)
-#		exec /usr/share/apps/switchdesk/Xclients.kde
-		;;
-	kde2)
-#		exec /usr/share/apps/switchdesk/Xclients.kde2
 		;;
     esac
 esac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/entrance.Xsession?r1=1.1&r2=1.2&f=u




More information about the pld-cvs-commit mailing list