[clfswm-cvs] r244 - in clfswm: . src
Philippe Brochard
pbrochard at common-lisp.net
Wed Jun 24 19:34:26 UTC 2009
Author: pbrochard
Date: Wed Jun 24 15:34:26 2009
New Revision: 244
Log:
clfswm-info.lisp: Use a standard menu for the help-menu.
Modified:
clfswm/ChangeLog
clfswm/clfswm.asd
clfswm/src/bindings-second-mode.lisp
clfswm/src/bindings.lisp
clfswm/src/clfswm-info.lisp
clfswm/src/clfswm.lisp
clfswm/src/config.lisp
clfswm/src/menu-def.lisp
Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog (original)
+++ clfswm/ChangeLog Wed Jun 24 15:34:26 2009
@@ -1,3 +1,7 @@
+2009-06-24 Philippe Brochard <pbrochard at common-lisp.net>
+
+ * src/clfswm-info.lisp: Use a standard menu for the help-menu.
+
2009-06-22 Philippe Brochard <pbrochard at common-lisp.net>
* contrib/mpd.lisp: New file to handle the Music Player Daemon (MPD)
Modified: clfswm/clfswm.asd
==============================================================================
--- clfswm/clfswm.asd (original)
+++ clfswm/clfswm.asd Wed Jun 24 15:34:26 2009
@@ -66,12 +66,12 @@
(:file "clfswm-nw-hooks"
:depends-on ("package" "clfswm-util" "clfswm-info" "clfswm-layout" "menu-def"))
(:file "bindings"
- :depends-on ("clfswm" "clfswm-internal" "clfswm-util"))
+ :depends-on ("clfswm" "clfswm-internal" "clfswm-util" "clfswm-menu"))
(:file "bindings-second-mode"
:depends-on ("clfswm" "clfswm-util" "clfswm-query" "bindings" "clfswm-pack" "clfswm-menu" "menu-def"
"clfswm-layout"))
(:file "menu-def"
- :depends-on ("clfswm-menu" "clfswm" "clfswm-util"))))))
+ :depends-on ("clfswm-menu" "clfswm" "clfswm-util" "clfswm-info"))))))
Modified: clfswm/src/bindings-second-mode.lisp
==============================================================================
--- clfswm/src/bindings-second-mode.lisp (original)
+++ clfswm/src/bindings-second-mode.lisp Wed Jun 24 15:34:26 2009
@@ -34,6 +34,7 @@
;;;`-----
(add-hook *binding-hook* 'init-*second-keys* 'init-*second-mouse*)
+
(defun open-frame-menu ()
"Open the frame menu"
(open-menu (find-menu 'frame-menu)))
@@ -79,7 +80,7 @@
(defun set-default-second-keys ()
- (define-second-key ("F1" :mod-1) 'help-on-second-mode)
+ (define-second-key ("F1" :mod-1) 'help-on-clfswm)
(define-second-key ("m") 'open-menu)
(define-second-key ("less") 'open-menu)
(define-second-key ("less" :control) 'open-menu)
Modified: clfswm/src/bindings.lisp
==============================================================================
--- clfswm/src/bindings.lisp (original)
+++ clfswm/src/bindings.lisp Wed Jun 24 15:34:26 2009
@@ -34,6 +34,13 @@
(add-hook *binding-hook* 'init-*main-keys* 'init-*main-mouse*)
+
+
+(defun help-on-clfswm ()
+ "Open the help and info window"
+ (open-menu (find-menu 'help-menu)))
+
+
(defun set-default-main-keys ()
(define-main-key ("F1" :mod-1) 'help-on-clfswm)
(define-main-key ("Home" :mod-1 :control :shift) 'exit-clfswm)
Modified: clfswm/src/clfswm-info.lisp
==============================================================================
--- clfswm/src/clfswm-info.lisp (original)
+++ clfswm/src/clfswm-info.lisp Wed Jun 24 15:34:26 2009
@@ -458,11 +458,6 @@
(info-on-shell "XMMS Playlist:" "xmms-shell -e list"))
-(defun xmms-info-menu ()
- "< Open the xmms menu >"
- (info-mode-menu '((#\s show-xmms-status)
- (#\l show-xmms-playlist))))
-
(defun show-cd-info ()
@@ -473,11 +468,6 @@
"Show the current CD playlist"
(info-on-shell "Current CD playlist:" "pcd mi"))
-(defun info-on-cd-menu ()
- "< Open the CD info menu >"
- (info-mode-menu '((#\i show-cd-info)
- (#\l show-cd-playlist))))
-
(defun show-version ()
"Show the current CLFSWM version"
@@ -485,16 +475,6 @@
-(defun help-on-clfswm ()
- "Open the help and info window"
- (info-mode-menu *help-menu-list*))
-
-
-(defun help-on-second-mode ()
- "Open the help and info window for the second mode"
- (info-mode-menu *help-menu-list*))
-
-
Modified: clfswm/src/clfswm.lisp
==============================================================================
--- clfswm/src/clfswm.lisp (original)
+++ clfswm/src/clfswm.lisp Wed Jun 24 15:34:26 2009
@@ -240,7 +240,6 @@
(xgrab-init-pointer)
(xgrab-init-keyboard)
(init-last-child)
- (reset-help-menu-list)
(call-hook *binding-hook*)
(map-window *no-focus-window*)
(dbg *display*)
Modified: clfswm/src/config.lisp
==============================================================================
--- clfswm/src/config.lisp (original)
+++ clfswm/src/config.lisp Wed Jun 24 15:34:26 2009
@@ -279,19 +279,3 @@
(defparameter *menu-color-menu-key* (->color #xFF9AFF)
"Config(Menu group): Menu key color in menu")
-
-;;; Help menu list
-(defparameter *help-menu-list* nil
- "Config(Info mode group): List of menus in the help menu")
-
-(defun reset-help-menu-list ()
- (setf *help-menu-list* `((#\h show-global-key-binding)
- (#\b show-main-mode-key-binding)
- (#\c show-corner-help)
- (#\g show-config-variable)
- (#\d show-date)
- (#\p show-cpu-proc)
- (#\m show-mem-proc)
- (#\x (xmms-info-menu ,*menu-color-submenu*))
- (#\v show-version)
- (#\i (info-on-cd-menu ,*menu-color-submenu*)))))
\ No newline at end of file
Modified: clfswm/src/menu-def.lisp
==============================================================================
--- clfswm/src/menu-def.lisp (original)
+++ clfswm/src/menu-def.lisp Wed Jun 24 15:34:26 2009
@@ -47,7 +47,7 @@
;;(define-second-key ("a") 'open-menu)
-;;(add-menu-key 'main "d" 'show-standard-menu)
+(add-sub-menu 'main "F1" 'help-menu "Help menu")
(add-sub-menu 'main "d" 'standard-menu "Standard menu")
(add-sub-menu 'main "c" 'child-menu "Child menu")
(add-sub-menu 'main "f" 'frame-menu "Frame menu")
@@ -61,6 +61,24 @@
(update-menus (find-menu 'standard-menu))
+(add-menu-key 'help-menu "h" 'show-global-key-binding)
+(add-menu-key 'help-menu "b" 'show-main-mode-key-binding)
+(add-menu-key 'help-menu "s" 'show-second-mode-key-binding)
+(add-menu-key 'help-menu "c" 'show-corner-help)
+(add-menu-key 'help-menu "g" 'show-config-variable)
+(add-menu-key 'help-menu "d" 'show-date)
+(add-menu-key 'help-menu "p" 'show-cpu-proc)
+(add-menu-key 'help-menu "m" 'show-mem-proc)
+(add-sub-menu 'help-menu "x" 'xmms-info-menu "XMMS menu")
+(add-menu-key 'help-menu "v" 'show-version)
+(add-sub-menu 'help-menu "i" 'info-on-cd-menu "CD info menu")
+
+(add-menu-key 'xmms-info-menu "s" 'show-xmms-status)
+(add-menu-key 'xmms-info-menu "l" 'show-xmms-playlist)
+
+(add-menu-key 'info-on-cd-menu "i" 'show-cd-info)
+(add-menu-key 'info-on-cd-menu "l" 'show-cd-playlist)
+
(add-menu-key 'child-menu "r" 'rename-current-child)
(add-menu-key 'child-menu "e" 'ensure-unique-name)
More information about the clfswm-cvs
mailing list