X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_xinitrc;h=fe6473492751ff4f2c0ec4f5a0ac91e2ac88280e;hb=8f0006b57b395fd873820e5ce6bc86997d1765e4;hp=b9007057c9e8ba09a87919a700a87aef56105d2d;hpb=5a4ae2f676698eb4c47e399858b7459269bf3fae;p=sugar.git

diff --git a/dot-files/_xinitrc b/dot-files/_xinitrc
index b900705..fe64734 100644
--- a/dot-files/_xinitrc
+++ b/dot-files/_xinitrc
@@ -2,8 +2,8 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
+sysresources=/usr/pkg/lib/X11/xinit/.Xresources
+sysmodmap=/usr/pkg/lib/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
 if [ -d "/usr/local/lib/X11/fonts/Unicode" ]; then
@@ -11,6 +11,16 @@ if [ -d "/usr/local/lib/X11/fonts/Unicode" ]; then
     xset fp rehash
 fi
 
+if [ -d "/usr/pkg/lib/X11/fonts/local/" ]; then
+    xset fp+ /usr/pkg/lib/X11/fonts/local/
+    xset fp rehash
+fi
+
+if [ -d "/usr/pkg/lib/X11/fonts/intlfonts/" ]; then
+    xset fp+ /usr/pkg/lib/X11/fonts/intlfonts/
+    xset fp rehash
+fi
+
 if [ -f $sysresources ]; then
     xrdb -merge $sysresources
 fi
@@ -31,20 +41,54 @@ fi
 if [ -d "/usr/pkg/bin" ]; then
     PATH="/usr/pkg/bin:$PATH"; export PATH
 fi
+if [ -d "/usr/local/bin" ]; then
+    PATH="/usr/local/bin:$PATH"; export PATH
+fi
 
 LANG="ja_JP.UTF-8"; export LANG
+GTK_PATH="/usr/pkg/lib/gtk-2.0"; export GTK_PATH
 GTK_IM_MODULE="uim"; export GTK_IM_MODULE
 
 # start some nice programs
 xhost +localhost
 
 # Set the mouse speed
-xset m 5 4
+case `hostname` in
+    aria.cielonegro.org)
+        xset m 5 4;;
+    yukari.cielonegro.org)
+        :xset m '1.5' 2;;
+esac
 
-echo ".xinitrc is going to exec window manager..."
+# Disable the beep / bell.
+xset -b
 
-# start the window manager
-if which quartz-wm 2>&1 >/dev/null; then
-    quartz-wm --only-proxy &
+# Launch ssh-agent-manager
+if which ssh-agent-manager 2>&1 >/dev/null; then
+    eval `ssh-agent-manager -s`
+fi
+
+# Start X.org auxiliary utilities
+if which vmware-user-suid-wrapper >/dev/null 2>&1; then
+    echo "Open Virtual Machine Tools is available. Starting..."
+    vmware-user-suid-wrapper
+
+elif vmware-user >/dev/null 2>&1; then
+    echo "VMWare Tools is available. Starting..."
+    vmware-user &
+
+elif which VBoxClient >/dev/null 2>&1; then
+    echo "VirtualBox Guest Addon is available. Starting..."
+    VBoxClient --display
+    VBoxClient --clipboard
+fi
+
+# Start the window manager
+echo ".xinitrc is going to exec window manager..."
+#if which quartz-wm 2>&1 >/dev/null; then
+#    quartz-wm --only-proxy &
+#fi
+if which fluxbox >/dev/null 2>&1; then
+    exec fluxbox
 fi
-exec fluxbox
+exec twm