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

[Philippe Brochard]

Author: pbrochard
Date: Wed Feb 23 16:25:51 2011
New Revision: 412

Log:
src/clfswm.lisp (main-unprotected): Create the configuration menu only once at startup.

Modified:
   clfswm/ChangeLog
   clfswm/contrib/amixer.lisp
   clfswm/contrib/volume-mode.lisp
   clfswm/src/clfswm.lisp
   clfswm/src/menu-def.lisp

Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog	(original)
+++ clfswm/ChangeLog	Wed Feb 23 16:25:51 2011
@@ -1,3 +1,8 @@
+2011-02-23  Philippe Brochard  <pbrochard at common-lisp.net>
+
+	* src/clfswm.lisp (main-unprotected): Create the configuration
+	menu only once at startup.
+
 2011-02-22  Desmond O. Chang <dochang at gmail.com>
 
 	* contrib/amixer.lisp: Add a volume mode inspired by the emms

Modified: clfswm/contrib/amixer.lisp
==============================================================================
--- clfswm/contrib/amixer.lisp	(original)
+++ clfswm/contrib/amixer.lisp	Wed Feb 23 16:25:51 2011
@@ -60,6 +60,8 @@
 
 (in-package :clfswm)
 
+(format t "Loading amixer code... ")
+
 (defvar *amixer-scontrol* "Master"
   "Default control for amixer commands.")
 
@@ -101,3 +103,5 @@
   (define-second-key ("greater") 'amixer-raise-1%))
 
 (add-hook *binding-hook* 'amixer-volume-bind)
+
+(format t "done~%")

Modified: clfswm/contrib/volume-mode.lisp
==============================================================================
--- clfswm/contrib/volume-mode.lisp	(original)
+++ clfswm/contrib/volume-mode.lisp	Wed Feb 23 16:25:51 2011
@@ -60,6 +60,7 @@
 
 (in-package :clfswm)
 
+(format t "Loading Volume mode code... ")
 
 (defparameter *volume-keys* nil)
 (defparameter *volume-mode-placement* 'bottom-middle-placement
@@ -100,8 +101,6 @@
 (defparameter *volume-external-mixer-cmd* "/usr/bin/gnome-alsamixer"
   "Config(Volume mode group): Command to start an external mixer program")
 
-(create-configuration-menu :clear t)
-
 (define-init-hash-table-key *volume-keys* "Volume mode keys")
 (define-define-key "volume" *volume-keys*)
 
@@ -258,3 +257,5 @@
 (defun run-external-volume-mixer ()
   "Start an external volume mixer"
   (do-shell *volume-external-mixer-cmd*))
+
+(format t "done~%")

Modified: clfswm/src/clfswm.lisp
==============================================================================
--- clfswm/src/clfswm.lisp	(original)
+++ clfswm/src/clfswm.lisp	Wed Feb 23 16:25:51 2011
@@ -251,6 +251,7 @@
   (conf-file-name alternate-conf)
   (when read-conf-file-p
     (read-conf-file))
+  (create-configuration-menu :clear t)
   (call-hook *main-entrance-hook*)
   (handler-case
       (open-display display protocol)

Modified: clfswm/src/menu-def.lisp
==============================================================================
--- clfswm/src/menu-def.lisp	(original)
+++ clfswm/src/menu-def.lisp	Wed Feb 23 16:25:51 2011
@@ -62,8 +62,6 @@
 
 (update-menus (find-menu 'standard-menu))
 
-(create-configuration-menu)
-
 (add-menu-key 'help-menu "a" 'show-first-aid-kit)
 (add-menu-key 'help-menu "h" 'show-global-key-binding)
 (add-menu-key 'help-menu "b" 'show-main-mode-key-binding)