[clfswm-cvs] r478 - in clfswm: . doc src
pbrochard at common-lisp.net
pbrochard at common-lisp.net
Sun Jun 5 12:42:25 UTC 2011
Author: pbrochard
Date: Sun Jun 5 05:42:22 2011
New Revision: 478
Log:
src/clfswm-util.lisp (add-frame-in-parent-frame): New function and binding.
Modified:
clfswm/ChangeLog
clfswm/doc/keys.html
clfswm/doc/keys.txt
clfswm/doc/menu.html
clfswm/doc/menu.txt
clfswm/src/bindings-second-mode.lisp
clfswm/src/clfswm-util.lisp
Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog Sat Jun 4 05:36:40 2011 (r477)
+++ clfswm/ChangeLog Sun Jun 5 05:42:22 2011 (r478)
@@ -1,3 +1,8 @@
+2011-06-05 Philippe Brochard <pbrochard at common-lisp.net>
+
+ * src/clfswm-util.lisp (add-frame-in-parent-frame): New function
+ and binding.
+
2011-06-04 Philippe Brochard <pbrochard at common-lisp.net>
* src/clfswm.lisp (main-unprotected): Destroy all frames windows
Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html Sat Jun 4 05:36:40 2011 (r477)
+++ clfswm/doc/keys.html Sun Jun 5 05:42:22 2011 (r478)
@@ -1258,6 +1258,17 @@
</tr>
<tr>
<td align="right" style="color:#ff0000" nowrap>
+ Control
+ </td>
+ <td align="center" nowrap>
+ A
+ </td>
+ <td style="color:#0000ff" nowrap>
+ Add a frame in the parent frame (and reorganize parent frame)
+ </td>
+ </tr>
+ <tr>
+ <td align="right" style="color:#ff0000" nowrap>
</td>
<td align="center" nowrap>
Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt Sat Jun 4 05:36:40 2011 (r477)
+++ clfswm/doc/keys.txt Sun Jun 5 05:42:22 2011 (r478)
@@ -126,6 +126,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 A Add a frame in the parent frame (and reorganize parent frame)
Plus Increase the tile layout size
Minus Decrease the tile layout size
Control Plus Increase slowly the tile layout size
Modified: clfswm/doc/menu.html
==============================================================================
--- clfswm/doc/menu.html Sat Jun 4 05:36:40 2011 (r477)
+++ clfswm/doc/menu.html Sun Jun 5 05:42:22 2011 (r478)
@@ -1323,148 +1323,103 @@
d: Privilege granting - Configure behavior of the privilege-granting tool
</p>
<p>
- e: Background - Change the background
+ e: Multimedia Systems Selector - Configure defaults for GStreamer applications
</p>
<p>
- f: Date and Time - Date and Time preferences panel
+ f: Touchpad - Set your touchpad preferences
</p>
<p>
- g: Displays - Change resolution and position of monitors and projectors
+ g: Java Control Panel
</p>
<p>
- h: System Info - System Information
+ h: Java Policy Settings
</p>
<p>
- i: Keyboard - Edit keyboard settings and application shortcuts
+ i: Menu Updating Tool
</p>
<p>
- j: Removable Media - Configure media and autorun preferences
+ j: Change Password
</p>
<p>
- k: Mouse and Touchpad - Set your mouse and touchpad preferences
+ k: Menu Editor
</p>
<p>
- l: Network - Network settings
+ l: System Settings
</p>
<p>
- m: Power - Power management settings
+ m: Preferred Applications
</p>
<p>
- n: Printers - Change printer settings
+ n: Customize Look and Feel - Customizes look and feel of your desktop and applications
</p>
<p>
- o: Region and Language - Change your region and language settings
+ o: Monitor Settings - Change screen resolution and configure external monitors
</p>
<p>
- p: Screen - Screen brightness and lock settings
+ p: Opera Widget Manager
</p>
<p>
- q: Sound - Change sound volume and sound events
+ q: Panel
</p>
<p>
- r: Universal Access - Universal Access Preferences
+ r: Qt Config - Configure Qt behavior, styles, fonts
</p>
<p>
- s: User Accounts - Add or remove users
+ s: Startup Applications - Choose what applications to start when you log in
</p>
<p>
- t: Multimedia Systems Selector - Configure defaults for GStreamer applications
+ t: File Manager - Configure the Thunar file manager
</p>
<p>
- u: Touchpad - Set your touchpad preferences
+ u: Panel tint2 - Customize the panel settings
</p>
<p>
- v: Java Control Panel
+ v: Startup Disk Creator - Create a startup disk using a CD or disc image
</p>
<p>
- w: Java Policy Settings
+ w: Desktop - Set desktop background and menu and icon behaviour
</p>
<p>
- x: Menu Updating Tool
+ x: Display - Configure screen settings and layout
</p>
<p>
- y: Change Password
+ y: Keyboard - Edit keyboard settings and application shortcuts
</p>
<p>
- z: Menu Editor
+ z: Mouse - Configure pointer device behavior and appearance
</p>
<p>
- 0: System Settings
+ 0: Session and Startup - Customize desktop startup and splash screen
</p>
<p>
- 1: Preferred Applications
+ 1: Settings Manager - Graphical Settings Manager for Xfce 4
</p>
<p>
- 2: Customize Look and Feel - Customizes look and feel of your desktop and applications
+ 2: Appearance - Customize the look of your desktop
</p>
<p>
- 3: Monitor Settings - Change screen resolution and configure external monitors
+ 3: Window Manager - Configure window behavior and shortcuts
</p>
<p>
- 4: Opera Widget Manager
+ 4: Window Manager Tweaks - Fine-tune window behaviour and effects
</p>
<p>
- 5: Panel
+ 5: Workspaces - Set number and names of workspaces
</p>
<p>
- 6: Qt Config - Configure Qt behavior, styles, fonts
+ 6: Orage preferences - Settings for the Xfce 4 Calendar Application (Orage)
</p>
<p>
- 7: Startup Applications - Choose what applications to start when you log in
+ 7: Accessibility - Improve keyboard and mouse accessibility
</p>
<p>
- 8: File Manager - Configure the Thunar file manager
+ 8: Settings Editor - Graphical settings editor for Xfconf
</p>
<p>
- 9: Panel tint2 - Customize the panel settings
+ 9: Xfce 4 Printing System Settings - Allow you to select the printing system backend that xfprint will use
</p>
<p>
- A: Startup Disk Creator - Create a startup disk using a CD or disc image
- </p>
- <p>
- B: Desktop - Set desktop background and menu and icon behaviour
- </p>
- <p>
- C: Display - Configure screen settings and layout
- </p>
- <p>
- D: Keyboard - Edit keyboard settings and application shortcuts
- </p>
- <p>
- E: Mouse - Configure pointer device behavior and appearance
- </p>
- <p>
- F: Session and Startup - Customize desktop startup and splash screen
- </p>
- <p>
- G: Settings Manager - Graphical Settings Manager for Xfce 4
- </p>
- <p>
- H: Appearance - Customize the look of your desktop
- </p>
- <p>
- I: Window Manager - Configure window behavior and shortcuts
- </p>
- <p>
- J: Window Manager Tweaks - Fine-tune window behaviour and effects
- </p>
- <p>
- K: Workspaces - Set number and names of workspaces
- </p>
- <p>
- L: Orage preferences - Settings for the Xfce 4 Calendar Application (Orage)
- </p>
- <p>
- M: Accessibility - Improve keyboard and mouse accessibility
- </p>
- <p>
- N: Settings Editor - Graphical settings editor for Xfconf
- </p>
- <p>
- O: Xfce 4 Printing System Settings - Allow you to select the printing system backend that xfprint will use
- </p>
- <p>
- P: Screensaver - Change screensaver properties
+ A: Screensaver - Change screensaver properties
</p>
<hr>
<h3>
@@ -1507,31 +1462,31 @@
l: Keyboard Layout - Preview keyboard layouts
</p>
<p>
- m: System Settings
+ m: Panel
</p>
<p>
- n: Panel
+ n: System Monitor
</p>
<p>
- o: System Monitor
+ o: GParted - Create, reorganize, and delete partitions
</p>
<p>
- p: User Accounts - Add or remove users
+ p: Htop - Show System Processes
</p>
<p>
- q: GParted - Create, reorganize, and delete partitions
+ q: Dolphin
</p>
<p>
- r: Htop - Show System Processes
+ r: K3b - Disk writing program
</p>
<p>
- s: Dolphin
+ s: KDiskFree
</p>
<p>
- t: K3b - Disk writing program
+ t: Konqueror
</p>
<p>
- u: KDiskFree
+ u: Konqueror
</p>
<p>
v: Konqueror
@@ -1540,79 +1495,73 @@
w: Konqueror
</p>
<p>
- x: Konqueror
- </p>
- <p>
- y: Konqueror
- </p>
- <p>
- z: KInfoCenter
+ x: KInfoCenter
</p>
<p>
- 0: File Manager - Super User Mode
+ y: File Manager - Super User Mode
</p>
<p>
- 1: Konsole
+ z: Konsole
</p>
<p>
- 2: KRandRTray - A panel applet for resizing and reorientating X screens.
+ 0: KRandRTray - A panel applet for resizing and reorientating X screens.
</p>
<p>
- 3: Krfb
+ 1: Krfb
</p>
<p>
- 4: Krusader - root-mode
+ 2: Krusader - root-mode
</p>
<p>
- 5: System Monitor
+ 3: System Monitor
</p>
<p>
- 6: KSystemLog
+ 4: KSystemLog
</p>
<p>
- 7: KUser
+ 5: KUser
</p>
<p>
- 8: KWalletManager
+ 6: KWalletManager
</p>
<p>
- 9: KwikDisk
+ 7: KwikDisk
</p>
<p>
- A: Nepomuk Backup
+ 8: Nepomuk Backup
</p>
<p>
- B: Yakuake
+ 9: Yakuake
</p>
<p>
- C: Task Manager - Manage running processes
+ A: Task Manager - Manage running processes
</p>
<p>
- D: rxvt-unicode - An Unicode capable rxvt clone
+ B: rxvt-unicode - An Unicode capable rxvt clone
</p>
<p>
- E: UNetbootin - Tool for creating Live USB drives
+ C: UNetbootin - Tool for creating Live USB drives
</p>
<p>
- F: Startup Disk Creator - Create a startup disk using a CD or disc image
+ D: Startup Disk Creator - Create a startup disk using a CD or disc image
</p>
<p>
- G: Startup Disk Creator - Create a startup disk using a CD or disc image
+ E: Startup Disk Creator - Create a startup disk using a CD or disc image
</p>
<p>
- H: Oracle VM VirtualBox
+ F: Oracle VM VirtualBox
</p>
<p>
- I: Wireshark - Network traffic analyzer
+ G: Wireshark - Network traffic analyzer
</p>
<p>
- J: Log Out
+ H: Log Out
</p>
<p>
- K: Xfe - A lightweight file manager for X Window
+ I: Xfe - A lightweight file manager for X Window
</p>
<p>
- L: XNC - Graphical File manager, X Northern Captain
+ J: XNC - Graphical File manager, X Northern Captain
</p>
<hr>
<h3>
Modified: clfswm/doc/menu.txt
==============================================================================
--- clfswm/doc/menu.txt Sat Jun 4 05:36:40 2011 (r477)
+++ clfswm/doc/menu.txt Sun Jun 5 05:42:22 2011 (r478)
@@ -447,54 +447,39 @@
b: Preferred Applications
c: Keyboard Indicator plugins - Enable/disable installed plugins
d: Privilege granting - Configure behavior of the privilege-granting tool
-e: Background - Change the background
-f: Date and Time - Date and Time preferences panel
-g: Displays - Change resolution and position of monitors and projectors
-h: System Info - System Information
-i: Keyboard - Edit keyboard settings and application shortcuts
-j: Removable Media - Configure media and autorun preferences
-k: Mouse and Touchpad - Set your mouse and touchpad preferences
-l: Network - Network settings
-m: Power - Power management settings
-n: Printers - Change printer settings
-o: Region and Language - Change your region and language settings
-p: Screen - Screen brightness and lock settings
-q: Sound - Change sound volume and sound events
-r: Universal Access - Universal Access Preferences
-s: User Accounts - Add or remove users
-t: Multimedia Systems Selector - Configure defaults for GStreamer applications
-u: Touchpad - Set your touchpad preferences
-v: Java Control Panel
-w: Java Policy Settings
-x: Menu Updating Tool
-y: Change Password
-z: Menu Editor
-0: System Settings
-1: Preferred Applications
-2: Customize Look and Feel - Customizes look and feel of your desktop and applications
-3: Monitor Settings - Change screen resolution and configure external monitors
-4: Opera Widget Manager
-5: Panel
-6: Qt Config - Configure Qt behavior, styles, fonts
-7: Startup Applications - Choose what applications to start when you log in
-8: File Manager - Configure the Thunar file manager
-9: Panel tint2 - Customize the panel settings
-A: Startup Disk Creator - Create a startup disk using a CD or disc image
-B: Desktop - Set desktop background and menu and icon behaviour
-C: Display - Configure screen settings and layout
-D: Keyboard - Edit keyboard settings and application shortcuts
-E: Mouse - Configure pointer device behavior and appearance
-F: Session and Startup - Customize desktop startup and splash screen
-G: Settings Manager - Graphical Settings Manager for Xfce 4
-H: Appearance - Customize the look of your desktop
-I: Window Manager - Configure window behavior and shortcuts
-J: Window Manager Tweaks - Fine-tune window behaviour and effects
-K: Workspaces - Set number and names of workspaces
-L: Orage preferences - Settings for the Xfce 4 Calendar Application (Orage)
-M: Accessibility - Improve keyboard and mouse accessibility
-N: Settings Editor - Graphical settings editor for Xfconf
-O: Xfce 4 Printing System Settings - Allow you to select the printing system backend that xfprint will use
-P: Screensaver - Change screensaver properties
+e: Multimedia Systems Selector - Configure defaults for GStreamer applications
+f: Touchpad - Set your touchpad preferences
+g: Java Control Panel
+h: Java Policy Settings
+i: Menu Updating Tool
+j: Change Password
+k: Menu Editor
+l: System Settings
+m: Preferred Applications
+n: Customize Look and Feel - Customizes look and feel of your desktop and applications
+o: Monitor Settings - Change screen resolution and configure external monitors
+p: Opera Widget Manager
+q: Panel
+r: Qt Config - Configure Qt behavior, styles, fonts
+s: Startup Applications - Choose what applications to start when you log in
+t: File Manager - Configure the Thunar file manager
+u: Panel tint2 - Customize the panel settings
+v: Startup Disk Creator - Create a startup disk using a CD or disc image
+w: Desktop - Set desktop background and menu and icon behaviour
+x: Display - Configure screen settings and layout
+y: Keyboard - Edit keyboard settings and application shortcuts
+z: Mouse - Configure pointer device behavior and appearance
+0: Session and Startup - Customize desktop startup and splash screen
+1: Settings Manager - Graphical Settings Manager for Xfce 4
+2: Appearance - Customize the look of your desktop
+3: Window Manager - Configure window behavior and shortcuts
+4: Window Manager Tweaks - Fine-tune window behaviour and effects
+5: Workspaces - Set number and names of workspaces
+6: Orage preferences - Settings for the Xfce 4 Calendar Application (Orage)
+7: Accessibility - Improve keyboard and mouse accessibility
+8: Settings Editor - Graphical settings editor for Xfconf
+9: Xfce 4 Printing System Settings - Allow you to select the printing system backend that xfprint will use
+A: Screensaver - Change screensaver properties
System
a: Terminal - Use the command line
@@ -509,42 +494,40 @@
j: dconf Editor - Directly edit your entire configuration database
k: Configuration Editor - Directly edit your entire configuration database
l: Keyboard Layout - Preview keyboard layouts
-m: System Settings
-n: Panel
-o: System Monitor
-p: User Accounts - Add or remove users
-q: GParted - Create, reorganize, and delete partitions
-r: Htop - Show System Processes
-s: Dolphin
-t: K3b - Disk writing program
-u: KDiskFree
+m: Panel
+n: System Monitor
+o: GParted - Create, reorganize, and delete partitions
+p: Htop - Show System Processes
+q: Dolphin
+r: K3b - Disk writing program
+s: KDiskFree
+t: Konqueror
+u: Konqueror
v: Konqueror
w: Konqueror
-x: Konqueror
-y: Konqueror
-z: KInfoCenter
-0: File Manager - Super User Mode
-1: Konsole
-2: KRandRTray - A panel applet for resizing and reorientating X screens.
-3: Krfb
-4: Krusader - root-mode
-5: System Monitor
-6: KSystemLog
-7: KUser
-8: KWalletManager
-9: KwikDisk
-A: Nepomuk Backup
-B: Yakuake
-C: Task Manager - Manage running processes
-D: rxvt-unicode - An Unicode capable rxvt clone
-E: UNetbootin - Tool for creating Live USB drives
-F: Startup Disk Creator - Create a startup disk using a CD or disc image
-G: Startup Disk Creator - Create a startup disk using a CD or disc image
-H: Oracle VM VirtualBox
-I: Wireshark - Network traffic analyzer
-J: Log Out
-K: Xfe - A lightweight file manager for X Window
-L: XNC - Graphical File manager, X Northern Captain
+x: KInfoCenter
+y: File Manager - Super User Mode
+z: Konsole
+0: KRandRTray - A panel applet for resizing and reorientating X screens.
+1: Krfb
+2: Krusader - root-mode
+3: System Monitor
+4: KSystemLog
+5: KUser
+6: KWalletManager
+7: KwikDisk
+8: Nepomuk Backup
+9: Yakuake
+A: Task Manager - Manage running processes
+B: rxvt-unicode - An Unicode capable rxvt clone
+C: UNetbootin - Tool for creating Live USB drives
+D: Startup Disk Creator - Create a startup disk using a CD or disc image
+E: Startup Disk Creator - Create a startup disk using a CD or disc image
+F: Oracle VM VirtualBox
+G: Wireshark - Network traffic analyzer
+H: Log Out
+I: Xfe - A lightweight file manager for X Window
+J: XNC - Graphical File manager, X Northern Captain
Utility
a: SAGE - SAGE NOTEBOOK
Modified: clfswm/src/bindings-second-mode.lisp
==============================================================================
--- clfswm/src/bindings-second-mode.lisp Sat Jun 4 05:36:40 2011 (r477)
+++ clfswm/src/bindings-second-mode.lisp Sun Jun 5 05:42:22 2011 (r478)
@@ -143,6 +143,7 @@
(define-second-key ("o") 'set-open-in-new-frame-in-parent-frame-nw-hook)
(define-second-key ("o" :control) 'set-open-in-new-frame-in-root-frame-nw-hook)
(define-second-key ("a") 'add-default-frame)
+ (define-second-key ("a" :control) 'add-frame-in-parent-frame)
(define-second-key ("plus") 'inc-tile-layout-size)
(define-second-key ("minus") 'dec-tile-layout-size)
(define-second-key ("plus" :control) 'inc-slow-tile-layout-size)
Modified: clfswm/src/clfswm-util.lisp
==============================================================================
--- clfswm/src/clfswm-util.lisp Sat Jun 4 05:36:40 2011 (r477)
+++ clfswm/src/clfswm-util.lisp Sun Jun 5 05:42:22 2011 (r478)
@@ -98,6 +98,20 @@
(push (create-frame :name name) (frame-child *current-child*))))
(leave-second-mode))
+(defun add-frame-in-parent-frame ()
+ "Add a frame in the parent frame (and reorganize parent frame)"
+ (let ((new-frame (create-frame))
+ (parent (find-parent-frame *current-child*)))
+ (when parent
+ (pushnew new-frame (frame-child parent))
+ (setf *current-root* parent
+ *current-child* parent)
+ (set-layout-once #'tile-space-layout)
+ (setf *current-child* new-frame)
+ (leave-second-mode))))
+
+
+
(defun add-placed-frame ()
"Add a placed frame in the current frame"
More information about the clfswm-cvs
mailing list