[clfswm-cvs] r194 - in clfswm: . doc src
Philippe Brochard
pbrochard at common-lisp.net
Sun Oct 26 21:20:49 UTC 2008
Author: pbrochard
Date: Sun Oct 26 21:20:49 2008
New Revision: 194
Log:
Rename sister frame to brother frame. Doc update
Modified:
clfswm/ChangeLog
clfswm/README
clfswm/doc/keys.html
clfswm/doc/keys.txt
clfswm/doc/menu.html
clfswm/doc/menu.txt
clfswm/src/bindings-second-mode.lisp
clfswm/src/bindings.lisp
clfswm/src/clfswm-internal.lisp
Modified: clfswm/ChangeLog
==============================================================================
--- clfswm/ChangeLog (original)
+++ clfswm/ChangeLog Sun Oct 26 21:20:49 2008
@@ -1,5 +1,7 @@
2008-10-26 Philippe Brochard <pbrochard at common-lisp.net>
+ * *: Rename 'sister' frame to 'brother' frame.
+
* src/clfswm-keys.lisp (unalias-modifiers): Convert a modifier
alias in a real modifier.
Modified: clfswm/README
==============================================================================
--- clfswm/README (original)
+++ clfswm/README Sun Oct 26 21:20:49 2008
@@ -21,7 +21,7 @@
Here is the default key binding to navigate throw this tree:
* Alt-Tab: circulate throw children of the current child.
- * Alt-Left/Right: circulate throw brother children (ie: this is like
+ * Alt-Left/Right: circulate through brother children (ie: this is like
workspaces for a more conventional window manager)
* Alt-Up: select the first child of the current frame.
* Alt-Down: select the parent of the current child.
Modified: clfswm/doc/keys.html
==============================================================================
--- clfswm/doc/keys.html (original)
+++ clfswm/doc/keys.html Sun Oct 26 21:20:49 2008
@@ -60,7 +60,7 @@
Right
</td>
<td style="color:#0000ff" nowrap>
- Select the next sister frame
+ Select the next brother frame
</td>
</tr>
<tr>
@@ -71,7 +71,7 @@
Left
</td>
<td style="color:#0000ff" nowrap>
- Select the previous sister frame
+ Select the previous brother frame
</td>
</tr>
<tr>
@@ -123,7 +123,7 @@
Shift
</td>
<td align="center" nowrap>
- Tab
+ Tab
</td>
<td style="color:#0000ff" nowrap>
Store the current child and switch to the previous one
@@ -780,7 +780,7 @@
Right
</td>
<td style="color:#0000ff" nowrap>
- Select the next sister frame
+ Select the next brother frame
</td>
</tr>
<tr>
@@ -791,7 +791,7 @@
Left
</td>
<td style="color:#0000ff" nowrap>
- Select the previous sister frame
+ Select the previous brother frame
</td>
</tr>
<tr>
Modified: clfswm/doc/keys.txt
==============================================================================
--- clfswm/doc/keys.txt (original)
+++ clfswm/doc/keys.txt Sun Oct 26 21:20:49 2008
@@ -8,8 +8,8 @@
Mod-1 F1 Open the help and info window
Mod-1 Control Shift Home Exit clfswm
- Mod-1 Right Select the next sister frame
- Mod-1 Left Select the previous sister frame
+ Mod-1 Right Select the next brother frame
+ Mod-1 Left Select the previous brother frame
Mod-1 Down Select the previous level in frame
Mod-1 Up Select the next level in frame
Mod-1 Tab Select the next child
@@ -82,8 +82,8 @@
Escape Leave second mode
T Tile the current frame
Mod-1 Control Shift Home Exit clfswm
- Mod-1 Right Select the next sister frame
- Mod-1 Left Select the previous sister frame
+ Mod-1 Right Select the next brother frame
+ Mod-1 Left Select the previous brother frame
Mod-1 Down Select the previous level in frame
Mod-1 Up Select the next level in frame
Mod-1 Tab Select the next child
Modified: clfswm/doc/menu.html
==============================================================================
--- clfswm/doc/menu.html (original)
+++ clfswm/doc/menu.html Sun Oct 26 21:20:49 2008
@@ -18,6 +18,9 @@
<a name="MAIN"></a><a href="#Top">Main</a>
</h3>
<p>
+ d: <a href="#STANDARD-MENU">< Standard menu ></a>
+ </p>
+ <p>
c: <a href="#CHILD-MENU">< Child menu ></a>
</p>
<p>
@@ -43,6 +46,510 @@
</p>
<hr>
<h3>
+ <a name="STANDARD-MENU"></a><a href="#MAIN">Standard-Menu</a>
+ </h3>
+ <p>
+ a: <a href="#GAMES">< GAMES ></a>
+ </p>
+ <p>
+ b: <a href="#APPS">< APPS ></a>
+ </p>
+ <p>
+ c: <a href="#XSHELLS">< XSHELLS ></a>
+ </p>
+ <p>
+ d: <a href="#HELP">< HELP ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="GAMES"></a><a href="#STANDARD-MENU">Games</a>
+ </h3>
+ <p>
+ a: <a href="#PUZZLES">< PUZZLES ></a>
+ </p>
+ <p>
+ b: <a href="#ARCADE">< ARCADE ></a>
+ </p>
+ <p>
+ c: <a href="#BOARD">< BOARD ></a>
+ </p>
+ <p>
+ d: <a href="#TETRIS-LIKE">< TETRIS-LIKE ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="PUZZLES"></a><a href="#GAMES">Puzzles</a>
+ </h3>
+ <p>
+ a: LMarbles
+ </p>
+ <p>
+ b: Glotski
+ </p>
+ <p>
+ c: Fish Fillets
+ </p>
+ <p>
+ d: Pathological
+ </p>
+ <p>
+ e: Einstein
+ </p>
+ <hr>
+ <h3>
+ <a name="ARCADE"></a><a href="#GAMES">Arcade</a>
+ </h3>
+ <p>
+ a: Thrust
+ </p>
+ <p>
+ b: Thrust
+ </p>
+ <p>
+ c: lbreakout2
+ </p>
+ <p>
+ d: Ri-li
+ </p>
+ <p>
+ e: xmoto
+ </p>
+ <p>
+ f: Toppler
+ </p>
+ <p>
+ g: Childsplay
+ </p>
+ <p>
+ h: Barrage
+ </p>
+ <p>
+ i: trackballs
+ </p>
+ <p>
+ j: rrootage
+ </p>
+ <p>
+ k: Abuse
+ </p>
+ <hr>
+ <h3>
+ <a name="BOARD"></a><a href="#GAMES">Board</a>
+ </h3>
+ <p>
+ a: eboard
+ </p>
+ <hr>
+ <h3>
+ <a name="TETRIS-LIKE"></a><a href="#GAMES">Tetris-Like</a>
+ </h3>
+ <p>
+ a: LTris
+ </p>
+ <p>
+ b: Frozen-Bubble
+ </p>
+ <hr>
+ <h3>
+ <a name="APPS"></a><a href="#STANDARD-MENU">Apps</a>
+ </h3>
+ <p>
+ a: <a href="#NET">< NET ></a>
+ </p>
+ <p>
+ b: <a href="#SYSTEM">< SYSTEM ></a>
+ </p>
+ <p>
+ c: <a href="#VIEWERS">< VIEWERS ></a>
+ </p>
+ <p>
+ d: <a href="#PROGRAMMING">< PROGRAMMING ></a>
+ </p>
+ <p>
+ e: <a href="#EMULATORS">< EMULATORS ></a>
+ </p>
+ <p>
+ f: <a href="#EDITORS">< EDITORS ></a>
+ </p>
+ <p>
+ g: <a href="#MATH">< MATH ></a>
+ </p>
+ <p>
+ h: <a href="#GRAPHICS">< GRAPHICS ></a>
+ </p>
+ <p>
+ i: <a href="#TOOLS">< TOOLS ></a>
+ </p>
+ <p>
+ j: <a href="#DATABASES">< DATABASES ></a>
+ </p>
+ <p>
+ k: <a href="#EDUCATION">< EDUCATION ></a>
+ </p>
+ <p>
+ l: <a href="#SOUND">< SOUND ></a>
+ </p>
+ <p>
+ m: <a href="#SHELLS">< SHELLS ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="NET"></a><a href="#APPS">Net</a>
+ </h3>
+ <p>
+ a: Lynx
+ </p>
+ <p>
+ b: Lynx Manual
+ </p>
+ <p>
+ c: Iceweasel
+ </p>
+ <p>
+ d: Icedove Mail
+ </p>
+ <p>
+ e: Mutt
+ </p>
+ <p>
+ f: Links 2
+ </p>
+ <p>
+ g: Links 2 (text)
+ </p>
+ <p>
+ h: w3m
+ </p>
+ <p>
+ i: Licq
+ </p>
+ <p>
+ j: Telnet
+ </p>
+ <hr>
+ <h3>
+ <a name="SYSTEM"></a><a href="#APPS">System</a>
+ </h3>
+ <p>
+ a: X-Terminal as root (GKsu)
+ </p>
+ <p>
+ b: Aptitude
+ </p>
+ <p>
+ c: RT2500 configuration utility
+ </p>
+ <p>
+ d: Top
+ </p>
+ <p>
+ e: Pstree
+ </p>
+ <p>
+ f: Pstree
+ </p>
+ <p>
+ g: reportbug
+ </p>
+ <p>
+ h: KControl
+ </p>
+ <p>
+ i: KInfoCenter
+ </p>
+ <p>
+ j: Task selector
+ </p>
+ <p>
+ k: <a href="#LANGUAGE-ENVIRONMENT">< LANGUAGE-ENVIRONMENT ></a>
+ </p>
+ <p>
+ l: ROX Filer
+ </p>
+ <p>
+ m: KDebugDialog
+ </p>
+ <p>
+ n: KDCOP
+ </p>
+ <p>
+ o: GDM flexiserver
+ </p>
+ <p>
+ p: GDM flexiserver in Xnest
+ </p>
+ <p>
+ q: GDM Photo Setup
+ </p>
+ <p>
+ r: GDM Setup
+ </p>
+ <p>
+ s: Kicker
+ </p>
+ <p>
+ t: <a href="#ADMIN">< ADMIN ></a>
+ </p>
+ <hr>
+ <h3>
+ <a name="LANGUAGE-ENVIRONMENT"></a><a href="#SYSTEM">Language-Environment</a>
+ </h3>
+ <p>
+ a: Native Language Environment
+ </p>
+ <p>
+ b: Native Language Environment - remove
+ </p>
+ <p>
+ c: Japanese environment
+ </p>
+ <p>
+ d: Thai environment
+ </p>
+ <p>
+ e: Korean environment
+ </p>
+ <p>
+ f: Danish environment
+ </p>
+ <p>
+ g: German environment
+ </p>
+ <p>
+ h: Spanish environment
+ </p>
+ <p>
+ i: French environment
+ </p>
+ <p>
+ j: Russian environment
+ </p>
+ <p>
+ k: Belarusian environment
+ </p>
+ <p>
+ l: Bulgarian environment
+ </p>
+ <p>
+ m: Macedonian environment
+ </p>
+ <p>
+ n: Serbian environment
+ </p>
+ <p>
+ o: Ukrainian environment
+ </p>
+ <p>
+ p: Polish environment
+ </p>
+ <p>
+ q: Catalan environment
+ </p>
+ <p>
+ r: Lithuanian environment
+ </p>
+ <p>
+ s: Turkish environment
+ </p>
+ <hr>
+ <h3>
+ <a name="ADMIN"></a><a href="#SYSTEM">Admin</a>
+ </h3>
+ <p>
+ a: alsaconf - Configure your soundcards for the ALSA system
+ </p>
+ <hr>
+ <h3>
+ <a name="VIEWERS"></a><a href="#APPS">Viewers</a>
+ </h3>
+ <p>
+ a: GV
+ </p>
+ <p>
+ b: gmplayer
+ </p>
+ <p>
+ c: Xpdf
+ </p>
+ <p>
+ d: VLC media player
+ </p>
+ <p>
+ e: ImageMagick
+ </p>
+ <hr>
+ <h3>
+ <a name="PROGRAMMING"></a><a href="#APPS">Programming</a>
+ </h3>
+ <p>
+ a: Tclsh8.4
+ </p>
+ <p>
+ b: TkWish8.4
+ </p>
+ <p>
+ c: Python (v2.4)
+ </p>
+ <p>
+ d: BeanShell (text)
+ </p>
+ <p>
+ e: BeanShell (windowed)
+ </p>
+ <p>
+ f: Guile 1.8
+ </p>
+ <p>
+ g: GDB
+ </p>
+ <hr>
+ <h3>
+ <a name="EMULATORS"></a><a href="#APPS">Emulators</a>
+ </h3>
+ <p>
+ a: hatari
+ </p>
+ <hr>
+ <h3>
+ <a name="EDITORS"></a><a href="#APPS">Editors</a>
+ </h3>
+ <p>
+ a: Emacs 21 (X11)
+ </p>
+ <p>
+ b: Emacs 21 (text)
+ </p>
+ <p>
+ c: Nano
+ </p>
+ <p>
+ d: AbiWord Word Processor
+ </p>
+ <p>
+ e: OpenOffice.org Writer
+ </p>
+ <hr>
+ <h3>
+ <a name="MATH"></a><a href="#APPS">Math</a>
+ </h3>
+ <p>
+ a: OpenOffice.org Math
+ </p>
+ <p>
+ b: Bc
+ </p>
+ <p>
+ c: Dc
+ </p>
+ <p>
+ d: OpenOffice.org Calc
+ </p>
+ <hr>
+ <h3>
+ <a name="GRAPHICS"></a><a href="#APPS">Graphics</a>
+ </h3>
+ <p>
+ a: tuxpaint
+ </p>
+ <p>
+ b: tuxpaint-config
+ </p>
+ <p>
+ c: xfig - XFig is a menu-driven tool that allows the user to draw and manipulate objects interactively in an X window. The resulting pictures can be saved, printed on postscript printers, or converted to a variety of other formats (e.g. to allow inclusion in LaTeX documents or web pages) using the transfig program.
+ </p>
+ <p>
+ d: The GIMP
+ </p>
+ <p>
+ e: OpenOffice.org Draw
+ </p>
+ <p>
+ f: OpenOffice.org Impress
+ </p>
+ <hr>
+ <h3>
+ <a name="TOOLS"></a><a href="#APPS">Tools</a>
+ </h3>
+ <p>
+ a: k3b
+ </p>
+ <p>
+ b: xvkbd
+ </p>
+ <p>
+ c: Rclock
+ </p>
+ <hr>
+ <h3>
+ <a name="DATABASES"></a><a href="#APPS">Databases</a>
+ </h3>
+ <p>
+ a: OpenOffice.org Base
+ </p>
+ <p>
+ b: HSQLDB Database Manager
+ </p>
+ <p>
+ c: HSQLDB Database Manager (Swing)
+ </p>
+ <p>
+ d: HSQLDB Query Tool
+ </p>
+ <p>
+ e: HSQLDB Transfer Tool
+ </p>
+ <hr>
+ <h3>
+ <a name="EDUCATION"></a><a href="#APPS">Education</a>
+ </h3>
+ <p>
+ a: gcompris
+ </p>
+ <p>
+ b: gcompris profile editor
+ </p>
+ <hr>
+ <h3>
+ <a name="SOUND"></a><a href="#APPS">Sound</a>
+ </h3>
+ <p>
+ a: Alsamixergui
+ </p>
+ <hr>
+ <h3>
+ <a name="SHELLS"></a><a href="#APPS">Shells</a>
+ </h3>
+ <p>
+ a: Bash
+ </p>
+ <p>
+ b: Sh
+ </p>
+ <p>
+ c: tcsh
+ </p>
+ <hr>
+ <h3>
+ <a name="XSHELLS"></a><a href="#STANDARD-MENU">Xshells</a>
+ </h3>
+ <p>
+ a: XTerm
+ </p>
+ <p>
+ b: XTerm (Unicode)
+ </p>
+ <p>
+ c: Rxvt
+ </p>
+ <hr>
+ <h3>
+ <a name="HELP"></a><a href="#STANDARD-MENU">Help</a>
+ </h3>
+ <p>
+ a: Info
+ </p>
+ <hr>
+ <h3>
<a name="CHILD-MENU"></a><a href="#MAIN">Child-Menu</a>
</h3>
<p>
Modified: clfswm/doc/menu.txt
==============================================================================
--- clfswm/doc/menu.txt (original)
+++ clfswm/doc/menu.txt Sun Oct 26 21:20:49 2008
@@ -2,6 +2,7 @@
(By default it is bound on second-mode + m)
Main
+d: < Standard menu >
c: < Child menu >
f: < Frame menu >
w: < Window menu >
@@ -11,6 +12,190 @@
y: < Utility menu >
m: < CLFSWM menu >
+Standard-Menu
+a: < GAMES >
+b: < APPS >
+c: < XSHELLS >
+d: < HELP >
+
+Games
+a: < PUZZLES >
+b: < ARCADE >
+c: < BOARD >
+d: < TETRIS-LIKE >
+
+Puzzles
+a: LMarbles
+b: Glotski
+c: Fish Fillets
+d: Pathological
+e: Einstein
+
+Arcade
+a: Thrust
+b: Thrust
+c: lbreakout2
+d: Ri-li
+e: xmoto
+f: Toppler
+g: Childsplay
+h: Barrage
+i: trackballs
+j: rrootage
+k: Abuse
+
+Board
+a: eboard
+
+Tetris-Like
+a: LTris
+b: Frozen-Bubble
+
+Apps
+a: < NET >
+b: < SYSTEM >
+c: < VIEWERS >
+d: < PROGRAMMING >
+e: < EMULATORS >
+f: < EDITORS >
+g: < MATH >
+h: < GRAPHICS >
+i: < TOOLS >
+j: < DATABASES >
+k: < EDUCATION >
+l: < SOUND >
+m: < SHELLS >
+
+Net
+a: Lynx
+b: Lynx Manual
+c: Iceweasel
+d: Icedove Mail
+e: Mutt
+f: Links 2
+g: Links 2 (text)
+h: w3m
+i: Licq
+j: Telnet
+
+System
+a: X-Terminal as root (GKsu)
+b: Aptitude
+c: RT2500 configuration utility
+d: Top
+e: Pstree
+f: Pstree
+g: reportbug
+h: KControl
+i: KInfoCenter
+j: Task selector
+k: < LANGUAGE-ENVIRONMENT >
+l: ROX Filer
+m: KDebugDialog
+n: KDCOP
+o: GDM flexiserver
+p: GDM flexiserver in Xnest
+q: GDM Photo Setup
+r: GDM Setup
+s: Kicker
+t: < ADMIN >
+
+Language-Environment
+a: Native Language Environment
+b: Native Language Environment - remove
+c: Japanese environment
+d: Thai environment
+e: Korean environment
+f: Danish environment
+g: German environment
+h: Spanish environment
+i: French environment
+j: Russian environment
+k: Belarusian environment
+l: Bulgarian environment
+m: Macedonian environment
+n: Serbian environment
+o: Ukrainian environment
+p: Polish environment
+q: Catalan environment
+r: Lithuanian environment
+s: Turkish environment
+
+Admin
+a: alsaconf - Configure your soundcards for the ALSA system
+
+Viewers
+a: GV
+b: gmplayer
+c: Xpdf
+d: VLC media player
+e: ImageMagick
+
+Programming
+a: Tclsh8.4
+b: TkWish8.4
+c: Python (v2.4)
+d: BeanShell (text)
+e: BeanShell (windowed)
+f: Guile 1.8
+g: GDB
+
+Emulators
+a: hatari
+
+Editors
+a: Emacs 21 (X11)
+b: Emacs 21 (text)
+c: Nano
+d: AbiWord Word Processor
+e: OpenOffice.org Writer
+
+Math
+a: OpenOffice.org Math
+b: Bc
+c: Dc
+d: OpenOffice.org Calc
+
+Graphics
+a: tuxpaint
+b: tuxpaint-config
+c: xfig - XFig is a menu-driven tool that allows the user to draw and manipulate objects interactively in an X window. The resulting pictures can be saved, printed on postscript printers, or converted to a variety of other formats (e.g. to allow inclusion in LaTeX documents or web pages) using the transfig program.
+d: The GIMP
+e: OpenOffice.org Draw
+f: OpenOffice.org Impress
+
+Tools
+a: k3b
+b: xvkbd
+c: Rclock
+
+Databases
+a: OpenOffice.org Base
+b: HSQLDB Database Manager
+c: HSQLDB Database Manager (Swing)
+d: HSQLDB Query Tool
+e: HSQLDB Transfer Tool
+
+Education
+a: gcompris
+b: gcompris profile editor
+
+Sound
+a: Alsamixergui
+
+Shells
+a: Bash
+b: Sh
+c: tcsh
+
+Xshells
+a: XTerm
+b: XTerm (Unicode)
+c: Rxvt
+
+Help
+a: Info
+
Child-Menu
r: Rename the current child
e: Ensure that all children names are unique
Modified: clfswm/src/bindings-second-mode.lisp
==============================================================================
--- clfswm/src/bindings-second-mode.lisp (original)
+++ clfswm/src/bindings-second-mode.lisp Sun Oct 26 21:20:49 2008
@@ -98,8 +98,8 @@
(define-second-key ("Escape") 'leave-second-mode)
(define-second-key ("t") 'tile-current-frame)
(define-second-key ("Home" :mod-1 :control :shift) 'exit-clfswm)
- (define-second-key ("Right" :mod-1) 'select-next-sister)
- (define-second-key ("Left" :mod-1) 'select-previous-sister)
+ (define-second-key ("Right" :mod-1) 'select-next-brother)
+ (define-second-key ("Left" :mod-1) 'select-previous-brother)
(define-second-key ("Down" :mod-1) 'select-previous-level)
(define-second-key ("Up" :mod-1) 'select-next-level)
(define-second-key ("Tab" :mod-1) 'select-next-child)
Modified: clfswm/src/bindings.lisp
==============================================================================
--- clfswm/src/bindings.lisp (original)
+++ clfswm/src/bindings.lisp Sun Oct 26 21:20:49 2008
@@ -37,8 +37,8 @@
(defun set-default-main-keys ()
(define-main-key ("F1" :mod-1) 'help-on-clfswm)
(define-main-key ("Home" :mod-1 :control :shift) 'exit-clfswm)
- (define-main-key ("Right" :mod-1) 'select-next-sister)
- (define-main-key ("Left" :mod-1) 'select-previous-sister)
+ (define-main-key ("Right" :mod-1) 'select-next-brother)
+ (define-main-key ("Left" :mod-1) 'select-previous-brother)
(define-main-key ("Down" :mod-1) 'select-previous-level)
(define-main-key ("Up" :mod-1) 'select-next-level)
(define-main-key ("Tab" :mod-1) 'select-next-child)
Modified: clfswm/src/clfswm-internal.lisp
==============================================================================
--- clfswm/src/clfswm-internal.lisp (original)
+++ clfswm/src/clfswm-internal.lisp Sun Oct 26 21:20:49 2008
@@ -727,8 +727,8 @@
-(defun select-next/previous-sister (fun-rotate)
- "Select the next/previous sister frame"
+(defun select-next/previous-brother (fun-rotate)
+ "Select the next/previous brother frame"
(let ((frame-is-root? (and (equal *current-root* *current-child*)
(not (equal *current-root* *root-frame*)))))
(if frame-is-root?
@@ -744,13 +744,13 @@
(show-all-children *current-root*)))
-(defun select-next-sister ()
- "Select the next sister frame"
- (select-next/previous-sister #'anti-rotate-list))
-
-(defun select-previous-sister ()
- "Select the previous sister frame"
- (select-next/previous-sister #'rotate-list))
+(defun select-next-brother ()
+ "Select the next brother frame"
+ (select-next/previous-brother #'anti-rotate-list))
+
+(defun select-previous-brother ()
+ "Select the previous brother frame"
+ (select-next/previous-brother #'rotate-list))
(defun select-next-level ()
More information about the clfswm-cvs
mailing list