# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1395581858 -3600
# Node ID 56ca097bc816488385984f8252e26f67f1ab420a
# Parent  263748c62e711642305e897dff277f29c2de15e6
Add slim support and custom rpi theme

diff -r 263748c62e71 -r 56ca097bc816 flavors/rpi-desktop/packages.list
--- a/flavors/rpi-desktop/packages.list	Sat Mar 22 20:14:49 2014 +0100
+++ b/flavors/rpi-desktop/packages.list	Sun Mar 23 14:37:38 2014 +0100
@@ -55,7 +55,6 @@
 xorg-libXpm
 xorg-libXext
 xorg-libXmu
-xorg-libXinerama
 xorg-libXau
 xorg-libXdmcp
 xorg-libXt
@@ -71,7 +70,6 @@
 xorg-libpciaccess
 xorg-libXxf86vm
 xorg-libXfont
-xorg-libXinerama
 xorg-libXcursor
 xorg-libXrandr
 xorg-libXdamage
@@ -100,3 +98,4 @@
 shutterbug
 calculator
 links
+slim
diff -r 263748c62e71 -r 56ca097bc816 rootfs/etc/init.d/rcS
--- a/rootfs/etc/init.d/rcS	Sat Mar 22 20:14:49 2014 +0100
+++ b/rootfs/etc/init.d/rcS	Sun Mar 23 14:37:38 2014 +0100
@@ -92,6 +92,14 @@
 	done
 fi
 
+# Start X session
+if [ "$LOGIN_MANAGER" ] && [ -x "/etc/init.d/$LOGIN_MANAGER" ]; then
+	#mkdir -p  /var/run/dbus
+	#/etc/init.d/dbus start
+	colorize 36 "Starting X environment..."
+	/etc/init.d/$LOGIN_MANAGER start >/dev/null &
+fi
+
 newline
 colorize 32 "$MESSAGE"
 
diff -r 263748c62e71 -r 56ca097bc816 rootfs/etc/rcS.conf
--- a/rootfs/etc/rcS.conf	Sat Mar 22 20:14:49 2014 +0100
+++ b/rootfs/etc/rcS.conf	Sun Mar 23 14:37:38 2014 +0100
@@ -14,5 +14,8 @@
 # Daemons/services to start later in boot process.
 RUN_DAEMONS=""
 
+# X Login manager: slim or empty to disable X
+LOGIN_MANAGER="slim"
+
 # Pre login bold message.
 MESSAGE="Welcome to SliTaz ARM"
diff -r 263748c62e71 -r 56ca097bc816 rootfs/etc/xdg/jwm/system.jwmrc
--- a/rootfs/etc/xdg/jwm/system.jwmrc	Sat Mar 22 20:14:49 2014 +0100
+++ b/rootfs/etc/xdg/jwm/system.jwmrc	Sun Mar 23 14:37:38 2014 +0100
@@ -7,7 +7,7 @@
 		<Menu icon="applications-accessories.png" label="Accessories">
 			<Program icon="galculator.png" label="Calculator">calculator</Program>
 			<Program icon="gnome-screenshot.png" label="Screenshot">shutterbug</Program>
-			<Program icon="joe.png" label="Joe Editor">terminal -e joe</Program>
+			<Program icon="joe.png" label="Text Editor">terminal -e joe</Program>
 		</Menu>
 		<Menu icon="applications-system.png" label="System Tools">
 			<Program icon="utilities-system-monitor.png" label="Top Monitor">terminal -e top</Program>
@@ -15,7 +15,7 @@
 			<Program icon="gnome-settings.png" label="System Config">terminal -e 'su -c slitaz-config'</Program>
 		</Menu>
 		<Menu icon="applications-internet.png" label="Network">
-			<Program icon="links.png" label="Links Web browser">links -g</Program>
+			<Program icon="links.xpm" label="Links Web browser">links -g</Program>
 			<Program icon="internet-web-browser.png" label="Lynx Web browser">terminal -e lynx</Program>
 			<Program icon="xchat.png" label="TazIRC IRC client">terminal -e 'tazirc --ask'</Program>
 		</Menu>
@@ -25,10 +25,10 @@
 	</RootMenu>
 	
 	<RootMenu height="22" onroot="3">
-		<Program icon="system-shut-down.png" label="Shut down system">halt</Program>
+		<Restart label="Restart JWM" icon="system-restart.png" />
+		<Exit label="Exit JWM" confirm="true" icon="system-suspend.png" />
 		<Program icon="system-restart.png" label="Reboot system">reboot</Program>
-		<Exit label="Exit JWM" confirm="true" icon="system-suspend.png"/>
-		<Restart label="Restart JWM" icon="system-restart.png"/>
+		<Program icon="system-shut-down.png" label="Shutdown system">halt</Program>
 	</RootMenu>
 
    <!-- Additional tray attributes: autohide, width, border, layer, layout -->
