From: <dom...@us...> - 2013-04-29 20:36:47
|
Revision: 321 http://sourceforge.net/p/fvwm-crystal/code/321 Author: dominique_libre Date: 2013-04-29 20:36:44 +0000 (Mon, 29 Apr 2013) Log Message: ----------- Updated and NumLock fix the mouse bindings Modified Paths: -------------- ChangeLog doc/Mouse bindings.txt fvwm/components/decorations/Buttons-amigaos fvwm/components/decorations/Buttons-amigaos-MiniIcon fvwm/components/decorations/Buttons-amigaos_NumLock fvwm/components/decorations/Buttons-fvwm-crystal fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon fvwm/components/decorations/Buttons-fvwm-crystal_NumLock fvwm/components/decorations/Buttons-macosx fvwm/components/decorations/Buttons-macosx-MiniIcon fvwm/components/decorations/Buttons-macosx_NumLock fvwm/components/decorations/Buttons-os2 fvwm/components/decorations/Buttons-os2-MiniIcon fvwm/components/decorations/Buttons-os2_NumLock fvwm/components/decorations/Buttons-windows fvwm/components/decorations/Buttons-windows_NumLock fvwm/components/functions/Fullscreen fvwm/components/functions/Window-Decorations fvwm/components/functions/Window-Focus Modified: ChangeLog =================================================================== --- ChangeLog 2013-04-29 15:19:55 UTC (rev 320) +++ ChangeLog 2013-04-29 20:36:44 UTC (rev 321) @@ -6,6 +6,7 @@ bin: updated some headers doc: updated some headers, added a few sentences. doc/FAQ: added 3.7 about flaky MPlayer. + updated and NumLock fix the mouse bindings. Dimanche 28 Avril 2013 Dominique Michel functions/Window-Buttons; functions/Fullscreen: cleanup of WindowResize Modified: doc/Mouse bindings.txt =================================================================== --- doc/Mouse bindings.txt 2013-04-29 15:19:55 UTC (rev 320) +++ doc/Mouse bindings.txt 2013-04-29 20:36:44 UTC (rev 321) @@ -29,7 +29,7 @@ Toggle the ability to switch desktop pages using screen edge (off/on, defult off). On the Amiga recipe, it will toggle the visibility of the top panel - between top and bottom. + between top and bottom layer. Alt + MMB Hide or show desktop panels. @@ -43,7 +43,7 @@ RMB Open a terminal window. -Alt + MMB +Alt + DoubleClick MMB Close selected window. @@ -64,8 +64,6 @@ Alt + MMB Resize selected window (move bottom-right corner). -Wheel - Increase or decrease the transparency of the selected window. Window's titlebar ----------------------------------------------------------------------------- @@ -87,14 +85,24 @@ MMB + drag Resize selected window (choose window edge(s) to move). +Wheel + Increase or decrease the transparency of the selected window. + Titlebar buttons ------------------------------------------------------------------------------ +---------------------------------------------------------------------------- + LMB, RMB, MMB + hold Show button menu(s). FVWM-Crystal button model: - Close buttons: + +----------+-----------------+----------+-----------+------------"----------+ + | Close B. | | Arrows B.| Options B.| Maximize B.| Close B. | + +----------+-----------------+----------+-----------+------------+----------+ +This apply also to the Amiga button model, which is the same but with only +one close button on the left: + + Close buttons: LMB Close selected window. @@ -107,7 +115,7 @@ Alt + MMB Destroy (kill) selected window. - Maximize button: + Maximize button (toggle between new size and default size): LMB Maximize window. @@ -128,21 +136,26 @@ Window options button: LMB - Set window to stay on top. + Minimize the window (or toggle to the default size). Alt + LMB - Set window to stay on bottom. + Toggle sticky window mode. RMB - Toggle sticky window mode. - - MMB Set window in "normal" mode (clears stay on top/bottom). + MMB + Set window to stay on top. + + Alt + MMB + Set window to stay on bottom. + + Arrows button: LMB Move selected window to the left (upper) desktop page. + Amiga model: Iconify the window. Alt + LMB Go to the left (upper) page with selected window. Modified: fvwm/components/decorations/Buttons-amigaos =================================================================== --- fvwm/components/decorations/Buttons-amigaos 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-amigaos 2013-04-29 20:36:44 UTC (rev 321) @@ -21,34 +21,37 @@ # Button 6: iconify (on non transiet window) -# First button - close, destroy, save default geometry -Mouse 1 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close Close -Mouse 2 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent +# First button - close, destroy, iconify #save default geometry +Mouse 1 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Close +Mouse 2 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent Mouse 2 1 $[Mod1] Window-Button-Function Button1 /Window-Menu-Close Destroy -Mouse 3 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close SaveWindowGeom +Mouse 3 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Window-Iconify +#SaveWindowGeom Style * Button 1 # Second button - raise/lower and various ways to maximize a window -Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower -Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen -Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen +Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow Style * Button 2 Style * NoButton 3 -# 4th button - minimize, default, maximize -Mouse 1 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize -Mouse 2 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Default -Mouse 3 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Maximize +# 4th button - minimize, stick and layers +Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize +Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Stick +Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 5 +Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 3 +Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 4 Style * Button 4 Style * NoButton 5 -# 6th button - move a window between pages +# 6th button - iconify, move a window between pages Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-Iconify #Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-MoveToPage-Backward Mouse 2 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page MoveToPage-Focus prev Modified: fvwm/components/decorations/Buttons-amigaos-MiniIcon =================================================================== --- fvwm/components/decorations/Buttons-amigaos-MiniIcon 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-amigaos-MiniIcon 2013-04-29 20:36:44 UTC (rev 321) @@ -6,20 +6,21 @@ # to see the popup menu of a certain button. -# First button - close, destroy, save default geometry -Mouse 1 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close Close -Mouse 2 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent +# First button - close, destroy, iconify #save default geometry +Mouse 1 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Close +Mouse 2 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent Mouse 2 1 $[Mod1] Window-Button-Function Button1 /Window-Menu-Close Destroy -Mouse 3 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close SaveWindowGeom +Mouse 3 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Window-Iconify +#SaveWindowGeom Style * Button 1 # Second button -various ways to maximize a window -Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower -Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen -Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen +Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow Style * Button 2 #Mouse 1 2 $[Mod0] RaiseLower @@ -29,15 +30,17 @@ Mouse 3 3 $[Mod] Window-Lower-Move Style * Button 3 -# 4th button - minimize, default, maximize -Mouse 1 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize -Mouse 2 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Default -Mouse 3 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Maximize +# 4th button - minimize, stick and layers +Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize +Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Stick +Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 5 +Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 3 +Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 4 Style * Button 4 Style * NoButton 5 -# 6th button - move a window between pages +# 6th button - iconify, move a window between pages Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-Iconify #Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-MoveToPage-Backward Mouse 2 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page MoveToPage-Focus prev Modified: fvwm/components/decorations/Buttons-amigaos_NumLock =================================================================== --- fvwm/components/decorations/Buttons-amigaos_NumLock 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-amigaos_NumLock 2013-04-29 20:36:44 UTC (rev 321) @@ -6,23 +6,28 @@ # to see the popup menu of a certain button. # Additional support for NumLock key -# First button - close, destroy, save default geometry +# First button - close, destroy, iconify #save default geometry +Mouse 1 1 $[Mod0]2 Window-Button-Function Button1 /Window-Menu-Close Close +Mouse 2 1 $[Mod0]2 Window-Button-Function Button1 /Window-Menu-Close FvwmIdent Mouse 2 1 $[Mod1]2 Window-Button-Function Button1 /Window-Menu-Close Destroy +Mouse 3 1 $[Mod0]2 Window-Button-Function Button1 /Window-Menu-Close Window-Iconify # 2th button - various ways to maximize a window -Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower -Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen -Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen +Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow -# 4th button - minimize, default, maximize +# 4th button - minimize, stick and layers Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize -Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Default -Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Maximize +Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Layer Stick +Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Layer 0 5 +Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Layer Layer 0 3 +Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Layer 0 4 -# 6th button - move a window between pages +# 6th button - iconify, move a window between pages Mouse 1 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Page Window-Iconify #Mouse 1 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Page Window-MoveToPage-Backward Mouse 2 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Page MoveToPage-Focus prev Modified: fvwm/components/decorations/Buttons-fvwm-crystal =================================================================== --- fvwm/components/decorations/Buttons-fvwm-crystal 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-fvwm-crystal 2013-04-29 20:36:44 UTC (rev 321) @@ -1,5 +1,6 @@ # FVWM-Crystal Button Setup # Written by Maciej Delmanowski <ha...@li...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the default FVWM-Crystal window button setup. Hold the mouse buttons # to see the popup menu of a certain button. @@ -22,21 +23,22 @@ Style * NoButton 3 # 4th button - various ways to maximize a window -Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower -Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen -Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow Style * Button 4 Style * NoButton 5 # 6th button - additional window commands -Mouse 1 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5 -Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3 -Mouse 2 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4 -Mouse 3 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Stick +Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Window-Resize Minimize +Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Stick +Mouse 2 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5 +Mouse 2 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3 +Mouse 3 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4 Style * Button 6 Style * NoButton 7 Modified: fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon =================================================================== --- fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon 2013-04-29 20:36:44 UTC (rev 321) @@ -1,5 +1,6 @@ # FVWM-Crystal Button Setup # Written by Maciej Delmanowski <ha...@po...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the default FVWM-Crystal window button setup. Hold the mouse buttons # to see the popup menu of a certain button. @@ -26,21 +27,22 @@ Style * Button 3 # 4th button - various ways to maximize a window -Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower -Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen -Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow Style * Button 4 Style * NoButton 5 # 6th button - additional window commands -Mouse 1 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5 -Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3 -Mouse 2 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4 -Mouse 3 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Stick +Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Window-Resize Minimize +Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Stick +Mouse 2 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5 +Mouse 2 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3 +Mouse 3 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4 Style * Button 6 Style * NoButton 7 Modified: fvwm/components/decorations/Buttons-fvwm-crystal_NumLock =================================================================== --- fvwm/components/decorations/Buttons-fvwm-crystal_NumLock 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-fvwm-crystal_NumLock 2013-04-29 20:36:44 UTC (rev 321) @@ -1,5 +1,6 @@ # FVWM-Crystal Button Setup # Written by Maciej Delmanowski <ha...@li...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the default FVWM-Crystal window button setup. Hold the mouse buttons # to see the popup menu of a certain button. @@ -13,15 +14,19 @@ Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Close Destroy # 4th button - various ways to maximize a window -Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower -Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen -Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow # 6th button - additional window commands -Mouse 1 6 $[Mod1]2 Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3 +Mouse 1 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Layer Window-Resize Minimize +Mouse 1 6 $[Mod1]2 Window-Button-Function Button6 /Window-Menu-Layer Stick +Mouse 2 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5 +Mouse 2 6 $[Mod1]2 Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3 +Mouse 3 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4 # 8th button - move a window between pages Mouse 1 8 $[Mod0]2 Window-Button-Function Button8 /Window-Menu-Page Window-MoveToPage-Backward Modified: fvwm/components/decorations/Buttons-macosx =================================================================== --- fvwm/components/decorations/Buttons-macosx 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-macosx 2013-04-29 20:36:44 UTC (rev 321) @@ -1,5 +1,6 @@ # MacOS X Button Setup # Written by Maciej Delmanowski <ha...@li...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the window titlebar button setup similar to the MacOS X # buttons on the titlebar @@ -21,12 +22,12 @@ Style * NoButton 4 # third button - various ways to maximize a window -Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize RaiseLower -Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Fullscreen -Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Hgrow Style * Button 5 Style * NoButton 6 Modified: fvwm/components/decorations/Buttons-macosx-MiniIcon =================================================================== --- fvwm/components/decorations/Buttons-macosx-MiniIcon 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-macosx-MiniIcon 2013-04-29 20:36:44 UTC (rev 321) @@ -1,5 +1,6 @@ # MacOS X Button Setup # Written by Maciej Delmanowski <ha...@po...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the window titlebar button setup similar to the MacOS X # buttons on the titlebar @@ -21,12 +22,12 @@ Style * NoButton 4 # third button - various ways to maximize a window -Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize RaiseLower -Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Fullscreen -Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Hgrow Style * Button 5 Style * NoButton 6 Modified: fvwm/components/decorations/Buttons-macosx_NumLock =================================================================== --- fvwm/components/decorations/Buttons-macosx_NumLock 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-macosx_NumLock 2013-04-29 20:36:44 UTC (rev 321) @@ -1,16 +1,17 @@ # MacOS X Button Setup # Written by Maciej Delmanowski <ha...@li...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the window titlebar button setup similar to the MacOS X # buttons on the titlebar # Additional support for NumLock key # third button - various ways to maximize a window -Mouse 1 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize RaiseLower -Mouse 2 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Fullscreen -Mouse 1 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Hgrow # vim:ft=fvwm Modified: fvwm/components/decorations/Buttons-os2 =================================================================== --- fvwm/components/decorations/Buttons-os2 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-os2 2013-04-29 20:36:44 UTC (rev 321) @@ -1,5 +1,6 @@ # OS/2 Button Setup # Written by Maciej Delmanowski <ha...@li...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the window titlebar button setup similar to the OS/2 # buttons on the titlebar @@ -11,12 +12,12 @@ Style * Button 1 # 2nd button - various ways to maximize a window -Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower -Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen -Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow Style * Button 2 Style * NoButton 3 Modified: fvwm/components/decorations/Buttons-os2-MiniIcon =================================================================== --- fvwm/components/decorations/Buttons-os2-MiniIcon 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-os2-MiniIcon 2013-04-29 20:36:44 UTC (rev 321) @@ -1,5 +1,6 @@ # OS/2 Button Setup # Written by Maciej Delmanowski <ha...@po...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the window titlebar button setup similar to the OS/2 # buttons on the titlebar @@ -11,12 +12,12 @@ Style * Button 1 # 2nd button - various ways to maximize a window -Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower -Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen -Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow Style * Button 2 # MiniIcon Modified: fvwm/components/decorations/Buttons-os2_NumLock =================================================================== --- fvwm/components/decorations/Buttons-os2_NumLock 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-os2_NumLock 2013-04-29 20:36:44 UTC (rev 321) @@ -1,16 +1,17 @@ # OS/2 Button Setup # Written by Maciej Delmanowski <ha...@li...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the window titlebar button setup similar to the OS/2 # buttons on the titlebar # Additional support for NumLock key # 2nd button - various ways to maximize a window -Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower -Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen -Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow # vim:ft=fvwm Modified: fvwm/components/decorations/Buttons-windows =================================================================== --- fvwm/components/decorations/Buttons-windows 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-windows 2013-04-29 20:36:44 UTC (rev 321) @@ -1,5 +1,6 @@ # MS Windows Button Setup # Written by Maciej Delmanowski <ha...@li...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the window titlebar button setup similar to the MS Windows # buttons on the titlebar @@ -17,12 +18,12 @@ Style * NoButton 3 # 4th button - various ways to maximize a window -Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower -Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen -Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow Style * Button 4 Style * NoButton 5 Modified: fvwm/components/decorations/Buttons-windows_NumLock =================================================================== --- fvwm/components/decorations/Buttons-windows_NumLock 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/decorations/Buttons-windows_NumLock 2013-04-29 20:36:44 UTC (rev 321) @@ -1,16 +1,17 @@ # MS Windows Button Setup # Written by Maciej Delmanowski <ha...@li...> +# Maintained and updated by Dominique Michel <dom...@us...urceforge,net> # # This is the window titlebar button setup similar to the MS Windows # buttons on the titlebar # Additional support for NumLock key # 4th button - various ways to maximize a window -Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower -Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize -Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen -Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100 -Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 -Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize +Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100 +Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100 +Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow +Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow +Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow # vim:ft=fvwm Modified: fvwm/components/functions/Fullscreen =================================================================== --- fvwm/components/functions/Fullscreen 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/functions/Fullscreen 2013-04-29 20:36:44 UTC (rev 321) @@ -22,10 +22,6 @@ # # Key KP_Multiply A $[Mod2] Disappear # -# and at the end of the recipe, add -# -# FullscreenRecover -# # The other window size functions are into Window-Buttons. # # 'Fullscreen-Start' and 'Fullscreen-Stop' functions shouldn't be called @@ -41,9 +37,6 @@ # correctly the first time it is put in full screen, but it does scale OK afterward. # If you know how to fix this, please send me a mail: # <dom...@us...> -# -# TODO: -# - restore the position when restoring the "normal" window InfoStoreAdd TmpDirectory "/tmp" Modified: fvwm/components/functions/Window-Decorations =================================================================== --- fvwm/components/functions/Window-Decorations 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/functions/Window-Decorations 2013-04-29 20:36:44 UTC (rev 321) @@ -18,6 +18,7 @@ #+ I TestRc (Match) KeepRc Include components/styles/Window-Decorations + I TestRc (Match) KeepRc SavePreferences LastChoosenWindowDecoration "Window-Decorations-Set $*" + I UnsetEnv Window_Decorations_ButtonModel-Temp ++ I Style * HandleWidth $[infostore.handle_width] DestroyMenu /Window-Decorations Modified: fvwm/components/functions/Window-Focus =================================================================== --- fvwm/components/functions/Window-Focus 2013-04-29 15:19:55 UTC (rev 320) +++ fvwm/components/functions/Window-Focus 2013-04-29 20:36:44 UTC (rev 321) @@ -21,6 +21,7 @@ + I MoveToPage $[page.nx] $[page.ny] + I FlipFocus #+ I Focus ++ I Layer Default + I Raise #+ I WarpToWindow 50 50 @@ -29,6 +30,7 @@ + I Iconify False + I FlipFocus #+ I Focus ++ I Layer Default + I Raise #+ I WarpToWindow 50 50 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |