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

[Philippe Brochard]

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  fb272618b50bfc23423ff277e9d16e4d0d17f85a (commit)
      from  e4e26d1ac6055f1c14c81c674310716146ce07c5 (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 fb272618b50bfc23423ff277e9d16e4d0d17f85a
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Fri Aug 24 23:07:21 2012 +0200

    contrib/mpd.lisp: Add a small parameter for toolbar modules useful with vertical toolbars.

diff --git a/ChangeLog b/ChangeLog
index 73774cc..00fe7d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* contrib/mpd.lisp: New toolbar modules (available only if
 	toolbar.lisp is loaded).
+	Add a small parameter for toolbar modules useful with vertical
+	toolbars.
 
 2012-08-21  Philippe Brochard  <pbrochard at common-lisp.net>
 
diff --git a/contrib/mpd.lisp b/contrib/mpd.lisp
index 008324d..52cd03a 100644
--- a/contrib/mpd.lisp
+++ b/contrib/mpd.lisp
@@ -137,29 +137,35 @@
   (define-toolbar-color mpd-info "MPD - Music Player Daemon information color")
   (define-toolbar-color mpd-buttons "MPD - Music Player Daemon buttons color")
 
-  (define-toolbar-module (mpd-info)
-    "MPD (Music Player Daemon) informations"
+  (define-toolbar-module (mpd-info small)
+    "(small) - MPD (Music Player Daemon) informations"
     (let* ((lines (do-shell "mpc" nil t))
            (mpd-line (loop for line = (read-line lines nil nil)
                         while line
                         collect line)))
       (if (>= (length mpd-line) 3)
-          (toolbar-module-text toolbar module (tb-color mpd-info)
-                               "~A - ~A"
-                               (ensure-printable (first mpd-line))
-                               (ensure-printable (second mpd-line)))
+          (if small
+              (toolbar-module-text toolbar module (tb-color mpd-info)
+                               "~A"
+                               (ensure-printable (first mpd-line)))
+              (toolbar-module-text toolbar module (tb-color mpd-info)
+                                   "~A - ~A"
+                                   (ensure-printable (first mpd-line))
+                                   (ensure-printable (second mpd-line))))
           (toolbar-module-text toolbar module (tb-color mpd-info)
                                "MPD - Not playing"))))
 
-  (define-toolbar-module (mpd-buttons)
-    "MPD (Music Player Daemon) buttons"
+  (define-toolbar-module (mpd-buttons small)
+    "(small) - MPD (Music Player Daemon) buttons"
     (with-set-toolbar-module-rectangle (module)
       (toolbar-module-text toolbar module (tb-color mpd-buttons)
-                           "P N T < > C")))
+                           (if small
+                               "PNT<>C"
+                               "P N T < > C"))))
 
-  (define-toolbar-module-click (mpd-buttons)
+  (define-toolbar-module-click (mpd-buttons small)
     "P=Previous, N=Next, T=Toogle, <=seek-5% >=seek+5% C=start MPD client"
-    (declare (ignore state))
+    (declare (ignore state small))
     (when (= code 1)
       (let ((pos (toolbar-module-subdiv toolbar module root-x root-y 6)))
         (case pos

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

Summary of changes:
 ChangeLog        |    2 ++
 contrib/mpd.lisp |   28 +++++++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)


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