| 1 |
matsuu 10/02/10 10:47:11 |
| 2 |
|
| 3 |
Modified: awesome-session |
| 4 |
Log: |
| 5 |
Added session handling, bug #303661. |
| 6 |
(Portage version: 2.1.7.17/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 x11-wm/awesome/files/awesome-session |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/files/awesome-session?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/files/awesome-session?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-wm/awesome/files/awesome-session?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: awesome-session |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-wm/awesome/files/awesome-session,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- awesome-session 21 Jan 2008 15:59:41 -0000 1.2 |
| 22 |
+++ awesome-session 10 Feb 2010 10:47:11 -0000 1.3 |
| 23 |
@@ -1,3 +1,90 @@ |
| 24 |
#!/bin/sh |
| 25 |
+# Awesome Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1 |
| 26 |
+ |
| 27 |
+# redirect errors to a file in user's home directory if we can |
| 28 |
+for errfile in "$HOME/.awesome-errors" "${TMPDIR-/tmp}/awesome-$USER" "/tmp/awesome-$USER" |
| 29 |
+do |
| 30 |
+ if ( cp /dev/null "$errfile" 2> /dev/null ) |
| 31 |
+ then |
| 32 |
+ chmod 600 "$errfile" |
| 33 |
+ exec > "$errfile" 2>&1 |
| 34 |
+ break |
| 35 |
+ fi |
| 36 |
+done |
| 37 |
+ |
| 38 |
+userresources=$HOME/.Xresources |
| 39 |
+usermodmap=$HOME/.Xmodmap |
| 40 |
+userxkbmap=$HOME/.Xkbmap |
| 41 |
+ |
| 42 |
+sysresources=/etc/X11/Xresources |
| 43 |
+sysmodmap=/etc/X11/Xmodmap |
| 44 |
+sysxkbmap=/etc/X11/Xkbmap |
| 45 |
+ |
| 46 |
+rh6sysresources=/etc/X11/xinit/Xresources |
| 47 |
+rh6sysmodmap=/etc/X11/xinit/Xmodmap |
| 48 |
+ |
| 49 |
+ |
| 50 |
+# merge in defaults |
| 51 |
+if [ -f "$rh6sysresources" ]; then |
| 52 |
+ xrdb -merge "$rh6sysresources" |
| 53 |
+fi |
| 54 |
+ |
| 55 |
+if [ -f "$sysresources" ]; then |
| 56 |
+ xrdb -merge "$sysresources" |
| 57 |
+fi |
| 58 |
+ |
| 59 |
+if [ -f "$userresources" ]; then |
| 60 |
+ xrdb -merge "$userresources" |
| 61 |
+fi |
| 62 |
+ |
| 63 |
+# merge in keymaps |
| 64 |
+if [ -f "$sysxkbmap" ]; then |
| 65 |
+ setxkbmap `cat "$sysxkbmap"` |
| 66 |
+ XKB_IN_USE=yes |
| 67 |
+fi |
| 68 |
+ |
| 69 |
+if [ -f "$userxkbmap" ]; then |
| 70 |
+ setxkbmap `cat "$userxkbmap"` |
| 71 |
+ XKB_IN_USE=yes |
| 72 |
+fi |
| 73 |
+ |
| 74 |
+# |
| 75 |
+# Eeek, this seems like too much magic here |
| 76 |
+# |
| 77 |
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then |
| 78 |
+ if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then |
| 79 |
+ xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf` |
| 80 |
+ if [ -n "$xkbsymbols" ]; then |
| 81 |
+ setxkbmap -symbols "$xkbsymbols" |
| 82 |
+ XKB_IN_USE=yes |
| 83 |
+ fi |
| 84 |
+ fi |
| 85 |
+fi |
| 86 |
+ |
| 87 |
+# xkb and xmodmap don't play nice together |
| 88 |
+if [ -z "$XKB_IN_USE" ]; then |
| 89 |
+ if [ -f "$rh6sysmodmap" ]; then |
| 90 |
+ xmodmap "$rh6sysmodmap" |
| 91 |
+ fi |
| 92 |
+ |
| 93 |
+ if [ -f "$sysmodmap" ]; then |
| 94 |
+ xmodmap "$sysmodmap" |
| 95 |
+ fi |
| 96 |
+ |
| 97 |
+ if [ -f "$usermodmap" ]; then |
| 98 |
+ xmodmap "$usermodmap" |
| 99 |
+ fi |
| 100 |
+fi |
| 101 |
+ |
| 102 |
+unset XKB_IN_USE |
| 103 |
+ |
| 104 |
+# run all system xinitrc shell scripts. |
| 105 |
+if [ -d /etc/X11/xinit/xinitrc.d ]; then |
| 106 |
+ for i in /etc/X11/xinit/xinitrc.d/* ; do |
| 107 |
+ if [ -x "$i" ]; then |
| 108 |
+ . "$i" |
| 109 |
+ fi |
| 110 |
+ done |
| 111 |
+fi |
| 112 |
|
| 113 |
exec /usr/bin/awesome |
Archives