X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=dot-files%2F_xinitrc;h=ab416d0e085edffb38ffb846dedc3c7720039f29;hb=3cd83fdb8424be6775f69562809630e1716f61a0;hp=f221e9d28730b534359cca77b6fb7c2f15d34711;hpb=d386ce32e9371eaee28aadaade9695d8fa2fc0bd;p=sugar.git

diff --git a/dot-files/_xinitrc b/dot-files/_xinitrc
index f221e9d..ab416d0 100644
--- a/dot-files/_xinitrc
+++ b/dot-files/_xinitrc
@@ -41,6 +41,9 @@ 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
@@ -50,23 +53,60 @@ GTK_IM_MODULE="uim"; export GTK_IM_MODULE
 xhost +localhost
 
 # Set the mouse speed
-if [ `hostname` != "seras" ]; then
-    xset m 5 4
-fi
+case `hostname` in
+    aria.cielonegro.org)
+        xset m 5 4;;
+    yukari.cielonegro.org)
+        :xset m '1.5' 2;;
+esac
+
+# 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 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
 
-# start the window manager
-#if which quartz-wm 2>&1 >/dev/null; then
-#    quartz-wm --only-proxy &
-#fi
-if which vmware-user 2>&1 >/dev/null; then
+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
+
+if which dunst 2>&1; then
+    dunst &
+fi
+
+if which xbanish 2>&1; then
+    xbanish &
+
+elif which unclutter 2>&1; then
+    unclutter -jitter 5 &
+fi
+
+# Start the compositor
+if which picom >/dev/null 2>&1; then
+    picom --backend xrender --daemon
+    # Fluxbox seems to have problems without this sleep...
+    sleep 0.5 || sleep 1
+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 /usr/pkg/bin/fluxbox
-exec /usr/pkg/bin/twm
+exec twm