[clfswm-cvs] r159 - in clfswm: . doc src
pbrochard at common-lisp.net
pbrochard at common-lisp.net
Wed Sep 3 20:10:00 UTC 2008
Author: pbrochard
Date: Wed Sep 3 16:09:59 2008
New Revision: 159
Modified:
clfswm/ChangeLog
clfswm/doc/keys.html
clfswm/doc/keys.txt
clfswm/doc/menu.html
clfswm/doc/menu.txt
clfswm/src/clfswm-util.lisp
clfswm/src/menu-def.lisp
clfswm/src/package.lisp
Log:
Reset-clfswm: new function
Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog (original)
+++ clfswm/ChangeLog Wed Sep 3 16:09:59 2008
@@ -1,3 +1,7 @@
+2008-09-03 Philippe Brochard <pbrochard at common-lisp.net>
+
+ * src/clfswm-util.lisp (reset-clfswm): New function.
+
2008-09-02 Philippe Brochard <pbrochard at common-lisp.net>
* src/clfswm-menu.lisp (init-menu): New function.
Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html (original)
+++ clfswm/doc/keys.html Wed Sep 3 16:09:59 2008
@@ -241,6 +241,17 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
+ Mod-1
+ </td>
+ <td align="center" nowrap>
+ B
+ </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>
@@ -285,10 +296,10 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Control
+ Mod-1
</td>
<td align="center" nowrap>
- Less
+ T
</td>
<td style="color:#0000ff" nowrap>
Switch to editing mode
@@ -296,13 +307,13 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Mod-1
+ Control
</td>
<td align="center" nowrap>
- Agrave
+ Less
</td>
<td style="color:#0000ff" nowrap>
- Bind or jump to a slot
+ Switch to editing mode
</td>
</tr>
<tr>
@@ -310,7 +321,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Ccedilla
+ |1|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -321,7 +332,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Underscore
+ |2|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -332,7 +343,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Egrave
+ |3|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -343,7 +354,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Minus
+ |4|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -354,7 +365,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Parenleft
+ |5|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -365,7 +376,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quoteright
+ |6|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -376,7 +387,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quotedbl
+ |7|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -387,7 +398,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Eacute
+ |8|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -398,7 +409,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Ampersand
+ |9|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -406,13 +417,13 @@
</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
</td>
</tr>
</table>
@@ -1140,7 +1151,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Agrave
+ |1|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -1151,7 +1162,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Ccedilla
+ |2|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -1162,7 +1173,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Underscore
+ |3|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -1173,7 +1184,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Egrave
+ |4|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -1184,7 +1195,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Minus
+ |5|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -1195,7 +1206,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Parenleft
+ |6|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -1206,7 +1217,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quoteright
+ |7|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -1217,7 +1228,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Quotedbl
+ |8|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -1228,7 +1239,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Eacute
+ |9|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
@@ -1239,7 +1250,7 @@
Mod-1
</td>
<td align="center" nowrap>
- Ampersand
+ |0|
</td>
<td style="color:#0000ff" nowrap>
Bind or jump to a slot
Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt (original)
+++ clfswm/doc/keys.txt Wed Sep 3 16:09:59 2008
@@ -25,22 +25,23 @@
Mod-1 Menu Show all frames info windows until a key is release
Shift Menu Show all frames info windows
Control Menu Show/Hide the root frame
+ Mod-1 B Move the pointer to the lower right corner of the screen
Control Shift Escape Close focus window: Delete the focus window in all frames and workspaces
Mod-1 Control Shift Escape Kill focus window: Destroy the focus window in all frames and workspaces
Control Escape Remove the focus window in the current frame
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 Agrave Bind or jump to a slot
- Mod-1 Ccedilla Bind or jump to a slot
- Mod-1 Underscore Bind or jump to a slot
- Mod-1 Egrave Bind or jump to a slot
- Mod-1 Minus Bind or jump to a slot
- Mod-1 Parenleft Bind or jump to a slot
- Mod-1 Quoteright Bind or jump to a slot
- Mod-1 Quotedbl Bind or jump to a slot
- Mod-1 Eacute Bind or jump to a slot
- Mod-1 Ampersand Bind or jump to a slot
- Twosuperior Move the pointer to the lower right corner of the screen
+ 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
Mouse buttons actions in main mode:
@@ -115,16 +116,16 @@
H start an xclock
Shift Menu Show all frames info windows
Control Menu Show/Hide the root frame
- Mod-1 Agrave Bind or jump to a slot
- Mod-1 Ccedilla Bind or jump to a slot
- Mod-1 Underscore Bind or jump to a slot
- Mod-1 Egrave Bind or jump to a slot
- Mod-1 Minus Bind or jump to a slot
- Mod-1 Parenleft Bind or jump to a slot
- Mod-1 Quoteright Bind or jump to a slot
- Mod-1 Quotedbl Bind or jump to a slot
- Mod-1 Eacute Bind or jump to a slot
- Mod-1 Ampersand Bind or jump to a slot
+ 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
Mouse buttons actions in second mode:
Modified: clfswm/doc/menu.html
==============================================================================
--- clfswm/doc/menu.html (original)
+++ clfswm/doc/menu.html Wed Sep 3 16:09:59 2008
@@ -501,7 +501,10 @@
<a name="CLFSWM-MENU"></a><a href="#MAIN">Clfswm-Menu</a>
</h3>
<p>
- r: Reload clfswm
+ r: Reset clfswm
+ </p>
+ <p>
+ l: Reload clfswm
</p>
<p>
x: Exit clfswm
Modified: clfswm/doc/menu.txt
==============================================================================
--- clfswm/doc/menu.txt (original)
+++ clfswm/doc/menu.txt Wed Sep 3 16:09:59 2008
@@ -179,7 +179,8 @@
exclam: Run a program from the query input
Clfswm-Menu
-r: Reload clfswm
+r: Reset clfswm
+l: Reload clfswm
x: Exit clfswm
Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp (original)
+++ clfswm/src/clfswm-util.lisp Wed Sep 3 16:09:59 2008
@@ -38,12 +38,16 @@
"Exit clfswm"
(throw 'exit-clfswm nil))
+(defun reset-clfswm ()
+ "Reset clfswm"
+ (throw 'exit-main-loop nil))
+
(defun reload-clfswm ()
"Reload clfswm"
(format t "~&-*- Reloading CLFSWM -*-~%")
(asdf:oos 'asdf:load-op :clfswm)
- (throw 'exit-main-loop nil))
+ (reset-clfswm))
Modified: clfswm/src/menu-def.lisp
==============================================================================
--- clfswm/src/menu-def.lisp (original)
+++ clfswm/src/menu-def.lisp Wed Sep 3 16:09:59 2008
@@ -169,6 +169,7 @@
(add-menu-key 'utility-menu "exclam" 'run-program-from-query-string)
-(add-menu-key 'clfswm-menu "r" 'reload-clfswm)
+(add-menu-key 'clfswm-menu "r" 'reset-clfswm)
+(add-menu-key 'clfswm-menu "l" 'reload-clfswm)
(add-menu-key 'clfswm-menu "x" 'exit-clfswm)
Modified: clfswm/src/package.lisp
==============================================================================
--- clfswm/src/package.lisp (original)
+++ clfswm/src/package.lisp Wed Sep 3 16:09:59 2008
@@ -30,6 +30,7 @@
;;(:shadow :defun)
(:export :main
:reload-clfswm
+ :reset-clfswm
:exit-clfswm))
More information about the clfswm-cvs
mailing list