wok-current diff slim/stuff/slim-1.3.5.patch @ rev 14601
SLiM session: slim up 1.3.5; added slim-theme manager; added three hand-made themes. Read forum for details
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Tue May 28 13:24:15 2013 +0000 (2013-05-28) |
parents | |
children | 6956f290aa5a |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/slim/stuff/slim-1.3.5.patch Tue May 28 13:24:15 2013 +0000 1.3 @@ -0,0 +1,169 @@ 1.4 +--- slim-1.3.5/app.cpp 1.5 ++++ slim-1.3.5/app.cpp 1.6 + 1.7 +Link forgotten header. 1.8 +@@ -25,6 +25,7 @@ 1.9 + #include "app.h" 1.10 + #include "numlock.h" 1.11 + #include "util.h" 1.12 ++#include <X11/Xmu/WinUtil.h> 1.13 + 1.14 + #ifdef HAVE_SHADOW 1.15 + #include <shadow.h> 1.16 + 1.17 +Option not to enter root's password if special command was given in the 1.18 +login field (suspend, halt or reboot). 1.19 +@@ -437,6 +438,11 @@ 1.20 + case Panel::Console: 1.21 + logStream << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl; 1.22 + return true; /* <--- This is simply fake! */ 1.23 ++ case Panel::Suspend: 1.24 ++ case Panel::Halt: 1.25 ++ case Panel::Reboot: 1.26 ++ if (cfg->getOption("root_password") == "false") 1.27 ++ return true; 1.28 + default: 1.29 + break; 1.30 + } 1.31 + 1.32 + 1.33 +--- slim-1.3.5/cfg.cpp 1.34 ++++ slim-1.3.5/cfg.cpp 1.35 + 1.36 +Change default settings for SliTaz. 1.37 +@@ -28,34 +28,35 @@ 1.38 + : currentSession(-1) 1.39 + { 1.40 + /* Configuration options */ 1.41 +- options.insert(option("default_path","/bin:/usr/bin:/usr/local/bin")); 1.42 +- options.insert(option("default_xserver","/usr/bin/X")); 1.43 ++ options.insert(option("default_path","/sbin:/bin:/usr/sbin:/usr/bin")); 1.44 ++ options.insert(option("default_xserver","/usr/bin/Xorg")); 1.45 + options.insert(option("xserver_arguments","")); 1.46 + options.insert(option("numlock","")); 1.47 + options.insert(option("daemon","")); 1.48 + options.insert(option("xauth_path","/usr/bin/xauth")); 1.49 +- options.insert(option("login_cmd","exec /bin/bash -login ~/.xinitrc %session")); 1.50 +- options.insert(option("halt_cmd","/sbin/shutdown -h now")); 1.51 +- options.insert(option("reboot_cmd","/sbin/shutdown -r now")); 1.52 ++ options.insert(option("login_cmd","exec /bin/sh -l ~/.xinitrc %session")); 1.53 ++ options.insert(option("halt_cmd","/sbin/poweroff")); 1.54 ++ options.insert(option("reboot_cmd","/sbin/reboot")); 1.55 ++ options.insert(option("root_password","true")); 1.56 + options.insert(option("suspend_cmd","")); 1.57 + options.insert(option("sessionstart_cmd","")); 1.58 + options.insert(option("sessionstop_cmd","")); 1.59 +- options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -g %dx%d+%d+%d -fn %dx%d -T ""Console login"" -e /bin/sh -c ""/bin/cat /etc/issue; exec /bin/login""")); 1.60 +- options.insert(option("screenshot_cmd","import -window root /slim.png")); 1.61 ++ options.insert(option("console_cmd","/usr/bin/xterm -C -fg white -bg black +sb -T ""Console login"" -e /bin/sh -l -c ""exec /bin/login""")); 1.62 ++ options.insert(option("screenshot_cmd","mtpaint -s /root/slim-shot.png")); 1.63 + options.insert(option("welcome_msg","Welcome to %host")); 1.64 + options.insert(option("session_msg","Session:")); 1.65 +- options.insert(option("default_user","")); 1.66 ++ options.insert(option("default_user","tux")); 1.67 + options.insert(option("focus_password","no")); 1.68 + options.insert(option("auto_login","no")); 1.69 +- options.insert(option("current_theme","default")); 1.70 +- options.insert(option("lockfile","/var/run/slim.lock")); 1.71 ++ options.insert(option("current_theme","slitaz,base")); 1.72 ++ options.insert(option("lockfile","/var/lock/slim.lock")); 1.73 + options.insert(option("logfile","/var/log/slim.log")); 1.74 + options.insert(option("authfile","/var/run/slim.auth")); 1.75 +- options.insert(option("shutdown_msg","The system is halting...")); 1.76 ++ options.insert(option("shutdown_msg","The system is going down...")); 1.77 + options.insert(option("reboot_msg","The system is rebooting...")); 1.78 +- options.insert(option("sessions","wmaker,blackbox,icewm")); 1.79 ++ options.insert(option("sessions","openbox,e17,jwm")); 1.80 + options.insert(option("sessiondir","")); 1.81 +- options.insert(option("hidecursor","false")); 1.82 ++ options.insert(option("hidecursor","true")); 1.83 + 1.84 + /* Theme stuff */ 1.85 + options.insert(option("input_panel_x","50%")); 1.86 + 1.87 + 1.88 +--- slim-1.3.5/slim.conf.original 1.89 ++++ slim-1.3.5/slim.conf 1.90 + 1.91 +Change default settings for SliTaz too. 1.92 +@@ -1,13 +1,16 @@ 1.93 ++# /etc/slim.conf: Slim LogIn Manger configuration file 1.94 ++# 1.95 ++ 1.96 + # Path, X server and arguments (if needed) 1.97 + # Note: -xauth $authfile is automatically appended 1.98 +-default_path /bin:/usr/bin:/usr/local/bin 1.99 +-default_xserver /usr/bin/X 1.100 ++default_path ./:/bin:/usr/bin:/usr/local/bin 1.101 ++default_xserver /usr/bin/Xorg 1.102 + #xserver_arguments -dpi 75 1.103 + 1.104 + # Commands for halt, login, etc. 1.105 +-halt_cmd /sbin/shutdown -h now 1.106 +-reboot_cmd /sbin/shutdown -r now 1.107 +-console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login" 1.108 ++halt_cmd /sbin/poweroff 1.109 ++reboot_cmd /sbin/reboot 1.110 ++console_cmd /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -l -c "exec /bin/login" 1.111 + #suspend_cmd /usr/sbin/suspend 1.112 + 1.113 + # Full path to the xauth binary 1.114 +@@ -22,7 +25,7 @@ 1.115 + 1.116 + # Hide the mouse cursor (note: does not work with some WMs). 1.117 + # Valid values: true|false 1.118 +-# hidecursor false 1.119 ++hidecursor true 1.120 + 1.121 + # This command is executed after a succesful login. 1.122 + # you can place the %session and %theme variables 1.123 +@@ -33,7 +36,7 @@ 1.124 + # to adjust the command according to your preferred shell, 1.125 + # i.e. for freebsd use: 1.126 + # login_cmd exec /bin/sh - ~/.xinitrc %session 1.127 +-login_cmd exec /bin/bash -login ~/.xinitrc %session 1.128 ++login_cmd exec /bin/sh -l ~/.xinitrc %session 1.129 + 1.130 + # Commands executed when starting and exiting a session. 1.131 + # They can be used for registering a X11 session with 1.132 +@@ -51,10 +54,10 @@ 1.133 + # The current chosen session name is replaced in the login_cmd 1.134 + # above, so your login command can handle different sessions. 1.135 + # see the xinitrc.sample file shipped with slim sources 1.136 +-sessions xfce4,icewm-session,wmaker,blackbox 1.137 ++sessions openbox,e17,jwm 1.138 + 1.139 + # Executed when pressing F11 (requires imagemagick) 1.140 +-screenshot_cmd import -window root /slim.png 1.141 ++#screenshot_cmd mtpaint -s /root/slim-shot.png 1.142 + 1.143 + # welcome message. Available variables: %host, %domain 1.144 + welcome_msg Welcome to %host 1.145 +@@ -63,12 +66,12 @@ 1.146 + # session_msg Session: 1.147 + 1.148 + # shutdown / reboot messages 1.149 +-shutdown_msg The system is halting... 1.150 ++shutdown_msg The system is going down... 1.151 + reboot_msg The system is rebooting... 1.152 + 1.153 + # default user, leave blank or remove this line 1.154 + # for avoid pre-loading the username. 1.155 +-#default_user simone 1.156 ++default_user tux 1.157 + 1.158 + # Focus the password field on start when default_user is set 1.159 + # Set to "yes" to enable this feature 1.160 +@@ -81,10 +84,10 @@ 1.161 + 1.162 + # current theme, use comma separated list to specify a set to 1.163 + # randomly choose from 1.164 +-current_theme default 1.165 ++current_theme slitaz,base 1.166 + 1.167 + # Lock file 1.168 +-lockfile /var/run/slim.lock 1.169 ++lockfile /var/lock/slim.lock 1.170 + 1.171 + # Log file 1.172 + logfile /var/log/slim.log