X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_xinitrc;h=6698c21770d8d74497e00e90cddf99f216b28386;hb=a236a7900c78ffddbb4b4b154820f1b4f5ab1065;hp=90192b6bce9fb29873d825d9737319d193246a03;hpb=dba45edf364398ee2ad69d9336a02b3ea58b5b8a;p=sugar.git

diff --git a/dot-files/_xinitrc b/dot-files/_xinitrc
index 90192b6..6698c21 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
@@ -33,10 +43,33 @@ if [ -d "/usr/pkg/bin" ]; then
 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
+if [ `hostname` != "seras" ]; then
+    xset m 5 4
+fi
+
+# Disable the beep / bell.
+xset -b
+
+# Launch ssh-agent-manager
+if which ssh-agent-manager 2>&1 >/dev/null; then
+    eval `ssh-agent-manager -s`
+fi
+
+echo ".xinitrc is going to exec window manager..."
+
 # start the window manager
-if which quartz-wm 2>&1 >/dev/null; then
-    quartz-wm --only-proxy &
+#if which quartz-wm 2>&1 >/dev/null; then
+#    quartz-wm --only-proxy &
+#fi
+if which vmware-user 2>&1 >/dev/null; then
+    vmware-user &
 fi
-exec fluxbox
+exec /usr/pkg/bin/fluxbox
+exec /usr/pkg/bin/twm