[clfswm-cvs] [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1106-163-g2f688e5

Philippe Brochard pbrochard at common-lisp.net
Fri Dec 7 22:10:49 UTC 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CLFSWM - A(nother) Common Lisp FullScreen Window Manager".

The branch, master has been updated
       via  2f688e57fbde0c4706a8082c0ec4ec8cc5ba7cc4 (commit)
      from  cc4e002203efa86c4bc39852a7bbd063494bedf2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2f688e57fbde0c4706a8082c0ec4ec8cc5ba7cc4
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Fri Dec 7 23:10:38 2012 +0100

    Blank window mode added. Documentation update

diff --git a/contrib/blank-window-mode.lisp b/contrib/blank-window-mode.lisp
new file mode 100644
index 0000000..4f6d77a
--- /dev/null
+++ b/contrib/blank-window-mode.lisp
@@ -0,0 +1,256 @@
+;;; --------------------------------------------------------------------------
+;;; CLFSWM - FullScreen Window Manager
+;;;
+;;; --------------------------------------------------------------------------
+;;; Documentation: Blank window mode to place blank window on screen and manage
+;;;  them with the keyboard or the mouse.
+;;;  This is useful when you want to hide some part of the screen (for example
+;;;  in school class for interactive presentation).
+;;; --------------------------------------------------------------------------
+;;;
+;;; (C) 2012 Philippe Brochard <pbrochard at common-lisp.net>
+;;;
+;;; This program is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or
+;;; (at your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful,
+;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program; if not, write to the Free Software
+;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+;;;
+;;; Documentation: Blank window mode to place blank window on screen.
+;;;   If you want to use this file, just add this line in your configuration
+;;;   file:
+;;;
+;;;   (load-contrib "blank-window-mode.lisp")
+;;;
+;;; --------------------------------------------------------------------------
+
+(in-package :clfswm)
+
+(format t "Loading Blank Window Mode code... ")
+
+(defconfig *blank-window-width* 50 'blank-window "Blank window width")
+(defconfig *blank-window-height* 20 'blank-window "Blank window height")
+(defconfig *blank-window-color* "white" 'blank-window "Blank window color")
+(defconfig *blank-window-border* "magenta" 'blank-window "Blank window border color")
+
+
+(defparameter *blank-window-list* nil)
+(defparameter *in-blank-window-mode* nil)
+(defparameter *blank-window-show-current* nil)
+
+(defparameter *blank-window-keys* nil)
+(defparameter *blank-window-mouse* nil)
+
+
+(define-init-hash-table-key *blank-window-keys* "Blank-Window mode keys")
+(define-init-hash-table-key *blank-window-mouse* "Blank-Window mode mouse button")
+
+(define-define-key "blank-window" *blank-window-keys*)
+(define-define-mouse "blank-window-mouse" *blank-window-mouse*)
+
+(add-hook *binding-hook* 'init-*blank-window-keys*)
+
+
+(defun leave-blank-window-mode (&optional window root-x root-y)
+  "Leave the blank-window mode"
+  (declare (ignore window root-x root-y))
+  (when *in-blank-window-mode*
+    (throw 'exit-blank-window-loop nil)))
+
+
+
+(defun bwm-enter-function ()
+  (setf *in-blank-window-mode* t)
+  (ungrab-main-keys)
+  (xgrab-keyboard *root*)
+  (xgrab-pointer *root* 66 67)
+  (dolist (window *blank-window-list*)
+    (raise-window window)))
+
+
+(defun bwm-leave-function ()
+  (setf *in-blank-window-mode* nil)
+  (xungrab-keyboard)
+  (xungrab-pointer)
+  (grab-main-keys)
+  (wait-no-key-or-button-press))
+
+
+
+(define-handler blank-window-mode :key-press (code state)
+  (funcall-key-from-code *blank-window-keys* code state))
+
+(define-handler blank-window-mode :button-press (code state window root-x root-y)
+  (funcall-button-from-code *blank-window-mouse* code state window root-x root-y *fun-press*))
+
+
+
+(defun blank-window-mode ()
+  "Blank window mode"
+  (generic-mode 'blank-window-mode
+		'exit-blank-window-loop
+		:enter-function #'bwm-enter-function
+		;;:loop-function #'bwm-loop-function
+		:leave-function #'bwm-leave-function
+                :original-mode 'main-mode))
+
+
+
+
+(defun create-new-blank-window ()
+  "Create a new blank window"
+  (with-x-pointer
+    (push (xlib:create-window :parent *root*
+                              :x (- x 50) :y y
+                              :width *blank-window-width* :height *blank-window-height*
+                              :background (get-color *blank-window-color*)
+                              :border-width 0
+                              :border (get-color *blank-window-border*)
+                              :colormap (xlib:screen-default-colormap *screen*)
+                              :event-mask '(:exposure))
+          *blank-window-list*))
+  (map-window (first *blank-window-list*)))
+
+(defun clear-all-blank-window ()
+  "Clear all blank window"
+  (dolist (window *blank-window-list*)
+    (hide-window window)
+    (xlib:destroy-window window))
+  (setf *blank-window-list* nil))
+
+(defmacro with-current-blank-window ((window) &body body)
+  `(let ((,window (first *blank-window-list*)))
+     (when ,window
+       , at body)))
+
+(defun blank-window-fill-width ()
+  "Current blank window fill all width screen"
+  (with-current-blank-window (window)
+    (setf (xlib:drawable-x window) 0
+          (xlib:drawable-width window) (xlib:drawable-width *root*))))
+
+(defun blank-window-fill-height ()
+  "Current blank window fill all height screen"
+  (with-current-blank-window (window)
+    (setf (xlib:drawable-y window) 0
+          (xlib:drawable-height window) (xlib:drawable-height *root*))))
+
+(defun blank-window-down (dy)
+  "Move current blank window down"
+  (with-current-blank-window (window)
+    (incf (xlib:drawable-y window) dy)))
+
+(defun blank-window-right (dx)
+  "Move current blank window right"
+  (with-current-blank-window (window)
+    (incf (xlib:drawable-x window) dx)))
+
+(defun blank-window-inc-width (dw)
+  "Change current blank window width"
+  (with-current-blank-window (window)
+    (decf (xlib:drawable-x window) dw)
+    (incf (xlib:drawable-width window) (* dw 2))))
+
+(defun blank-window-inc-height (dh)
+  "Change current blank window height"
+  (with-current-blank-window (window)
+    (decf (xlib:drawable-y window) dh)
+    (incf (xlib:drawable-height window) (* dh 2))))
+
+
+(defun select-next-blank-window ()
+  "Select next blank window"
+  (with-current-blank-window (window)
+    (setf (xlib:drawable-border-width window) 0))
+  (setf *blank-window-list* (rotate-list *blank-window-list*))
+  (when *blank-window-show-current*
+    (with-current-blank-window (window)
+      (setf (xlib:drawable-border-width window) 1))))
+
+(defun toggle-show-current-blank-window ()
+  (setf *blank-window-show-current* (not *blank-window-show-current*))
+  (with-current-blank-window (window)
+    (setf (xlib:drawable-border-width window) (if *blank-window-show-current* 1 0))))
+
+(defun remove-current-blank-window ()
+  (let ((window (pop *blank-window-list*)))
+    (when window
+      (hide-window window)
+      (xlib:destroy-window window)))
+  (with-current-blank-window (window)
+    (setf (xlib:drawable-border-width window) (if *blank-window-show-current* 1 0))))
+
+(defun place-current-blank-window (window root-x root-y)
+  "Place the current blank window with the mouse"
+  (declare (ignore window))
+  (with-current-blank-window (window)
+    (setf (xlib:drawable-x window) root-x
+          (xlib:drawable-y window) root-y)))
+
+(defun blank-black-window ()
+  "Open a black window. ie light of the screen"
+  (let ((black-win (xlib:create-window :parent *root*
+                                       :x 0 :y 0
+                                       :width (xlib:drawable-width *root*)
+                                       :height (xlib:drawable-height *root*)
+                                       :background (get-color "black")
+                                       :border-width 0
+                                       :border (get-color "black")
+                                       :colormap (xlib:screen-default-colormap *screen*)
+                                       :event-mask '(:exposure))))
+    (map-window black-win)
+    (wait-no-key-or-button-press)
+    (wait-a-key-or-button-press)
+    (xlib:destroy-window black-win)
+    (wait-no-key-or-button-press)))
+
+
+
+(defun set-default-blank-window-keys ()
+  ;;(define-blank-window-key ("Return") 'leave-blank-window-mode)
+  (define-blank-window-key ("Escape") 'leave-blank-window-mode)
+  (define-blank-window-key ("twosuperior") 'leave-blank-window-mode)
+  (define-blank-window-key ("Return") 'create-new-blank-window)
+  (define-blank-window-key ("BackSpace" :control) 'clear-all-blank-window)
+  (define-blank-window-key ("Tab") 'select-next-blank-window)
+  (define-blank-window-key ("w") 'blank-window-fill-width)
+  (define-blank-window-key ("h") 'blank-window-fill-height)
+  (define-blank-window-key ("Down") 'blank-window-down 5)
+  (define-blank-window-key ("Down" :shift) 'blank-window-down 1)
+  (define-blank-window-key ("Down" :control) 'blank-window-down 20)
+  (define-blank-window-key ("Up") 'blank-window-down -5)
+  (define-blank-window-key ("Up" :shift) 'blank-window-down -1)
+  (define-blank-window-key ("Up" :control) 'blank-window-down -20)
+  (define-blank-window-key ("Right") 'blank-window-right 5)
+  (define-blank-window-key ("Right" :shift) 'blank-window-right 1)
+  (define-blank-window-key ("Right" :control) 'blank-window-right 20)
+  (define-blank-window-key ("Left") 'blank-window-right -5)
+  (define-blank-window-key ("Left" :shift) 'blank-window-right -1)
+  (define-blank-window-key ("Left" :control) 'blank-window-right -20)
+  (define-blank-window-key ("c") 'toggle-show-current-blank-window)
+  (define-blank-window-key ("p") 'blank-window-inc-width 1)
+  (define-blank-window-key ("o") 'blank-window-inc-height 1)
+  (define-blank-window-key ("m") 'blank-window-inc-width -1)
+  (define-blank-window-key ("l") 'blank-window-inc-height -1)
+  (define-blank-window-key ("Delete") 'remove-current-blank-window)
+  (define-blank-window-key ("Control_R") 'banish-pointer)
+  (define-blank-window-key ("b") 'banish-pointer)
+  (define-blank-window-key ("x") 'blank-black-window)
+
+  (define-blank-window-mouse (1) 'place-current-blank-window))
+
+
+
+(add-hook *binding-hook* 'set-default-blank-window-keys)
+
+
+
+(format t "done~%")
diff --git a/doc/corner.html b/doc/corner.html
index b9cc515..fa5c276 100644
--- a/doc/corner.html
+++ b/doc/corner.html
@@ -120,7 +120,7 @@
           Bottom-Left:
         </td>
         <td style="color:#0000ff" nowrap>
-          Start the file manager
+          ---
         </td>
       </tr>
     </table>
diff --git a/doc/corner.txt b/doc/corner.txt
index 2ff5964..553b9e2 100644
--- a/doc/corner.txt
+++ b/doc/corner.txt
@@ -16,7 +16,7 @@ Here are the actions associated to screen corners in CLFSWM:
   Top-Left: Hide/Unhide a terminal
   Top-Right: Close or kill the current window (ask before doing anything)
   Bottom-Right: Present all windows in all frames (An expose like)
-  Bottom-Left: Start the file manager
+  Bottom-Left: ---
 
 *Corner-Second-Mode-Left-Button*:
   Top-Left: ---
diff --git a/doc/keys.html b/doc/keys.html
index 114df17..6238d9f 100644
--- a/doc/keys.html
+++ b/doc/keys.html
@@ -32,208 +32,10 @@
       </tr>
       <tr>
         <td align="right" style="color:#ff0000" nowrap>
-           Control 
-        </td>
-        <td align="center" nowrap>
-          Sunprint_screen
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Open the screenshot window
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Sunprint_screen
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Take a screenshot
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86audioplay
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Toggles Play/Pause, plays if stopped
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86tools
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Start gmpc
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86mail
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Run a file manager
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86search
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Run a Web browser search
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86favorites
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Run a Web Browser
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86homepage
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Run Emacs
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Control 
-        </td>
-        <td align="center" nowrap>
-          Pause
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Open the Reboot/Halt menu
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Mod-4 
-        </td>
-        <td align="center" nowrap>
-          A
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Move the pointer to the lower right corner of the screen
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Control  Shift 
-        </td>
-        <td align="center" nowrap>
-          66
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Present all windows in all frames (An expose like)
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Control 
-        </td>
-        <td align="center" nowrap>
-          66
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Present all windows in currents roots (An expose like)
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Control_r
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Move the pointer to the lower right corner of the screen
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Control 
-        </td>
-        <td align="center" nowrap>
-          Twosuperior
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Start Apwal
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86audioraisevolume
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Raise volume.
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86audiolowervolume
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Lower volume.
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86audiomute
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Toggle mute.
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Pause
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Start a black screen
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Agrave
+          0
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -244,29 +46,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          F2
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Open the Music Player Daemon (MPD) menu
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Twosuperior
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Move the pointer to the lower right corner of the screen
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Mod-1 
-        </td>
-        <td align="center" nowrap>
-          Ampersand
+          9
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -277,7 +57,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Eacute
+          8
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -288,7 +68,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Quotedbl
+          7
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -299,7 +79,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Quoteright
+          6
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -310,7 +90,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Parenleft
+          5
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -321,7 +101,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Minus
+          4
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -332,7 +112,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Egrave
+          3
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -343,7 +123,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Underscore
+          2
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -354,7 +134,7 @@
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Ccedilla
+          1
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -952,149 +732,6 @@ Or do actions on corners
       </tr>
       <tr>
         <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          L2
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Raise volume.
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          L1
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Lower volume.
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Shift 
-        </td>
-        <td align="center" nowrap>
-          S
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Ask an URL to be opened in the Surf browser
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Control 
-        </td>
-        <td align="center" nowrap>
-          S
-        </td>
-        <td style="color:#0000ff" nowrap>
-          start the web browser on the search page with google
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          S
-        </td>
-        <td style="color:#0000ff" nowrap>
-          start the web browser on the search page
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Shift 
-        </td>
-        <td align="center" nowrap>
-          Z
-        </td>
-        <td style="color:#0000ff" nowrap>
-          start the Konqueror web browser
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Z
-        </td>
-        <td style="color:#0000ff" nowrap>
-          start the web browser
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Space
-        </td>
-        <td style="color:#0000ff" nowrap>
-          start the file manager
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Greater
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Raise 1% volume.
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86audioraisevolume
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Raise volume.
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86audiolowervolume
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Lower volume.
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-          
-        </td>
-        <td align="center" nowrap>
-          Xf86audiomute
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Toggle mute.
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
-           Mod-1 
-        </td>
-        <td align="center" nowrap>
-          Agrave
-        </td>
-        <td style="color:#0000ff" nowrap>
-          Bind or jump to a slot (a frame or a window)
-        </td>
-      </tr>
-      <tr>
-        <td align="right" style="color:#ff0000" nowrap>
            Control 
         </td>
         <td align="center" nowrap>
@@ -1117,13 +754,13 @@ Or do actions on corners
       </tr>
       <tr>
         <td align="right" style="color:#ff0000" nowrap>
-          
+           Mod-1 
         </td>
         <td align="center" nowrap>
-          Twosuperior
+          0
         </td>
         <td style="color:#0000ff" nowrap>
-          Move the pointer to the lower right corner of the screen
+          Bind or jump to a slot (a frame or a window)
         </td>
       </tr>
       <tr>
@@ -1131,7 +768,7 @@ Or do actions on corners
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Ampersand
+          9
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1142,7 +779,7 @@ Or do actions on corners
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Eacute
+          8
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1153,7 +790,7 @@ Or do actions on corners
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Quotedbl
+          7
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1164,7 +801,7 @@ Or do actions on corners
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Quoteright
+          6
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1175,7 +812,7 @@ Or do actions on corners
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Parenleft
+          5
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1186,7 +823,7 @@ Or do actions on corners
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Minus
+          4
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1197,7 +834,7 @@ Or do actions on corners
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Egrave
+          3
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1208,7 +845,7 @@ Or do actions on corners
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Underscore
+          2
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -1219,7 +856,7 @@ Or do actions on corners
            Mod-1 
         </td>
         <td align="center" nowrap>
-          Ccedilla
+          1
         </td>
         <td style="color:#0000ff" nowrap>
           Bind or jump to a slot (a frame or a window)
@@ -2113,7 +1750,7 @@ Or do actions on corners
           Less
         </td>
         <td style="color:#0000ff" nowrap>
-          Lower 1% volume.
+          Open the main menu
         </td>
       </tr>
       <tr>
@@ -2444,6 +2081,17 @@ Or do corners actions
       </tr>
       <tr>
         <td align="right" style="color:#ff0000" nowrap>
+           Mod-2 
+        </td>
+        <td align="center" nowrap>
+          Kp_enter
+        </td>
+        <td style="color:#0000ff" nowrap>
+          Leave the info mode and valid the selected item
+        </td>
+      </tr>
+      <tr>
+        <td align="right" style="color:#ff0000" nowrap>
           
         </td>
         <td align="center" nowrap>
diff --git a/doc/keys.txt b/doc/keys.txt
index b68a8d5..a5a9865 100644
--- a/doc/keys.txt
+++ b/doc/keys.txt
@@ -6,36 +6,16 @@ Note: Mod-1 is the Meta or Alt key
 Main mode keys:
 --------------
 
-  Control              Sunprint_screen   Open the screenshot window
-                       Sunprint_screen   Take a screenshot
-                       Xf86audioplay   Toggles Play/Pause, plays if stopped
-                       Xf86tools       Start gmpc
-                       Xf86mail        Run a file manager
-                       Xf86search      Run a Web browser search
-                       Xf86favorites   Run a Web Browser
-                       Xf86homepage    Run Emacs
-  Control              Pause           Open the Reboot/Halt menu
-  Mod-4                A               Move the pointer to the lower right corner of the screen
-  Control Shift        66              Present all windows in all frames (An expose like)
-  Control              66              Present all windows in currents roots (An expose like)
-                       Control_r       Move the pointer to the lower right corner of the screen
-  Control              Twosuperior     Start Apwal
-                       Xf86audioraisevolume   Raise volume.
-                       Xf86audiolowervolume   Lower volume.
-                       Xf86audiomute   Toggle mute.
-                       Pause           Start a black screen
-  Mod-1                Agrave          Bind or jump to a slot (a frame or a window)
-  Mod-1                F2              Open the Music Player Daemon (MPD) menu
-                       Twosuperior     Move the pointer to the lower right corner of the screen
-  Mod-1                Ampersand       Bind or jump to a slot (a frame or a window)
-  Mod-1                Eacute          Bind or jump to a slot (a frame or a window)
-  Mod-1                Quotedbl        Bind or jump to a slot (a frame or a window)
-  Mod-1                Quoteright      Bind or jump to a slot (a frame or a window)
-  Mod-1                Parenleft       Bind or jump to a slot (a frame or a window)
-  Mod-1                Minus           Bind or jump to a slot (a frame or a window)
-  Mod-1                Egrave          Bind or jump to a slot (a frame or a window)
-  Mod-1                Underscore      Bind or jump to a slot (a frame or a window)
-  Mod-1                Ccedilla        Bind or jump to a slot (a frame or a window)
+  Mod-1                0               Bind or jump to a slot (a frame or a window)
+  Mod-1                9               Bind or jump to a slot (a frame or a window)
+  Mod-1                8               Bind or jump to a slot (a frame or a window)
+  Mod-1                7               Bind or jump to a slot (a frame or a window)
+  Mod-1                6               Bind or jump to a slot (a frame or a window)
+  Mod-1                5               Bind or jump to a slot (a frame or a window)
+  Mod-1                4               Bind or jump to a slot (a frame or a window)
+  Mod-1                3               Bind or jump to a slot (a frame or a window)
+  Mod-1                2               Bind or jump to a slot (a frame or a window)
+  Mod-1                1               Bind or jump to a slot (a frame or a window)
   Control              Less            Switch to editing mode (second mode)
   Mod-1                T               Switch to editing mode (second mode)
   Control              Escape          Close or kill the current window (ask before doing anything)
@@ -100,31 +80,18 @@ Or do actions on corners
 Second mode keys:
 ----------------
 
-                       L2              Raise volume.
-                       L1              Lower volume.
-  Shift                S               Ask an URL to be opened in the Surf browser
-  Control              S               start the web browser on the search page with google
-                       S               start the web browser on the search page
-  Shift                Z               start the Konqueror web browser
-                       Z               start the web browser
-                       Space           start the file manager
-                       Greater         Raise 1% volume.
-                       Xf86audioraisevolume   Raise volume.
-                       Xf86audiolowervolume   Lower volume.
-                       Xf86audiomute   Toggle mute.
-  Mod-1                Agrave          Bind or jump to a slot (a frame or a window)
   Control              T               Decrement the current window transparency
   Control Shift        T               Increment the current window transparency
-                       Twosuperior     Move the pointer to the lower right corner of the screen
-  Mod-1                Ampersand       Bind or jump to a slot (a frame or a window)
-  Mod-1                Eacute          Bind or jump to a slot (a frame or a window)
-  Mod-1                Quotedbl        Bind or jump to a slot (a frame or a window)
-  Mod-1                Quoteright      Bind or jump to a slot (a frame or a window)
-  Mod-1                Parenleft       Bind or jump to a slot (a frame or a window)
-  Mod-1                Minus           Bind or jump to a slot (a frame or a window)
-  Mod-1                Egrave          Bind or jump to a slot (a frame or a window)
-  Mod-1                Underscore      Bind or jump to a slot (a frame or a window)
-  Mod-1                Ccedilla        Bind or jump to a slot (a frame or a window)
+  Mod-1                0               Bind or jump to a slot (a frame or a window)
+  Mod-1                9               Bind or jump to a slot (a frame or a window)
+  Mod-1                8               Bind or jump to a slot (a frame or a window)
+  Mod-1                7               Bind or jump to a slot (a frame or a window)
+  Mod-1                6               Bind or jump to a slot (a frame or a window)
+  Mod-1                5               Bind or jump to a slot (a frame or a window)
+  Mod-1                4               Bind or jump to a slot (a frame or a window)
+  Mod-1                3               Bind or jump to a slot (a frame or a window)
+  Mod-1                2               Bind or jump to a slot (a frame or a window)
+  Mod-1                1               Bind or jump to a slot (a frame or a window)
   Mod-1 Shift          L2              Show all frames info windows
   Shift                L2              Show all frames info windows until a key is release
   Control              F10             Present all windows in all frames (An expose like)
@@ -205,7 +172,7 @@ Second mode keys:
                        W               Open the window menu
                        F               Open the frame menu
   Control              Less            Open the main menu
-                       Less            Lower 1% volume.
+                       Less            Open the main menu
                        M               Open the main menu
   Mod-1                F1              Open the help and info window
 
@@ -246,6 +213,7 @@ Info mode keys:
   Control              G               Leave the info mode
                        Escape          Leave the info mode
                        Space           Leave the info mode and valid the selected item
+  Mod-2                Kp_enter        Leave the info mode and valid the selected item
                        Return          Leave the info mode and valid the selected item
                        Q               Leave the info mode
 
diff --git a/doc/menu.html b/doc/menu.html
index 234fd83..3755f58 100644
--- a/doc/menu.html
+++ b/doc/menu.html
@@ -93,105 +93,6 @@
     <p>
       v: Show the current CLFSWM version
     </p>
-    <p>
-      F2: <a href="#MPD-MENU">< Music Player Daemon (MPD) menu ></a>
-    </p>
-    <p>
-      x: <a href="#XMMS-MENU">< XMMS menu ></a>
-    </p>
-    <p>
-      i: <a href="#CDPLAYER-MENU">< CDPLAYER menu ></a>
-    </p>
-    <hr>
-    <h3>
-      <a name="MPD-MENU"></a><a href="#HELP-MENU">Mpd-Menu</a>
-    </h3>
-    <p>
-      i: Show MPD informations
-    </p>
-    <p>
-      p: Play the previous song in the current playlist
-    </p>
-    <p>
-      n: Play the next song in the current playlist
-    </p>
-    <p>
-      t: Toggles Play/Pause, plays if stopped
-    </p>
-    <p>
-      y: Start playing
-    </p>
-    <p>
-      k: Stop the currently playing playlists
-    </p>
-    <p>
-      x: Seeks to +5%
-    </p>
-    <p>
-      w: Seeks to -5%
-    </p>
-    <p>
-      l: Show the current MPD playlist
-    </p>
-    <p>
-      s: Start sonata
-    </p>
-    <p>
-      g: Start gmpc
-    </p>
-    <hr>
-    <h3>
-      <a name="XMMS-MENU"></a><a href="#HELP-MENU">Xmms-Menu</a>
-    </h3>
-    <p>
-      r: Lanch XMMS
-    </p>
-    <p>
-      s: Show the current xmms status
-    </p>
-    <p>
-      l: Show the current xmms playlist
-    </p>
-    <p>
-      n: Play the next XMMS track
-    </p>
-    <p>
-      p: Play the previous XMMS track
-    </p>
-    <p>
-      e: open xmms "Load file(s)" dialog window.
-    </p>
-    <hr>
-    <h3>
-      <a name="CDPLAYER-MENU"></a><a href="#HELP-MENU">Cdplayer-Menu</a>
-    </h3>
-    <p>
-      y: Start playing CD
-    </p>
-    <p>
-      k: Stop playing CD
-    </p>
-    <p>
-      t: Toggle pause
-    </p>
-    <p>
-      s: Show the current CD status
-    </p>
-    <p>
-      l: Show the current CD playlist
-    </p>
-    <p>
-      n: Play the next CD track
-    </p>
-    <p>
-      p: Play the previous CD track
-    </p>
-    <p>
-      e: Eject CD
-    </p>
-    <p>
-      c: Close CD
-    </p>
     <hr>
     <h3>
       <a name="STANDARD-MENU"></a><a href="#MAIN">Standard-Menu</a>
@@ -304,7 +205,10 @@
       h: Thunar File Manager - Browse the filesystem with the file manager
     </p>
     <p>
-      i: Gentoo - Fully GUI-configurable, two-pane X file manager
+      i: Midnight Commander - File manager
+    </p>
+    <p>
+      j: Gentoo - Fully GUI-configurable, two-pane X file manager
     </p>
     <hr>
     <h3>
@@ -340,6 +244,9 @@
     <p>
       j: Links 2
     </p>
+    <p>
+      k: Luakit - Fast, small, webkit based micro-browser extensible by Lua
+    </p>
     <hr>
     <h3>
       <a name="AUDIOVIDEO"></a><a href="#STANDARD-MENU">Audiovideo</a>
@@ -381,76 +288,82 @@
       l: MediathekView - View streams from public German TV stations
     </p>
     <p>
-      m: Sonata - An elegant GTK+ MPD client
+      m: XBMC Media Center - Manage and view your media 
+    </p>
+    <p>
+      n: Sonata - An elegant GTK+ MPD client
+    </p>
+    <p>
+      o: Stopmotion - Program to create stop-motion animations
     </p>
     <p>
-      n: Stopmotion - Program to create stop-motion animations
+      p: Gnome Music Player Client - A gnome frontend for the mpd daemon
     </p>
     <p>
-      o: Gnome Music Player Client - A gnome frontend for the mpd daemon
+      q: PulseAudio Volume Control - Adjust the volume level
     </p>
     <p>
-      p: PulseAudio Volume Control - Adjust the volume level
+      r: Minitube - Watch YouTube videos
     </p>
     <p>
-      q: GNOME ALSA Mixer - ALSA sound mixer for GNOME
+      s: GNOME ALSA Mixer - ALSA sound mixer for GNOME
     </p>
     <p>
-      r: Mixer - Audio mixer for the Xfce Desktop Environment
+      t: Mixer - Audio mixer for the Xfce Desktop Environment
     </p>
     <p>
-      s: Alsa Modular Synth - Modular Software Synth
+      u: Alsa Modular Synth - Modular Software Synth
     </p>
     <p>
-      t: VLC media player - Read, capture, broadcast your multimedia streams
+      v: VLC media player - Read, capture, broadcast your multimedia streams
     </p>
     <p>
-      u: Petri-Foo - Sound Sampler
+      w: Petri-Foo - Sound Sampler
     </p>
     <p>
-      v: Sound Juicer - Copy music from your CDs
+      x: Sound Juicer - Copy music from your CDs
     </p>
     <p>
-      w: PulseAudio Volume Meter (Playback) - Monitor the output volume
+      y: PulseAudio Volume Meter (Playback) - Monitor the output volume
     </p>
     <p>
-      x: Rhythmbox - Play and organize your music collection
+      z: Rhythmbox - Play and organize your music collection
     </p>
     <p>
-      y: Brasero - Create and copy CDs and DVDs
+      0: Brasero - Create and copy CDs and DVDs
     </p>
     <p>
-      z: Audacity - Record and edit audio files
+      1: Audacity - Record and edit audio files
     </p>
     <p>
-      0: Cheese - Take photos and videos with your webcam, with fun graphical effects
+      2: Cheese - Take photos and videos with your webcam, with fun graphical effects
     </p>
     <p>
-      1: Sound Recorder - Record sound clips
+      3: Sound Recorder - Record sound clips
     </p>
     <p>
-      2: OpenShot Video Editor - Create and edit videos and movies
+      4: OpenShot Video Editor - Create and edit videos and movies
     </p>
     <p>
-      3: terminatorX - Scratch and mix audio
+      5: terminatorX - Scratch and mix audio
     </p>
     <p>
-      4: Decibel Audio Player - A simple audio player
+      6: Decibel Audio Player - A simple audio player
     </p>
     <p>
-      5: Movie Player - Play movies and songs
+      7: Movie Player - Play movies and songs
     </p>
     <p>
-      6: QVideoob - Search for videos on many websites, and get info about them
+      8: QVideoob - Search for videos on many websites, and get info about them
     </p>
     <p>
-      7: PulseAudio Volume Meter (Capture) - Monitor the input volume
+      9: PulseAudio Volume Meter (Capture) - Monitor the input volume
     </p>
     <p>
-      8: Specimen - Sound Sampler
+      A: Specimen - Sound Sampler
     </p>
     <p>
-      9: Music Player - Play your music files easily
+      B: Music Player - Play your music files easily
     </p>
     <hr>
     <h3>
@@ -515,16 +428,22 @@
       a: Camorama Webcam Viewer - View, alter and save images from a webcam
     </p>
     <p>
-      b: Stopmotion - Program to create stop-motion animations
+      b: XBMC Media Center - Manage and view your media 
+    </p>
+    <p>
+      c: Stopmotion - Program to create stop-motion animations
     </p>
     <p>
-      c: OptGeo - Interactive tool to study and simulate optic assemblies
+      d: Minitube - Watch YouTube videos
     </p>
     <p>
-      d: OpenShot Video Editor - Create and edit videos and movies
+      e: OptGeo - Interactive tool to study and simulate optic assemblies
     </p>
     <p>
-      e: Movie Player - Play movies and songs
+      f: OpenShot Video Editor - Create and edit videos and movies
+    </p>
+    <p>
+      g: Movie Player - Play movies and songs
     </p>
     <hr>
     <h3>
@@ -573,31 +492,34 @@
       n: IDLE (using Python-2.7) - Integrated Development Environment for Python (using Python-2.7)
     </p>
     <p>
-      o: IDLE - Integrated Development Environment for Python
+      o: GvRng - Guido van Robot NG
+    </p>
+    <p>
+      p: IDLE - Integrated Development Environment for Python
     </p>
     <p>
-      p: Python (v2.6) - Python Interpreter (v2.6)
+      q: Python (v2.6) - Python Interpreter (v2.6)
     </p>
     <p>
-      q: Python (v3.2) - Python Interpreter (v3.2)
+      r: Python (v3.2) - Python Interpreter (v3.2)
     </p>
     <p>
-      r: IDLE (using Python-3.2) - Integrated Development Environment for Python (using Python-3.2)
+      s: IDLE (using Python-3.2) - Integrated Development Environment for Python (using Python-3.2)
     </p>
     <p>
-      s: IDLE 3 - Integrated DeveLopment Environment for Python3
+      t: IDLE 3 - Integrated DeveLopment Environment for Python3
     </p>
     <p>
-      t: Python (v2.7) - Python Interpreter (v2.7)
+      u: Python (v2.7) - Python Interpreter (v2.7)
     </p>
     <p>
-      u: IDLE (using Python-2.6) - Integrated Development Environment for Python (using Python-2.6)
+      v: IDLE (using Python-2.6) - Integrated Development Environment for Python (using Python-2.6)
     </p>
     <p>
-      v: GNU Emacs 23 - View and edit files
+      w: GNU Emacs 23 - View and edit files
     </p>
     <p>
-      w: Squeak -  Programming system and content development tool
+      x: Squeak -  Programming system and content development tool
     </p>
     <hr>
     <h3>
@@ -709,31 +631,43 @@
       8: OptGeo - Interactive tool to study and simulate optic assemblies
     </p>
     <p>
-      9: Klavaro - Yet another touch typing tutor
+      9: GvRng - Guido van Robot NG
     </p>
     <p>
-      A: wxMaxima - Perform symbolic and numeric calculations using Maxima
+      A: Klavaro - Yet another touch typing tutor
     </p>
     <p>
-      B: Regina - Software for 3-manifold topology and normal surface theory
+      B: TurtleArt - A Logo programming environment
     </p>
     <p>
-      C: CaRMetal - CaRMetal interactive geometry
+      C: wxMaxima - Perform symbolic and numeric calculations using Maxima
     </p>
     <p>
-      D: python-whiteboard
+      D: Little Wizard - Development environment for children
     </p>
     <p>
-      E: AWeather - Advanced weather reporting program
+      E: Regina - Software for 3-manifold topology and normal surface theory
     </p>
     <p>
-      F: Xcas Computer Algebra System - The swiss knife for mathematics
+      F: CaRMetal - CaRMetal interactive geometry
     </p>
     <p>
-      G: Squeak -  Programming system and content development tool
+      G: python-whiteboard
     </p>
     <p>
-      H: Educational suite GCompris - Educational game for ages 2 to 10
+      H: AWeather - Advanced weather reporting program
+    </p>
+    <p>
+      I: Xcas Computer Algebra System - The swiss knife for mathematics
+    </p>
+    <p>
+      J: Squeak -  Programming system and content development tool
+    </p>
+    <p>
+      K: Educational suite GCompris - Educational game for ages 2 to 10
+    </p>
+    <p>
+      L: eToys -  A media-rich model, simulation construction kit and authoring tool
     </p>
     <hr>
     <h3>
@@ -905,25 +839,28 @@
       S: Neverball - A 3D arcade game with a ball
     </p>
     <p>
-      T: SDL-Ball
+      T: Teeworlds - An online multi-player platform 2D shooter
+    </p>
+    <p>
+      U: SDL-Ball
     </p>
     <p>
-      U: FreeDinkedit - Portable Dink Smallwood game editor
+      V: FreeDinkedit - Portable Dink Smallwood game editor
     </p>
     <p>
-      V: PyChess - PyChess is a fully featured, nice looking, easy to use chess client for the Gnome desktop
+      W: PyChess - PyChess is a fully featured, nice looking, easy to use chess client for the Gnome desktop
     </p>
     <p>
-      W: PlayOnLinux - PlayOnLinux
+      X: PlayOnLinux - PlayOnLinux
     </p>
     <p>
-      X: REminiscence - A port of FlashBack game engine
+      Y: REminiscence - A port of FlashBack game engine
     </p>
     <p>
-      Y: Gravitation - game about mania, melancholia, and the creative process
+      Z: Gravitation - game about mania, melancholia, and the creative process
     </p>
     <p>
-      Z: OpenArena - A fast-paced 3D first-person shooter, similar to id Software Inc.'s Quake III Arena
+      |: OpenArena - A fast-paced 3D first-person shooter, similar to id Software Inc.'s Quake III Arena
     </p>
     <p>
       |: The Ur-Quan Masters - An interstellar adventure game
@@ -1178,6 +1115,9 @@
       |: Gunroar - Kenta Cho's Gunroar
     </p>
     <p>
+      |: Singularity - Become the singularity
+    </p>
+    <p>
       |: Quadrapassel - Fit falling blocks together
     </p>
     <p>
@@ -1244,6 +1184,9 @@
       |: Funny Boat - a side scrolling arcade shooter game on a steamboat
     </p>
     <p>
+      |: T.E.G. client - Tenes Empanadas Graciela client
+    </p>
+    <p>
       |: Tennix! - Play tennis against the computer or a friend
     </p>
     <p>
@@ -1602,6 +1545,9 @@
     <p>
       J: Gnubiff - Gnubiff is a mail notification program.
     </p>
+    <p>
+      K: Luakit - Fast, small, webkit based micro-browser extensible by Lua
+    </p>
     <hr>
     <h3>
       <a name="OFFICE"></a><a href="#STANDARD-MENU">Office</a>
@@ -1875,9 +1821,6 @@
       Z: Settings Manager - Graphical Settings Manager for Xfce 4
     </p>
     <p>
-      |: Panel tint2 - Customize the panel settings
-    </p>
-    <p>
       |: Tux Paint Config. - Configure Tux Paint
     </p>
     <p>
@@ -2077,40 +2020,46 @@
       N: Log Out
     </p>
     <p>
-      O: XTerm - standard terminal emulator for the X window system
+      O: Keyboard Layout - Preview keyboard layouts
     </p>
     <p>
-      P: Reportbug - Report bugs to the Debian BTS
+      P: XTerm - standard terminal emulator for the X window system
     </p>
     <p>
-      Q: GDebi Package Installer - Install and view software packages
+      Q: Reportbug - Report bugs to the Debian BTS
     </p>
     <p>
-      R: Terminal emulator - Terminal Emulator
+      R: GDebi Package Installer - Install and view software packages
     </p>
     <p>
-      S: Xfe - A lightweight file manager for X Window
+      S: Terminal emulator - Terminal Emulator
     </p>
     <p>
-      T: Thunar File Manager - Browse the filesystem with the file manager
+      T: Xfe - A lightweight file manager for X Window
     </p>
     <p>
-      U: Synaptic Package Manager - Install, remove and upgrade software packages
+      U: Thunar File Manager - Browse the filesystem with the file manager
     </p>
     <p>
-      V: Software Update - Update software installed on the system
+      V: Synaptic Package Manager - Install, remove and upgrade software packages
     </p>
     <p>
-      W: dconf Editor - Directly edit your entire configuration database
+      W: Software Update - Update software installed on the system
     </p>
     <p>
-      X: Htop - Show System Processes
+      X: Midnight Commander - File manager
     </p>
     <p>
-      Y: UNetbootin - Tool for creating Live USB drives
+      Y: dconf Editor - Directly edit your entire configuration database
     </p>
     <p>
-      Z: Add/Remove Software - Add or remove software installed on the system
+      Z: Htop - Show System Processes
+    </p>
+    <p>
+      |: UNetbootin - Tool for creating Live USB drives
+    </p>
+    <p>
+      |: Add/Remove Software - Add or remove software installed on the system
     </p>
     <p>
       |: Service Pack Creator - Create service packs for sharing with other computers
@@ -2372,6 +2321,9 @@
       |: Thunar File Manager - Browse the filesystem with the file manager
     </p>
     <p>
+      |: Midnight Commander - File manager
+    </p>
+    <p>
       |: Xfwrite - A simple text editor for Xfe
     </p>
     <p>
@@ -3312,9 +3264,6 @@
     <p>
       i: Open the window in this frame if it match nw-absorb-test
     </p>
-    <p>
-      s: Open the window in the Surf frame if it match surf absorb-nw-test
-    </p>
     <hr>
     <h3>
       <a name="FRAME-MOVEMENT-MENU"></a><a href="#FRAME-MENU">Frame-Movement-Menu</a>
@@ -3643,70 +3592,92 @@
       <a name="CONFIGURATION-MENU"></a><a href="#MAIN">Configuration-Menu</a>
     </h3>
     <p>
-      a: <a href="#CONF-CORNER">< Corner Group ></a>
+      a: <a href="#CONF-PLACEMENT">< Placement Group ></a>
+    </p>
+    <p>
+      b: <a href="#CONF-CORNER">< Corner Group ></a>
     </p>
     <p>
-      b: <a href="#CONF-HOOK">< Hook Group ></a>
+      c: <a href="#CONF-HOOK">< Hook Group ></a>
     </p>
     <p>
-      c: <a href="#CONF-ROOT">< Root Group ></a>
+      d: <a href="#CONF-ROOT">< Root Group ></a>
     </p>
     <p>
-      d: <a href="#CONF-MAIN-MODE">< Main Mode Group ></a>
+      e: <a href="#CONF-MAIN-MODE">< Main Mode Group ></a>
     </p>
     <p>
-      e: <a href="#CONF-FRAME-COLORS">< Frame Colors Group ></a>
+      f: <a href="#CONF-FRAME-COLORS">< Frame Colors Group ></a>
     </p>
     <p>
-      f: <a href="#CONF-MISCELLANEOUS">< Miscellaneous Group ></a>
+      g: <a href="#CONF-MISCELLANEOUS">< Miscellaneous Group ></a>
     </p>
     <p>
-      g: <a href="#CONF-SECOND-MODE">< Second Mode Group ></a>
+      h: <a href="#CONF-SECOND-MODE">< Second Mode Group ></a>
     </p>
     <p>
-      h: <a href="#CONF-IDENTIFY-KEY">< Identify Key Group ></a>
+      i: <a href="#CONF-IDENTIFY-KEY">< Identify Key Group ></a>
     </p>
     <p>
-      i: <a href="#CONF-QUERY-STRING">< Query String Group ></a>
+      j: <a href="#CONF-QUERY-STRING">< Query String Group ></a>
     </p>
     <p>
-      j: <a href="#CONF-CIRCULATE-MODE">< Circulate Mode Group ></a>
+      k: <a href="#CONF-CIRCULATE-MODE">< Circulate Mode Group ></a>
     </p>
     <p>
-      k: <a href="#CONF-EXPOSE-MODE">< Expose Mode Group ></a>
+      l: <a href="#CONF-EXPOSE-MODE">< Expose Mode Group ></a>
     </p>
     <p>
-      l: <a href="#CONF-INFO-MODE">< Info Mode Group ></a>
+      m: <a href="#CONF-INFO-MODE">< Info Mode Group ></a>
     </p>
     <p>
-      m: <a href="#CONF-MENU">< Menu Group ></a>
+      n: <a href="#CONF-MENU">< Menu Group ></a>
     </p>
     <p>
-      n: <a href="#CONF-NOTIFY-WINDOW">< Notify Window Group ></a>
+      o: <a href="#CONF-NOTIFY-WINDOW">< Notify Window Group ></a>
     </p>
     <p>
-      o: <a href="#CONF-GIMP-LAYOUT">< Gimp Layout Group ></a>
+      p: <a href="#CONF-GIMP-LAYOUT">< Gimp Layout Group ></a>
     </p>
     <p>
-      p: <a href="#CONF-POWER-MANAGEMENT">< Power Management Group ></a>
+      F2: Save all configuration variables in clfswmrc
+    </p>
+    <p>
+      F3: Reset all configuration variables to their default values
     </p>
+    <hr>
+    <h3>
+      <a name="CONF-PLACEMENT"></a><a href="#CONFIGURATION-MENU">Conf-Placement</a>
+    </h3>
     <p>
-      q: <a href="#CONF-PLACEMENT">< Placement Group ></a>
+      a: Configure BANISH-POINTER-PLACEMENT
     </p>
     <p>
-      r: <a href="#CONF-VOLUME-MODE">< Volume Mode Group ></a>
+      b: Configure SECOND-MODE-PLACEMENT
     </p>
     <p>
-      s: <a href="#CONF-TOOLBAR">< Toolbar Group ></a>
+      c: Configure INFO-MODE-PLACEMENT
     </p>
     <p>
-      t: <a href="#CONF-WALLPAPER">< Wallpaper Group ></a>
+      d: Configure QUERY-MODE-PLACEMENT
     </p>
     <p>
-      F2: Save all configuration variables in clfswmrc
+      e: Configure CIRCULATE-MODE-PLACEMENT
     </p>
     <p>
-      F3: Reset all configuration variables to their default values
+      f: Configure EXPOSE-MODE-PLACEMENT
+    </p>
+    <p>
+      g: Configure EXPOSE-QUERY-PLACEMENT
+    </p>
+    <p>
+      h: Configure NOTIFY-WINDOW-PLACEMENT
+    </p>
+    <p>
+      i: Configure ASK-CLOSE/KILL-PLACEMENT
+    </p>
+    <p>
+      j: Configure UNMANAGED-WINDOW-PLACEMENT
     </p>
     <hr>
     <h3>
@@ -3768,7 +3739,7 @@
       c: Configure MAIN-ENTRANCE-HOOK
     </p>
     <p>
-      d: Configure ROOT-SIZE-CHANGE
+      d: Configure ROOT-SIZE-CHANGE-HOOK
     </p>
     <p>
       e: Configure INIT-HOOK
@@ -4139,191 +4110,6 @@
     </p>
     <hr>
     <h3>
-      <a name="CONF-POWER-MANAGEMENT"></a><a href="#CONFIGURATION-MENU">Conf-Power-Management</a>
-    </h3>
-    <p>
-      a: Configure POWER-SUSPEND-TO-RAM-CMD
-    </p>
-    <p>
-      b: Configure POWER-SUSPEND-TO-DISK-CMD
-    </p>
-    <p>
-      c: Configure POWER-REBOOT-CMD
-    </p>
-    <p>
-      d: Configure POWER-HALT-CMD
-    </p>
-    <hr>
-    <h3>
-      <a name="CONF-PLACEMENT"></a><a href="#CONFIGURATION-MENU">Conf-Placement</a>
-    </h3>
-    <p>
-      a: Configure BANISH-POINTER-PLACEMENT
-    </p>
-    <p>
-      b: Configure SECOND-MODE-PLACEMENT
-    </p>
-    <p>
-      c: Configure INFO-MODE-PLACEMENT
-    </p>
-    <p>
-      d: Configure QUERY-MODE-PLACEMENT
-    </p>
-    <p>
-      e: Configure CIRCULATE-MODE-PLACEMENT
-    </p>
-    <p>
-      f: Configure EXPOSE-MODE-PLACEMENT
-    </p>
-    <p>
-      g: Configure EXPOSE-QUERY-PLACEMENT
-    </p>
-    <p>
-      h: Configure NOTIFY-WINDOW-PLACEMENT
-    </p>
-    <p>
-      i: Configure ASK-CLOSE/KILL-PLACEMENT
-    </p>
-    <p>
-      j: Configure UNMANAGED-WINDOW-PLACEMENT
-    </p>
-    <p>
-      k: Configure TOOLBAR-WINDOW-PLACEMENT
-    </p>
-    <p>
-      l: Configure VOLUME-MODE-PLACEMENT
-    </p>
-    <hr>
-    <h3>
-      <a name="CONF-VOLUME-MODE"></a><a href="#CONFIGURATION-MENU">Conf-Volume-Mode</a>
-    </h3>
-    <p>
-      a: Configure VOLUME-FONT-STRING
-    </p>
-    <p>
-      b: Configure VOLUME-BACKGROUND
-    </p>
-    <p>
-      c: Configure VOLUME-FOREGROUND
-    </p>
-    <p>
-      d: Configure VOLUME-BORDER
-    </p>
-    <p>
-      e: Configure VOLUME-BORDER-SIZE
-    </p>
-    <p>
-      f: Configure VOLUME-WIDTH
-    </p>
-    <p>
-      g: Configure VOLUME-HEIGHT
-    </p>
-    <p>
-      h: Configure VOLUME-TEXT-LIMIT
-    </p>
-    <p>
-      i: Configure VOLUME-EXTERNAL-MIXER-CMD
-    </p>
-    <hr>
-    <h3>
-      <a name="CONF-TOOLBAR"></a><a href="#CONFIGURATION-MENU">Conf-Toolbar</a>
-    </h3>
-    <p>
-      a: Configure DEFAULT-TOOLBAR
-    </p>
-    <p>
-      b: Configure TOOLBAR-WINDOW-FONT-STRING
-    </p>
-    <p>
-      c: Configure TOOLBAR-WINDOW-BACKGROUND
-    </p>
-    <p>
-      d: Configure TOOLBAR-WINDOW-FOREGROUND
-    </p>
-    <p>
-      e: Configure TOOLBAR-WINDOW-BORDER
-    </p>
-    <p>
-      f: Configure TOOLBAR-DEFAULT-BORDER-SIZE
-    </p>
-    <p>
-      g: Configure TOOLBAR-WINDOW-TRANSPARENCY
-    </p>
-    <p>
-      h: Configure TOOLBAR-DEFAULT-THICKNESS
-    </p>
-    <p>
-      i: Configure TOOLBAR-DEFAULT-REFRESH-DELAY
-    </p>
-    <p>
-      j: Configure TOOLBAR-DEFAULT-AUTOHIDE
-    </p>
-    <p>
-      k: Configure TOOLBAR-SENSIBILITY
-    </p>
-    <p>
-      l: Configure TOOLBAR-CLOCK-COLOR
-    </p>
-    <p>
-      m: Configure TOOLBAR-LABEL-COLOR
-    </p>
-    <p>
-      n: Configure TOOLBAR-CLICKABLE-LABEL-COLOR
-    </p>
-    <p>
-      o: Configure TOOLBAR-CLICKABLE-CLOCK-COLOR
-    </p>
-    <p>
-      p: Configure TOOLBAR-CLOCK-ACTION
-    </p>
-    <p>
-      q: Configure TOOLBAR-CLFSWM-MENU-COLOR
-    </p>
-    <p>
-      r: Configure TOOLBAR-CPU-COLOR
-    </p>
-    <p>
-      s: Configure TOOLBAR-MEM-COLOR
-    </p>
-    <p>
-      t: Configure TOOLBAR-SYSTEM-INFO-COLOR
-    </p>
-    <p>
-      u: Configure TOOLBAR-SYSTEM-INFO-LOW-COLOR
-    </p>
-    <p>
-      v: Configure TOOLBAR-SYSTEM-INFO-ALERT-COLOR
-    </p>
-    <p>
-      w: Configure TOOLBAR-SYSTEM-INFO-URGENT-COLOR
-    </p>
-    <p>
-      x: Configure TOOLBAR-EXPOSE-MODE-BUTTON-COLOR
-    </p>
-    <p>
-      y: Configure MPD-TOOLBAR
-    </p>
-    <p>
-      z: Configure MPD-TOOLBAR-CLIENT
-    </p>
-    <p>
-      0: Configure TOOLBAR-MPD-INFO-COLOR
-    </p>
-    <p>
-      1: Configure TOOLBAR-MPD-BUTTONS-COLOR
-    </p>
-    <p>
-      2: Configure TOOLBAR-VOLUME-MODE-BUTTON-COLOR
-    </p>
-    <hr>
-    <h3>
-      <a name="CONF-WALLPAPER"></a><a href="#CONFIGURATION-MENU">Conf-Wallpaper</a>
-    </h3>
-    <p>
-      a: Configure WALLPAPER-COMMAND
-    </p>
-    <hr>
-    <h3>
       <a name="CLFSWM-MENU"></a><a href="#MAIN">Clfswm-Menu</a>
     </h3>
     <p>
@@ -4335,28 +4121,6 @@
     <p>
       x: Exit clfswm
     </p>
-    <p>
-      Pause: <a href="#REBOOT-HALT-MENU">< Suspend/Reboot/Halt menu ></a>
-    </p>
-    <hr>
-    <h3>
-      <a name="REBOOT-HALT-MENU"></a><a href="#CLFSWM-MENU">Reboot-Halt-Menu</a>
-    </h3>
-    <p>
-      -: Do nothing
-    </p>
-    <p>
-      s: Suspend the computer to RAM
-    </p>
-    <p>
-      d: Suspend the computer to DISK
-    </p>
-    <p>
-      r: Reboot the computer
-    </p>
-    <p>
-      h: Halt the computer
-    </p>
     <hr>
     <p>
       <small>
diff --git a/doc/menu.txt b/doc/menu.txt
index 9faea08..99fb1e9 100644
--- a/doc/menu.txt
+++ b/doc/menu.txt
@@ -28,41 +28,6 @@ d: Show the current time and date
 p: Show current processes sorted by CPU usage
 m: Show current processes sorted by memory usage
 v: Show the current CLFSWM version
-F2: < Music Player Daemon (MPD) menu >
-x: < XMMS menu >
-i: < CDPLAYER menu >
-
-Mpd-Menu
-i: Show MPD informations
-p: Play the previous song in the current playlist
-n: Play the next song in the current playlist
-t: Toggles Play/Pause, plays if stopped
-y: Start playing
-k: Stop the currently playing playlists
-x: Seeks to +5%
-w: Seeks to -5%
-l: Show the current MPD playlist
-s: Start sonata
-g: Start gmpc
-
-Xmms-Menu
-r: Lanch XMMS
-s: Show the current xmms status
-l: Show the current xmms playlist
-n: Play the next XMMS track
-p: Play the previous XMMS track
-e: open xmms "Load file(s)" dialog window.
-
-Cdplayer-Menu
-y: Start playing CD
-k: Stop playing CD
-t: Toggle pause
-s: Show the current CD status
-l: Show the current CD playlist
-n: Play the next CD track
-p: Play the previous CD track
-e: Eject CD
-c: Close CD
 
 Standard-Menu
 a: < TEXTEDITOR >
@@ -102,7 +67,8 @@ e: Open Folder with Thunar - Open the specified folders in Thunar
 f: Worker - File manager for X.
 g: Xfe - A lightweight file manager for X Window
 h: Thunar File Manager - Browse the filesystem with the file manager
-i: Gentoo - Fully GUI-configurable, two-pane X file manager
+i: Midnight Commander - File manager
+j: Gentoo - Fully GUI-configurable, two-pane X file manager
 
 Webbrowser
 a: Konqueror
@@ -115,6 +81,7 @@ g: Midori Private Browsing - Open a new private browsing window
 h: Web - Browse the web
 i: Conkeror Web Browser - Browse the World Wide Web
 j: Links 2
+k: Luakit - Fast, small, webkit based micro-browser extensible by Lua
 
 Audiovideo
 a: Dragon Player
@@ -129,30 +96,32 @@ i: Rhythmbox - Play and organize your music collection
 j: Musique - Play your music collection
 k: HasciiCam - (h)ascii for the masses!
 l: MediathekView - View streams from public German TV stations
-m: Sonata - An elegant GTK+ MPD client
-n: Stopmotion - Program to create stop-motion animations
-o: Gnome Music Player Client - A gnome frontend for the mpd daemon
-p: PulseAudio Volume Control - Adjust the volume level
-q: GNOME ALSA Mixer - ALSA sound mixer for GNOME
-r: Mixer - Audio mixer for the Xfce Desktop Environment
-s: Alsa Modular Synth - Modular Software Synth
-t: VLC media player - Read, capture, broadcast your multimedia streams
-u: Petri-Foo - Sound Sampler
-v: Sound Juicer - Copy music from your CDs
-w: PulseAudio Volume Meter (Playback) - Monitor the output volume
-x: Rhythmbox - Play and organize your music collection
-y: Brasero - Create and copy CDs and DVDs
-z: Audacity - Record and edit audio files
-0: Cheese - Take photos and videos with your webcam, with fun graphical effects
-1: Sound Recorder - Record sound clips
-2: OpenShot Video Editor - Create and edit videos and movies
-3: terminatorX - Scratch and mix audio
-4: Decibel Audio Player - A simple audio player
-5: Movie Player - Play movies and songs
-6: QVideoob - Search for videos on many websites, and get info about them
-7: PulseAudio Volume Meter (Capture) - Monitor the input volume
-8: Specimen - Sound Sampler
-9: Music Player - Play your music files easily
+m: XBMC Media Center - Manage and view your media 
+n: Sonata - An elegant GTK+ MPD client
+o: Stopmotion - Program to create stop-motion animations
+p: Gnome Music Player Client - A gnome frontend for the mpd daemon
+q: PulseAudio Volume Control - Adjust the volume level
+r: Minitube - Watch YouTube videos
+s: GNOME ALSA Mixer - ALSA sound mixer for GNOME
+t: Mixer - Audio mixer for the Xfce Desktop Environment
+u: Alsa Modular Synth - Modular Software Synth
+v: VLC media player - Read, capture, broadcast your multimedia streams
+w: Petri-Foo - Sound Sampler
+x: Sound Juicer - Copy music from your CDs
+y: PulseAudio Volume Meter (Playback) - Monitor the output volume
+z: Rhythmbox - Play and organize your music collection
+0: Brasero - Create and copy CDs and DVDs
+1: Audacity - Record and edit audio files
+2: Cheese - Take photos and videos with your webcam, with fun graphical effects
+3: Sound Recorder - Record sound clips
+4: OpenShot Video Editor - Create and edit videos and movies
+5: terminatorX - Scratch and mix audio
+6: Decibel Audio Player - A simple audio player
+7: Movie Player - Play movies and songs
+8: QVideoob - Search for videos on many websites, and get info about them
+9: PulseAudio Volume Meter (Capture) - Monitor the input volume
+A: Specimen - Sound Sampler
+B: Music Player - Play your music files easily
 
 Audio
 a: KMix
@@ -175,10 +144,12 @@ q: Music Player - Play your music files easily
 
 Video
 a: Camorama Webcam Viewer - View, alter and save images from a webcam
-b: Stopmotion - Program to create stop-motion animations
-c: OptGeo - Interactive tool to study and simulate optic assemblies
-d: OpenShot Video Editor - Create and edit videos and movies
-e: Movie Player - Play movies and songs
+b: XBMC Media Center - Manage and view your media 
+c: Stopmotion - Program to create stop-motion animations
+d: Minitube - Watch YouTube videos
+e: OptGeo - Interactive tool to study and simulate optic assemblies
+f: OpenShot Video Editor - Create and edit videos and movies
+g: Movie Player - Play movies and songs
 
 Development
 a: KLinkStatus
@@ -195,15 +166,16 @@ k: Scilab CLI - Scientific software package for numerical computations
 l: Scilab - Scientific software package for numerical computations
 m: Scilab advanced CLI - Scientific software package for numerical computations
 n: IDLE (using Python-2.7) - Integrated Development Environment for Python (using Python-2.7)
-o: IDLE - Integrated Development Environment for Python
-p: Python (v2.6) - Python Interpreter (v2.6)
-q: Python (v3.2) - Python Interpreter (v3.2)
-r: IDLE (using Python-3.2) - Integrated Development Environment for Python (using Python-3.2)
-s: IDLE 3 - Integrated DeveLopment Environment for Python3
-t: Python (v2.7) - Python Interpreter (v2.7)
-u: IDLE (using Python-2.6) - Integrated Development Environment for Python (using Python-2.6)
-v: GNU Emacs 23 - View and edit files
-w: Squeak -  Programming system and content development tool
+o: GvRng - Guido van Robot NG
+p: IDLE - Integrated Development Environment for Python
+q: Python (v2.6) - Python Interpreter (v2.6)
+r: Python (v3.2) - Python Interpreter (v3.2)
+s: IDLE (using Python-3.2) - Integrated Development Environment for Python (using Python-3.2)
+t: IDLE 3 - Integrated DeveLopment Environment for Python3
+u: Python (v2.7) - Python Interpreter (v2.7)
+v: IDLE (using Python-2.6) - Integrated Development Environment for Python (using Python-2.6)
+w: GNU Emacs 23 - View and edit files
+x: Squeak -  Programming system and content development tool
 
 Education
 a: Kig - Explore Geometric Constructions
@@ -241,15 +213,19 @@ z: GeoGebra - Create interactive mathematical constructions and applets.
 6: Scilab advanced CLI - Scientific software package for numerical computations
 7: Geomview - Interactive geometry viewing program
 8: OptGeo - Interactive tool to study and simulate optic assemblies
-9: Klavaro - Yet another touch typing tutor
-A: wxMaxima - Perform symbolic and numeric calculations using Maxima
-B: Regina - Software for 3-manifold topology and normal surface theory
-C: CaRMetal - CaRMetal interactive geometry
-D: python-whiteboard
-E: AWeather - Advanced weather reporting program
-F: Xcas Computer Algebra System - The swiss knife for mathematics
-G: Squeak -  Programming system and content development tool
-H: Educational suite GCompris - Educational game for ages 2 to 10
+9: GvRng - Guido van Robot NG
+A: Klavaro - Yet another touch typing tutor
+B: TurtleArt - A Logo programming environment
+C: wxMaxima - Perform symbolic and numeric calculations using Maxima
+D: Little Wizard - Development environment for children
+E: Regina - Software for 3-manifold topology and normal surface theory
+F: CaRMetal - CaRMetal interactive geometry
+G: python-whiteboard
+H: AWeather - Advanced weather reporting program
+I: Xcas Computer Algebra System - The swiss knife for mathematics
+J: Squeak -  Programming system and content development tool
+K: Educational suite GCompris - Educational game for ages 2 to 10
+L: eToys -  A media-rich model, simulation construction kit and authoring tool
 
 Game
 a: Kolf
@@ -307,13 +283,14 @@ P: I Have No Tomatoes - How many tomatoes can you smash in ten short minutes?
 Q: FreeCraft - The War begins
 R: FreeGish - A physics based arcade game
 S: Neverball - A 3D arcade game with a ball
-T: SDL-Ball
-U: FreeDinkedit - Portable Dink Smallwood game editor
-V: PyChess - PyChess is a fully featured, nice looking, easy to use chess client for the Gnome desktop
-W: PlayOnLinux - PlayOnLinux
-X: REminiscence - A port of FlashBack game engine
-Y: Gravitation - game about mania, melancholia, and the creative process
-Z: OpenArena - A fast-paced 3D first-person shooter, similar to id Software Inc.'s Quake III Arena
+T: Teeworlds - An online multi-player platform 2D shooter
+U: SDL-Ball
+V: FreeDinkedit - Portable Dink Smallwood game editor
+W: PyChess - PyChess is a fully featured, nice looking, easy to use chess client for the Gnome desktop
+X: PlayOnLinux - PlayOnLinux
+Y: REminiscence - A port of FlashBack game engine
+Z: Gravitation - game about mania, melancholia, and the creative process
+|: OpenArena - A fast-paced 3D first-person shooter, similar to id Software Inc.'s Quake III Arena
 |: The Ur-Quan Masters - An interstellar adventure game
 |: Golly - A Conway's Game of Life simulator
 |: Chromium B.S.U. - Scrolling space shooter
@@ -398,6 +375,7 @@ Z: OpenArena - A fast-paced 3D first-person shooter, similar to id Software Inc.
 |: Heroes - Collect powerups and avoid your opponents' trails
 |: Secret Maryo Chronicles - A 2D platform game with style similar to classic sidescroller games
 |: Gunroar - Kenta Cho's Gunroar
+|: Singularity - Become the singularity
 |: Quadrapassel - Fit falling blocks together
 |: Minetest - InfiniMiner/Minecraft-inspired open game world
 |: Angband (GTK) - A roguelike dungeon exploration game based on the books of J.R.R.Tolkien
@@ -420,6 +398,7 @@ Z: OpenArena - A fast-paced 3D first-person shooter, similar to id Software Inc.
 |: Zatacka - Arcade multiplayer game for 2-6 players
 |: Tumiki Fighters - Kenta Cho's Tumiki Fighters
 |: Funny Boat - a side scrolling arcade shooter game on a steamboat
+|: T.E.G. client - Tenes Empanadas Graciela client
 |: Tennix! - Play tennis against the computer or a friend
 |: LordsAWar Tile Editor - Create or Edit LordsAWar tilesets
 |: Battle for Wesnoth (1.10) - A fantasy turn-based strategy game
@@ -541,6 +520,7 @@ G: Links 2
 H: Wicd Network Manager
 I: Dillo - Lightweight browser
 J: Gnubiff - Gnubiff is a mail notification program.
+K: Luakit - Fast, small, webkit based micro-browser extensible by Lua
 
 Office
 a: Lokalize
@@ -633,7 +613,6 @@ W: Guake Preferences - Comment
 X: System Settings
 Y: IcedTea Web Control Panel - Configure IcedTea Web (javaws and plugin)
 Z: Settings Manager - Graphical Settings Manager for Xfce 4
-|: Panel tint2 - Customize the panel settings
 |: Tux Paint Config. - Configure Tux Paint
 |: Passwords and Keys - Manage your passwords and encryption keys
 |: Software Settings - Change software update preferences and enable or disable software sources
@@ -701,18 +680,20 @@ K: System Monitor - View current processes and monitor system state
 L: Open Folder with Thunar - Open the specified folders in Thunar
 M: Catalog Installer - Install a catalog of software on the system
 N: Log Out
-O: XTerm - standard terminal emulator for the X window system
-P: Reportbug - Report bugs to the Debian BTS
-Q: GDebi Package Installer - Install and view software packages
-R: Terminal emulator - Terminal Emulator
-S: Xfe - A lightweight file manager for X Window
-T: Thunar File Manager - Browse the filesystem with the file manager
-U: Synaptic Package Manager - Install, remove and upgrade software packages
-V: Software Update - Update software installed on the system
-W: dconf Editor - Directly edit your entire configuration database
-X: Htop - Show System Processes
-Y: UNetbootin - Tool for creating Live USB drives
-Z: Add/Remove Software - Add or remove software installed on the system
+O: Keyboard Layout - Preview keyboard layouts
+P: XTerm - standard terminal emulator for the X window system
+Q: Reportbug - Report bugs to the Debian BTS
+R: GDebi Package Installer - Install and view software packages
+S: Terminal emulator - Terminal Emulator
+T: Xfe - A lightweight file manager for X Window
+U: Thunar File Manager - Browse the filesystem with the file manager
+V: Synaptic Package Manager - Install, remove and upgrade software packages
+W: Software Update - Update software installed on the system
+X: Midnight Commander - File manager
+Y: dconf Editor - Directly edit your entire configuration database
+Z: Htop - Show System Processes
+|: UNetbootin - Tool for creating Live USB drives
+|: Add/Remove Software - Add or remove software installed on the system
 |: Service Pack Creator - Create service packs for sharing with other computers
 
 Utility
@@ -800,6 +781,7 @@ Z: Bluetooth Device Setup - Setup Bluetooth devices
 |: Terminal emulator - Terminal Emulator
 |: GNU Emacs 23 - View and edit files
 |: Thunar File Manager - Browse the filesystem with the file manager
+|: Midnight Commander - File manager
 |: Xfwrite - A simple text editor for Xfe
 |: Gentoo - Fully GUI-configurable, two-pane X file manager
 |: Disk Utility - Manage Drives and Media
@@ -1123,7 +1105,6 @@ f: Open the next window in the current frame and leave the focus on the current
 g: Open the next window in a named frame
 h: Open the next window in a numbered frame
 i: Open the window in this frame if it match nw-absorb-test
-s: Open the window in the Surf frame if it match surf absorb-nw-test
 
 Frame-Movement-Menu
 p: < Frame pack menu >
@@ -1243,29 +1224,37 @@ l: Run LXDE
 p: Prompt for an other window manager
 
 Configuration-Menu
-a: < Corner Group >
-b: < Hook Group >
-c: < Root Group >
-d: < Main Mode Group >
-e: < Frame Colors Group >
-f: < Miscellaneous Group >
-g: < Second Mode Group >
-h: < Identify Key Group >
-i: < Query String Group >
-j: < Circulate Mode Group >
-k: < Expose Mode Group >
-l: < Info Mode Group >
-m: < Menu Group >
-n: < Notify Window Group >
-o: < Gimp Layout Group >
-p: < Power Management Group >
-q: < Placement Group >
-r: < Volume Mode Group >
-s: < Toolbar Group >
-t: < Wallpaper Group >
+a: < Placement Group >
+b: < Corner Group >
+c: < Hook Group >
+d: < Root Group >
+e: < Main Mode Group >
+f: < Frame Colors Group >
+g: < Miscellaneous Group >
+h: < Second Mode Group >
+i: < Identify Key Group >
+j: < Query String Group >
+k: < Circulate Mode Group >
+l: < Expose Mode Group >
+m: < Info Mode Group >
+n: < Menu Group >
+o: < Notify Window Group >
+p: < Gimp Layout Group >
 F2: Save all configuration variables in clfswmrc
 F3: Reset all configuration variables to their default values
 
+Conf-Placement
+a: Configure BANISH-POINTER-PLACEMENT
+b: Configure SECOND-MODE-PLACEMENT
+c: Configure INFO-MODE-PLACEMENT
+d: Configure QUERY-MODE-PLACEMENT
+e: Configure CIRCULATE-MODE-PLACEMENT
+f: Configure EXPOSE-MODE-PLACEMENT
+g: Configure EXPOSE-QUERY-PLACEMENT
+h: Configure NOTIFY-WINDOW-PLACEMENT
+i: Configure ASK-CLOSE/KILL-PLACEMENT
+j: Configure UNMANAGED-WINDOW-PLACEMENT
+
 Conf-Corner
 a: Configure CORNER-SIZE
 b: Configure CORNER-MAIN-MODE-LEFT-BUTTON
@@ -1286,7 +1275,7 @@ Conf-Hook
 a: Configure BINDING-HOOK
 b: Configure LOOP-HOOK
 c: Configure MAIN-ENTRANCE-HOOK
-d: Configure ROOT-SIZE-CHANGE
+d: Configure ROOT-SIZE-CHANGE-HOOK
 e: Configure INIT-HOOK
 f: Configure CLOSE-HOOK
 g: Configure DEFAULT-NW-HOOK
@@ -1419,83 +1408,10 @@ f: Configure NOTIFY-WINDOW-TRANSPARENCY
 Conf-Gimp-Layout
 a: Configure GIMP-LAYOUT-NOTIFY-WINDOW-DELAY
 
-Conf-Power-Management
-a: Configure POWER-SUSPEND-TO-RAM-CMD
-b: Configure POWER-SUSPEND-TO-DISK-CMD
-c: Configure POWER-REBOOT-CMD
-d: Configure POWER-HALT-CMD
-
-Conf-Placement
-a: Configure BANISH-POINTER-PLACEMENT
-b: Configure SECOND-MODE-PLACEMENT
-c: Configure INFO-MODE-PLACEMENT
-d: Configure QUERY-MODE-PLACEMENT
-e: Configure CIRCULATE-MODE-PLACEMENT
-f: Configure EXPOSE-MODE-PLACEMENT
-g: Configure EXPOSE-QUERY-PLACEMENT
-h: Configure NOTIFY-WINDOW-PLACEMENT
-i: Configure ASK-CLOSE/KILL-PLACEMENT
-j: Configure UNMANAGED-WINDOW-PLACEMENT
-k: Configure TOOLBAR-WINDOW-PLACEMENT
-l: Configure VOLUME-MODE-PLACEMENT
-
-Conf-Volume-Mode
-a: Configure VOLUME-FONT-STRING
-b: Configure VOLUME-BACKGROUND
-c: Configure VOLUME-FOREGROUND
-d: Configure VOLUME-BORDER
-e: Configure VOLUME-BORDER-SIZE
-f: Configure VOLUME-WIDTH
-g: Configure VOLUME-HEIGHT
-h: Configure VOLUME-TEXT-LIMIT
-i: Configure VOLUME-EXTERNAL-MIXER-CMD
-
-Conf-Toolbar
-a: Configure DEFAULT-TOOLBAR
-b: Configure TOOLBAR-WINDOW-FONT-STRING
-c: Configure TOOLBAR-WINDOW-BACKGROUND
-d: Configure TOOLBAR-WINDOW-FOREGROUND
-e: Configure TOOLBAR-WINDOW-BORDER
-f: Configure TOOLBAR-DEFAULT-BORDER-SIZE
-g: Configure TOOLBAR-WINDOW-TRANSPARENCY
-h: Configure TOOLBAR-DEFAULT-THICKNESS
-i: Configure TOOLBAR-DEFAULT-REFRESH-DELAY
-j: Configure TOOLBAR-DEFAULT-AUTOHIDE
-k: Configure TOOLBAR-SENSIBILITY
-l: Configure TOOLBAR-CLOCK-COLOR
-m: Configure TOOLBAR-LABEL-COLOR
-n: Configure TOOLBAR-CLICKABLE-LABEL-COLOR
-o: Configure TOOLBAR-CLICKABLE-CLOCK-COLOR
-p: Configure TOOLBAR-CLOCK-ACTION
-q: Configure TOOLBAR-CLFSWM-MENU-COLOR
-r: Configure TOOLBAR-CPU-COLOR
-s: Configure TOOLBAR-MEM-COLOR
-t: Configure TOOLBAR-SYSTEM-INFO-COLOR
-u: Configure TOOLBAR-SYSTEM-INFO-LOW-COLOR
-v: Configure TOOLBAR-SYSTEM-INFO-ALERT-COLOR
-w: Configure TOOLBAR-SYSTEM-INFO-URGENT-COLOR
-x: Configure TOOLBAR-EXPOSE-MODE-BUTTON-COLOR
-y: Configure MPD-TOOLBAR
-z: Configure MPD-TOOLBAR-CLIENT
-0: Configure TOOLBAR-MPD-INFO-COLOR
-1: Configure TOOLBAR-MPD-BUTTONS-COLOR
-2: Configure TOOLBAR-VOLUME-MODE-BUTTON-COLOR
-
-Conf-Wallpaper
-a: Configure WALLPAPER-COMMAND
-
 Clfswm-Menu
 r: Reset clfswm
 l: Reload clfswm
 x: Exit clfswm
-Pause: < Suspend/Reboot/Halt menu >
-
-Reboot-Halt-Menu
--: Do nothing
-s: Suspend the computer to RAM
-d: Suspend the computer to DISK
-r: Reboot the computer
-h: Halt the computer
 
 
 This documentation was produced with the CLFSWM auto-doc functions. To reproduce it, use the produce-menu-doc-in-file or
diff --git a/doc/variables.html b/doc/variables.html
index 223131f..0084d27 100644
--- a/doc/variables.html
+++ b/doc/variables.html
@@ -85,11 +85,6 @@
         </a>
       </li>
       <li>
-        <a href='#power-management'>
-          Power Management Group
-        </a>
-      </li>
-      <li>
         <a href='#query-string'>
           Query String Group
         </a>
@@ -104,21 +99,6 @@
           Second Mode Group
         </a>
       </li>
-      <li>
-        <a href='#toolbar'>
-          Toolbar Group
-        </a>
-      </li>
-      <li>
-        <a href='#volume-mode'>
-          Volume Mode Group
-        </a>
-      </li>
-      <li>
-        <a href='#wallpaper'>
-          Wallpaper Group
-        </a>
-      </li>
     </ul>
     <p>
       <a name='circulate-mode' href='#top'>
@@ -332,10 +312,10 @@
         ((:TOP-LEFT PRESENT-CLFSWM-TERMINAL) (:TOP-RIGHT ASK-CLOSE/KILL-CURRENT-WINDOW) (:BOTTOM-RIGHT EXPOSE-ALL-WINDOWS-MODE) <br>
 
     
-         (:BOTTOM-LEFT START-FILE-MANAGER)) <br>
+         (:BOTTOM-LEFT NIL)) <br>
 
     
-            Config(Corner group): Actions on corners in the main mode with the right mouse button <br>
+            Actions on corners in the main mode with the right mouse button <br>
 
     <font color='#ff0000'>
           *corner-main-mode-middle-button*
@@ -568,7 +548,7 @@
           *close-hook*
     </font>
     <font color='#0000ff'>
-       = (CLOSE-NOTIFY-WINDOW CLOSE-CLFSWM-TERMINAL CLOSE-VIRTUAL-KEYBOARD CLOSE-ALL-TOOLBARS) <br>
+       = (CLOSE-NOTIFY-WINDOW CLOSE-CLFSWM-TERMINAL CLOSE-VIRTUAL-KEYBOARD) <br>
     </font>
     
             Close hook. This hook is run just before closing the display <br>
@@ -577,16 +557,16 @@
           *init-hook*
     </font>
     <font color='#0000ff'>
-       = (DEFAULT-INIT-HOOK DISPLAY-HELLO-WINDOW OPEN-ALL-TOOLBARS MY-INIT-HOOK MY-WALLPAPER) <br>
+       = (DEFAULT-INIT-HOOK DISPLAY-HELLO-WINDOW) <br>
     </font>
     
             Init hook. This hook is run just after the first root frame is created <br>
 
     <font color='#ff0000'>
-          *root-size-change*
+          *root-size-change-hook*
     </font>
     <font color='#0000ff'>
-       = (MY-WALLPAPER) <br>
+       = NIL <br>
     </font>
     
             Hook executed when the root size has changed for example when adding/removing a monitor <br>
@@ -628,10 +608,7 @@
          SET-DEFAULT-INFO-KEYS SET-DEFAULT-INFO-MOUSE INIT-*MAIN-KEYS* INIT-*MAIN-MOUSE* SET-DEFAULT-MAIN-KEYS <br>
 
     
-         SET-DEFAULT-MAIN-MOUSE INIT-*SECOND-KEYS* INIT-*SECOND-MOUSE* SET-DEFAULT-SECOND-KEYS SET-DEFAULT-SECOND-MOUSE <br>
-
-    
-         MPD-BINDING FR-BINDING REBOOT-HALT-BINDING INIT-*VOLUME-KEYS* SET-DEFAULT-VOLUME-KEYS AMIXER-VOLUME-BIND LOCAL-BINDING) <br>
+         SET-DEFAULT-MAIN-MOUSE INIT-*SECOND-KEYS* INIT-*SECOND-MOUSE* SET-DEFAULT-SECOND-KEYS SET-DEFAULT-SECOND-MOUSE) <br>
 
     
             Hook executed when keys/buttons are bounds <br>
@@ -1042,7 +1019,7 @@
           *default-frame-data*
     </font>
     <font color='#0000ff'>
-       = ((:TILE-SIZE 0.8) (:TILE-SPACE-SIZE 0.1) (:MAIN-LAYOUT-WINDOWS NIL) (:FAST-LAYOUT (TILE-SPACE-LAYOUT NO-LAYOUT))) <br>
+       = ((:TILE-SIZE 0.8) (:TILE-SPACE-SIZE 0.1) (:FAST-LAYOUT (TILE-LEFT-LAYOUT TILE-LAYOUT)) (:MAIN-LAYOUT-WINDOWS NIL)) <br>
     </font>
     
             Default slots set in frame date <br>
@@ -1184,24 +1161,6 @@
       </a>
     </p>
     <font color='#ff0000'>
-          *volume-mode-placement*
-    </font>
-    <font color='#0000ff'>
-       = BOTTOM-MIDDLE-ROOT-PLACEMENT <br>
-    </font>
-    
-            Volume mode window placement <br>
-
-    <font color='#ff0000'>
-          *toolbar-window-placement*
-    </font>
-    <font color='#0000ff'>
-       = TOP-LEFT-PLACEMENT <br>
-    </font>
-    
-            Toolbar window placement <br>
-
-    <font color='#ff0000'>
           *unmanaged-window-placement*
     </font>
     <font color='#0000ff'>
@@ -1286,53 +1245,12 @@
           *banish-pointer-placement*
     </font>
     <font color='#0000ff'>
-       = MIDDLE-RIGHT-ROOT-PLACEMENT <br>
+       = BOTTOM-RIGHT-ROOT-PLACEMENT <br>
     </font>
     
             Pointer banishment placement <br>
 
     <p>
-      <a name='power-management' href='#top'>
-        <= Power Management Group => 
-      </a>
-    </p>
-    <font color='#ff0000'>
-          *power-halt-cmd*
-    </font>
-    <font color='#0000ff'>
-       = "sudo /sbin/halt" <br>
-    </font>
-    
-            Halt command <br>
-
-    <font color='#ff0000'>
-          *power-reboot-cmd*
-    </font>
-    <font color='#0000ff'>
-       = "sudo /sbin/reboot" <br>
-    </font>
-    
-            Reboot command <br>
-
-    <font color='#ff0000'>
-          *power-suspend-to-disk-cmd*
-    </font>
-    <font color='#0000ff'>
-       = "sudo pm-hibernate" <br>
-    </font>
-    
-            Suspend to disk command <br>
-
-    <font color='#ff0000'>
-          *power-suspend-to-ram-cmd*
-    </font>
-    <font color='#0000ff'>
-       = "sudo pm-suspend" <br>
-    </font>
-    
-            Suspend to ram command <br>
-
-    <p>
       <a name='query-string' href='#top'>
         <= Query String Group => 
       </a>
@@ -1564,372 +1482,6 @@
             Second mode window border color <br>
 
     <p>
-      <a name='toolbar' href='#top'>
-        <= Toolbar Group => 
-      </a>
-    </p>
-    <font color='#ff0000'>
-          *toolbar-volume-mode-button-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            Volume mode color <br>
-
-    <font color='#ff0000'>
-          *toolbar-mpd-buttons-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            MPD - Music Player Daemon buttons color <br>
-
-    <font color='#ff0000'>
-          *toolbar-mpd-info-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            MPD - Music Player Daemon information color <br>
-
-    <font color='#ff0000'>
-          *mpd-toolbar-client*
-    </font>
-    <font color='#0000ff'>
-       = "gmpc" <br>
-    </font>
-    
-            MPD client <br>
-
-    <font color='#ff0000'>
-          *mpd-toolbar*
-    </font>
-    <font color='#0000ff'>
-       = ((MPD-BUTTONS 1) (MPD-INFO 60)) <br>
-    </font>
-    
-            MPD toolbar modules <br>
-
-    <font color='#ff0000'>
-          *toolbar-expose-mode-button-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            Expose-mode button <br>
-
-    <font color='#ff0000'>
-          *toolbar-system-info-urgent-color*
-    </font>
-    <font color='#0000ff'>
-       = "Red" <br>
-    </font>
-    
-            System information colors (CPU+Mem+Battery) <br>
-
-    <font color='#ff0000'>
-          *toolbar-system-info-alert-color*
-    </font>
-    <font color='#0000ff'>
-       = "Magenta" <br>
-    </font>
-    
-            System information colors (CPU+Mem+Battery) <br>
-
-    <font color='#ff0000'>
-          *toolbar-system-info-low-color*
-    </font>
-    <font color='#0000ff'>
-       = "Yellow" <br>
-    </font>
-    
-            System information colors (CPU+Mem+Battery) <br>
-
-    <font color='#ff0000'>
-          *toolbar-system-info-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            System information colors (CPU+Mem+Battery) <br>
-
-    <font color='#ff0000'>
-          *toolbar-mem-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            Memory color <br>
-
-    <font color='#ff0000'>
-          *toolbar-cpu-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            CPU color <br>
-
-    <font color='#ff0000'>
-          *toolbar-clfswm-menu-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            CLFSWM menu color <br>
-
-    <font color='#ff0000'>
-          *toolbar-clock-action*
-    </font>
-    <font color='#0000ff'>
-       = "xclock -analog" <br>
-    </font>
-    
-            Toolbar clickable clock module action on click <br>
-
-    <font color='#ff0000'>
-          *toolbar-clickable-clock-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            Clickable clock color <br>
-
-    <font color='#ff0000'>
-          *toolbar-clickable-label-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            Clickable label color <br>
-
-    <font color='#ff0000'>
-          *toolbar-label-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            Label color <br>
-
-    <font color='#ff0000'>
-          *toolbar-clock-color*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            Clock color <br>
-
-    <font color='#ff0000'>
-          *toolbar-sensibility*
-    </font>
-    <font color='#0000ff'>
-       = 3 <br>
-    </font>
-    
-            Toolbar sensibility in pixels <br>
-
-    <font color='#ff0000'>
-          *toolbar-default-autohide*
-    </font>
-    <font color='#0000ff'>
-       = NIL <br>
-    </font>
-    
-            Toolbar default autohide value <br>
-
-    <font color='#ff0000'>
-          *toolbar-default-refresh-delay*
-    </font>
-    <font color='#0000ff'>
-       = 30 <br>
-    </font>
-    
-            Toolbar default refresh delay <br>
-
-    <font color='#ff0000'>
-          *toolbar-default-thickness*
-    </font>
-    <font color='#0000ff'>
-       = 20 <br>
-    </font>
-    
-            Toolbar default thickness <br>
-
-    <font color='#ff0000'>
-          *toolbar-window-transparency*
-    </font>
-    <font color='#0000ff'>
-       = 0.8 <br>
-    </font>
-    
-            Toolbar window background transparency <br>
-
-    <font color='#ff0000'>
-          *toolbar-default-border-size*
-    </font>
-    <font color='#0000ff'>
-       = 0 <br>
-    </font>
-    
-            Toolbar Window border size <br>
-
-    <font color='#ff0000'>
-          *toolbar-window-border*
-    </font>
-    <font color='#0000ff'>
-       = "red" <br>
-    </font>
-    
-            Toolbar Window border color <br>
-
-    <font color='#ff0000'>
-          *toolbar-window-foreground*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            Toolbar Window foreground color <br>
-
-    <font color='#ff0000'>
-          *toolbar-window-background*
-    </font>
-    <font color='#0000ff'>
-       = "black" <br>
-    </font>
-    
-            Toolbar Window background color <br>
-
-    <font color='#ff0000'>
-          *toolbar-window-font-string*
-    </font>
-    <font color='#0000ff'>
-       = "fixed" <br>
-    </font>
-    
-            Toolbar window font string <br>
-
-    <font color='#ff0000'>
-          *default-toolbar*
-    </font>
-    <font color='#0000ff'>
-       = ((CLFSWM-MENU 1) (EXPOSE-MODE-BUTTON 10) (SYSTEM-USAGE 90) (CLICKABLE-CLOCK 99)) <br>
-    </font>
-    
-            Default toolbar modules <br>
-
-    <p>
-      <a name='volume-mode' href='#top'>
-        <= Volume Mode Group => 
-      </a>
-    </p>
-    <font color='#ff0000'>
-          *volume-external-mixer-cmd*
-    </font>
-    <font color='#0000ff'>
-       = "/usr/bin/gnome-alsamixer" <br>
-    </font>
-    
-            Command to start an external mixer program <br>
-
-    <font color='#ff0000'>
-          *volume-text-limit*
-    </font>
-    <font color='#0000ff'>
-       = 30 <br>
-    </font>
-    
-            Maximum text limit in the volume window <br>
-
-    <font color='#ff0000'>
-          *volume-height*
-    </font>
-    <font color='#0000ff'>
-       = 15 <br>
-    </font>
-    
-            Volume mode window height <br>
-
-    <font color='#ff0000'>
-          *volume-width*
-    </font>
-    <font color='#0000ff'>
-       = 400 <br>
-    </font>
-    
-            Volume mode window width <br>
-
-    <font color='#ff0000'>
-          *volume-border-size*
-    </font>
-    <font color='#0000ff'>
-       = 1 <br>
-    </font>
-    
-            Volume window border size <br>
-
-    <font color='#ff0000'>
-          *volume-border*
-    </font>
-    <font color='#0000ff'>
-       = "red" <br>
-    </font>
-    
-            Volume window border color <br>
-
-    <font color='#ff0000'>
-          *volume-foreground*
-    </font>
-    <font color='#0000ff'>
-       = "green" <br>
-    </font>
-    
-            Volume window foreground color <br>
-
-    <font color='#ff0000'>
-          *volume-background*
-    </font>
-    <font color='#0000ff'>
-       = "black" <br>
-    </font>
-    
-            Volume window background color <br>
-
-    <font color='#ff0000'>
-          *volume-font-string*
-    </font>
-    <font color='#0000ff'>
-       = "fixed" <br>
-    </font>
-    
-            Volume window font string <br>
-
-    <p>
-      <a name='wallpaper' href='#top'>
-        <= Wallpaper Group => 
-      </a>
-    </p>
-    <font color='#ff0000'>
-          *wallpaper-command*
-    </font>
-    <font color='#0000ff'>
-       = "Esetroot -scale" <br>
-    </font>
-    
-            Command to install the wallpaper <br>
-
-    <p>
       <small>
         
 This documentation was produced with the CLFSWM auto-doc functions. To reproduce it, use the produce-conf-var-doc-html-in-file or
diff --git a/doc/variables.txt b/doc/variables.txt
index 09cf97e..b7fd067 100644
--- a/doc/variables.txt
+++ b/doc/variables.txt
@@ -55,8 +55,8 @@ The command to display the virtual keybaord
     Actions on corners in the second mode with the left mouse button
   *CORNER-MAIN-MODE-RIGHT-BUTTON* = 
 ((:TOP-LEFT PRESENT-CLFSWM-TERMINAL) (:TOP-RIGHT ASK-CLOSE/KILL-CURRENT-WINDOW) (:BOTTOM-RIGHT EXPOSE-ALL-WINDOWS-MODE)
- (:BOTTOM-LEFT START-FILE-MANAGER))
-    Config(Corner group): Actions on corners in the main mode with the right mouse button
+ (:BOTTOM-LEFT NIL))
+    Actions on corners in the main mode with the right mouse button
   *CORNER-MAIN-MODE-MIDDLE-BUTTON* = ((:TOP-LEFT HELP-ON-CLFSWM) (:TOP-RIGHT ASK-CLOSE/KILL-CURRENT-WINDOW) (:BOTTOM-RIGHT NIL) (:BOTTOM-LEFT NIL))
     Actions on corners in the main mode with the middle mouse button
   *CORNER-MAIN-MODE-LEFT-BUTTON* = ((:TOP-LEFT OPEN-MENU) (:TOP-RIGHT PRESENT-VIRTUAL-KEYBOARD) (:BOTTOM-RIGHT EXPOSE-WINDOWS-MODE) (:BOTTOM-LEFT NIL))
@@ -119,11 +119,11 @@ The command to display the virtual keybaord
     Query hook. Hook called on each key press event in query loop
   *DEFAULT-NW-HOOK* = DEFAULT-FRAME-NW-HOOK
     Default action to do on newly created windows
-  *CLOSE-HOOK* = (CLOSE-NOTIFY-WINDOW CLOSE-CLFSWM-TERMINAL CLOSE-VIRTUAL-KEYBOARD CLOSE-ALL-TOOLBARS)
+  *CLOSE-HOOK* = (CLOSE-NOTIFY-WINDOW CLOSE-CLFSWM-TERMINAL CLOSE-VIRTUAL-KEYBOARD)
     Close hook. This hook is run just before closing the display
-  *INIT-HOOK* = (DEFAULT-INIT-HOOK DISPLAY-HELLO-WINDOW OPEN-ALL-TOOLBARS MY-INIT-HOOK MY-WALLPAPER)
+  *INIT-HOOK* = (DEFAULT-INIT-HOOK DISPLAY-HELLO-WINDOW)
     Init hook. This hook is run just after the first root frame is created
-  *ROOT-SIZE-CHANGE* = (MY-WALLPAPER)
+  *ROOT-SIZE-CHANGE-HOOK* = NIL
     Hook executed when the root size has changed for example when adding/removing a monitor
   *MAIN-ENTRANCE-HOOK* = NIL
     
@@ -134,8 +134,7 @@ loading configuration file and before opening the display.
   *BINDING-HOOK* = 
 (INIT-*QUERY-KEYS* SET-DEFAULT-QUERY-KEYS SET-DEFAULT-CIRCULATE-KEYS INIT-*INFO-KEYS* INIT-*INFO-MOUSE*
  SET-DEFAULT-INFO-KEYS SET-DEFAULT-INFO-MOUSE INIT-*MAIN-KEYS* INIT-*MAIN-MOUSE* SET-DEFAULT-MAIN-KEYS
- SET-DEFAULT-MAIN-MOUSE INIT-*SECOND-KEYS* INIT-*SECOND-MOUSE* SET-DEFAULT-SECOND-KEYS SET-DEFAULT-SECOND-MOUSE
- MPD-BINDING FR-BINDING REBOOT-HALT-BINDING INIT-*VOLUME-KEYS* SET-DEFAULT-VOLUME-KEYS AMIXER-VOLUME-BIND LOCAL-BINDING)
+ SET-DEFAULT-MAIN-MOUSE INIT-*SECOND-KEYS* INIT-*SECOND-MOUSE* SET-DEFAULT-SECOND-KEYS SET-DEFAULT-SECOND-MOUSE)
     Hook executed when keys/buttons are bounds
 
 
@@ -244,7 +243,7 @@ Example: :mod-2 for num_lock, :lock for Caps_lock...
     Default mouse focus policy. One of :click, :sloppy, :sloppy-strict or :sloppy-select.
   *DEFAULT-MANAGED-TYPE* = (:NORMAL)
     Default managed window types
-  *DEFAULT-FRAME-DATA* = ((:TILE-SIZE 0.8) (:TILE-SPACE-SIZE 0.1) (:MAIN-LAYOUT-WINDOWS NIL) (:FAST-LAYOUT (TILE-SPACE-LAYOUT NO-LAYOUT)))
+  *DEFAULT-FRAME-DATA* = ((:TILE-SIZE 0.8) (:TILE-SPACE-SIZE 0.1) (:FAST-LAYOUT (TILE-LEFT-LAYOUT TILE-LAYOUT)) (:MAIN-LAYOUT-WINDOWS NIL))
     Default slots set in frame date
   *DEFAULT-FONT-STRING* = "fixed"
     The default font used in clfswm
@@ -283,10 +282,6 @@ It is particulary useful with CLISP/MIT-CLX.
 
 <= Placement Group =>
 
-  *VOLUME-MODE-PLACEMENT* = BOTTOM-MIDDLE-ROOT-PLACEMENT
-    Volume mode window placement
-  *TOOLBAR-WINDOW-PLACEMENT* = TOP-LEFT-PLACEMENT
-    Toolbar window placement
   *UNMANAGED-WINDOW-PLACEMENT* = MIDDLE-MIDDLE-ROOT-PLACEMENT
     Unmanager window placement
   *ASK-CLOSE/KILL-PLACEMENT* = TOP-RIGHT-ROOT-PLACEMENT
@@ -305,22 +300,10 @@ It is particulary useful with CLISP/MIT-CLX.
     Info mode window placement
   *SECOND-MODE-PLACEMENT* = TOP-MIDDLE-ROOT-PLACEMENT
     Second mode window placement
-  *BANISH-POINTER-PLACEMENT* = MIDDLE-RIGHT-ROOT-PLACEMENT
+  *BANISH-POINTER-PLACEMENT* = BOTTOM-RIGHT-ROOT-PLACEMENT
     Pointer banishment placement
 
 
-<= Power Management Group =>
-
-  *POWER-HALT-CMD* = "sudo /sbin/halt"
-    Halt command
-  *POWER-REBOOT-CMD* = "sudo /sbin/reboot"
-    Reboot command
-  *POWER-SUSPEND-TO-DISK-CMD* = "sudo pm-hibernate"
-    Suspend to disk command
-  *POWER-SUSPEND-TO-RAM-CMD* = "sudo pm-suspend"
-    Suspend to ram command
-
-
 <= Query String Group =>
 
   *QUERY-MIN-COMPLET-CHAR* = 2
@@ -381,96 +364,6 @@ on the root window in the main mode with the mouse
   *SM-BORDER-COLOR* = "Green"
     Second mode window border color
 
-
-<= Toolbar Group =>
-
-  *TOOLBAR-VOLUME-MODE-BUTTON-COLOR* = "green"
-    Volume mode color
-  *TOOLBAR-MPD-BUTTONS-COLOR* = "green"
-    MPD - Music Player Daemon buttons color
-  *TOOLBAR-MPD-INFO-COLOR* = "green"
-    MPD - Music Player Daemon information color
-  *MPD-TOOLBAR-CLIENT* = "gmpc"
-    MPD client
-  *MPD-TOOLBAR* = ((MPD-BUTTONS 1) (MPD-INFO 60))
-    MPD toolbar modules
-  *TOOLBAR-EXPOSE-MODE-BUTTON-COLOR* = "green"
-    Expose-mode button
-  *TOOLBAR-SYSTEM-INFO-URGENT-COLOR* = "Red"
-    System information colors (CPU+Mem+Battery)
-  *TOOLBAR-SYSTEM-INFO-ALERT-COLOR* = "Magenta"
-    System information colors (CPU+Mem+Battery)
-  *TOOLBAR-SYSTEM-INFO-LOW-COLOR* = "Yellow"
-    System information colors (CPU+Mem+Battery)
-  *TOOLBAR-SYSTEM-INFO-COLOR* = "green"
-    System information colors (CPU+Mem+Battery)
-  *TOOLBAR-MEM-COLOR* = "green"
-    Memory color
-  *TOOLBAR-CPU-COLOR* = "green"
-    CPU color
-  *TOOLBAR-CLFSWM-MENU-COLOR* = "green"
-    CLFSWM menu color
-  *TOOLBAR-CLOCK-ACTION* = "xclock -analog"
-    Toolbar clickable clock module action on click
-  *TOOLBAR-CLICKABLE-CLOCK-COLOR* = "green"
-    Clickable clock color
-  *TOOLBAR-CLICKABLE-LABEL-COLOR* = "green"
-    Clickable label color
-  *TOOLBAR-LABEL-COLOR* = "green"
-    Label color
-  *TOOLBAR-CLOCK-COLOR* = "green"
-    Clock color
-  *TOOLBAR-SENSIBILITY* = 3
-    Toolbar sensibility in pixels
-  *TOOLBAR-DEFAULT-AUTOHIDE* = NIL
-    Toolbar default autohide value
-  *TOOLBAR-DEFAULT-REFRESH-DELAY* = 30
-    Toolbar default refresh delay
-  *TOOLBAR-DEFAULT-THICKNESS* = 20
-    Toolbar default thickness
-  *TOOLBAR-WINDOW-TRANSPARENCY* = 0.8
-    Toolbar window background transparency
-  *TOOLBAR-DEFAULT-BORDER-SIZE* = 0
-    Toolbar Window border size
-  *TOOLBAR-WINDOW-BORDER* = "red"
-    Toolbar Window border color
-  *TOOLBAR-WINDOW-FOREGROUND* = "green"
-    Toolbar Window foreground color
-  *TOOLBAR-WINDOW-BACKGROUND* = "black"
-    Toolbar Window background color
-  *TOOLBAR-WINDOW-FONT-STRING* = "fixed"
-    Toolbar window font string
-  *DEFAULT-TOOLBAR* = ((CLFSWM-MENU 1) (EXPOSE-MODE-BUTTON 10) (SYSTEM-USAGE 90) (CLICKABLE-CLOCK 99))
-    Default toolbar modules
-
-
-<= Volume Mode Group =>
-
-  *VOLUME-EXTERNAL-MIXER-CMD* = "/usr/bin/gnome-alsamixer"
-    Command to start an external mixer program
-  *VOLUME-TEXT-LIMIT* = 30
-    Maximum text limit in the volume window
-  *VOLUME-HEIGHT* = 15
-    Volume mode window height
-  *VOLUME-WIDTH* = 400
-    Volume mode window width
-  *VOLUME-BORDER-SIZE* = 1
-    Volume window border size
-  *VOLUME-BORDER* = "red"
-    Volume window border color
-  *VOLUME-FOREGROUND* = "green"
-    Volume window foreground color
-  *VOLUME-BACKGROUND* = "black"
-    Volume window background color
-  *VOLUME-FONT-STRING* = "fixed"
-    Volume window font string
-
-
-<= Wallpaper Group =>
-
-  *WALLPAPER-COMMAND* = "Esetroot -scale"
-    Command to install the wallpaper
-
  Those variables can be changed in clfswm.
 Maybe you'll need to restart clfswm to take care of new values
 
diff --git a/load.lisp b/load.lisp
index ce9fbfa..fb0356c 100644
--- a/load.lisp
+++ b/load.lisp
@@ -42,11 +42,15 @@
 ;;;------------------
 (defparameter *interactive* t)
 
+(defparameter *build-original-doc* t
+  "Set to t to use original configuration or to nil to use your own configuration
+from $XDG_CONFIG_HOME/clfswm/clfswmrc")
+
+
 ;;; Comment or uncomment the lines above to fit your needs.
 (pushnew :clfswm-compile *features*)
 ;;(pushnew :clfswm-run *features*)
 (pushnew :clfswm-build-image *features*)
-;;(pushnew :clfswm-install *features*)
 ;;(pushnew :clfswm-build-doc *features*)
 
 (defparameter *binary-name* "clfswm")
@@ -141,11 +145,11 @@
 #+(or :clfswm-run :clfswm-build-doc :clfswm-build-image)
 (in-package :clfswm)
 
-#+:clfswm-run
+#+(or :clfswm-run :clfswm-build-doc)
 (progn
   (cl-user::load-info "Running CLFSWM")
-  (ignore-errors
-    (main :read-conf-file-p t)))
+;;  (ignore-errors
+    (main :read-conf-file-p (not cl-user::*build-original-doc*)));)
 
 
 ;;;-------------------------

-----------------------------------------------------------------------

Summary of changes:
 contrib/blank-window-mode.lisp |  256 ++++++++++++++++++
 doc/corner.html                |    2 +-
 doc/corner.txt                 |    2 +-
 doc/keys.html                  |  420 +++---------------------------
 doc/keys.txt                   |   76 ++----
 doc/menu.html                  |  566 ++++++++++++----------------------------
 doc/menu.txt                   |  310 ++++++++--------------
 doc/variables.html             |  466 +--------------------------------
 doc/variables.txt              |  123 +--------
 load.lisp                      |   12 +-
 10 files changed, 617 insertions(+), 1616 deletions(-)
 create mode 100644 contrib/blank-window-mode.lisp


hooks/post-receive
-- 
CLFSWM - A(nother) Common Lisp FullScreen Window Manager




More information about the clfswm-cvs mailing list