[clfswm-cvs] r256 - in clfswm: . doc src
Philippe Brochard
pbrochard at common-lisp.net
Sun Nov 8 14:05:20 UTC 2009
Author: pbrochard
Date: Sun Nov 8 09:05:18 2009
New Revision: 256
Log:
TODO update. Add a read-conf-file-p parameter to prevent reading the configuration file.
Modified:
clfswm/ChangeLog
clfswm/TODO
clfswm/doc/keys.html
clfswm/doc/keys.txt
clfswm/doc/menu.html
clfswm/doc/menu.txt
clfswm/load.lisp
clfswm/src/clfswm.lisp
Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog (original)
+++ clfswm/ChangeLog Sun Nov 8 09:05:18 2009
@@ -1,3 +1,10 @@
+2009-11-08 Philippe Brochard <pbrochard at common-lisp.net>
+
+ * src/clfswm.lisp (main): Add a read-conf-file-p parameter to
+ prevent reading the configuration file (this may be useful to
+ produce the original documentation without user modifications
+ with the rc configuration file).
+
2009-11-07 Philippe Brochard <pbrochard at common-lisp.net>
* src/bindings-second-mode.lisp (set-default-second-keys):
Modified: clfswm/TODO
==============================================================================
--- clfswm/TODO (original)
+++ clfswm/TODO Sun Nov 8 09:05:18 2009
@@ -9,8 +9,6 @@
- Mouse support in menu -> very urgent
-- Close/Kill/Unhide... menu bound to control+escape key
-
- Show config -> list and display documentation for all tweakable global variables. [Philippe]
TODO :
In ~/.clfswmrc:
Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html (original)
+++ clfswm/doc/keys.html Sun Nov 8 09:05:18 2009
@@ -263,46 +263,13 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Control Shift
- </td>
- <td align="center" nowrap>
- Escape
- </td>
- <td style="color:#0000ff" nowrap>
- Close focus window: Delete the focus window in all frames and workspaces
- </td>
- </tr>
- <tr>
- <td align="right" style="color:#ff0000" nowrap>
- Mod-1 Control Shift
- </td>
- <td align="center" nowrap>
- Escape
- </td>
- <td style="color:#0000ff" nowrap>
- Kill focus window: Destroy the focus window in all frames and workspaces
- </td>
- </tr>
- <tr>
- <td align="right" style="color:#ff0000" nowrap>
Control
</td>
<td align="center" nowrap>
Escape
</td>
<td style="color:#0000ff" nowrap>
- Remove the focus window in the current frame
- </td>
- </tr>
- <tr>
- <td align="right" style="color:#ff0000" nowrap>
- Shift
- </td>
- <td align="center" nowrap>
- Escape
- </td>
- <td style="color:#0000ff" nowrap>
- Unhide all hidden windows into the current child
+ Close or kill the current window (ask before doing anything)
</td>
</tr>
<tr>
@@ -437,17 +404,6 @@
Bind or jump to a slot (a frame or a window)
</td>
</tr>
- <tr>
- <td align="right" style="color:#ff0000" nowrap>
- Mod-1
- </td>
- <td align="center" nowrap>
- F2
- </td>
- <td style="color:#0000ff" nowrap>
- Open the Music Player Daemon (MPD) menu
- </td>
- </tr>
</table>
<h3>
<u>
@@ -1005,46 +961,13 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
- Control Shift
- </td>
- <td align="center" nowrap>
- Escape
- </td>
- <td style="color:#0000ff" nowrap>
- Close focus window: Delete the focus window in all frames and workspaces
- </td>
- </tr>
- <tr>
- <td align="right" style="color:#ff0000" nowrap>
- Mod-1 Control Shift
- </td>
- <td align="center" nowrap>
- Escape
- </td>
- <td style="color:#0000ff" nowrap>
- Kill focus window: Destroy the focus window in all frames and workspaces
- </td>
- </tr>
- <tr>
- <td align="right" style="color:#ff0000" nowrap>
Control
</td>
<td align="center" nowrap>
Escape
</td>
<td style="color:#0000ff" nowrap>
- Remove the focus window in the current frame
- </td>
- </tr>
- <tr>
- <td align="right" style="color:#ff0000" nowrap>
- Shift
- </td>
- <td align="center" nowrap>
- Escape
- </td>
- <td style="color:#0000ff" nowrap>
- Unhide all hidden windows into the current child
+ Close or kill the current window (ask before doing anything)
</td>
</tr>
<tr>
Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt (original)
+++ clfswm/doc/keys.txt Sun Nov 8 09:05:18 2009
@@ -27,10 +27,7 @@
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
+ Control Escape Close or kill the current window (ask before doing anything)
Mod-1 T Switch to editing mode
Control Less Switch to editing mode
Mod-1 1 Bind or jump to a slot (a frame or a window)
@@ -43,7 +40,6 @@
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)
- Mod-1 F2 Open the Music Player Daemon (MPD) menu
Mouse buttons actions in main mode:
@@ -103,10 +99,7 @@
O Open the next window in a new frame in the parent frame
Control O Open the next window in a new frame in the root frame
A Add a default frame in the current frame
- 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
+ Control Escape Close or kill the current window (ask before doing anything)
Control X Cut the current child to the selection
Mod-1 Control X Clear the current selection
Control C Copy the current child to the selection
Modified: clfswm/doc/menu.html
==============================================================================
--- clfswm/doc/menu.html (original)
+++ clfswm/doc/menu.html Sun Nov 8 09:05:18 2009
@@ -76,75 +76,834 @@
m: Show current processes sorted by memory usage
</p>
<p>
- x: <a href="#XMMS-INFO-MENU">< XMMS menu ></a>
+ v: Show the current CLFSWM version
+ </p>
+ <hr>
+ <h3>
+ <a name="STANDARD-MENU"></a><a href="#MAIN">Standard-Menu</a>
+ </h3>
+ <p>
+ a: <a href="#WINDOW MANAGERS">< WINDOW MANAGERS ></a>
+ </p>
+ <p>
+ b: <a href="#APPLICATIONS">< APPLICATIONS ></a>
+ </p>
+ <p>
+ c: <a href="#GAMES">< GAMES ></a>
+ </p>
+ <p>
+ d: <a href="#HELP">< HELP ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="WINDOW MANAGERS"></a><a href="#STANDARD-MENU">Window Managers</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="APPLICATIONS"></a><a href="#STANDARD-MENU">Applications</a>
+ </h3>
+ <p>
+ a: <a href="#SYSTEM">< SYSTEM ></a>
+ </p>
+ <p>
+ b: <a href="#OFFICE">< OFFICE ></a>
+ </p>
+ <p>
+ c: <a href="#NETWORK">< NETWORK ></a>
+ </p>
+ <p>
+ d: <a href="#VIDEO">< VIDEO ></a>
+ </p>
+ <p>
+ e: <a href="#SCIENCE">< SCIENCE ></a>
+ </p>
+ <p>
+ f: <a href="#SOUND">< SOUND ></a>
+ </p>
+ <p>
+ g: <a href="#TERMINAL EMULATORS">< TERMINAL EMULATORS ></a>
+ </p>
+ <p>
+ h: <a href="#VIEWERS">< VIEWERS ></a>
+ </p>
+ <p>
+ i: <a href="#FILE MANAGEMENT">< FILE MANAGEMENT ></a>
+ </p>
+ <p>
+ j: <a href="#TEXT">< TEXT ></a>
+ </p>
+ <p>
+ k: <a href="#GRAPHICS">< GRAPHICS ></a>
+ </p>
+ <p>
+ l: <a href="#EDITORS">< EDITORS ></a>
+ </p>
+ <p>
+ m: <a href="#DATA MANAGEMENT">< DATA MANAGEMENT ></a>
+ </p>
+ <p>
+ n: <a href="#PROGRAMMING">< PROGRAMMING ></a>
+ </p>
+ <p>
+ o: <a href="#TOOLS">< TOOLS ></a>
+ </p>
+ <p>
+ p: <a href="#SHELLS">< SHELLS ></a>
+ </p>
+ <p>
+ q: <a href="#ACCESSIBILITY">< ACCESSIBILITY ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="SYSTEM"></a><a href="#APPLICATIONS">System</a>
+ </h3>
+ <p>
+ a: <a href="#HARDWARE">< HARDWARE ></a>
+ </p>
+ <p>
+ b: <a href="#ADMINISTRATION">< ADMINISTRATION ></a>
+ </p>
+ <p>
+ c: <a href="#MONITORING">< MONITORING ></a>
+ </p>
+ <p>
+ d: <a href="#PACKAGE MANAGEMENT">< PACKAGE MANAGEMENT ></a>
+ </p>
+ <p>
+ e: <a href="#SECURITY">< SECURITY ></a>
+ </p>
+ <p>
+ f: <a href="#LANGUAGE ENVIRONMENT">< LANGUAGE ENVIRONMENT ></a>
+ </p>
+ <p>
+ g: X Window Snapshot
+ </p>
+ <p>
+ h: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="HARDWARE"></a><a href="#SYSTEM">Hardware</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="ADMINISTRATION"></a><a href="#SYSTEM">Administration</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <p>
+ g: X Window Snapshot
+ </p>
+ <p>
+ h: X Window Snapshot
+ </p>
+ <p>
+ i: X Window Snapshot
+ </p>
+ <p>
+ j: X Window Snapshot
+ </p>
+ <p>
+ k: X Window Snapshot
+ </p>
+ <p>
+ l: X Window Snapshot
+ </p>
+ <p>
+ m: X Window Snapshot
+ </p>
+ <p>
+ n: X Window Snapshot
+ </p>
+ <p>
+ o: X Window Snapshot
+ </p>
+ <p>
+ p: X Window Snapshot
+ </p>
+ <p>
+ q: X Window Snapshot
+ </p>
+ <p>
+ r: X Window Snapshot
+ </p>
+ <p>
+ s: X Window Snapshot
+ </p>
+ <p>
+ t: X Window Snapshot
+ </p>
+ <p>
+ u: X Window Snapshot
+ </p>
+ <p>
+ v: X Window Snapshot
+ </p>
+ <p>
+ w: X Window Snapshot
+ </p>
+ <p>
+ x: X Window Snapshot
+ </p>
+ <p>
+ y: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="MONITORING"></a><a href="#SYSTEM">Monitoring</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <p>
+ g: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="PACKAGE MANAGEMENT"></a><a href="#SYSTEM">Package Management</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="SECURITY"></a><a href="#SYSTEM">Security</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="LANGUAGE ENVIRONMENT"></a><a href="#SYSTEM">Language Environment</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <p>
+ g: X Window Snapshot
+ </p>
+ <p>
+ h: X Window Snapshot
+ </p>
+ <p>
+ i: X Window Snapshot
+ </p>
+ <p>
+ j: X Window Snapshot
+ </p>
+ <p>
+ k: X Window Snapshot
+ </p>
+ <p>
+ l: X Window Snapshot
+ </p>
+ <p>
+ m: X Window Snapshot
+ </p>
+ <p>
+ n: X Window Snapshot
+ </p>
+ <p>
+ o: X Window Snapshot
+ </p>
+ <p>
+ p: X Window Snapshot
+ </p>
+ <p>
+ q: X Window Snapshot
+ </p>
+ <p>
+ r: X Window Snapshot
+ </p>
+ <p>
+ s: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="OFFICE"></a><a href="#APPLICATIONS">Office</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="NETWORK"></a><a href="#APPLICATIONS">Network</a>
+ </h3>
+ <p>
+ a: <a href="#WEB BROWSING">< WEB BROWSING ></a>
+ </p>
+ <p>
+ b: <a href="#COMMUNICATION">< COMMUNICATION ></a>
+ </p>
+ <p>
+ c: <a href="#MONITORING">< MONITORING ></a>
+ </p>
+ <p>
+ d: <a href="#FILE TRANSFER">< FILE TRANSFER ></a>
+ </p>
+ <p>
+ e: <a href="#WEB NEWS">< WEB NEWS ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="WEB BROWSING"></a><a href="#NETWORK">Web Browsing</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="COMMUNICATION"></a><a href="#NETWORK">Communication</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <p>
+ g: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="MONITORING"></a><a href="#NETWORK">Monitoring</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="FILE TRANSFER"></a><a href="#NETWORK">File Transfer</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
</p>
<p>
- v: Show the current CLFSWM version
+ b: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="WEB NEWS"></a><a href="#NETWORK">Web News</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="VIDEO"></a><a href="#APPLICATIONS">Video</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="SCIENCE"></a><a href="#APPLICATIONS">Science</a>
+ </h3>
+ <p>
+ a: <a href="#MATHEMATICS">< MATHEMATICS ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="MATHEMATICS"></a><a href="#SCIENCE">Mathematics</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
</p>
<p>
- i: <a href="#INFO-ON-CD-MENU">< CD info menu ></a>
+ d: X Window Snapshot
</p>
<p>
- F2: <a href="#MPD-MENU">< Music Player Daemon (MPD) menu ></a>
+ e: X Window Snapshot
</p>
<hr>
<h3>
- <a name="XMMS-INFO-MENU"></a><a href="#HELP-MENU">Xmms-Info-Menu</a>
+ <a name="SOUND"></a><a href="#APPLICATIONS">Sound</a>
</h3>
<p>
- s: Show the current xmms status
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <p>
+ g: X Window Snapshot
+ </p>
+ <p>
+ h: X Window Snapshot
+ </p>
+ <p>
+ i: X Window Snapshot
+ </p>
+ <p>
+ j: X Window Snapshot
+ </p>
+ <p>
+ k: X Window Snapshot
+ </p>
+ <p>
+ l: X Window Snapshot
+ </p>
+ <p>
+ m: X Window Snapshot
+ </p>
+ <p>
+ n: X Window Snapshot
+ </p>
+ <p>
+ o: X Window Snapshot
</p>
<p>
- l: Show the current xmms playlist
+ p: X Window Snapshot
</p>
<hr>
<h3>
- <a name="INFO-ON-CD-MENU"></a><a href="#HELP-MENU">Info-On-Cd-Menu</a>
+ <a name="TERMINAL EMULATORS"></a><a href="#APPLICATIONS">Terminal Emulators</a>
</h3>
<p>
- i: Show the current CD track
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
</p>
<p>
- l: Show the current CD playlist
+ d: X Window Snapshot
</p>
<hr>
<h3>
- <a name="MPD-MENU"></a><a href="#HELP-MENU">Mpd-Menu</a>
+ <a name="VIEWERS"></a><a href="#APPLICATIONS">Viewers</a>
</h3>
<p>
- i: Show MPD informations
+ a: X Window Snapshot
</p>
<p>
- p: Play the previous song in the current playlist
+ b: X Window Snapshot
</p>
<p>
- n: Play the next song in the current playlist
+ c: X Window Snapshot
</p>
<p>
- t: Toggles Play/Pause, plays if stopped
+ d: X Window Snapshot
</p>
<p>
- y: Start playing
+ e: X Window Snapshot
</p>
<p>
- k: Stop the currently playing playlists
+ f: X Window Snapshot
</p>
<p>
- x: Seeks to +5%
+ g: X Window Snapshot
</p>
<p>
- w: Seeks to -5%
+ h: X Window Snapshot
</p>
<p>
- l: Show the current MPD playlist
+ i: X Window Snapshot
</p>
<p>
- s: Start sonata
+ j: X Window Snapshot
</p>
<hr>
<h3>
- <a name="STANDARD-MENU"></a><a href="#MAIN">Standard-Menu</a>
+ <a name="FILE MANAGEMENT"></a><a href="#APPLICATIONS">File Management</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="TEXT"></a><a href="#APPLICATIONS">Text</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="GRAPHICS"></a><a href="#APPLICATIONS">Graphics</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="EDITORS"></a><a href="#APPLICATIONS">Editors</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="DATA MANAGEMENT"></a><a href="#APPLICATIONS">Data Management</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="PROGRAMMING"></a><a href="#APPLICATIONS">Programming</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="TOOLS"></a><a href="#APPLICATIONS">Tools</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="SHELLS"></a><a href="#APPLICATIONS">Shells</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="ACCESSIBILITY"></a><a href="#APPLICATIONS">Accessibility</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="GAMES"></a><a href="#STANDARD-MENU">Games</a>
+ </h3>
+ <p>
+ a: <a href="#ACTION">< ACTION ></a>
+ </p>
+ <p>
+ b: <a href="#BOARD">< BOARD ></a>
+ </p>
+ <p>
+ c: <a href="#CARD">< CARD ></a>
+ </p>
+ <p>
+ d: <a href="#PUZZLES">< PUZZLES ></a>
+ </p>
+ <p>
+ e: <a href="#BLOCKS">< BLOCKS ></a>
+ </p>
+ <p>
+ f: <a href="#TOYS">< TOYS ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="ACTION"></a><a href="#GAMES">Action</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="BOARD"></a><a href="#GAMES">Board</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <p>
+ g: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="CARD"></a><a href="#GAMES">Card</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="PUZZLES"></a><a href="#GAMES">Puzzles</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="BLOCKS"></a><a href="#GAMES">Blocks</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="TOYS"></a><a href="#GAMES">Toys</a>
+ </h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
+ <p>
+ e: X Window Snapshot
+ </p>
+ <p>
+ f: X Window Snapshot
+ </p>
+ <hr>
+ <h3>
+ <a name="HELP"></a><a href="#STANDARD-MENU">Help</a>
</h3>
+ <p>
+ a: X Window Snapshot
+ </p>
+ <p>
+ b: X Window Snapshot
+ </p>
+ <p>
+ c: X Window Snapshot
+ </p>
+ <p>
+ d: X Window Snapshot
+ </p>
<hr>
<h3>
<a name="CHILD-MENU"></a><a href="#MAIN">Child-Menu</a>
@@ -272,6 +1031,12 @@
h: Tile child in its frame (horizontal)
</p>
<p>
+ c: One column layout
+ </p>
+ <p>
+ l: One line layout
+ </p>
+ <p>
s: Tile Space: tile child in its frame leaving spaces between them
</p>
<hr>
Modified: clfswm/doc/menu.txt
==============================================================================
--- clfswm/doc/menu.txt (original)
+++ clfswm/doc/menu.txt Sun Nov 8 09:05:18 2009
@@ -22,32 +22,309 @@
d: Show the current time and date
p: Show current processes sorted by CPU usage
m: Show current processes sorted by memory usage
-x: < XMMS menu >
v: Show the current CLFSWM version
-i: < CD info menu >
-F2: < Music Player Daemon (MPD) menu >
-
-Xmms-Info-Menu
-s: Show the current xmms status
-l: Show the current xmms playlist
-
-Info-On-Cd-Menu
-i: Show the current CD track
-l: Show the current CD playlist
-
-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
Standard-Menu
+a: < WINDOW MANAGERS >
+b: < APPLICATIONS >
+c: < GAMES >
+d: < HELP >
+
+Window Managers
+a: X Window Snapshot
+b: X Window Snapshot
+
+Applications
+a: < SYSTEM >
+b: < OFFICE >
+c: < NETWORK >
+d: < VIDEO >
+e: < SCIENCE >
+f: < SOUND >
+g: < TERMINAL EMULATORS >
+h: < VIEWERS >
+i: < FILE MANAGEMENT >
+j: < TEXT >
+k: < GRAPHICS >
+l: < EDITORS >
+m: < DATA MANAGEMENT >
+n: < PROGRAMMING >
+o: < TOOLS >
+p: < SHELLS >
+q: < ACCESSIBILITY >
+
+System
+a: < HARDWARE >
+b: < ADMINISTRATION >
+c: < MONITORING >
+d: < PACKAGE MANAGEMENT >
+e: < SECURITY >
+f: < LANGUAGE ENVIRONMENT >
+g: X Window Snapshot
+h: X Window Snapshot
+
+Hardware
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+
+Administration
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+g: X Window Snapshot
+h: X Window Snapshot
+i: X Window Snapshot
+j: X Window Snapshot
+k: X Window Snapshot
+l: X Window Snapshot
+m: X Window Snapshot
+n: X Window Snapshot
+o: X Window Snapshot
+p: X Window Snapshot
+q: X Window Snapshot
+r: X Window Snapshot
+s: X Window Snapshot
+t: X Window Snapshot
+u: X Window Snapshot
+v: X Window Snapshot
+w: X Window Snapshot
+x: X Window Snapshot
+y: X Window Snapshot
+
+Monitoring
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+g: X Window Snapshot
+
+Package Management
+a: X Window Snapshot
+b: X Window Snapshot
+
+Security
+a: X Window Snapshot
+
+Language Environment
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+g: X Window Snapshot
+h: X Window Snapshot
+i: X Window Snapshot
+j: X Window Snapshot
+k: X Window Snapshot
+l: X Window Snapshot
+m: X Window Snapshot
+n: X Window Snapshot
+o: X Window Snapshot
+p: X Window Snapshot
+q: X Window Snapshot
+r: X Window Snapshot
+s: X Window Snapshot
+
+Office
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+
+Network
+a: < WEB BROWSING >
+b: < COMMUNICATION >
+c: < MONITORING >
+d: < FILE TRANSFER >
+e: < WEB NEWS >
+
+Web Browsing
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+
+Communication
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+g: X Window Snapshot
+
+Monitoring
+a: X Window Snapshot
+
+File Transfer
+a: X Window Snapshot
+b: X Window Snapshot
+
+Web News
+a: X Window Snapshot
+
+Video
+a: X Window Snapshot
+b: X Window Snapshot
+
+Science
+a: < MATHEMATICS >
+
+Mathematics
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+
+Sound
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+g: X Window Snapshot
+h: X Window Snapshot
+i: X Window Snapshot
+j: X Window Snapshot
+k: X Window Snapshot
+l: X Window Snapshot
+m: X Window Snapshot
+n: X Window Snapshot
+o: X Window Snapshot
+p: X Window Snapshot
+
+Terminal Emulators
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+
+Viewers
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+g: X Window Snapshot
+h: X Window Snapshot
+i: X Window Snapshot
+j: X Window Snapshot
+
+File Management
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+
+Text
+a: X Window Snapshot
+b: X Window Snapshot
+
+Graphics
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+
+Editors
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+
+Data Management
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+
+Programming
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+
+Tools
+a: X Window Snapshot
+
+Shells
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+
+Accessibility
+a: X Window Snapshot
+
+Games
+a: < ACTION >
+b: < BOARD >
+c: < CARD >
+d: < PUZZLES >
+e: < BLOCKS >
+f: < TOYS >
+
+Action
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+
+Board
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+g: X Window Snapshot
+
+Card
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+
+Puzzles
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+
+Blocks
+a: X Window Snapshot
+b: X Window Snapshot
+
+Toys
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
+e: X Window Snapshot
+f: X Window Snapshot
+
+Help
+a: X Window Snapshot
+b: X Window Snapshot
+c: X Window Snapshot
+d: X Window Snapshot
Child-Menu
r: Rename the current child
@@ -94,6 +371,8 @@
Frame-Tile-Layout-Menu
v: Tile child in its frame (vertical)
h: Tile child in its frame (horizontal)
+c: One column layout
+l: One line layout
s: Tile Space: tile child in its frame leaving spaces between them
Frame-Tile-Dir-Layout-Menu
Modified: clfswm/load.lisp
==============================================================================
--- clfswm/load.lisp (original)
+++ clfswm/load.lisp Sun Nov 8 09:05:18 2009
@@ -54,4 +54,9 @@
(in-package :clfswm)
-(clfswm:main)
+(ignore-errors
+ (main :read-conf-file-p t))
+
+;;(produce-all-docs)
+
+
Modified: clfswm/src/clfswm.lisp
==============================================================================
--- clfswm/src/clfswm.lisp (original)
+++ clfswm/src/clfswm.lisp Sun Nov 8 09:05:18 2009
@@ -305,9 +305,11 @@
(defun main-unprotected (&key (display (or (getenv "DISPLAY") ":0")) protocol
(base-dir (directory-namestring (or *load-truename* "")))
+ (read-conf-file-p t)
error-msg)
(setf *contrib-dir* base-dir)
- (read-conf-file)
+ (when read-conf-file-p
+ (read-conf-file))
(handler-case
(open-display display protocol)
(xlib:access-error (c)
@@ -336,12 +338,14 @@
(defun main (&key (display (or (getenv "DISPLAY") ":0")) protocol
- (base-dir (directory-namestring (or *load-truename* ""))))
+ (base-dir (directory-namestring (or *load-truename* "")))
+ (read-conf-file-p t))
(let (error-msg)
(catch 'exit-clfswm
(loop
(handler-case
(main-unprotected :display display :protocol protocol :base-dir base-dir
+ :read-conf-file-p read-conf-file-p
:error-msg error-msg)
(error (c)
(let ((msg (format nil "CLFSWM Error: ~A." c)))
More information about the clfswm-cvs
mailing list