summary refs log tree commit diff
path: root/_xinitrc
diff options
context:
space:
mode:
Diffstat (limited to '_xinitrc')
-rw-r--r--_xinitrc12
1 files changed, 3 insertions, 9 deletions
diff --git a/_xinitrc b/_xinitrc
index dc3d1c06..61d281d3 100644
--- a/_xinitrc
+++ b/_xinitrc
@@ -1,5 +1,3 @@
-#eval `dbus-launch --sh-syntax --exit-with-session`
-
 xrdb ~/.Xresources &
 xautolock -locker slimlock -time 30 &
 
@@ -7,10 +5,6 @@ xautolock -locker slimlock -time 30 &
 xmodmap -e "clear Lock" -e "keysym Caps_Lock = Escape" # Caps Lock -> Esc
 xmodmap -e "remove mod1 = Alt_R" -e "keysym Alt_R = Multi_key" # Right Alt -> Compose
 
-DEFAULT=openbox-session
-
-if [[ $1 ]]; then
-    exec ck-launch-session dbus-launch $1
-else
-    exec ck-launch-session dbus-launch $DEFAULT
-fi
+SESSION=openbox-session
+[ $1 ] && SESSION=$1
+exec ck-launch-session dbus-launch $SESSION
be8519d72a9372a0&follow=1'>Remove clientRemove call from clientCastJune McEnroe If an error occurs on a client socket during a broadcast, that client will show up in the kqueue loop with EV_EOF and get removed that way. Tested by sending SIGKILL to a client and watching its cursor disappear. 2017-09-01Add client readOnly modeJune McEnroe 2017-08-31Clean up merge toolJune McEnroe Choose the version with the most recent access if the modify times are the same. 2017-08-31Choose B for tiles with equal modify timesJune McEnroe This way newer access counts and times will be preserved. 2017-08-31Add quick data file merge toolJune McEnroe Hopefully I won't have to use it ever again. 2017-08-30Use only foreground color for selecting spawnJune McEnroe 2017-08-29Add four additional spawnsJune McEnroe 2017-08-28Add respawningJune McEnroe 2017-08-26Move license above includesJune McEnroe Why was it down there? 2017-08-26Snapshot metadataJune McEnroe 2017-08-26Add meta.c to READMEJune McEnroe 2017-08-26Use MakefileJune McEnroe