[clfswm-cvs] r242 - in clfswm: . doc src
Philippe Brochard
pbrochard at common-lisp.net
Fri Jun 19 19:41:51 UTC 2009
Author: pbrochard
Date: Fri Jun 19 15:41:51 2009
New Revision: 242
Log:
Minor documentation update
Modified:
clfswm/ChangeLog
clfswm/doc/keys.html
clfswm/doc/keys.txt
clfswm/src/clfswm-autodoc.lisp
clfswm/src/clfswm-util.lisp
Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog (original)
+++ clfswm/ChangeLog Fri Jun 19 15:41:51 2009
@@ -1,3 +1,8 @@
+2009-06-19 Philippe Brochard <pbrochard at common-lisp.net>
+
+ * src/clfswm-autodoc.lisp (produce-doc, produce-doc-html): Minor
+ number key cleanup.
+
2009-06-18 Philippe Brochard <pbrochard at common-lisp.net>
* src/config.lisp (get-fullscreen-size): One pixel adjustment
Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html (original)
+++ clfswm/doc/keys.html Fri Jun 19 15:41:51 2009
@@ -332,10 +332,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |1|
+ 1
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -343,10 +343,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |2|
+ 2
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -354,10 +354,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |3|
+ 3
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -365,10 +365,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |4|
+ 4
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -376,10 +376,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |5|
+ 5
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -387,10 +387,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |6|
+ 6
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -398,10 +398,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |7|
+ 7
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -409,10 +409,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |8|
+ 8
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -420,10 +420,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |9|
+ 9
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -431,10 +431,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |0|
+ 0
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
</table>
@@ -1173,10 +1173,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |1|
+ 1
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -1184,10 +1184,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |2|
+ 2
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -1195,10 +1195,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |3|
+ 3
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -1206,10 +1206,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |4|
+ 4
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -1217,10 +1217,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |5|
+ 5
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -1228,10 +1228,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |6|
+ 6
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -1239,10 +1239,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |7|
+ 7
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -1250,10 +1250,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |8|
+ 8
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -1261,10 +1261,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |9|
+ 9
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
<tr>
@@ -1272,10 +1272,10 @@
Mod-1
</td>
<td align="center" nowrap>
- |0|
+ 0
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Bind or jump to a slot (a frame or a window)
</td>
</tr>
</table>
@@ -1625,7 +1625,7 @@
</td>
<td align="center" nowrap>
- Clfswm motion
+ Motion
</td>
<td style="color:#0000ff" nowrap>
Grab text
Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt (original)
+++ clfswm/doc/keys.txt Fri Jun 19 15:41:51 2009
@@ -33,16 +33,16 @@
Shift Escape Unhide all hidden windows into the current child
Mod-1 T Switch to editing mode
Control Less Switch to editing mode
- Mod-1 |1| Bind or jump to a slot
- Mod-1 |2| Bind or jump to a slot
- Mod-1 |3| Bind or jump to a slot
- Mod-1 |4| Bind or jump to a slot
- Mod-1 |5| Bind or jump to a slot
- Mod-1 |6| Bind or jump to a slot
- Mod-1 |7| Bind or jump to a slot
- Mod-1 |8| Bind or jump to a slot
- Mod-1 |9| Bind or jump to a slot
- Mod-1 |0| Bind or jump to a slot
+ Mod-1 1 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 3 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 5 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 7 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 9 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)
Mouse buttons actions in main mode:
@@ -118,16 +118,16 @@
H start an xclock
Shift Menu Show all frames info windows
Control Menu Show/Hide the root frame
- Mod-1 |1| Bind or jump to a slot
- Mod-1 |2| Bind or jump to a slot
- Mod-1 |3| Bind or jump to a slot
- Mod-1 |4| Bind or jump to a slot
- Mod-1 |5| Bind or jump to a slot
- Mod-1 |6| Bind or jump to a slot
- Mod-1 |7| Bind or jump to a slot
- Mod-1 |8| Bind or jump to a slot
- Mod-1 |9| Bind or jump to a slot
- Mod-1 |0| Bind or jump to a slot
+ Mod-1 1 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 3 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 5 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 7 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 9 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)
Mouse buttons actions in second mode:
@@ -171,7 +171,7 @@
2 Leave the info mode
4 Move one line up
5 Move one line down
- Clfswm::motion Grab text
+ Motion Grab text
Modified: clfswm/src/clfswm-autodoc.lisp
==============================================================================
--- clfswm/src/clfswm-autodoc.lisp (original)
+++ clfswm/src/clfswm-autodoc.lisp Fri Jun 19 15:41:51 2009
@@ -26,6 +26,12 @@
(in-package :clfswm)
+(defun is-string-keysym (k)
+ (when (stringp k)
+ (or (parse-integer k :junk-allowed t)
+ (intern (string-upcase k)))))
+
+
(defun produce-doc-html (hash-table-key-list &optional (stream t))
"Produce an html doc from a hash-table key"
(labels ((clean-string (str)
@@ -48,9 +54,7 @@
,(clean-string (format nil "~{~@(~S ~)~}" (state->modifiers (second k)))))
("td align=\"center\" nowrap"
,(clean-string (format nil "~@(~S~)"
- (or (and (stringp (first k))
- (intern (string-upcase (first k))))
- (first k)))))
+ (or (is-string-keysym (first k)) (first k)))))
("td style=\"color:#0000FF\" nowrap" ,(documentation (or (first v) (third v)) 'function)))
acc)))
hk)
@@ -101,9 +105,7 @@
(when (consp k)
(format stream "~& ~20@<~{~@(~A~) ~}~> ~13@<~@(~A~)~> ~A~%"
(state->modifiers (second k))
- (remove #\# (remove #\\ (format nil "~S" (or (and (stringp (first k))
- (intern (string-upcase (first k))))
- (first k)))))
+ (remove #\# (remove #\\ (format nil "~S" (or (is-string-keysym (first k)) (first k)))))
(documentation (or (first v) (third v)) 'function))))
hk)
(format stream "~2&"))
@@ -117,7 +119,7 @@
or
CLFSWM> (produce-all-docs)~2%"))
-
+
(defun produce-doc-in-file (filename)
(format t "Producing text keys documentation in ~S " filename)
@@ -163,7 +165,7 @@
CLFSWM> (produce-all-docs)~2%")))
-
+
(defun produce-menu-doc-in-file (filename)
(format t "Producing text menus documentation in ~S " filename)
(with-open-file (stream filename :direction :output
@@ -216,7 +218,7 @@
or<br> CLFSWM> (produce-all-docs)"))))
0 stream))))
-
+
(defun produce-menu-doc-html-in-file (filename)
(format t "Producing html menus documentation in ~S " filename)
(with-open-file (stream filename :direction :output
@@ -249,7 +251,7 @@
or
CLFSWM> (produce-all-docs)~2%")))
-
+
(defun produce-corner-doc-in-file (filename)
(format t "Producing text corner documentation in ~S " filename)
(with-open-file (stream filename :direction :output
@@ -292,7 +294,7 @@
or<br> CLFSWM> (produce-all-docs)"))))
0 stream))))
-
+
(defun produce-corner-doc-html-in-file (filename)
(format t "Producing html corner documentation in ~S " filename)
(with-open-file (stream filename :direction :output
Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp (original)
+++ clfswm/src/clfswm-util.lisp Fri Jun 19 15:41:51 2009
@@ -695,7 +695,7 @@
(show-all-children *current-root*))))
(defun bind-or-jump (n)
- "Bind or jump to a slot"
+ "Bind or jump to a slot (a frame or a window)"
(setf current-slot (- n 1))
(let ((default-bind `("b" bind-on-slot
,(format nil "Bind slot ~A on child: ~A" n (child-fullname *current-child*)))))
More information about the clfswm-cvs
mailing list