[clfswm-cvs] r249 - in clfswm: . doc src
Philippe Brochard
pbrochard at common-lisp.net
Sun Jun 28 19:28:10 UTC 2009
Author: pbrochard
Date: Sun Jun 28 15:28:10 2009
New Revision: 249
Log:
set-no-layout-remember-size): New layout: Maximize windows in there frame - Leave frames to there actual size.
Modified:
clfswm/ChangeLog
clfswm/TODO
clfswm/doc/keys.html
clfswm/doc/keys.txt
clfswm/doc/menu.html
clfswm/doc/menu.txt
clfswm/src/clfswm-layout.lisp
Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog (original)
+++ clfswm/ChangeLog Sun Jun 28 15:28:10 2009
@@ -1,5 +1,9 @@
2009-06-28 Philippe Brochard <pbrochard at common-lisp.net>
+ * src/clfswm-layout.lisp (set-no-layout-remember-size): New layout:
+ Maximize windows in there frame - Leave frames to there actual
+ size.
+
* src/bindings-second-mode.lisp (set-default-second-keys): Bind
"o" on set-open-in-new-frame-in-parent-frame-nw-hook.
Modified: clfswm/TODO
==============================================================================
--- clfswm/TODO (original)
+++ clfswm/TODO Sun Jun 28 15:28:10 2009
@@ -7,6 +7,8 @@
===============
Should handle these soon.
+- Frame layout menu: No layout but frames 'learn' there position/size.
+
- New: Put CD player / xmms modules in contrib/ ...
- Mouse support in menu
Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html (original)
+++ clfswm/doc/keys.html Sun Jun 28 15:28:10 2009
@@ -437,6 +437,17 @@
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>
@@ -593,7 +604,7 @@
F1
</td>
<td style="color:#0000ff" nowrap>
- Open the help and info window for the second mode
+ Open the help and info window
</td>
</tr>
<tr>
@@ -967,7 +978,7 @@
O
</td>
<td style="color:#0000ff" nowrap>
- Open the next window in a new frame in the root frame
+ Open the next window in a new frame in the parent frame
</td>
</tr>
<tr>
@@ -978,7 +989,7 @@
O
</td>
<td style="color:#0000ff" nowrap>
- Open the next window in a new frame in the parent frame
+ Open the next window in a new frame in the root frame
</td>
</tr>
<tr>
Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt (original)
+++ clfswm/doc/keys.txt Sun Jun 28 15:28:10 2009
@@ -43,6 +43,7 @@
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:
@@ -65,7 +66,7 @@
Second mode keys:
----------------
- Mod-1 F1 Open the help and info window for the second mode
+ Mod-1 F1 Open the help and info window
M Open the main menu
Less Open the main menu
Control Less Open the main menu
@@ -99,8 +100,8 @@
Mod-1 Shift Home Switch and select the root frame
Menu Show all frames info windows until a key is release
Mod-1 B Move the pointer to the lower right corner of the screen
- O Open the next window in a new frame in the root frame
- Control O Open the next window in a new frame in the parent frame
+ 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
Modified: clfswm/doc/menu.html
==============================================================================
--- clfswm/doc/menu.html (original)
+++ clfswm/doc/menu.html Sun Jun 28 15:28:10 2009
@@ -18,6 +18,9 @@
<a name="MAIN"></a><a href="#Top">Main</a>
</h3>
<p>
+ F1: <a href="#HELP-MENU">< Help menu ></a>
+ </p>
+ <p>
d: <a href="#STANDARD-MENU">< Standard menu ></a>
</p>
<p>
@@ -46,6 +49,100 @@
</p>
<hr>
<h3>
+ <a name="HELP-MENU"></a><a href="#MAIN">Help-Menu</a>
+ </h3>
+ <p>
+ h: Show all key binding
+ </p>
+ <p>
+ b: Show the main mode binding
+ </p>
+ <p>
+ s: Show the second mode key binding
+ </p>
+ <p>
+ c: Help on clfswm corner
+ </p>
+ <p>
+ g: Show all configurable variables
+ </p>
+ <p>
+ d: Show the current time and date
+ </p>
+ <p>
+ p: Show current processes sorted by CPU usage
+ </p>
+ <p>
+ m: Show current processes sorted by memory usage
+ </p>
+ <p>
+ x: <a href="#XMMS-INFO-MENU">< XMMS menu ></a>
+ </p>
+ <p>
+ v: Show the current CLFSWM version
+ </p>
+ <p>
+ i: <a href="#INFO-ON-CD-MENU">< CD info menu ></a>
+ </p>
+ <p>
+ F2: <a href="#MPD-MENU">< Music Player Daemon (MPD) menu ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="XMMS-INFO-MENU"></a><a href="#HELP-MENU">Xmms-Info-Menu</a>
+ </h3>
+ <p>
+ s: Show the current xmms status
+ </p>
+ <p>
+ l: Show the current xmms playlist
+ </p>
+ <hr>
+ <h3>
+ <a name="INFO-ON-CD-MENU"></a><a href="#HELP-MENU">Info-On-Cd-Menu</a>
+ </h3>
+ <p>
+ i: Show the current CD track
+ </p>
+ <p>
+ l: Show the current CD playlist
+ </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>
+ <hr>
+ <h3>
<a name="STANDARD-MENU"></a><a href="#MAIN">Standard-Menu</a>
</h3>
<hr>
@@ -131,25 +228,28 @@
a: <a href="#FRAME-FAST-LAYOUT-MENU">< Frame fast layout menu ></a>
</p>
<p>
- b: No layout: Maximize windows in there frame - Leave frame to there size
+ b: No layout: Maximize windows in there frame - Leave frames to there original size
+ </p>
+ <p>
+ c: No layout: Maximize windows in there frame - Leave frames to there actual size
</p>
<p>
- c: Maximize layout: Maximize windows and frames in there parent frame
+ d: Maximize layout: Maximize windows and frames in there parent frame
</p>
<p>
- d: <a href="#FRAME-TILE-LAYOUT-MENU">< Frame tile layout menu ></a>
+ e: <a href="#FRAME-TILE-LAYOUT-MENU">< Frame tile layout menu ></a>
</p>
<p>
- e: <a href="#FRAME-TILE-DIR-LAYOUT-MENU">< Tile in one direction layout menu ></a>
+ f: <a href="#FRAME-TILE-DIR-LAYOUT-MENU">< Tile in one direction layout menu ></a>
</p>
<p>
- f: <a href="#FRAME-TILE-SPACE-LAYOUT-MENU">< Tile with some space on one side menu ></a>
+ g: <a href="#FRAME-TILE-SPACE-LAYOUT-MENU">< Tile with some space on one side menu ></a>
</p>
<p>
- g: <a href="#FRAME-MAIN-WINDOW-LAYOUT-MENU">< Main window layout menu ></a>
+ h: <a href="#FRAME-MAIN-WINDOW-LAYOUT-MENU">< Main window layout menu ></a>
</p>
<p>
- h: <a href="#FRAME-GIMP-LAYOUT-MENU">< The GIMP layout menu ></a>
+ i: <a href="#FRAME-GIMP-LAYOUT-MENU">< The GIMP layout menu ></a>
</p>
<hr>
<h3>
Modified: clfswm/doc/menu.txt
==============================================================================
--- clfswm/doc/menu.txt (original)
+++ clfswm/doc/menu.txt Sun Jun 28 15:28:10 2009
@@ -2,6 +2,7 @@
(By default it is bound on second-mode + m)
Main
+F1: < Help menu >
d: < Standard menu >
c: < Child menu >
f: < Frame menu >
@@ -12,6 +13,40 @@
y: < Utility menu >
m: < CLFSWM menu >
+Help-Menu
+h: Show all key binding
+b: Show the main mode binding
+s: Show the second mode key binding
+c: Help on clfswm corner
+g: Show all configurable variables
+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
Child-Menu
@@ -43,13 +78,14 @@
Frame-Layout-Menu
a: < Frame fast layout menu >
-b: No layout: Maximize windows in there frame - Leave frame to there size
-c: Maximize layout: Maximize windows and frames in there parent frame
-d: < Frame tile layout menu >
-e: < Tile in one direction layout menu >
-f: < Tile with some space on one side menu >
-g: < Main window layout menu >
-h: < The GIMP layout menu >
+b: No layout: Maximize windows in there frame - Leave frames to there original size
+c: No layout: Maximize windows in there frame - Leave frames to there actual size
+d: Maximize layout: Maximize windows and frames in there parent frame
+e: < Frame tile layout menu >
+f: < Tile in one direction layout menu >
+g: < Tile with some space on one side menu >
+h: < Main window layout menu >
+i: < The GIMP layout menu >
Frame-Fast-Layout-Menu
s: Switch between two layouts
Modified: clfswm/src/clfswm-layout.lisp
==============================================================================
--- clfswm/src/clfswm-layout.lisp (original)
+++ clfswm/src/clfswm-layout.lisp Sun Jun 28 15:28:10 2009
@@ -130,7 +130,7 @@
;;; No layout
(defgeneric no-layout (child parent)
- (:documentation "No layout: Maximize windows in there frame - Leave frame to there size"))
+ (:documentation "No layout: Maximize windows in there frame - Leave frames to there original size"))
(defmethod no-layout ((child xlib:window) parent)
(with-slots (rx ry rw rh) parent
@@ -148,11 +148,20 @@
(defun set-no-layout ()
- "No layout: Maximize windows in there frame - Leave frame to there size"
+ "No layout: Maximize windows in there frame - Leave frames to there original size"
(set-layout #'no-layout))
(register-layout 'set-no-layout)
+;;; No layout remember size
+(defun set-no-layout-remember-size ()
+ "No layout: Maximize windows in there frame - Leave frames to there actual size"
+ (fixe-real-size-current-child)
+ (set-no-layout))
+
+(register-layout 'set-no-layout-remember-size)
+
+
;;; Maximize layout
(defgeneric maximize-layout (child parent)
More information about the clfswm-cvs
mailing list