[clfswm-cvs] r396 - in clfswm: . contrib src

[Philippe Brochard]

Author: pbrochard
Date: Fri Jan 28 17:25:49 2011
New Revision: 396

Log:
XDG_CONFIG_HOME should be $HOME/.config by default.

Modified:
   clfswm/ChangeLog
   clfswm/contrib/osd.lisp
   clfswm/src/clfswm-util.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Fri Jan 28 17:25:49 2011
@@ -1,3 +1,8 @@
+2011-01-28  Desmond O. Chang <dochang at gmail.com>
+
+	* src/clfswm-util.lisp (xdg-config-home): XDG_CONFIG_HOME should
+	be $HOME/.config by default.
+
 2010-12-29  Philippe Brochard  <pbrochard at common-lisp.net>
 
 	* contrib/osd.lisp (display-doc): Add another method where a

Modified: clfswm/contrib/osd.lisp
==============================================================================
--- clfswm/contrib/osd.lisp	(original)
+++ clfswm/contrib/osd.lisp	Fri Jan 28 17:25:49 2011
@@ -68,7 +68,7 @@
 	  *osd-font* (xlib:open-font *display* *osd-font-string*)
 	  *osd-gc* (xlib:create-gcontext :drawable *osd-window*
 					 :foreground (get-color "white")
-					 :background (get-color "black")
+					 :background (get-color "gray10")
 					 :font *osd-font*
 					 :line-style :solid))
     (map-window *osd-window*))

Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp	(original)
+++ clfswm/src/clfswm-util.lisp	Fri Jan 28 17:25:49 2011
@@ -28,9 +28,10 @@
 
 ;;; Configuration file
 (defun xdg-config-home ()
-  (pathname-directory (concatenate 'string (or (getenv "XDG_CONFIG_HOME")
-					       (getenv "HOME"))
-				   "/")))
+  (aif (getenv "XDG_CONFIG_HOME")
+       (pathname-directory (concatenate 'string it "/"))
+       (append (pathname-directory (user-homedir-pathname)) '(".config"))))
+
 
 (let ((saved-conf-name nil))
   (defun conf-file-name (&optional alternate-name)