diff -r 263748c62e71 -r 56ca097bc816 rpi/rootfs/etc/rcS.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpi/rootfs/etc/rcS.conf	Sun Mar 23 14:37:38 2014 +0100
@@ -0,0 +1,21 @@
+# /etc/rcS.conf - Initial boot script configuration for SliTaz ARM
+# Config file used by /etc/init.d/rcS
+#
+
+# Syslogd: Max size (KB) before rotation.
+SYSLOGD_SIZE="40"
+
+# Kernel modules to load earlier in boot.
+LOAD_MODULES="snd-bcm2835"
+
+# Scripts to run at boot time. Important: system.sh after network.sh.
+RUN_SCRIPTS="network.sh system.sh local.sh"
+
+# Daemons/services to start later in boot process.
+RUN_DAEMONS=""
+
+# X Login manager: slim or empty to disable X
+LOGIN_MANAGER="slim"
+
+# Pre login bold message.
+MESSAGE="Welcome to SliTaz RaspberryPi"
diff -r 263748c62e71 -r 56ca097bc816 rpi/rootfs/etc/slim.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpi/rootfs/etc/slim.conf	Sun Mar 23 14:37:38 2014 +0100
@@ -0,0 +1,94 @@
+# /etc/slim.conf: Slim LogIn Manger configuration file
+#
+
+# Path, X server and arguments (if needed)
+# Note: -xauth $authfile is automatically appended
+default_path        ./:/bin:/usr/bin:/usr/local/bin
+default_xserver      /usr/bin/Xorg
+#xserver_arguments   -dpi 75
+
+# Commands for halt, login, etc.
+halt_cmd            /sbin/poweroff
+reboot_cmd          /sbin/reboot
+console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login"
+#suspend_cmd        /usr/sbin/suspend
+
+# Full path to the xauth binary
+xauth_path         /usr/bin/xauth 
+
+# Xauth file for server
+authfile           /var/run/slim.auth
+
+
+# Activate numlock when slim starts. Valid values: on|off
+# numlock             on
+
+# Hide the mouse cursor (note: does not work with some WMs).
+# Valid values: true|false
+hidecursor          true
+
+# This command is executed after a succesful login.
+# you can place the %session and %theme variables
+# to handle launching of specific commands in .xinitrc
+# depending of chosen session and slim theme
+#
+# NOTE: if your system does not have bash you need
+# to adjust the command according to your preferred shell,
+# i.e. for freebsd use:
+# login_cmd           exec /bin/sh - ~/.xinitrc %session
+login_cmd           exec /bin/sh -l ~/.xinitrc %session
+
+# Commands executed when starting and exiting a session.
+# They can be used for registering a X11 session with
+# sessreg. You can use the %user variable
+#
+# sessionstart_cmd	some command
+# sessionstop_cmd	some command
+
+# Start in daemon mode. Valid values: yes | no
+# Note that this can be overriden by the command line
+# options "-d" and "-nodaemon"
+# daemon	yes
+
+# Available sessions (first one is the default).
+# The current chosen session name is replaced in the login_cmd
+# above, so your login command can handle different sessions.
+# see the xinitrc.sample file shipped with slim sources
+sessions            jwm
+
+# Executed when pressing F11 (requires imagemagick)
+#screenshot_cmd      mtpaint -s /root/slim-shot.png
+
+# welcome message. Available variables: %host, %domain
+welcome_msg         Welcome to %host
+
+# Session message. Prepended to the session name when pressing F1
+# session_msg         Session: 
+
+# shutdown / reboot messages
+shutdown_msg       The system is going down...
+reboot_msg         The system is rebooting...
+
+# default user, leave blank or remove this line
+# for avoid pre-loading the username.
+default_user        root
+
+# Focus the password field on start when default_user is set
+# Set to "yes" to enable this feature
+#focus_password      no
+
+# Automatically login the default user (without entering
+# the password. Set to "yes" to enable this feature
+#auto_login          no
+
+
+# current theme, use comma separated list to specify a set to 
+# randomly choose from
+current_theme       rpi
+
+# Lock file
+lockfile            /var/lock/slim.lock
+
+# Log file
+logfile             /var/log/slim.log
+
diff -r 263748c62e71 -r 56ca097bc816 rpi/rootfs/usr/share/slim/themes/rpi/background.png
Binary file rpi/rootfs/usr/share/slim/themes/rpi/background.png has changed
diff -r 263748c62e71 -r 56ca097bc816 rpi/rootfs/usr/share/slim/themes/rpi/panel.png
Binary file rpi/rootfs/usr/share/slim/themes/rpi/panel.png has changed
diff -r 263748c62e71 -r 56ca097bc816 rpi/rootfs/usr/share/slim/themes/rpi/slim.theme
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rpi/rootfs/usr/share/slim/themes/rpi/slim.theme	Sun Mar 23 14:37:38 2014 +0100
@@ -0,0 +1,37 @@
+# SliTaz theme for SLiM
+# 
+
+# Messages
+msg_color               #000000
+msg_font                Vera:size=18:bold:dpi=75
+msg_x                   50%
+msg_y                   35%
+#msg_shadow_color        #FFFFFF
+#msg_shadow_xoffset      1
+#msg_shadow_yoffset      1
+
+# valid values: stretch, tile
+background_style        tile
+background_color        #ffffff
+
+# Input controls
+input_panel_x           50%
+input_panel_y           40%
+input_name_x           60
+input_name_y           326
+input_font          	    Vera:size=12:dpi=75
+input_fgcolor             #000000
+
+# Username / password request
+username_font          	Vera:size=20:bold:dpi=75
+username_color        	#cfcfcf
+username_x              50%
+username_y              275
+password_x              50%
+password_y              275
+#username_shadow_color   #000000
+#username_shadow_xoffset 1
+#username_shadow_yoffset 1
+
+username_msg           Login name:
+password_msg            Password: