Menu
▾
▴
fvwm-crystal-commits
|
From: <dom...@us...> - 2010-12-19 22:34:31
|
Revision: 29
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=29&view=rev
Author: dominique_libre
Date: 2010-12-19 22:34:25 +0000 (Sun, 19 Dec 2010)
Log Message:
-----------
Fixed bug in FvwmMiniConsole with Numpad, some new or midified bindings
Modified Paths:
--------------
fvwm/components/apps/FvwmMiniConsole
fvwm/components/bindings/Desktop-MMB-TogglePanels
fvwm/components/bindings/Multimedia_Keys_NumLock
Added Paths:
-----------
fvwm/components/bindings/Desktop-MMB-ToggleTopBar
Modified: fvwm/components/apps/FvwmMiniConsole
===================================================================
--- fvwm/components/apps/FvwmMiniConsole 2010-12-19 22:00:50 UTC (rev 28)
+++ fvwm/components/apps/FvwmMiniConsole 2010-12-19 22:34:25 UTC (rev 29)
@@ -3,7 +3,8 @@
# Variables
SetEnv FvwmConsoleTerminal "NO_FVWMCONSOLE_TERMINAL_FOUND"
-FindCommand FvwmConsoleTerminal xterm aterm urxvt mrxvt
+#FindCommand FvwmConsoleTerminal xterm aterm urxvt mrxvt
+LoadPreferences FvwmConsoleTerminal
Mouse (FvwmMiniConsoleNeedsUniqueName) 2 W $[Mod1] FvwmMiniConsole-Resize
Modified: fvwm/components/bindings/Desktop-MMB-TogglePanels
===================================================================
--- fvwm/components/bindings/Desktop-MMB-TogglePanels 2010-12-19 22:00:50 UTC (rev 28)
+++ fvwm/components/bindings/Desktop-MMB-TogglePanels 2010-12-19 22:34:25 UTC (rev 29)
@@ -4,6 +4,6 @@
Mouse 2 RI $[Mod1] EWMH-Toggle Mouse 2 RI $[Mod1]
# Toggle panel visibility with NumLock
-Mouse 2 RI $[Mod1]2 EWMH-Toggle Mouse 2 RI $[Mod1]
+Mouse 2 RI $[Mod1]2 EWMH-Toggle Mouse 2 RI $[Mod1]2
# vim:ft=fvwm
Added: fvwm/components/bindings/Desktop-MMB-ToggleTopBar
===================================================================
--- fvwm/components/bindings/Desktop-MMB-ToggleTopBar (rev 0)
+++ fvwm/components/bindings/Desktop-MMB-ToggleTopBar 2010-12-19 22:34:25 UTC (rev 29)
@@ -0,0 +1,7 @@
+# Default desktop bindings
+
+# Toggle panel visibility on Alt+MMB
+Mouse 2 RI $[Mod0] Toggle-TopBar-OnTop
+Mouse 2 RI $[Mod0]2 Toggle-TopBar-OnTop
+
+# vim:ft=fvwm
Modified: fvwm/components/bindings/Multimedia_Keys_NumLock
===================================================================
--- fvwm/components/bindings/Multimedia_Keys_NumLock 2010-12-19 22:00:50 UTC (rev 28)
+++ fvwm/components/bindings/Multimedia_Keys_NumLock 2010-12-19 22:34:25 UTC (rev 29)
@@ -14,11 +14,11 @@
key XF86AudioPlay A $[Mod0]2 Music-FrameStep
key XF86AudioPlay A $[Mod1]2 Music-Speed normal mplayer
key XF86AudioPlay A C2 Music-Pause
-# key XF86AudioStop A $[Mod0]2 Music-Stop
+## key XF86AudioStop A $[Mod0]2 Music-Stop
key XF86AudioStop A C2 Music-Pause
key XF86AudioStop A $[Mod1]2 Music-Speed normal mplayer
-Key XF86AudioNext A $[Mod]2 Music-Next
-Key XF86AudioPrev A $[Mod]2 Music-Prev
-Key XF86AudioMedia A $[Mod]2 Music-GUI
+#Key XF86AudioNext A $[Mod]2 Music-Next
+#Key XF86AudioPrev A $[Mod]2 Music-Prev
+#Key XF86AudioMedia A $[Mod]2 Music-GUI
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-22 19:06:35
|
Revision: 33
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=33&view=rev
Author: dominique_libre
Date: 2010-12-22 19:06:29 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
New Amiga focus policy, fixed Window-Remember-* functions to use new syntax
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Window-Remember-ClickToFocus
fvwm/components/functions/Window-Remember-SloppyFocus
fvwm/components/styles/FocusPolicy-Amiga
fvwm/components/styles/FocusPolicy-MSWindows
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-22 01:01:24 UTC (rev 32)
+++ ChangeLog 2010-12-22 19:06:29 UTC (rev 33)
@@ -1,5 +1,12 @@
ChangeLog for FVWM-Crystal
+Mercredi 23 décembre 2010 Dominique Michel
+ * New Amiga focus policy : click to focus without raise,
+ icons are move to focus :), its not AmigaOS behaviour but I like it that
+ way for now, may change in the future
+
+ * Fixed Window-Remember-*, State 2 initialisation was using old syntax
+
Mardi 22 décembre 2010 Dominique Michel
The commit list bounced here too !
* New Maximize functions and associated bindings
Modified: fvwm/components/functions/Window-Remember-ClickToFocus
===================================================================
--- fvwm/components/functions/Window-Remember-ClickToFocus 2010-12-22 01:01:24 UTC (rev 32)
+++ fvwm/components/functions/Window-Remember-ClickToFocus 2010-12-22 19:06:29 UTC (rev 33)
@@ -2,18 +2,29 @@
# Functions for Style * ClickToFocus
# ---------------------------------------
+# Called when focus change, set state 2 for the focused window,
+# unset it for the other.
+###############################################################
DestroyFunc Window-RememberFocused
AddToFunc Window-RememberFocused
+ I None (CurrentPage, AcceptsFocus) Break
-+ I Current (!Iconified, !Sticky) All (CurrentPage) State 2 False
-+ I Current (!Iconified) State 2 True
++ I Current (!Iconified, !Sticky) All (CurrentPage) WindowStyle !State 2
++ I Current (!Iconified) WindowStyle State 2
+# Called when new page and destroy window, restore the focus to the
+# previouslx focused window.
+###################################################################
DestroyFunc Window-FocusRemembered
AddToFunc Window-FocusRemembered
+#+ I Any (FvwmMiniConsoleNeedsUniqueName, Visible) Break
+#+ I Any (QuakeConsoleNeedsUniqueName, Visible) Break
+ I None (CurrentPage, AcceptsFocus) Break
+#+ I Current (!Focused, Visible, Sticky) Break
+ I Current (Focused, Sticky, !CirculateHit) Break
+ I Next (CurrentPage, State 2) Focus
-+ I None (CurrentPage, Focused) Prev (CurrentPage, !Iconified) Focus
+#+ I None (CurrentPage, Focused, !Iconified, Visible) Prev (CurrentPage, !Iconified, Visible) Focus
+#+ I None (CurrentPage, Focused) Prev (CurrentPage, !Iconified) Focus
++ I None (CurrentPage, Focused, !Iconified) Prev (CurrentPage, !Iconified) Focus
DestroyModuleConfig FvwmEvent-Window-Remember: *
@@ -21,12 +32,6 @@
*FvwmEvent-Window-Remember: focus_change Window-RememberFocused
*FvwmEvent-Window-Remember: destroy_window Window-FocusRemembered
-# OK, I know that it's stupid. It sucks. But, I don't know why, when I launch
-# FvwmEvent only once, it doesn't keep focus on the QuakeConsole while desktop
-# pages are changed. And when there are two FvwmEvent modules loaded, it does
-# do that. If you will find a solution how to keep that effect without two
-# copies of FvwmEvent, let me know.
Module FvwmEvent FvwmEvent-Window-Remember
-Module FvwmEvent FvwmEvent-Window-Remember
# vim:ft=fvwm
Modified: fvwm/components/functions/Window-Remember-SloppyFocus
===================================================================
--- fvwm/components/functions/Window-Remember-SloppyFocus 2010-12-22 01:01:24 UTC (rev 32)
+++ fvwm/components/functions/Window-Remember-SloppyFocus 2010-12-22 19:06:29 UTC (rev 33)
@@ -5,13 +5,15 @@
DestroyFunc Window-RememberFocused
AddToFunc Window-RememberFocused
+ I None (CurrentPage, AcceptsFocus) Break
-+ I Current (!Iconified, !Sticky) All (CurrentPage) State 2 False
-+ I Current (!Iconified, !Sticky) State 2 True
++ I Current (!Iconified, !Sticky) All (CurrentPage) WindowStyle !State 2
++ I Current (!Iconified, !Sticky) WindowStyle State 2
DestroyFunc Window-FocusRemembered
AddToFunc Window-FocusRemembered
+#+ I All (FvwmMiniConsoleNeedsUniqueName, Visible) Break
+#+ I All (QuakeConsoleNeedsUniqueName, Visible) Break
+ I None (CurrentPage, AcceptsFocus) Break
-+ I Current (Focused, Sticky) Break
++ I Current (Focused, Visible, Sticky) Break
+ I Next (CurrentPage, HasPointer) Focus
+ I TestRc (Match) Break
+ I Next (CurrentPage, State 2) Focus
@@ -23,12 +25,6 @@
*FvwmEvent-Window-Remember: focus_change Window-RememberFocused
*FvwmEvent-Window-Remember: destroy_window Window-FocusRemembered
-# OK, I know that it's stupid. It sucks. But, I don't know why, when I launch
-# FvwmEvent only once, it doesn't keep focus on the QuakeConsole while desktop
-# pages are changed. And when there are two FvwmEvent modules loaded, it does
-# do that. If you will find a solution how to keep that effect without two
-# copies of FvwmEvent, let me know.
Module FvwmEvent FvwmEvent-Window-Remember
-Module FvwmEvent FvwmEvent-Window-Remember
# vim:ft=fvwm
Modified: fvwm/components/styles/FocusPolicy-Amiga
===================================================================
--- fvwm/components/styles/FocusPolicy-Amiga 2010-12-22 01:01:24 UTC (rev 32)
+++ fvwm/components/styles/FocusPolicy-Amiga 2010-12-22 19:06:29 UTC (rev 33)
@@ -13,8 +13,6 @@
Style * FPGrabFocus, FPGrabFocusTransient
Style * FPReleaseFocus, FPReleaseFocusTransient
-#IgnoreModifiers L2
-
# Focus style for icons
# FPEnterToFocus
DestroyFunc Focus-Iconic
@@ -33,7 +31,6 @@
#Module FvwmEvent FvwmEvent-IconFocus
# Functions for remembering last focused window on a desktop page
-#Include components/functions/Window-Remember-SloppyFocus
-#Include components/functions/Window-Remember-ClickToFocus
+Include components/functions/Window-Remember-ClickToFocus
# vim:ft=fvwm
Modified: fvwm/components/styles/FocusPolicy-MSWindows
===================================================================
--- fvwm/components/styles/FocusPolicy-MSWindows 2010-12-22 01:01:24 UTC (rev 32)
+++ fvwm/components/styles/FocusPolicy-MSWindows 2010-12-22 19:06:29 UTC (rev 33)
@@ -1,7 +1,7 @@
# Window focusing policy - MS Windows
# - click to focus
-# - windows are automatically raised upon focus
+# - windows are automatically raised upon focus (raised by clicks)
# - new windows are automatically being focused
Style * !FPEnterToFocus, !FPLeaveToUnfocus, FPClickToFocus, FPClickDecorToFocus
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-22 19:24:29
|
Revision: 34
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=34&view=rev
Author: dominique_libre
Date: 2010-12-22 19:24:23 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Added some application styles, fixed a hard to figure out bug into the style loading order.
Modified Paths:
--------------
ChangeLog
fvwm/components/desktop/FVWM-Crystal_Styles
fvwm/components/styles/Application-Icons-22-32
fvwm/components/styles/Applications
fvwm/components/styles/FVWM
fvwm/components/styles/Window-Decorations
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-22 19:06:29 UTC (rev 33)
+++ ChangeLog 2010-12-22 19:24:23 UTC (rev 34)
@@ -4,8 +4,10 @@
* New Amiga focus policy : click to focus without raise,
icons are move to focus :), its not AmigaOS behaviour but I like it that
way for now, may change in the future
-
* Fixed Window-Remember-*, State 2 initialisation was using old syntax
+ * Added some application styles
+ * Fixed the style order loading causing non wanted effect after restart.
+ Hope it work well now. This one was hard to figure out.
Mardi 22 décembre 2010 Dominique Michel
The commit list bounced here too !
Modified: fvwm/components/desktop/FVWM-Crystal_Styles
===================================================================
--- fvwm/components/desktop/FVWM-Crystal_Styles 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/desktop/FVWM-Crystal_Styles 2010-12-22 19:24:23 UTC (rev 34)
@@ -1,9 +1,17 @@
# Default FVWM-Crystal styles
-Append components/styles/Application-Icons-22-32
+
+# FVWM, Applications and QuakeConsole styles are already loaded
+# by components/desktop/FVWM-Crystal_Preferences that do
+# a LoadPreferences LastChoosenWindowDecoration.
+# This function call launch Window-Decoration-set, which include
+# an Include components/styles/Window-Decorations, which
+# read those 3 files.
+# If we don't read all the files here, the panels get screwed.
+Include components/styles/FVWM
Append components/styles/Applications
Include components/styles/QuakeConsole
+Append components/styles/Application-Icons-22-32
Include components/styles/Menu
-Include components/styles/FVWM
Include components/styles/CursorStyle
# vim:ft=fvwm
Modified: fvwm/components/styles/Application-Icons-22-32
===================================================================
--- fvwm/components/styles/Application-Icons-22-32 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/styles/Application-Icons-22-32 2010-12-22 19:24:23 UTC (rev 34)
@@ -5,8 +5,8 @@
# Default icon styles {{{1
Style ** MiniIcon 22x22/apps/default.png, Icon 32x32/apps/default.png
-# Icons below are used in �fvwm-crystal-minimal" version {{{1
-# �-----------------------------------------------------------
+# Icons below are used in "fvwm-crystal-minimal" version {{{1
+# -----------------------------------------------------------
# Terminal emulators {{{2
Style XTerm MiniIcon 22x22/apps/xterm.png, Icon 32x32/apps/xterm.png
@@ -19,7 +19,29 @@
Style Multi-gnome-terminal MiniIcon 22x22/apps/multi-gnome-terminal.png, Icon 32x32/apps/multi-gnome-terminal.png
Style xfce4-terminal MiniIcon 22x22/apps/xfce4-terminal.png, Icon 32x32/apps/xfce4-terminal.png
Style Terminator MiniIcon 22x22/apps/terminator.png, Icon 32x32/apps/terminator.png
+Style Lxterminal MiniIcon 22x22/apps/lxterminal.png, Icon 32x32/apps/lxterminal.png
+Style Vte MiniIcon 22x22/apps/vte.png, Icon 32x32/apps/vte.png
+*FvwmEvent-Terminal: Cmd
+*FvwmEvent-Terminal: PassId
+*FvwmEvent-Terminal: add_window FuncResizeTerm
+DestroyFunc FuncResizeTerm
+AddToFunc FuncResizeTerm
++ I WindowId $0 ("XTerm") Resize 80 50
++ I WindowId $0 ("aterm") Resize 80c 25
++ I WindowId $0 ("Eterm") Resize 80 60
++ I WindowId $0 ("URxwt") Resize 80 60
++ I WindowId $0 ("mrxvt") Resize 80 60
++ I WindowId $0 ("konsole") Resize 80 60
++ I WindowId $0 ("Gnome-terminal") Resize 80 60
++ I WindowId $0 ("Multi-gnome-terminal") Resize 80 60
++ I WindowId $0 ("xfce4-terminal") Resize 80 60
++ I WindowId $0 ("Terminator") Resize 80 60
++ I WindowId $0 ("Lxterminal") Resize 80 50
++ I WindowId $0 ("Vte") Resize 80 50
+
+AddToFunc StartFunction I FvwmEvent FvwmEvent-Terminal
+
# Text applications {{{2
Style elinks MiniIcon 22x22/apps/elinks.png, Icon 32x32/apps/elinks.png
Style aptsh MiniIcon 22x22/apps/aptsh.png, Icon 32x32/apps/aptsh.png
@@ -33,11 +55,13 @@
Style mc MiniIcon 22x22/apps/mc.png , Icon 32x32/apps/mc.png
Style aptitude MiniIcon 22x22/apps/aptitude.png, Icon 32x32/apps/aptitude.png
+
+
# GTK/GNOME applications {{{2
Style Gimp MiniIcon 22x22/apps/gimp.png, Icon 32x32/apps/gimp.png
Style MPlayer MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
-Style Firefox-bin MiniIcon 22x22/apps/firefox.png, Icon 32x32/apps/firefox.png
Style Firefox MiniIcon 22x22/apps/firefox.png, Icon 32x32/apps/firefox.png
+Style Firefox-bin UseStyle Firefox
Style gajim.py MiniIcon 22x22/apps/gajim.png, Icon 32x32/apps/gajim.png
Style gajim MiniIcon 22x22/apps/gajim.png, Icon 32x32/apps/gajim.png
@@ -148,7 +172,7 @@
Style gtk-gnutella MiniIcon 22x22/apps/gtk-gnutella.png, Icon 32x32/apps/gtk-gnutella.png
Style GTKtalog MiniIcon 22x22/apps/gtktalog.png, Icon 32x32/apps/gtktalog.png
Style gtktalog UseStyle GTKtalog
-Style jumpnbump-menu MiniIcon 22x22/apps/jumpnbump-menu.png, Icon 32x32/apps/jumpnbump-menu.png
+Style jumpnbump-menu MiniIcon 22x22/apps/jumpnbump.png, Icon 32x32/apps/jumpnbump.png
Style gossip MiniIcon 22x22/apps/gossip.png, Icon 32x32/apps/gossip.png
Style gaim MiniIcon 22x22/apps/gaim.png, Icon 32x32/apps/gaim.png
Style gnumeric MiniIcon 22x22/apps/gnumeric.png, Icon 32x32/apps/gnumeric.png
@@ -165,15 +189,17 @@
Style xqf MiniIcon 22x22/apps/xqf.png, Icon 32x32/apps/xqf.png
Style streamtuner MiniIcon 22x22/apps/streamtuner.png, Icon 32x32/apps/streamtuner.png
Style Flock-bin MiniIcon 22x22/apps/flock.png, Icon 32x32/apps/flock.png
-Style Mozilla-bin MiniIcon 22x22/apps/mozilla.png, Icon 32x32/apps/mozilla.png
+Style Mozilla MiniIcon 22x22/apps/mozilla.png, Icon 32x32/apps/mozilla.png
+Style Mozilla-bin UseStyle Mozilla
Style xchat MiniIcon 22x22/apps/xchat.png, Icon 32x32/apps/xchat.png
Style gnudoku MiniIcon 22x22/apps/gnudoku.png, Icon 32x32/apps/gnudoku.png
Style goobox MiniIcon 22x22/apps/goobox.png, Icon 32x32/apps/goobox.png
Style evince MiniIcon 22x22/apps/evince.png, Icon 32x32/apps/evince.png
Style seahorse MiniIcon 22x22/apps/seahorse.png, Icon 32x32/apps/seahorse.png
Style gweled MiniIcon 22x22/apps/gweled.png, Icon 32x32/apps/gweled.png
-Style Thunderbird-bin MiniIcon 22x22/apps/thunderbird.png, Icon 32x32/apps/thunderbird.png
-Style Mozilla-thunderbird-bin UseStyle Thunderbird-bin
+Style Thunderbird MiniIcon 22x22/apps/thunderbird.png, Icon 32x32/apps/thunderbird.png
+Style Thunderbird-bin UseStyle Thunderbird
+Style Mozilla-thunderbird-bin UseStyle Thunderbird
Style Evolution MiniIcon 22x22/apps/evolution.png, Icon 32x32/apps/evolution.png
Style "Evolution:shell" UseStyle Evolution
Style Mahjongg MiniIcon 22x22/apps/mahjongg.png, Icon 32x32/apps/mahjongg.png
Modified: fvwm/components/styles/Applications
===================================================================
--- fvwm/components/styles/Applications 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/styles/Applications 2010-12-22 19:24:23 UTC (rev 34)
@@ -11,9 +11,13 @@
#Style Untitled !Title, !Borders
Style wine !Title, !Borders
Style lxdoom !Title, !Borders, EWMHPlacementIgnoreWorkingArea
-Style Firefox-bin NoPPosition, EWMHNoMiniIconOverride
-Style Thunderbird-bin NoPPosition, EWMHNoMiniIconOverride
-Style Mozilla-bin NoPPosition, EWMHNoMiniIconOverride
+Style Firefox NoPPosition, EWMHNoMiniIconOverride
+Style Firefox-bin UseStyle Firefox
+Style Thunderbird NoPPosition, EWMHNoMiniIconOverride
+Style Thunderbird-bin UseStyle Thunderbird
+Style Mozilla-thunderbird-bin UseStyle Thunderbird
+Style Mozilla NoPPosition, EWMHNoMiniIconOverride
+Style Mozilla-bin UseStyle Mozilla
Style kicker !Title, !Borders, NeverFocus, NoIcon, FixedSize, \
WindowListSkip, FixedPosition
@@ -23,9 +27,6 @@
Style Blender !Title, !Borders
Style giFToxic EWMHMiniIconOverride
-Style MPlayer NoTitle, !Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
-Style "MPlayer - Video" Title, Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
-
Style tuxeyes !Title, !Borders, StaysOnBottom, Sticky, NoIcon, \
WindowListSkip
@@ -41,12 +42,6 @@
Style FREEGLUT !Title, !Borders
-Style XMMS_Player !Title
-Style XMMS_Playlist !Title
-Style XMMS_Equalizer !Title
-
-Style beep-media-player !Title
-
Style Zinf !Title
Style OpenOffice.org* Title, Borders, NakedTransient
@@ -54,6 +49,8 @@
Style xtensoftphone !Title, !Borders
+# Media players styles are in components/Music
+
Include components/bindings/Application-Ardour
# vim:ft=fvwm
Modified: fvwm/components/styles/FVWM
===================================================================
--- fvwm/components/styles/FVWM 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/styles/FVWM 2010-12-22 19:24:23 UTC (rev 34)
@@ -8,11 +8,13 @@
Style FvwmButtons UseStyle FvwmParts
Style FvwmPager UseStyle FvwmParts
Style FvwmIconMan UseStyle FvwmParts
-#Style FvwmScript UseStyle FvwmParts
+Style FvwmScript UseStyle FvwmParts
Style trayer UseStyle FvwmParts
+#Style stalonetray UseStyle FvwmParts
Style FvwmIdent UseStyle FvwmParts
-Style FvwmIdent VariablePosition
+Style FvwmIdent VariablePosition, \
+ Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:encoding=iso10646-1"
Style FvwmForm Sticky, WindowListSkip, \
FixedSize, StaysOnTop, NoHandles, BorderWidth 1, HandleWidth 1, \
Modified: fvwm/components/styles/Window-Decorations
===================================================================
--- fvwm/components/styles/Window-Decorations 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/styles/Window-Decorations 2010-12-22 19:24:23 UTC (rev 34)
@@ -2,8 +2,8 @@
# which can be affected by changed decoration. You don't need to use it
# directly
-Read $./FVWM
-Read $./QuakeConsole
-Read $./Applications
+Include components/style/FVWM
+Include components/style/QuakeConsole
+Include components/style/Applications
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-22 19:44:11
|
Revision: 35
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=35&view=rev
Author: dominique_libre
Date: 2010-12-22 19:44:03 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Added Amiga style icon functions
Modified Paths:
--------------
ChangeLog
Added Paths:
-----------
fvwm/components/desktop/Icon-Amiga
fvwm/components/functions/Icon-Amiga
fvwm/components/functions/Icon-Basic-SingleClick
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-22 19:24:23 UTC (rev 34)
+++ ChangeLog 2010-12-22 19:44:03 UTC (rev 35)
@@ -4,6 +4,7 @@
* New Amiga focus policy : click to focus without raise,
icons are move to focus :), its not AmigaOS behaviour but I like it that
way for now, may change in the future
+ * Added Amiga style icon functions
* Fixed Window-Remember-*, State 2 initialisation was using old syntax
* Added some application styles
* Fixed the style order loading causing non wanted effect after restart.
Added: fvwm/components/desktop/Icon-Amiga
===================================================================
--- fvwm/components/desktop/Icon-Amiga (rev 0)
+++ fvwm/components/desktop/Icon-Amiga 2010-12-22 19:44:03 UTC (rev 35)
@@ -0,0 +1,6 @@
+# Nice, thumbnailed icons on the desktop
+Include components/functions/Icon-Basic-SingleClick
+Include components/functions/Icon-Amiga
+Include components/bindings/Icon-Basic
+
+# vim:ft=fvwm
Added: fvwm/components/functions/Icon-Amiga
===================================================================
--- fvwm/components/functions/Icon-Amiga (rev 0)
+++ fvwm/components/functions/Icon-Amiga 2010-12-22 19:44:03 UTC (rev 35)
@@ -0,0 +1,19 @@
+# Icons - Amiga style
+
+Style * IconTitle
+Style * IconTitleColorset $[cs_icon_active]
+Style * HilightIconTitleColorset $[cs_menu_active]
+Style * IconBackgroundColorset $[cs_icon_active]
+Style * IconTitleRelief 0
+Style * IconBackgroundRelief 0
+Style * IconBackgroundPadding 0
+Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:encoding=iso10646-1"
+Style * IndexedIconName
+Style * StickyIcon
+Style * IconSize 68 68
+Style * !StickyStippledIconTitle
+
+# Icons can be moved around
+AddToFunc Icon-Restore-CurrentDesk M Move
+
+# vim:ft=fvwm
Added: fvwm/components/functions/Icon-Basic-SingleClick
===================================================================
--- fvwm/components/functions/Icon-Basic-SingleClick (rev 0)
+++ fvwm/components/functions/Icon-Basic-SingleClick 2010-12-22 19:44:03 UTC (rev 35)
@@ -0,0 +1,20 @@
+DestroyFunc Icon-Restore-CurrentDesk
+AddToFunc Icon-Restore-CurrentDesk
++ C Iconify False
++ M Move
++ C MoveToPage $[page.nx] $[page.ny]
++ C FlipFocus
++ C Raise
++ C Layer default
+
+DestroyFunc Icon-Restore-DefaultDesk
+AddToFunc Icon-Restore-DefaultDesk
++ D Iconify False
++ D FlipFocus
++ D Raise
+
+DestroyFunc Icon-Close
+AddToFunc Icon-Close
++ D Close
+
+# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-12 10:19:31
|
Revision: 222
http://sourceforge.net/p/fvwm-crystal/code/222
Author: dominique_libre
Date: 2013-04-12 10:19:27 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
+functions/Xdg-User-Dirs: Set locale aware variables for well know user directories
Modified Paths:
--------------
ChangeLog
fvwm/components/desktop/FVWM-Crystal_Functions
Added Paths:
-----------
fvwm/components/functions/Xdg-User-Dirs
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-11 21:28:38 UTC (rev 221)
+++ ChangeLog 2013-04-12 10:19:27 UTC (rev 222)
@@ -1,5 +1,10 @@
ChangeLog for FVWM-Crystal
+Vendredi 12 Avril 2013 Dominique Michel
+
++ functions/Xdg-User-Dirs: Set locale aware variables for well
+ know user directories
+
Jeudi 11 Avril 2013 Dominique Michel
FAQ: Added q.a. about tear off menus.
functions/Music-mplayer: fix glitch into the speed control; introduced
Modified: fvwm/components/desktop/FVWM-Crystal_Functions
===================================================================
--- fvwm/components/desktop/FVWM-Crystal_Functions 2013-04-11 21:28:38 UTC (rev 221)
+++ fvwm/components/desktop/FVWM-Crystal_Functions 2013-04-12 10:19:27 UTC (rev 222)
@@ -6,6 +6,9 @@
# In order to be safe, we load here all the preferences they doesn't need
# some of the fvwm-crystal functions.
+# Load the "well know" user directories (locale aware)
+Include components/functions/Xdg-User-Dirs
+
## Load the prefs with only a SetEnv initialisation
LoadPreferences DefaultMixer
LoadPreferences DefaultMusicPlayer
Added: fvwm/components/functions/Xdg-User-Dirs
===================================================================
--- fvwm/components/functions/Xdg-User-Dirs (rev 0)
+++ fvwm/components/functions/Xdg-User-Dirs 2013-04-12 10:19:27 UTC (rev 222)
@@ -0,0 +1,15 @@
+# Support for localized user directories into Fvwm-Crystal
+# Written by: Dominique Michel <dom...@so...> 2013
+# see /etc/xdg/user-dirs.defaults
+
+PipeRead 'test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs; \
+echo "InfoStoreAdd UserMusicDir ${XDG_MUSIC_DIR:-$HOME}"; \
+echo "InfoStoreAdd UserVideosDir ${XDG_VIDEOS_DIR:-$HOME}"'
+
+#echo "InfoStoreAdd UserDesktopDir ${XDG_DESKTOP_DIR:-$HOME/Desktop}"; \
+#echo "InfoStoreAdd UserDownloadDir ${XDG_DOWNLOAD_DIR:-$HOME}"; \
+#echo "InfoStoreAdd UserTemplatesDir ${XDG_TEMPLATES_DIR:-$HOME}"; \
+#echo "InfoStoreAdd UserPublicShareDir ${XDG_PUBLICSHARE_DIR:-$HOME}"; \
+#echo "InfoStoreAdd UserDocumentsDir ${XDG_DOCUMENTS_DIR:-$HOME}"; \
+#echo "InfoStoreAdd UserPicturesDir ${XDG_PICTURES_DIR:-$HOME}"; \
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-05-03 20:16:04
|
Revision: 344
http://sourceforge.net/p/fvwm-crystal/code/344
Author: dominique_libre
Date: 2013-05-03 20:16:00 +0000 (Fri, 03 May 2013)
Log Message:
-----------
associated files in functions, styles and desktop: introduce font style preference
Modified Paths:
--------------
ChangeLog
fvwm/components/desktop/FVWM-Crystal_Functions
fvwm/components/functions/Debug-Functions
fvwm/components/functions/FvwmExpose
fvwm/components/functions/FvwmFormDefault
fvwm/components/functions/FvwmIdent
fvwm/components/functions/Icon-Amiga
fvwm/components/functions/Icon-Launcher
fvwm/components/functions/Icon-Mwm
fvwm/components/functions/MakePanel
fvwm/components/functions/Tooltip
fvwm/components/styles/FVWM
fvwm/components/styles/Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-05-03 19:16:41 UTC (rev 343)
+++ ChangeLog 2013-05-03 20:16:00 UTC (rev 344)
@@ -9,8 +9,9 @@
+ scripts/FontSelector/FontSelector: FvwmScript based xft font selector for
Fvwm-Crystal; introduced font style preferences
+ preferences/*FontStyle: new font style default setup
- functions/preferences-Menu: converted font preferences to FontSelector;
-
+ functions/preferences-Menu: converted font preferences to FontSelector
+ associated files in functions, styles and desktop: introduce font style preference
+
Mercredi 1 Mai 2913 Dominique Michel
updated the version to 3.1.8
functions/Icon-Thumbnails: fix for desiconification of fullscreen windows;
Modified: fvwm/components/desktop/FVWM-Crystal_Functions
===================================================================
--- fvwm/components/desktop/FVWM-Crystal_Functions 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/desktop/FVWM-Crystal_Functions 2013-05-03 20:16:00 UTC (rev 344)
@@ -20,6 +20,9 @@
LoadPreferences PanelFontSize
LoadPreferences TitleFontSize
LoadPreferences MenuFontSize
+LoadPreferences PanelFontStyle
+LoadPreferences TitleFontStyle
+LoadPreferences MenuFontStyle
## Load the prefs with only Styles initialisation
LoadPreferences PrivilegedTerminals
Modified: fvwm/components/functions/Debug-Functions
===================================================================
--- fvwm/components/functions/Debug-Functions 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Debug-Functions 2013-05-03 20:16:00 UTC (rev 344)
@@ -16,11 +16,11 @@
*FvwmIconMan-Debug-WindowList: Title "Debug Window List: Title [icon:icon title] | class/resource"
PipeRead "echo *FvwmIconMan-Debug-WindowList: ButtonGeometry $((($[vp.width]-12)/2))x24"
*FvwmIconMan-Debug-WindowList: ManagerGeometry +3+3
-*FvwmIconMan-Debug-WindowList: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]"
+*FvwmIconMan-Debug-WindowList: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
*FvwmIconMan-Debug-WindowList: Tips always
*FvwmIconMan-Debug-WindowList: TipsDelays 400 100
*FvwmIconMan-Debug-WindowList: TipsFormat "%c/%r"
-*FvwmIconMan-Debug-WindowList: TipsFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold"
+*FvwmIconMan-Debug-WindowList: TipsFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
*FvwmIconMan-Debug-WindowList: TipsBorderWidth 2
*FvwmIconMan-Debug-WindowList: TipsColorset $[infostore.cs_panel_inactive]
*FvwmIconMan-Debug-WindowList: TipsJustification leftup
@@ -44,7 +44,7 @@
Module FvwmIconMan FvwmIconMan-Debug-WindowList
*FvwmIdent: Colorset $[infostore.cs_panel_active]
-*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]"
+*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
*FvwmIdent: MinimalLayer 6
DestroyMenu /Debug/WindowList
Modified: fvwm/components/functions/FvwmExpose
===================================================================
--- fvwm/components/functions/FvwmExpose 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/FvwmExpose 2013-05-03 20:16:00 UTC (rev 344)
@@ -32,7 +32,7 @@
+ I *FvwmExpose: ActiveColorset $[infostore.cs_panel_active]
+ I *FvwmExpose: Padding 4 4
+ I *FvwmExpose: Frame 0
-+ I *FvwmExpose: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold:Italic"
++ I *FvwmExpose: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
+ I All (!Iconic, !FvwmMiniConsoleNeedsUniqueName, !Shaded, CurrentPage, AcceptsFocus) FvwmExpose-Thumbnail
+ I Module FvwmButtons FvwmExpose
+ I None (FvwmExpose) Wait
Modified: fvwm/components/functions/FvwmFormDefault
===================================================================
--- fvwm/components/functions/FvwmFormDefault 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/FvwmFormDefault 2013-05-03 20:16:00 UTC (rev 344)
@@ -1,10 +1,10 @@
# Default settings for FvwmForm
*FvwmFormDefault: Colorset $[infostore.cs_panel_inactive]
*FvwmFormDefault: ItemColorset $[infostore.cs_panel_active]
-*FvwmFormDefault: Font "xft:$[menu_font]:pixelsize=$[menu_font_size]"
-*FvwmFormDefault: InputFont "xft:$[menu_font]:pixelsize=$[menu_font_size]"
-*FvwmFormDefault: ButtonFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:Bold"
-*FvwmFormDefault: TimeoutFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:Bold"
+*FvwmFormDefault: Font "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
+*FvwmFormDefault: InputFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
+*FvwmFormDefault: ButtonFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
+*FvwmFormDefault: TimeoutFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
# ViM modeline {{{1
# vim:foldmethod=marker:foldenable:foldlevel=0:filetype=fvwm
Modified: fvwm/components/functions/FvwmIdent
===================================================================
--- fvwm/components/functions/FvwmIdent 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/FvwmIdent 2013-05-03 20:16:00 UTC (rev 344)
@@ -1,5 +1,5 @@
# Settings for FvwmIdent
-*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold"
+*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
*FvwmIdent: Colorset $[infostore.cs_panel_active]
# ViM modeline {{{1
Modified: fvwm/components/functions/Icon-Amiga
===================================================================
--- fvwm/components/functions/Icon-Amiga 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Icon-Amiga 2013-05-03 20:16:00 UTC (rev 344)
@@ -7,7 +7,7 @@
Style * IconTitleRelief 0
Style * IconBackgroundRelief 0
Style * IconBackgroundPadding 0
-Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]"
+Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
Style * IconTitleFormat %n (%t)
Style * StickyIcon
Style * IconSize 68 68
Modified: fvwm/components/functions/Icon-Launcher
===================================================================
--- fvwm/components/functions/Icon-Launcher 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Icon-Launcher 2013-05-03 20:16:00 UTC (rev 344)
@@ -45,7 +45,7 @@
+ I Module FvwmButtons $0
+ I Module FvwmAuto 10 -menter "Change-Icon $0 $1" "Restore-Icon $0 $1"
+ I Style $0 UseStyle *
-+ I Style $0 Icon $1, StartIconic, StartsLowered, !Handles, VariablePosition, BorderWidth 0, !Borders, ParentalRelativity, IconTitle, IconTitleColorset $[infostore.cs_menu_active], HilightIconTitleColorset $[infostore.cs_menu_active], IconTitleFormat %n, IconBackgroundColorset $[infostore.cs_icon_inactive], IconBackgroundColorset $[infostore.cs_icon_inactive], IconTitleRelief 0, IconBackgroundRelief 0, IconBackgroundRelief 0, IconFont "xft:$[title_font]:pixelsize=$[title_font_size]", StickyIcon,!StickyStippledIconTitle
++ I Style $0 Icon $1, StartIconic, StartsLowered, !Handles, VariablePosition, BorderWidth 0, !Borders, ParentalRelativity, IconTitle, IconTitleColorset $[infostore.cs_menu_active], HilightIconTitleColorset $[infostore.cs_menu_active], IconTitleFormat %n, IconBackgroundColorset $[infostore.cs_icon_inactive], IconBackgroundColorset $[infostore.cs_icon_inactive], IconTitleRelief 0, IconBackgroundRelief 0, IconBackgroundRelief 0, IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]", StickyIcon,!StickyStippledIconTitle
DestroyFunc Change-Icon
AddToFunc Change-Icon
Modified: fvwm/components/functions/Icon-Mwm
===================================================================
--- fvwm/components/functions/Icon-Mwm 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Icon-Mwm 2013-05-03 20:16:00 UTC (rev 344)
@@ -7,7 +7,7 @@
Style * IconTitleRelief 0
Style * IconBackgroundRelief 0
Style * IconBackgroundPadding 10
-Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:Bold"
+Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
Style * IconTitleFormat %n (%t)
Style * IconSize 48 48
Modified: fvwm/components/functions/MakePanel
===================================================================
--- fvwm/components/functions/MakePanel 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/MakePanel 2013-05-03 20:16:00 UTC (rev 344)
@@ -22,7 +22,7 @@
+ I *FvwmButtons-$0: Columns $4
+ I *FvwmButtons-$0: Padding $5
+ I *FvwmButtons-$0: Frame $6
-+ I *FvwmButtons-$0: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]"
++ I *FvwmButtons-$0: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
## Make a button ##
###################
Modified: fvwm/components/functions/Tooltip
===================================================================
--- fvwm/components/functions/Tooltip 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Tooltip 2013-05-03 20:16:00 UTC (rev 344)
@@ -26,7 +26,7 @@
+ I *FvwmButtons-Tooltip-$0: Rows 1
+ I *FvwmButtons-Tooltip-$0: Padding 1 1
+ I *FvwmButtons-Tooltip-$0: Frame 0
-+ I *FvwmButtons-Tooltip-$0: Font "xft:$[panel_font]:pixelsize=$[menu_font_size]"
++ I *FvwmButtons-Tooltip-$0: Font "xft:$[panel_font]:pixelsize=$[menu_font_size]:$[panel_font_style]"
+ I *FvwmButtons-Tooltip-$0: (1x1, Id "Tooltip-$0", Title (Side) "$[gt.$1] $2")
+ I Style FvwmButtons-Tooltip-$0 Layer $4
+ I Module FvwmButtons FvwmButtons-Tooltip-$0
Modified: fvwm/components/styles/FVWM
===================================================================
--- fvwm/components/styles/FVWM 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/styles/FVWM 2013-05-03 20:16:00 UTC (rev 344)
@@ -18,7 +18,7 @@
Style FvwmIdent UseStyle FvwmParts
Style FvwmIdent VariablePosition, \
- Font "xft:$[panel_font]:pixelsize=$[panel_font_size]"
+ Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
Style FvwmForm Sticky, WindowListSkip, \
FixedSize, StaysOnTop, !Handles, BorderWidth 1, HandleWidth 1, \
Modified: fvwm/components/styles/Menu
===================================================================
--- fvwm/components/styles/Menu 2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/styles/Menu 2013-05-03 20:16:00 UTC (rev 344)
@@ -16,6 +16,6 @@
MenuStyle * TitleWarpOff
MenuStyle * TrianglesSolid
MenuStyle * VerticalItemSpacing 1 4
-MenuStyle * Font "xft:$[menu_font]:pixelsize=$[menu_font_size]"
+MenuStyle * Font "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-05-16 07:40:48
|
Revision: 406
http://sourceforge.net/p/fvwm-crystal/code/406
Author: dominique_libre
Date: 2013-05-16 07:40:41 +0000 (Thu, 16 May 2013)
Log Message:
-----------
oops, added None icon Type
Modified Paths:
--------------
fvwm/components/functions/Preferences-Menu
Added Paths:
-----------
fvwm/components/Icon-None
Added: fvwm/components/Icon-None
===================================================================
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2013-05-16 01:06:31 UTC (rev 405)
+++ fvwm/components/functions/Preferences-Menu 2013-05-16 07:40:41 UTC (rev 406)
@@ -243,25 +243,28 @@
#
DestroyMenu /Preferences/IconsType
AddToMenu /Preferences/IconsType
++ '$[gt.No icon]' SelectIconsType None
++ '' Nop
+ '%22x22/fvwm-crystal/icon.png%$[gt.Thumbnails]' SelectIconsType Thumbnails
+ '%22x22/fvwm-crystal/icon2.png%Amiga' SelectIconsType Amiga
+ '%22x22/fvwm-crystal/icon3.png%Mwm' SelectIconsType Mwm
DestroyFunc SelectIconsType
AddToFunc SelectIconsType
-+ I SavePreferences IconsType "Include components/functions/Icon-$0"
++ I SavePreferences IconsType "Include components/desktop/Icon-$0"
++ I Module FvwmForm IconsType-Dialog
All (IconsType-Dialog) Close
DestroyModuleConfig IconsType-Dialog: *
-*NotificationAreaManager-Dialog: Title "$[gt.Restart FVWM-Crystal]"
-*NotificationAreaManager-Dialog: Text "$[gt.New notification area setting will be used after next startup]"
-*NotificationAreaManager-Dialog: Line center
-*NotificationAreaManager-Dialog: Line center
-*NotificationAreaManager-Dialog: Button quit " $[gt.Restart] " ^M
-*NotificationAreaManager-Dialog: Command Restart
-*NotificationAreaManager-Dialog: Button quit " $[gt.Not now] " ^[
-*NotificationAreaManager-Dialog: Command Nop
-*NotificationAreaManager-Dialog: Line center
+*IconsType-Dialog: Title "$[gt.Restart FVWM-Crystal]"
+*IconsType-Dialog: Text "$[gt.New type of icons will be used after next startup]"
+*IconsType-Dialog: Line center
+*IconsType-Dialog: Line center
+*IconsType-Dialog: Button quit " $[gt.Restart] " ^M
+*IconsType-Dialog: Command Restart
+*IconsType-Dialog: Button quit " $[gt.Not now] " ^[
+*IconsType-Dialog: Command Nop
+*IconsType-Dialog: Line center
#
# Notification Area Application
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-05-16 12:57:05
|
Revision: 410
http://sourceforge.net/p/fvwm-crystal/code/410
Author: dominique_libre
Date: 2013-05-16 12:57:02 +0000 (Thu, 16 May 2013)
Log Message:
-----------
functions/FvwmExpose: fixed the synchronization. desktop/Keyboard; desktop/Keyboard-NumLock; functions/LoasCommonStuffs: make FvwmExpose available through Alt+e.
Modified Paths:
--------------
ChangeLog
fvwm/components/desktop/Keyboard
fvwm/components/desktop/Keyboard_NumLock
fvwm/components/functions/LoadCommonStuffs
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-05-16 12:39:35 UTC (rev 409)
+++ ChangeLog 2013-05-16 12:57:02 UTC (rev 410)
@@ -4,7 +4,9 @@
+ preferences/DesktopMenu; functions/LoadCommonStuffs;
functions/Preferences-Menu; recipes/*: make the desktop menu with
Mouse 1 optional; incorporate the Music menu in all the recipes.
- functions/FvwmExpose: fixed the synchronization
+ functions/FvwmExpose: fixed the synchronization.
+ desktop/Keyboard; desktop/Keyboard-NumLock; functions/LoasCommonStuffs:
+ make FvwmExpose available through Alt+e.
Mercredi 15 Mai 2013 Dominique Michel
functions/LoadCommonStuffs; recipes/*: Moved back DefaultDesktopManager
Modified: fvwm/components/desktop/Keyboard
===================================================================
--- fvwm/components/desktop/Keyboard 2013-05-16 12:39:35 UTC (rev 409)
+++ fvwm/components/desktop/Keyboard 2013-05-16 12:57:02 UTC (rev 410)
@@ -6,6 +6,7 @@
Include components/bindings/PageSwitch-Horizontal
Include components/bindings/Mouse-GoHome
Include components/bindings/Window-Control
+Key E A [Mod1] FvwmExpose
Include components/bindings/Window-List
Include components/bindings/Window-Rearrange
Include components/bindings/Window-Warp
Modified: fvwm/components/desktop/Keyboard_NumLock
===================================================================
--- fvwm/components/desktop/Keyboard_NumLock 2013-05-16 12:39:35 UTC (rev 409)
+++ fvwm/components/desktop/Keyboard_NumLock 2013-05-16 12:57:02 UTC (rev 410)
@@ -7,6 +7,7 @@
Include components/bindings/PageSwitch-Horizontal_NumLock
Include components/bindings/Window-Control_NumLock
Include components/bindings/Window-Rearrange_NumLock
+Key E A [Mod1]2 fvwmExpose
Include components/bindings/Window-Warp_NumLock
Include components/bindings/Misc-Keybindings_NumLock
Modified: fvwm/components/functions/LoadCommonStuffs
===================================================================
--- fvwm/components/functions/LoadCommonStuffs 2013-05-16 12:39:35 UTC (rev 409)
+++ fvwm/components/functions/LoadCommonStuffs 2013-05-16 12:57:02 UTC (rev 410)
@@ -25,6 +25,7 @@
Include components/desktop/FVWM-Crystal_Functions
Include components/desktop/FVWM-Crystal_Preferences
Include components/functions/Fullscreen
+Include components/functions/FvwmExpose
Append preferences/Startup
# Preferred applications {{{2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-06-06 18:37:44
|
Revision: 504
http://sourceforge.net/p/fvwm-crystal/code/504
Author: dominique_libre
Date: 2013-06-06 18:37:42 +0000 (Thu, 06 Jun 2013)
Log Message:
-----------
functions/Mixer; bindings/Multimedia*: added toggle mute functions
Modified Paths:
--------------
ChangeLog
fvwm/components/bindings/Multimedia_Keys
fvwm/components/bindings/Multimedia_Keys_NumLock
fvwm/components/functions/Mixer
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-06-05 19:28:01 UTC (rev 503)
+++ ChangeLog 2013-06-06 18:37:42 UTC (rev 504)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+Jeudi 6 juin 2013 Dominique Michel
+ functions/Mixer; bindings/Multimedia*: added toggle mute functions
+
Mercredi 5 juin 2013 Dominique Michel
recipes(Default with ACPI; recipes/SilentHacker: make the buttons to be aligned
when the font size is changing
Modified: fvwm/components/bindings/Multimedia_Keys
===================================================================
--- fvwm/components/bindings/Multimedia_Keys 2013-06-05 19:28:01 UTC (rev 503)
+++ fvwm/components/bindings/Multimedia_Keys 2013-06-06 18:37:42 UTC (rev 504)
@@ -9,8 +9,8 @@
Key XF86AudioLowerVolume A C Music-Speed-Down
Key XF86AudioRaiseVolume A C Music-Speed-Up
-Key XF86AudioMute A $[Mod0] Music-VolumeUp
-key XF86AudioMute A C Music-VolumeDown
+Key XF86AudioMute A $[Mod0] Mixer-Volume-Toggle
+key XF86AudioMute A C Mixer-Volume-Toggle
key XF86AudioPlay A $[Mod0] Music-FrameStep
#key XF86AudioPlay A $[Mod0] Music-PlayPause
key XF86AudioPlay A $[Mod1] Music-Speed normal mplayer
Modified: fvwm/components/bindings/Multimedia_Keys_NumLock
===================================================================
--- fvwm/components/bindings/Multimedia_Keys_NumLock 2013-06-05 19:28:01 UTC (rev 503)
+++ fvwm/components/bindings/Multimedia_Keys_NumLock 2013-06-06 18:37:42 UTC (rev 504)
@@ -9,8 +9,8 @@
Key XF86AudioLowerVolume A C2 Music-Speed-Down
Key XF86AudioRaiseVolume A C2 Music-Speed-Up
-Key XF86AudioMute A $[Mod0]2 Music-VolumeUp
-key XF86AudioMute A C2 Music-VolumeDown
+Key XF86AudioMute A $[Mod0]2 Mixer-Volume-Toggle
+key XF86AudioMute A C2 Music-Volume-Toggle
key XF86AudioPlay A $[Mod0]2 Music-FrameStep
key XF86AudioPlay A $[Mod1]2 Music-Speed normal mplayer
key XF86AudioPlay A C2 Music-Pause
Modified: fvwm/components/functions/Mixer
===================================================================
--- fvwm/components/functions/Mixer 2013-06-05 19:28:01 UTC (rev 503)
+++ fvwm/components/functions/Mixer 2013-06-06 18:37:42 UTC (rev 504)
@@ -56,6 +56,16 @@
# Set VolControl: Test if MASTER mixer exist, fallback to PCM
PipeRead "if [[ $[infostore.Mixer] == aumix ]] ; then NVolControl=`aumix -d /dev/mixer$[infostore.SoundCard] -q | grep master -c` ; echo InfoStoreAdd VolControl `if [[ $NVolControl == 0 ]]; then echo w; else echo v ; fi` ; fi"
+# Memorize the volume
+#PipeRead 'tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"'
+
+# Mute = off
+InfoStoreAdd MixerMute 0
+InfoStoreAdd MixerMuteAP 0
+InfoStoreAdd MixerMuteCdcd 0
+InfoStoreAdd MixerMuteMP 0
+InfoStoreAdd MixerMuteMP2 0
+
# Basics functions {{{1
# Mixer-Volume <value> {{{2
DestroyFunc Mixer-Volume
@@ -104,11 +114,43 @@
*) echo Nop ;; \\
esac'
+# Mixer volume toggle mute {{{2
+# Selected player will toggle the pause.
+# If alsamixer or aumix is selected, it will mute toggle too.
+DestroyFunc Mixer-Volume-Toggle
+AddToFunc Mixer-Volume-Toggle
++ I PipeRead 'if [[ $[infostore.Mixer] == amixer ]]; then \\
+ if [[ $[infostore.MixerMute] == 0 ]]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
++ I PipeRead 'if [[ $[infostore.Mixer] == aumix ]]; then \\
+ if [[ $[infostore.MixerMute] == 0 ]]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
++ I PipeRead 'if [[ $[infostore.MusicPlayer] == audacious ]]; then \\
+ exec audtool playback-playpause > /dev/null; fi'
++ I PipeRead 'if [[ $[infostore.MusicPlayer] == cdcd ]]; then \\
+ if [[ $[infostore.MixerMuteCdcd] == 0 ]]; then echo "InfoStoreAdd MixerMuteCdcd 1"; exec cdcd pause > /dev/null; else echo "InfoStoreAdd MixerMuteCdcd 0"; cdcd resume > /dev/null; fi; fi'
++ I PipeRead 'if [[ $[infostore.Musicplayer] == cmus ]]; then \\
+ exec cmus-remote --pause > /dev/null; fi'
++ I PipeRead 'if [[ $[infostore.MusicPlayer] == mpd ]]; then \\
+ exec mpc toggle > /dev/null; fi'
++ I PipeRead 'if [[ $[infostore.MusicPlayer] == quodlibet ]]; then \\
+ exec quodlibet --play-pause > /dev/null; fi'
++ I PipeRead 'if [[ $[infostore.MusicPlayer] == xmms2 ]]; then \\
+ exec xmms2 toggle > /dev/null; fi'
+# the other players
++ I PipeRead 'if [[ $[infostore.MusicPlayer] == alsaplayer ]]; then \\
+ if [[ $[infostore.MixerMuteAP] == 0 ]]; then echo "InfoStoreAdd MixerMuteAP 1"; exec alsaplayer --speed 0; else echo "InfoStoreAdd MixerMuteAP 0"; exec alsaplayer --speed $[infostore.speed]; fi; fi'
++ I PipeRead 'if [[ $[infostore.MusicPlayer] == mocp ]]; then \\
+ exec mocp --sync --toggle-pause; fi'
++ I PipeRead 'if [[ $[infostore.MusicPlayer] == mplayer ]]; then \\
+ if [[ $[infostore.MixerMuteMP] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP 1"; exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe; else echo "InfoStoreAdd MixerMuteMP 0"; exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe; fi; fi'
++ I PipeRead 'if [[ $[infostore.MusicPlayer] == mplayer2 ]]; then \\
+ if [[ $[infostore.MixerMuteMP2] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP2 1"; exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe; else echo "InfoStoreAdd MixerMuteMP2 0"; exec echo "pause" > /home/$[infostore.USERDIR]/.mplayer/pipe; fi; fi'
+
# Mixer-Volume-dB <value>dB {{{2
DestroyFunc Mixer-Volume-dB
AddToFunc Mixer-Volume-dB
+ I Exec exec amixer -c $[infostore.SoundCard] -- set '$[infostore.VolControl]' $0 > /dev/null
+ I PipeRead 'tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:"`; echo "InfoStoreAdd CurrentVolume $tmpval2"'
+
# Show/Hide the GUI {{{2
DestroyFunc Mixer-GUI
AddToFunc Mixer-GUI
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2010-12-31 16:35:41
|
Revision: 42
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=42&view=rev
Author: dominique_libre
Date: 2010-12-31 16:35:35 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Added font support from font prefernces into FvwmIdent. Cleanup into the focus policies.
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/FvwmIdent
fvwm/components/functions/Window-Remember-ClickToFocus
fvwm/components/functions/Window-Remember-SloppyFocus
fvwm/components/styles/FocusPolicy-Amiga
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-23 20:43:54 UTC (rev 41)
+++ ChangeLog 2010-12-31 16:35:35 UTC (rev 42)
@@ -1,5 +1,9 @@
ChangeLog for FVWM-Crystal
+Vendredi 31 décembre 2011 Dominique Michel
+ * Added font support from font preference in FvwmIdent
+ * Some cleanup in the Focus policies
+
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
icons are move to focus :), its not AmigaOS behaviour but I like it that
Modified: fvwm/components/functions/FvwmIdent
===================================================================
--- fvwm/components/functions/FvwmIdent 2010-12-23 20:43:54 UTC (rev 41)
+++ fvwm/components/functions/FvwmIdent 2010-12-31 16:35:35 UTC (rev 42)
@@ -1,6 +1,5 @@
# Settings for FvwmIdent
-*FvwmIdent: Font "xft:Verdana:pixelsize=12:Bold"
-Test (EnvIsSet FVWM_FLAG_UTF_8) *FvwmIdent: Font "xft:Verdana:pixelsize=12:Bold:encoding=iso10646-1"
+*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold:encoding=iso10646-1"
*FvwmIdent: Colorset $[cs_panel_active]
# ViM modeline {{{1
Modified: fvwm/components/functions/Window-Remember-ClickToFocus
===================================================================
--- fvwm/components/functions/Window-Remember-ClickToFocus 2010-12-23 20:43:54 UTC (rev 41)
+++ fvwm/components/functions/Window-Remember-ClickToFocus 2010-12-31 16:35:35 UTC (rev 42)
@@ -3,7 +3,7 @@
# ---------------------------------------
# Called when focus change, set state 2 for the focused window,
-# unset it for the other.
+# unset it for the other ones.
###############################################################
DestroyFunc Window-RememberFocused
AddToFunc Window-RememberFocused
@@ -16,14 +16,11 @@
###################################################################
DestroyFunc Window-FocusRemembered
AddToFunc Window-FocusRemembered
-#+ I Any (FvwmMiniConsoleNeedsUniqueName, Visible) Break
-#+ I Any (QuakeConsoleNeedsUniqueName, Visible) Break
++ I Any (FvwmMiniConsoleNeedsUniqueName, Visible) Break
++ I Any (QuakeConsoleNeedsUniqueName, Visible) Break
+ I None (CurrentPage, AcceptsFocus) Break
-#+ I Current (!Focused, Visible, Sticky) Break
+ I Current (Focused, Sticky, !CirculateHit) Break
+ I Next (CurrentPage, State 2) Focus
-#+ I None (CurrentPage, Focused, !Iconified, Visible) Prev (CurrentPage, !Iconified, Visible) Focus
-#+ I None (CurrentPage, Focused) Prev (CurrentPage, !Iconified) Focus
+ I None (CurrentPage, Focused, !Iconified) Prev (CurrentPage, !Iconified) Focus
Modified: fvwm/components/functions/Window-Remember-SloppyFocus
===================================================================
--- fvwm/components/functions/Window-Remember-SloppyFocus 2010-12-23 20:43:54 UTC (rev 41)
+++ fvwm/components/functions/Window-Remember-SloppyFocus 2010-12-31 16:35:35 UTC (rev 42)
@@ -10,8 +10,8 @@
DestroyFunc Window-FocusRemembered
AddToFunc Window-FocusRemembered
-#+ I All (FvwmMiniConsoleNeedsUniqueName, Visible) Break
-#+ I All (QuakeConsoleNeedsUniqueName, Visible) Break
++ I All (FvwmMiniConsoleNeedsUniqueName, Visible) Break
++ I All (QuakeConsoleNeedsUniqueName, Visible) Break
+ I None (CurrentPage, AcceptsFocus) Break
+ I Current (Focused, Visible, Sticky) Break
+ I Next (CurrentPage, HasPointer) Focus
Modified: fvwm/components/styles/FocusPolicy-Amiga
===================================================================
--- fvwm/components/styles/FocusPolicy-Amiga 2010-12-23 20:43:54 UTC (rev 41)
+++ fvwm/components/styles/FocusPolicy-Amiga 2010-12-31 16:35:35 UTC (rev 42)
@@ -5,10 +5,9 @@
# window's titlebar or border
# - new windows are automatically being focused
-Style * FPClickToFocus, !FPEnterToFocus, !FPLeaveToUnfocus, ClickToFocus
+Style * !FPEnterToFocus, !FPLeaveToUnfocus, FPClickToFocus, FPClickDecorToFocus
Style * !FPClickRaisesFocused, FPClickDecorRaisesFocused
-Style * FPAllowRaiseClickFunction
-#, FPAllowFocusClickFunction
+Style * FPAllowRaiseClickFunction, FPAllowFocusClickFunction
Style * FPFocusByProgram, FPFocusByFunction, !FPFocusByFunctionWarpPointer
Style * FPGrabFocus, FPGrabFocusTransient
Style * FPReleaseFocus, FPReleaseFocusTransient
@@ -27,8 +26,8 @@
*FvwmEvent-IconFocus: iconify Focus-Iconic
*FvwmEvent-IconFocus: deiconify Focus-Normal
-Module FvwmEvent FvwmEvent-IconFocus
#Module FvwmEvent FvwmEvent-IconFocus
+#Module FvwmEvent FvwmEvent-IconFocus
# Functions for remembering last focused window on a desktop page
Include components/functions/Window-Remember-ClickToFocus
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-01 10:28:16
|
Revision: 56
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=56&view=rev
Author: dominique_libre
Date: 2011-01-01 10:28:10 +0000 (Sat, 01 Jan 2011)
Log Message:
-----------
Wimdow-Raise-Move-Lover witll focus the previous window of the current page.
Modified Paths:
--------------
ChangeLog
fvwm/components/bindings/Window-Basic-Amiga
fvwm/components/functions/Window-Basic
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-31 22:10:20 UTC (rev 55)
+++ ChangeLog 2011-01-01 10:28:10 UTC (rev 56)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+Samedi 1 janvier 2011 Dominique Michel
+ * Wimdow-Raise-Move-Lover witll focus the previous window of the current page, if any.
+
Vendredi 31 décembre 2011 Dominique Michel
* Added font support from font preference in FvwmIdent
* Some cleanup in the Focus policies
@@ -18,7 +21,7 @@
* Added scripts to generate the media playlists from the menu
* Introducing unified Mixer control
* Changed Default Music Player to mplayer
-
+
Mercredi 23 décembre 2010 Dominique Michel
* New Amiga focus policy : click to focus without raise,
icons are move to focus :), its not AmigaOS behaviour but I like it that
Modified: fvwm/components/bindings/Window-Basic-Amiga
===================================================================
--- fvwm/components/bindings/Window-Basic-Amiga 2010-12-31 22:10:20 UTC (rev 55)
+++ fvwm/components/bindings/Window-Basic-Amiga 2011-01-01 10:28:10 UTC (rev 56)
@@ -2,15 +2,15 @@
# When moving a window, it stay on its layer.
# A click will raise or lower it.
+Mouse 1 T $[Mod] Window-Lower-Move-Raise
+Mouse 2 T $[Mod] Window-Shade-Resize
Mouse 3 T $[Mod] Window-Raise-Move-Lower
-Mouse 2 T $[Mod] Window-Shade-Resize
-Mouse 1 T $[Mod] Window-Lower-Move-Raise
+Mouse 1 WT $[Mod1] Window-Lower-Move-Raise
+Mouse 1 WT $[Mod1]2 Window-Lower-Move-Raise
+Mouse 2 WT $[Mod1] Window-Resize-Opaque SE
+Mouse 2 WT $[Mod1]2 Window-Resize-Opaque SE
Mouse 3 WT $[Mod1] Window-Raise-Move-Lower
Mouse 3 WT $[Mod1]2 Window-Raise-Move-Lower
-Mouse 2 WT $[Mod1] Window-Resize-Opaque SE
-Mouse 2 WT $[Mod1]2 Window-Resize-Opaque SE
-Mouse 1 WT $[Mod1] Window-Lower-Move-Raise
-Mouse 1 WT $[Mod1]2 Window-Lower-Move-Raise
# vim:ft=fvwm
Modified: fvwm/components/functions/Window-Basic
===================================================================
--- fvwm/components/functions/Window-Basic 2010-12-31 22:10:20 UTC (rev 55)
+++ fvwm/components/functions/Window-Basic 2011-01-01 10:28:10 UTC (rev 56)
@@ -47,6 +47,7 @@
+ C Raise
+ M Move
+ C Lower
++ C Prev (!Iconic, CurrentPage) Focus
# }
# { Used in recipes/Amiga for the pager
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-05-23 19:24:23
|
Revision: 461
http://sourceforge.net/p/fvwm-crystal/code/461
Author: dominique_libre
Date: 2013-05-23 19:24:20 +0000 (Thu, 23 May 2013)
Log Message:
-----------
desktop/Keyboard&Keyboard-NumLock; bindings/Misc-Keybings&Misc-Keybindings_NumLock: fixed typo in fvwm-Expose bindings and moved them to Misc-Keybindings*
Modified Paths:
--------------
ChangeLog
fvwm/components/bindings/Misc-Keybindings
fvwm/components/bindings/Misc-Keybindings_NumLock
fvwm/components/desktop/Keyboard
fvwm/components/desktop/Keyboard_NumLock
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-05-23 18:58:02 UTC (rev 460)
+++ ChangeLog 2013-05-23 19:24:20 UTC (rev 461)
@@ -15,7 +15,8 @@
not set by the user.
scripts/media_directories; functions/Prefernces-Menu: popup a help message
when preferences/MediaDirectories is copied into the user directory.
- desktop/Keyboard&Keyboard-NumLock: fixed typo in fvwm-Expose bindings
+ desktop/Keyboard&Keyboard-NumLock; bindings/Misc-Keybings&Misc-Keybindings_NumLock:
+ fixed typo in fvwm-Expose bindings and moved them to Misc-Keybindings*
Mercredi 22 Mai 2013 Dominique Michel
moved the X session and desktop files to new location: shared
Modified: fvwm/components/bindings/Misc-Keybindings
===================================================================
--- fvwm/components/bindings/Misc-Keybindings 2013-05-23 18:58:02 UTC (rev 460)
+++ fvwm/components/bindings/Misc-Keybindings 2013-05-23 19:24:20 UTC (rev 461)
@@ -27,4 +27,7 @@
# Main menu
Key Menu A $[Mod1] Menu /FVWM-Crystal root c c
+# FvwmExpose
+Key E A $[Mod1] FvwmExpose
+
# vim:ft=fvwm
Modified: fvwm/components/bindings/Misc-Keybindings_NumLock
===================================================================
--- fvwm/components/bindings/Misc-Keybindings_NumLock 2013-05-23 18:58:02 UTC (rev 460)
+++ fvwm/components/bindings/Misc-Keybindings_NumLock 2013-05-23 19:24:20 UTC (rev 461)
@@ -21,4 +21,7 @@
# Main menu
Key Menu A $[Mod1]2 Menu /FVWM-Crystal root c c
+# FvwmExpose
+Key E A $[Mod1]2 Fvwm-Expose
+
# vim:ft=fvwm
Modified: fvwm/components/desktop/Keyboard
===================================================================
--- fvwm/components/desktop/Keyboard 2013-05-23 18:58:02 UTC (rev 460)
+++ fvwm/components/desktop/Keyboard 2013-05-23 19:24:20 UTC (rev 461)
@@ -6,7 +6,6 @@
Include components/bindings/PageSwitch-Horizontal
Include components/bindings/Mouse-GoHome
Include components/bindings/Window-Control
-#Key E A $[Mod1] FvwmExpose
Include components/bindings/Window-List
Include components/bindings/Window-Rearrange
Include components/bindings/Window-Warp
Modified: fvwm/components/desktop/Keyboard_NumLock
===================================================================
--- fvwm/components/desktop/Keyboard_NumLock 2013-05-23 18:58:02 UTC (rev 460)
+++ fvwm/components/desktop/Keyboard_NumLock 2013-05-23 19:24:20 UTC (rev 461)
@@ -7,7 +7,6 @@
Include components/bindings/PageSwitch-Horizontal_NumLock
Include components/bindings/Window-Control_NumLock
Include components/bindings/Window-Rearrange_NumLock
-#Key E A $[Mod1]2 FvwmExpose
Include components/bindings/Window-Warp_NumLock
Include components/bindings/Misc-Keybindings_NumLock
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-08-31 22:53:17
|
Revision: 545
http://sourceforge.net/p/fvwm-crystal/code/545
Author: dominique_libre
Date: 2013-08-31 22:53:13 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
fixed bashisms in crystal fvwm files
Modified Paths:
--------------
fvwm/components/apps/DesktopIcons
fvwm/components/functions/EWMH-BaseStruts
fvwm/components/functions/Feedback
fvwm/components/functions/Fvwm-Crystal-Menu
fvwm/components/functions/Media
fvwm/components/functions/Mixer
fvwm/components/functions/Xdg-User-Dirs
fvwm/components/functions/Xephyr
Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons 2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/apps/DesktopIcons 2013-08-31 22:53:13 UTC (rev 545)
@@ -42,16 +42,16 @@
+ I Test (EnvMatch ShowPartitions yes) GetPartitions
# The number of row and columns {{{2
+ I PipeRead 'echo "SetEnv IconRowsNumber $(((($[vp.height]-92))/60))"'
-+ I PipeRead 'tmpvar=$(($[IconNumber]/$[IconRowsNumber])); if [[ $(($[IconRowsNumber]*${tmpvar})) != $[IconNumber] ]]; then echo "SetEnv IconColumnsNumber $((${tmpvar}+1))"; else echo "SetEnv IconColumnsNumber ${tmpvar}"; fi'
++ I PipeRead 'tmpvar=$(($[IconNumber]/$[IconRowsNumber])); if [ $(($[IconRowsNumber]*${tmpvar})) = $[IconNumber] ]; then echo "SetEnv IconColumnsNumber ${tmpvar}"; else echo "SetEnv IconColumnsNumber $((${tmpvar}+1))"; fi'
# IconBox {{{1
#+ I PipeRead 'echo "Style * IconBox $(($[vp.width]-((((50*$[IconColumnsNumber]))+$[infostore.DeskIconsXSup))))x$(($[vp.height]-92))+$((36+((50*$[IconColumnsNumber]))))+46"'
# umount/pumount wrapper
DestroyFunc DesktopUmount
AddToFunc DesktopUmount
-+ I PipeRead 'if [[ $(echo $* | grep -e media) != "" ]]; \
- then exem="pumount"; \
- else exem="umount"; \
++ I PipeRead 'if [ "`echo $* | grep -e media`" = "" ]; \
+ then exem="umount"; \
+ else exem="pumount"; \
fi ; \
echo "+ \\\"Unmount $*\\\" Exec exec ${exem} $*"'
@@ -88,11 +88,11 @@
echo "AddToMenu /Partitions${line}"; \
echo "+ ${line} Nop"; \
echo "DesktopUmount ${line}"; \
- if [[ "${line}" == "/" ]]; \
+ if [ "${line}" = "/" ]; \
then icon="48x48/categories/Root.png"; \
- else if [[ $(echo ${line} | grep -e cdrom -e dvd) != "" ]]; \
- then icon="48x48/categories/CD.png"; \
- else icon="48x48/categories/Work_4.png"; \
+ else if [ "$(echo ${line} | grep -e cdrom -e dvd)" = "" ]; \
+ then icon="48x48/categories/Work_4.png"; \
+ else icon="48x48/categories/CD.png"; \
fi ; \
fi ; \
echo "*DesktopIcons: (1x1, Padding 1 1, Frame 0, Icon ${icon}, ActiveIcon ${icon}.active.png, PressIcon ${icon}.active.png, Action (Mouse 1) $[infostore.FileBrowser1] ${line} $[infostore.SILENT], Action (Mouse 2) $[infostore.FileBrowser2] ${line} $[infostore.SILENT], Action (Mouse 3) Menu /Partitions${line})"; \
@@ -114,7 +114,7 @@
DestroyFunc FindUMPartitions
AddToFunc FindUMPartitions
-+ I PipeRead "cat /etc/fstab|grep user|grep -v \\\#| awk \'{print $$2}\'|while read line; do partition=${line}; exist=0; while read lines; do if [[ ${partition} == ${lines} ]]; then exist=1; fi; done </tmp/Icon-Drives; if [[ ${exist} == 0 ]]; then echo AddToMenu $0 \\\"Mount ${line}\\\" Exec exec mount ${line}; fi; done"
++ I PipeRead "cat /etc/fstab|grep user|grep -v \\\#| awk \'{print $$2}\'|while read line; do partition=${line}; exist=0; while read lines; do if [ ${partition} = ${lines} ]; then exist=1; fi; done </tmp/Icon-Drives; if [ ${exist} = 0 ]; then echo AddToMenu $0 \\\"Mount ${line}\\\" Exec exec mount ${line}; fi; done"
DestroyFunc IconLauncher-generator
AddToFunc IconLauncher-generator
Modified: fvwm/components/functions/EWMH-BaseStruts
===================================================================
--- fvwm/components/functions/EWMH-BaseStruts 2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/EWMH-BaseStruts 2013-08-31 22:53:13 UTC (rev 545)
@@ -87,7 +87,7 @@
+ I All (gDeskCal) Iconify false
+ I All (trayer) Iconify false
+ I All (FvwmStalonePanel) Iconify false
-PipeRead "if [[ $(echo $[infostore.Fvwm_Crystal_Recipe]| sed -e 's:.*Amiga:Amiga:') == Amiga ]]; then echo '+ I Restore-TopBar-RaiseLower'; fi"
+PipeRead "if [ \"$(echo $[infostore.Fvwm_Crystal_Recipe]| sed -e 's:.*Amiga:Amiga:')\" = \"Amiga\" ]; then echo '+ I Restore-TopBar-RaiseLower'; fi"
+ I EWMH-Set-Panel
+ I $0 $1 $2 $3 Interface_Hide $0 $1 $2 $3
Modified: fvwm/components/functions/Feedback
===================================================================
--- fvwm/components/functions/Feedback 2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Feedback 2013-08-31 22:53:13 UTC (rev 545)
@@ -77,5 +77,4 @@
*SetBrowser-Dialog: Line center
# Check if $BROWSER exist, if not chek preference, if not set it.{{{1
-PipeRead 'if [[ "$BROWSER" == "" ]]; then if [[ -f "$FVWM_USERDIR/preferences/BROWSER" ]]; then echo LoadPreferences BROWSER; else echo Module FvwmForm SetBrowser-Dialog; fi; fi'
-
+PipeRead 'if [ "$BROWSER" = "" ]; then if [ -f "$FVWM_USERDIR/preferences/BROWSER" ]; then echo LoadPreferences BROWSER; else echo Module FvwmForm SetBrowser-Dialog; fi; fi'
Modified: fvwm/components/functions/Fvwm-Crystal-Menu
===================================================================
--- fvwm/components/functions/Fvwm-Crystal-Menu 2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Fvwm-Crystal-Menu 2013-08-31 22:53:13 UTC (rev 545)
@@ -47,7 +47,7 @@
+ '%22x22/fvwm-crystal/applications-development.png%$[gt.Developer menu]' Popup /Developer
+ '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.About FVWM-Crystal]' Include components/functions/About
+ MissingSubmenuFunction FuncFvwmMenuXephyrDirectory
-+ '%22x22/fvwm-crystal/gdm-xnest.png%$[gt.Nested sessions]' Popup /etc/X11/Sessions
++ '%22x22/fvwm-crystal/gdm-xnest.png%$[gt.Nested sessions]' Popup /usr/share/xsessions
+ '%22x22/fvwm-crystal/system-log-out.png%$[gt.Exit]' Popup /Exit
# }}}2
Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media 2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Media 2013-08-31 22:53:13 UTC (rev 545)
@@ -68,7 +68,7 @@
InfoStoreAdd speed 1
# Decimal point in use (alsaplayer) {{{2
-PipeRead 'if [[ $[infostore.MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; else echo "InfoStoreRemove dec_point"; fi'
+PipeRead 'if [ "$[infostore.MusicPlayer]" = "alsaplayer" ]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; else echo "InfoStoreRemove dec_point"; fi'
# We must start mplayer in slave mode and send the commands via a pipe
# Create the pipe if it doesn't exist:
Modified: fvwm/components/functions/Mixer
===================================================================
--- fvwm/components/functions/Mixer 2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Mixer 2013-08-31 22:53:13 UTC (rev 545)
@@ -46,15 +46,15 @@
# Initialisations {{{1
# amixer {{{2
# Set VolControl: Test if a MASTER mixer exist, fallback to PCM
-PipeRead "if [[ $[infostore.Mixer] == amixer ]] ; then NVolControl=`amixer -c $[infostore.SoundCard] get Master \ 2>/dev/null | grep Master -c`; echo InfoStoreAdd VolControl `if [[ $NVolControl == 0 ]]; then echo PCM; else echo Master; fi`; fi"
+PipeRead "if [ $[infostore.Mixer] = amixer ] ; then NVolControl=`amixer -c $[infostore.SoundCard] get Master \ 2>/dev/null | grep Master -c`; echo InfoStoreAdd VolControl `if [ $NVolControl = 0 ]; then echo PCM; else echo Master; fi`; fi"
# Set SnddB: >0 = control in dB
-PipeRead "if [[ $[infostore.Mixer] == amixer ]] ; then echo InfoStoreAdd SnddB `amixer -c $[infostore.SoundCard] get $[infostore.VolControl] \| grep dB -c` ; fi"
-PipeRead "if [[ $[infostore.Mixer] != amixer ]] ; then echo InfoStoreAdd SnddB 0 ; fi"
+PipeRead "if [ $[infostore.Mixer] = amixer ] ; then echo InfoStoreAdd SnddB `amixer -c $[infostore.SoundCard] get $[infostore.VolControl] \| grep dB -c` \
+ else echo InfoStoreAdd SnddB 0 ; fi"
# aumix {{{2
# Set VolControl: Test if MASTER mixer exist, fallback to PCM
-PipeRead "if [[ $[infostore.Mixer] == aumix ]] ; then NVolControl=`aumix -d /dev/mixer$[infostore.SoundCard] -q | grep master -c` ; echo InfoStoreAdd VolControl `if [[ $NVolControl == 0 ]]; then echo w; else echo v ; fi` ; fi"
+PipeRead "if [ $[infostore.Mixer] = aumix ] ; then NVolControl=`aumix -d /dev/mixer$[infostore.SoundCard] -q | grep master -c` ; echo InfoStoreAdd VolControl `if [ $NVolControl = 0 ]; then echo w; else echo v ; fi` ; fi"
# Memorize the volume
#PipeRead 'tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"'
@@ -119,40 +119,40 @@
# If alsamixer or aumix is selected, it will mute toggle too.
DestroyFunc Mixer-Volume-Toggle
AddToFunc Mixer-Volume-Toggle
-+ I PipeRead 'if [[ $[infostore.Mixer] == amixer ]]; then \\
- if [[ $[infostore.MixerMute] == 0 ]]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
-+ I PipeRead 'if [[ $[infostore.Mixer] == aumix ]]; then \\
- if [[ $[infostore.MixerMute] == 0 ]]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == audacious ]]; then \\
++ I PipeRead 'if [ $[infostore.Mixer] = amixer ]; then \\
+ if [ $[infostore.MixerMute] = 0 ]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
++ I PipeRead 'if [ $[infostore.Mixer] = aumix ]; then \\
+ if [ $[infostore.MixerMute] = 0 ]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
++ I PipeRead 'if [ $[infostore.MusicPlayer] = audacious ]; then \\
exec audtool playback-playpause > /dev/null; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == cdcd ]]; then \\
- if [[ $[infostore.MixerMuteCdcd] == 0 ]]; then echo "InfoStoreAdd MixerMuteCdcd 1"; exec cdcd pause > /dev/null; else echo "InfoStoreAdd MixerMuteCdcd 0"; cdcd resume > /dev/null; fi; fi'
-+ I PipeRead 'if [[ $[infostore.Musicplayer] == cmus ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] = cdcd ]; then \\
+ if [ $[infostore.MixerMuteCdcd] = 0 ]; then echo "InfoStoreAdd MixerMuteCdcd 1"; exec cdcd pause > /dev/null; else echo "InfoStoreAdd MixerMuteCdcd 0"; cdcd resume > /dev/null; fi; fi'
++ I PipeRead 'if [ $[infostore.Musicplayer] = cmus ]; then \\
exec cmus-remote --pause > /dev/null; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == mpd ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] = mpd ]; then \\
exec mpc toggle > /dev/null; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == quodlibet ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] = quodlibet ]; then \\
exec quodlibet --play-pause > /dev/null; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == xmms2 ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] = xmms2 ]; then \\
exec xmms2 toggle > /dev/null; fi'
# the other players
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == alsaplayer ]]; then \\
- if [[ $[infostore.MixerMuteAP] == 0 ]]; then echo "InfoStoreAdd MixerMuteAP 1"; exec alsaplayer --speed 0; else echo "InfoStoreAdd MixerMuteAP 0"; exec alsaplayer --speed $[infostore.speed]; fi; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == mocp ]]; then \\
++ I PipeRead 'if [ $[infostore.MusicPlayer] = alsaplayer ]; then \\
+ if [ $[infostore.MixerMuteAP] = 0 ]; then echo "InfoStoreAdd MixerMuteAP 1"; exec alsaplayer --speed 0; else echo "InfoStoreAdd MixerMuteAP 0"; exec alsaplayer --speed $[infostore.speed]; fi; fi'
++ I PipeRead 'if [ $[infostore.MusicPlayer] = mocp ]; then \\
exec mocp --sync --toggle-pause; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == mplayer ]]; then \\
- if [[ $[infostore.MixerMuteMP] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP 1"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
-+ I PipeRead 'if [[ $[infostore.MusicPlayer] == mplayer2 ]]; then \\
- if [[ $[infostore.MixerMuteMP2] == 0 ]]; then echo "InfoStoreAdd MixerMuteMP2 1"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP2 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
++ I PipeRead 'if [ $[infostore.MusicPlayer] = mplayer ]; then \\
+ if [ $[infostore.MixerMuteMP] = 0 ]; then echo "InfoStoreAdd MixerMuteMP 1"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
++ I PipeRead 'if [ $[infostore.MusicPlayer] = mplayer2 ]; then \\
+ if [ $[infostore.MixerMuteMP2] = 0 ]; then echo "InfoStoreAdd MixerMuteMP2 1"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; else echo "InfoStoreAdd MixerMuteMP2 0"; echo "Exec exec echo pause > /home/$[infostore.USERDIR]/.mplayer/pipe"; fi; fi'
# Mixer volume mute toggle mute {{{2
# Toggle only alsamixer or aumix if selected.
DestroyFunc Mixer-Mute-Toggle
AddToFunc Mixer-Mute-Toggle
-+ I PipeRead 'if [[ $[infostore.Mixer] == amixer ]]; then \\
- if [[ $[infostore.MixerMute] == 0 ]]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
-+ I PipeRead 'if [[ $[infostore.Mixer] == aumix ]]; then \\
- if [[ $[infostore.MixerMute] == 0 ]]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
++ I PipeRead 'if [ $[infostore.Mixer] = amixer ]; then \\
+ if [ $[infostore.MixerMute] = 0 ]; then tmpval=`amixer -c $[infostore.SoundCard] get $[infostore.VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:" -e "s:\\[::" -e "s:\\]::"`; echo "InfoStoreAdd CurrentVolume $tmpval2"; amixer -c $[infostore.SoundCard] -- set $[infostore.VolControl] 0 > /dev/null; echo "InfoStoreAdd MixerMute 1"; else amixer -c $[infostore.Soundcard] -- set $[infostore.VolControl] $[infostore.CurrentVolume] > /dev/null; echo "InfoStoreAdd MixerMute 0"; fi; fi'
++ I PipeRead 'if [ $[infostore.Mixer] = aumix ]; then \\
+ if [ $[infostore.MixerMute] = 0 ]; then echo "InfoStoreAdd MixerMute 1"; tmpval=`aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]'q | sed -e "s:.*, ::"`; echo "InfoStoreAdd CurrentVolume $tmpval"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' 0 > /dev/null; else echo "InfoStoreAdd MixerMute 0"; exec aumix -d /dev/mixer$[infostore.SoundCard] -'$[infostore.VolControl]' $[infostore.CurrentVolume] > /dev/null; fi; fi'
+
# Mixer-Volume-dB <value>dB {{{2
@@ -187,7 +187,7 @@
+ '%22x22/fvwm-crystal/mixer-2.png%$[gt.Show main mixer]' Mixer-GUI
+ '%22x22/fvwm-crystal/mixer.png%$[gt.Audio mixer]' Popup /Preferences/Mixer
PipeRead 'for i in 0 -3 -6 -9 -12 -15 -18 -24 -30 -36 -42 -48 -54 -60 -100 ; \\
- do if [[ $[infostore.SnddB] != 0 ]] ; \\
+ do if [ $[infostore.SnddB] != 0 ] ; \\
then echo \"+ \\\"${i} dB\\\" Mixer-Volume-dB ${i}dB\" ; \\
else case $i in \\
0) vol=100;; \\
Modified: fvwm/components/functions/Xdg-User-Dirs
===================================================================
--- fvwm/components/functions/Xdg-User-Dirs 2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Xdg-User-Dirs 2013-08-31 22:53:13 UTC (rev 545)
@@ -6,7 +6,7 @@
PipeRead 'test ! -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && xdg-user-dirs-update'
# We want them to be globals for the user and with full path
-PipeRead 'test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && source ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs; \
+PipeRead 'test -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs && . ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs; \
echo SetEnv XDG_MUSIC_DIR ${XDG_MUSIC_DIR:-$HOME}; \
echo SetEnv XDG_VIDEOS_DIR ${XDG_VIDEOS_DIR:-$HOME}; \
echo SetEnv XDG_DESKTOP_DIR ${XDG_DESKTOP_DIR:-$HOME/Desktop}; \
@@ -15,4 +15,3 @@
echo SetEnv XDG_PUBLICSHARE_DIR ${XDG_PUBLICSHARE_DIR:-$HOME}; \
echo SetEnv XDG_DOCUMENTS_DIR ${XDG_DOCUMENTS_DIR:-$HOME}; \
echo SetEnv XDG_PICTURES_DIR ${XDG_PICTURES_DIR:-$HOME}'
-
Modified: fvwm/components/functions/Xephyr
===================================================================
--- fvwm/components/functions/Xephyr 2013-08-31 22:50:06 UTC (rev 544)
+++ fvwm/components/functions/Xephyr 2013-08-31 22:53:13 UTC (rev 545)
@@ -6,7 +6,7 @@
DestroyFunc FuncFvwmMenuXephyrDirectory
AddToFunc FuncFvwmMenuXephyrDirectory
+ I PipeRead 'case "$0" in \
- "/etc/X11/Sessions"*) myexec="$[FVWM_SYSTEMDIR]/scripts/launchwm $[vp.width] $[vp.height]";; \
+ "/usr/share/xsessions"*) myexec="$[FVWM_SYSTEMDIR]/scripts/launchwm $[vp.width] $[vp.height]";; \
esac; \
test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
test -f "$0"/.media.png && mypng="$0"/.media.png; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-12-11 17:03:58
|
Revision: 554
http://sourceforge.net/p/fvwm-crystal/code/554
Author: dominique_libre
Date: 2013-12-11 17:03:55 +0000 (Wed, 11 Dec 2013)
Log Message:
-----------
functions/fullscreen: + Quit function to remove temporary files.
Modified Paths:
--------------
ChangeLog
fvwm/components/apps/DesktopIcons
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-12-11 16:47:38 UTC (rev 553)
+++ ChangeLog 2013-12-11 17:03:55 UTC (rev 554)
@@ -3,7 +3,13 @@
Mercredi 10 décembre 2013 Dominique Michel
fvwm-crystal: introduced code to remove orphaned control files in /tmp at startup.
fvwm-crystal.play-movies: interval change to make it work in any directory.
-
+ apps/DesktopIcons: use bash instead of sh. Bash is the de facto standard GNU/Linux
+ shell and it is allready in use by FVWM-Crystal. use killall instead of killall -9
+ to kill the helper script; separated Quit and ToRestart functions.
+ scripts/DesktopCheckMounts: use 1 temporary file to control it state. Cleanup this
+ file at exit or fvwm exit/crash.
+ functions/fullscreen: + Quit function to remove temporary files.
+
Mercredi 4 septembre 2013 Dominique Michel
Makefile: fixed .svn copy in make dist - replaced find command by rsync.
NEWS: zpdated.
Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons 2013-12-11 16:47:38 UTC (rev 553)
+++ fvwm/components/apps/DesktopIcons 2013-12-11 17:03:55 UTC (rev 554)
@@ -42,14 +42,14 @@
+ I Test (EnvMatch ShowPartitions yes) GetPartitions
# The number of row and columns {{{2
+ I PipeRead 'echo "SetEnv IconRowsNumber $(((($[vp.height]-92))/60))"'
-+ I PipeRead 'tmpvar=$(($[IconNumber]/$[IconRowsNumber])); if [[ $(($[IconRowsNumber]*${tmpvar})) != $[IconNumber] ]]; then echo "SetEnv IconColumnsNumber $((${tmpvar}+1))"; else echo "SetEnv IconColumnsNumber ${tmpvar}"; fi'
++ I PipeRead 'tmpvar=$(($[IconNumber]/$[IconRowsNumber])); if [ $(($[IconRowsNumber]*${tmpvar})) != $[IconNumber] ]; then echo "SetEnv IconColumnsNumber $((${tmpvar}+1))"; else echo "SetEnv IconColumnsNumber ${tmpvar}"; fi'
# IconBox {{{1
#+ I PipeRead 'echo "Style * IconBox $(($[vp.width]-((((50*$[IconColumnsNumber]))+$[infostore.DeskIconsXSup))))x$(($[vp.height]-92))+$((36+((50*$[IconColumnsNumber]))))+46"'
# umount/pumount wrapper
DestroyFunc DesktopUmount
AddToFunc DesktopUmount
-+ I PipeRead 'if [[ $(echo $* | grep -e media) != "" ]]; \
++ I PipeRead 'if [ $(echo $* | grep -e media) != "" ]; \
then exem="pumount"; \
else exem="umount"; \
fi ; \
@@ -88,9 +88,9 @@
echo "AddToMenu /Partitions${line}"; \
echo "+ ${line} Nop"; \
echo "DesktopUmount ${line}"; \
- if [[ "${line}" == "/" ]]; \
+ if [ "${line}" == "/" ]; \
then icon="48x48/categories/Root.png"; \
- else if [[ $(echo ${line} | grep -e cdrom -e dvd) != "" ]]; \
+ else if [ $(echo ${line} | grep -e cdrom -e dvd) != "" ]; \
then icon="48x48/categories/CD.png"; \
else icon="48x48/categories/Work_4.png"; \
fi ; \
@@ -114,7 +114,7 @@
DestroyFunc FindUMPartitions
AddToFunc FindUMPartitions
-+ I PipeRead "cat /etc/fstab|grep user|grep -v \\\#| awk \'{print $$2}\'|while read line; do partition=${line}; exist=0; while read lines; do if [[ ${partition} == ${lines} ]]; then exist=1; fi; done </tmp/Icon-Drives; if [[ ${exist} == 0 ]]; then echo AddToMenu $0 \\\"Mount ${line}\\\" Exec exec mount ${line}; fi; done"
++ I PipeRead "cat /etc/fstab|grep user|grep -v \\\#| awk \'{print $$2}\'|while read line; do partition=${line}; exist=0; while read lines; do if [ ${partition} == ${lines} ]; then exist=1; fi; done </tmp/Icon-Drives; if [ ${exist} == 0 ]; then echo AddToMenu $0 \\\"Mount ${line}\\\" Exec exec mount ${line}; fi; done"
DestroyFunc IconLauncher-generator
AddToFunc IconLauncher-generator
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2013-12-11 16:47:38 UTC (rev 553)
+++ fvwm/components/functions/Fullscreen 2013-12-11 17:03:55 UTC (rev 554)
@@ -136,6 +136,7 @@
AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.19.*
AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.20.*
+AddToFunc ExitFunction I Test (Quit) Exec rm -f $[infostore.TmpDirectory]/fullscreen.*
# Be sure the temporary files are destroyed when a window is closed
DestroyFunc Window-Fullscreen-Destroy
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2014-10-07 15:18:50
|
Revision: 639
http://sourceforge.net/p/fvwm-crystal/code/639
Author: dominique_libre
Date: 2014-10-07 15:18:47 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
Add BlankScreen function with Alt+B
Modified Paths:
--------------
ChangeLog
fvwm/components/bindings/Misc-Keybindings
fvwm/components/bindings/Misc-Keybindings_NumLock
fvwm/components/functions/LoadCommonStuffs
Added Paths:
-----------
fvwm/components/functions/ScreenSaver
Modified: ChangeLog
===================================================================
--- ChangeLog 2014-10-07 14:53:18 UTC (rev 638)
+++ ChangeLog 2014-10-07 15:18:47 UTC (rev 639)
@@ -2,10 +2,13 @@
Mardi 7 octobre 2014
INSTALL; README; session-management.README: update
- functions/CheckForFiles: load XDGMenu
- apps/QuakeConsole: Fix horizontal shift
- functions/Exec-Accelerator: Add support for urxvtd
-
+ functions/CheckForFiles: load XDGMenu.
+ apps/QuakeConsole: Fix horizontal shift.
+ functions/Exec-Accelerator: Add support for urxvtd.
++ functions/ScreenSaver: Add instantaneous screen blanking support.
+ functions/LoadCommonStuffs: Add ScreenSaver to the files we want to load by default.
+ bindings/Misc-Keybindings*: Add Alt+B binding for BlankScreen function. Fixed typo.
+
Vendredi 2 mai 2014 Dominique Michel
+ addons/makecrystalicon: make fvwm-crystal icons from arbitrary image files.
bin/fvwm-crystal.generate-menu: review of the usage comment; add new additional
Modified: fvwm/components/bindings/Misc-Keybindings
===================================================================
--- fvwm/components/bindings/Misc-Keybindings 2014-10-07 14:53:18 UTC (rev 638)
+++ fvwm/components/bindings/Misc-Keybindings 2014-10-07 15:18:47 UTC (rev 639)
@@ -18,6 +18,9 @@
# Screenshot
Key Print A $[Mod] Screenshot
+# ScreenBlanker
+Key B A $[Mod1] BlankScreen
+
# Application menu
# Windows Left
#Key Super_L A $[Mod1] Menu /Applications root c c
Modified: fvwm/components/bindings/Misc-Keybindings_NumLock
===================================================================
--- fvwm/components/bindings/Misc-Keybindings_NumLock 2014-10-07 14:53:18 UTC (rev 638)
+++ fvwm/components/bindings/Misc-Keybindings_NumLock 2014-10-07 15:18:47 UTC (rev 639)
@@ -9,6 +9,9 @@
# Open FvwmConsole using Alt+;
Key semicolon A $[Mod1]2 FvwmMiniConsole
+# Screen blanker
+Key B A $[mod1]2 BlankScreen
+
# Application menu
# Windows Left
#Key Super_L A $[Mod1]2 Menu /Applications root c c
@@ -22,6 +25,6 @@
Key A A $[Mod1]2 Menu FvwmMenu
# FvwmExpose
-Key E A $[Mod1]2 Fvwm-Expose
+Key E A $[Mod1]2 FvwmExpose
# vim:ft=fvwm
Modified: fvwm/components/functions/LoadCommonStuffs
===================================================================
--- fvwm/components/functions/LoadCommonStuffs 2014-10-07 14:53:18 UTC (rev 638)
+++ fvwm/components/functions/LoadCommonStuffs 2014-10-07 15:18:47 UTC (rev 639)
@@ -39,6 +39,7 @@
Include components/apps/QuakeConsole
Include components/apps/OpenOffice.org
Include components/functions/Xephyr
+Include components/functions/ScreenSaver
# Desktop & window bindings {{{2
Include components/bindings/Desktop-RMB-OpenTerminal
Added: fvwm/components/functions/ScreenSaver
===================================================================
--- fvwm/components/functions/ScreenSaver (rev 0)
+++ fvwm/components/functions/ScreenSaver 2014-10-07 15:18:47 UTC (rev 639)
@@ -0,0 +1,11 @@
+# FVWM-Crystal: BlankScreen
+# Written by Dominique Michel
+# Not all computers have an instant blanking key, this file add such a function
+# that can be called by a key binding (Alt+B by default).
+#
+# We need to use xset 2 consecutive times for it to stay
+DestroyFunc BlankScreen
+AddToFunc BlankScreen
++ I Exec exec xset dpms force off
++ I Exec exec xset dpms force off
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2015-10-25 18:39:23
|
Revision: 761
http://sourceforge.net/p/fvwm-crystal/code/761
Author: dominique_libre
Date: 2015-10-25 18:39:21 +0000 (Sun, 25 Oct 2015)
Log Message:
-----------
Use State 30 to control which windows are put on top
Modified Paths:
--------------
ChangeLog
fvwm/components/apps/DesktopIcons
fvwm/components/functions/Panel-Display
fvwm/components/styles/FVWM
Modified: ChangeLog
===================================================================
--- ChangeLog 2015-10-25 17:42:02 UTC (rev 760)
+++ ChangeLog 2015-10-25 18:39:21 UTC (rev 761)
@@ -7,6 +7,9 @@
scripts/FileEditors/FileEditWithHelp, functions/Preferences-Menu: Fix file saving: fix
loading and removal of temporary environmental variable.
apps/DesktopIcons: Add preference setting to put or not the desktop icons on top with the panel.
+ It now use State 30 to which windows are put on top. State 31 remain to put them to bottom.
+ styles/FVWM: add State 30 style to the FVWM parts.
+ Panel-Display: Use State 30 to control which windows are put on top.
Vendredi 23 octobre 2015
bindings/Desktop-MMB-TogglePanels: new binding to toggle on top the panels; changed the
Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons 2015-10-25 17:42:02 UTC (rev 760)
+++ fvwm/components/apps/DesktopIcons 2015-10-25 18:39:21 UTC (rev 761)
@@ -27,6 +27,7 @@
LoadPreferences FileBrowser1
LoadPreferences FileBrowser2
LoadPreferences DeskIconsSign.$[infostore.Recipe]
+LoadPreferences DeskIconsOnTop
# For the recipes
SetEnv DefaultDesktopManager Crystal
@@ -149,7 +150,7 @@
+ I AddToMenu $0 '$[gt.Show directories]' LaunchFileWithHelp ShowDirectories
+ I AddToMenu $0 '$[gt.Actions]' PopUp /Preferences/FileBrowser
+ I AddToMenu $0 '$[gt.Emplacement]' Popup /Preferences/DeskIconsPlace
-+ I AddToMenu $0 '$[gt.Show on top with panel]' Popup /Preferences/DeskIconsTop
++ I AddToMenu $0 '$[gt.Show on top with panels]' Popup /Preferences/DeskIconsTop
DestroyMenu /Preferences/XDG
AddToMenu /Preferences/XDG
@@ -279,12 +280,12 @@
DestroyFunc DeskIconsOnTop
AddToFunc DeskIconsOnTop
-+ I SavePreferences DeskIconsOnTop "All (DesktopIcons) WindowStyle State 31"
-+ I All (DesktopIcons) WindowStyle State 31
++ I SavePreferences DeskIconsOnTop "Style DesktopIcons State 30"
++ I All (DesktopIcons) WindowStyle State 30
DestroyFunc DeskIconsOnBottom
AddToFunc DeskIconsOnBottom
-+ I SavePreferences DeskIconsOnTop "All (DesktopIcons) WindowStyle !State 31"
-+ I All (DesktopIcons) WindowStyle !State 31
++ I SavePreferences DeskIconsOnTop "Style DesktopIcons !State 30"
++ I All (DesktopIcons) WindowStyle !State 30
# vim:ft=fvwm
Modified: fvwm/components/functions/Panel-Display
===================================================================
--- fvwm/components/functions/Panel-Display 2015-10-25 17:42:02 UTC (rev 760)
+++ fvwm/components/functions/Panel-Display 2015-10-25 18:39:21 UTC (rev 761)
@@ -17,7 +17,7 @@
# State 31 true, State 1 true => on bottom, false => on top
DestroyFunc Panel-Toggle-OnTop
AddToFunc Panel-Toggle-OnTop
-+ I All (State 31, State 1) WindowStyle StaysOnTop, !State 1
++ I All (State 30, State 1) WindowStyle StaysOnTop, !State 1
+ I TestRc (NoMatch) All (State 31) WindowStyle StaysOnBottom, State 1
PipeRead "if [ \"$(echo $[infostore.Fvwm_Crystal_Recipe]| sed -e 's:.*Amiga:Amiga:')\" = \"Amiga\" ]; then echo '+ I Schedule 100 Restore-TopBar-RaiseLower'; fi"
@@ -47,31 +47,4 @@
#EdgeCommand Top Toggle-TopBar-OnTop
-
-# Show on top bottom panels {{{2
-#DestroyFunc Toggle-BottomBar-OnTop
-#AddToFunc Toggle-BottomBar-OnTop
-#+ I Next (FvwmButtons-Bottom, !State 1) PutBottomBar-OnTop
-#+ I TestRc (NoMatch) PutBottomBar-OnBottom
-
-#DestroyFunc PutBottomBar-OnTop
-#AddToFunc PutBottomBar-OnTop
-#+ I All (FvwmButtons-BottomSwitchPanel) PutOnTop
-#+ I All (FvwmButtons-Bottom) PutOnTop
-#+ I All (FvwmButtons-BottomNotifAera) PutOnTop
-#+ I All (trayer) PutOnTop
-#+ I All (FvwmButtons-BottomSwitchPanel2) PutOnTop
-#+ I All (ApplicationPanel) PutOnTop
-#+ I All (FvwmPager PutOnTop
-
-DestroyFunc PutBottomBar-OnBottom
-AddToFunc PutBottomBar-OnBottom
-#+ I All (FvwmButtons-BottomSwitchPanel) PutOnBottom
-#+ I All (FvwmButtons-Bottom) PutOnBottom
-#+ I All (FvwmButtons-BottomNotifAera) PutOnBottom
-#+ I All (trayer) PutOnBottom
-#+ I All (FvwmButtons-BottomSwitchPanel2) PutOnBottom
-#+ I All (ApplicationPanel) PutOnBottom
-#+ I All (FvwmPager) PutOnBottom
-
-#EdgeCommand Bottom Toggle-BottomBar-OnTop
+# vim:ft=fvwm
Modified: fvwm/components/styles/FVWM
===================================================================
--- fvwm/components/styles/FVWM 2015-10-25 17:42:02 UTC (rev 760)
+++ fvwm/components/styles/FVWM 2015-10-25 18:39:21 UTC (rev 761)
@@ -15,7 +15,7 @@
FixedSize, StaysOnBottom, !Handles, BorderWidth 1, HandleWidth 1, \
NoTitle, NoIcon, Colorset $[infostore.cs_panel_border], \
BorderColorset $[infostore.cs_panel_border], HilightColorset $[infostore.cs_panel_border], \
- HilightBorderColorset $[infostore.cs_panel_border], ParentalRelativity, State 31, State 1
+ HilightBorderColorset $[infostore.cs_panel_border], ParentalRelativity, State 31, State 30, State 1
Style FvwmButtons UseStyle FvwmParts
Style FvwmPager UseStyle FvwmParts
@@ -44,7 +44,7 @@
# GKrellM settings
Style gkrellm NoTitle, StaysOnBottom, Sticky, NoIcon, NeverFocus, \
- FixedSize, WindowListSkip, FixedPosition, !Borders, State 31, State 1
+ FixedSize, WindowListSkip, FixedPosition, !Borders, State 31, State 30, State 1
Style gkrellm2 UseStyle gkrellm
Style gDeskCal UseStyle gkrellm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2019-08-22 23:01:13
|
Revision: 928
http://sourceforge.net/p/fvwm-crystal/code/928
Author: dominique_libre
Date: 2019-08-22 23:00:57 +0000 (Thu, 22 Aug 2019)
Log Message:
-----------
Maximize function cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/bindings/Numpad-Control
fvwm/components/bindings/Window-Control
fvwm/components/bindings/Window-Control_NumLock
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/Window-Basic
fvwm/components/functions/Window-Buttons
fvwm/components/functions/Window-Buttons-Vertical
Modified: ChangeLog
===================================================================
--- ChangeLog 2019-08-21 20:12:10 UTC (rev 927)
+++ ChangeLog 2019-08-22 23:00:57 UTC (rev 928)
@@ -1,5 +1,28 @@
ChangeLog for FVWM-Crystal
+vendredi 23 août 2019
+ fvwm/components/bindings/Numpad-Control
+ fvwm/components/bindings/Window-Control
+ fvwm/components/bindings/Window-Control_NumLock
+ 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/Window-Basic
+ fvwm/components/functions/Window-Buttons
+ fvwm/components/functions/Window-Buttons-Vertical:
+ Maximize functions cleanup
+
mercredi 21 aoùt 2019
fvwm/decorations/Amiga/*: remove non necessary spaces and lines
asciidoc/KeyboardBindings: add words about keyboard modifiers change
Modified: fvwm/components/bindings/Numpad-Control
===================================================================
--- fvwm/components/bindings/Numpad-Control 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/bindings/Numpad-Control 2019-08-22 23:00:57 UTC (rev 928)
@@ -3,7 +3,7 @@
Key KP_Delete A $[Mod0] Lower
Key KP_Divide A $[Mod0] Window-Shade toggle
Key KP_Divide A $[Mod1] Stick toggle
-Key KP_Multiply A $[Mod0] Window-Resize Maximize
+Key KP_Multiply A $[Mod0] Maximize
Key KP_Multiply A $[Mod1] Fullscreen
Key KP_Multiply A $[Mod2] Disappear
Key KP_Subtract A $[Mod1] Window-Iconify
Modified: fvwm/components/bindings/Window-Control
===================================================================
--- fvwm/components/bindings/Window-Control 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/bindings/Window-Control 2019-08-22 23:00:57 UTC (rev 928)
@@ -1,7 +1,7 @@
# Subset of window control functions in case you don't have numpad
Key minus A $[Mod1] Raise
Key minus A $[Mod2] Lower
-Key equal A $[Mod1] New-State All
+Key equal A $[Mod1] Maximize
Key equal A $[Mod2] Fullscreen
Key BackSpace A $[Mod1] Window-Iconify
Key BackSpace A $[Mod2] Close
Modified: fvwm/components/bindings/Window-Control_NumLock
===================================================================
--- fvwm/components/bindings/Window-Control_NumLock 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/bindings/Window-Control_NumLock 2019-08-22 23:00:57 UTC (rev 928)
@@ -1,7 +1,7 @@
# Subset of window control functions in case you don't have numpad
Key minus A $[Mod1]2 Raise
Key minus A $[Mod2]2 Lower
-Key equal A $[Mod1]2 New-State All
+Key equal A $[Mod1]2 Maximize
Key equal A $[Mod2]2 Fullscreen
Key BackSpace A $[Mod1]2 Window-Iconify
Key BackSpace A $[Mod2]2 Close
Modified: fvwm/components/decorations/Buttons-amigaos
===================================================================
--- fvwm/components/decorations/Buttons-amigaos 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-amigaos 2019-08-22 23:00:57 UTC (rev 928)
@@ -3,10 +3,10 @@
# Modified by Dominique Michel in order to reproduce the look and feel
# of the Amiga OS
#
-# For the real lock and feel, just buy an Amiga. This is not an exact
+# For the real lock and feel, just find an Amiga. This is not an exact
# reproduction of the Amiga button setup.
-#
-# This is the AmigaOS window button setup. Hold the mouse buttons
+#
+# This is the AmigaOS window button setup. Hold the mouse button
# to see the popup menu of a certain button.
#
# Mod : any modifier
@@ -13,7 +13,7 @@
# Mod0: no modifier
# Mod1: Meta (Alt)
# Mod2: Shift Alt
-#
+#
# Original Amiga 3.1 button setup
# Button 1: close
# Button 2: raise/lower
@@ -20,28 +20,26 @@
# Button 4: minimize|maximize|fullscreen/default (one of 3/default)
# Button 6: iconify (on non transiet window)
-
-# First button - close, destroy, iconify #save default geometry
+# First button - close, destroy, iconify
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 $[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 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
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 100 0
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow grow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 grow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow 0
Style * Button 2
Style * NoButton 3
# 4th button - minimize, stick and layers
-Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer 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
@@ -48,7 +46,6 @@
Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 4
Style * Button 4
-
Style * NoButton 5
# 6th button - iconify, move a window between pages
Modified: fvwm/components/decorations/Buttons-amigaos-MiniIcon
===================================================================
--- fvwm/components/decorations/Buttons-amigaos-MiniIcon 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-amigaos-MiniIcon 2019-08-22 23:00:57 UTC (rev 928)
@@ -6,21 +6,20 @@
# to see the popup menu of a certain button.
-# First button - close, destroy, iconify #save default geometry
+# First button - close, destroy, iconify
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 $[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 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
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 100 0
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow grow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 grow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow 0
Style * Button 2
#Mouse 1 2 $[Mod0] RaiseLower
@@ -31,7 +30,7 @@
Style * Button 3
# 4th button - minimize, stick and layers
-Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer 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
@@ -52,9 +51,8 @@
Style * NoButton 7
-# 8th button -
+# 8th button
Style * NoButton 8
-#Style * Button 8
Style * NoButton 9
Modified: fvwm/components/decorations/Buttons-amigaos_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-amigaos_NumLock 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-amigaos_NumLock 2019-08-22 23:00:57 UTC (rev 928)
@@ -13,15 +13,15 @@
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 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
+Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize
+Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 100
+Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 100 0
+Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow grow
+Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 grow
+Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow 0
# 4th button - minimize, stick and layers
-Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Minimize
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
Modified: fvwm/components/decorations/Buttons-fvwm-crystal
===================================================================
--- fvwm/components/decorations/Buttons-fvwm-crystal 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-fvwm-crystal 2019-08-22 23:00:57 UTC (rev 928)
@@ -23,18 +23,18 @@
Style * NoButton 3
# 4th button - various ways to maximize a window
-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
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Maximize
+Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True 0 100
+Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True 100 0
+Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True grow grow
+Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True 0 grow
+Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True grow 0
Style * Button 4
Style * NoButton 5
# 6th button - additional window commands
-Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer 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
Modified: fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon
===================================================================
--- fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon 2019-08-22 23:00:57 UTC (rev 928)
@@ -27,18 +27,18 @@
Style * Button 3
# 4th button - various ways to maximize a window
-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
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Maximize
+Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True 0 100
+Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True 100 0
+Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True grow grow
+Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True 0 grow
+Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Maximize True grow 0
Style * Button 4
Style * NoButton 5
# 6th button - additional window commands
-Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer 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
Modified: fvwm/components/decorations/Buttons-fvwm-crystal_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-fvwm-crystal_NumLock 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-fvwm-crystal_NumLock 2019-08-22 23:00:57 UTC (rev 928)
@@ -14,15 +14,15 @@
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 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
+Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize
+Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize True 0 100
+Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize True 100 0
+Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize True grow grow
+Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize True 0 grow
+Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize True grow 0
# 6th button - additional window commands
-Mouse 1 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Layer 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
Modified: fvwm/components/decorations/Buttons-macosx
===================================================================
--- fvwm/components/decorations/Buttons-macosx 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-macosx 2019-08-22 23:00:57 UTC (rev 928)
@@ -22,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 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
+Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Maximize
+Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Maximize 0 100
+Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Maximize 100 0
+Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Maximize grow grow
+Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Maximize 0 grow
+Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Maximize grow 0
Style * Button 5
Style * NoButton 6
Modified: fvwm/components/decorations/Buttons-macosx-MiniIcon
===================================================================
--- fvwm/components/decorations/Buttons-macosx-MiniIcon 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-macosx-MiniIcon 2019-08-22 23:00:57 UTC (rev 928)
@@ -22,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 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
+Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Maximize
+Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Maximize 0 100
+Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Maximize 100 0
+Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Maximize grow grow
+Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Maximize 0 grow
+Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Maximize grow 0
Style * Button 5
Style * NoButton 6
Modified: fvwm/components/decorations/Buttons-macosx_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-macosx_NumLock 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-macosx_NumLock 2019-08-22 23:00:57 UTC (rev 928)
@@ -7,11 +7,11 @@
# 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 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
+Mouse 1 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Maximize
+Mouse 2 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Maximize 0 100
+Mouse 3 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Maximize 100 0
+Mouse 1 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Maximize grow grow
+Mouse 2 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Maximize 0 grow
+Mouse 3 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Maximize grow 0
# vim:ft=fvwm
Modified: fvwm/components/decorations/Buttons-os2
===================================================================
--- fvwm/components/decorations/Buttons-os2 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-os2 2019-08-22 23:00:57 UTC (rev 928)
@@ -12,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 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
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize 100 0
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow grow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 grow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow 0
Style * Button 2
Style * NoButton 3
Modified: fvwm/components/decorations/Buttons-os2-MiniIcon
===================================================================
--- fvwm/components/decorations/Buttons-os2-MiniIcon 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-os2-MiniIcon 2019-08-22 23:00:57 UTC (rev 928)
@@ -12,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 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
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize 100 0
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow grow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 grow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow 0
Style * Button 2
# MiniIcon
Modified: fvwm/components/decorations/Buttons-os2_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-os2_NumLock 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-os2_NumLock 2019-08-22 23:00:57 UTC (rev 928)
@@ -7,11 +7,11 @@
# 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 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
+Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize
+Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 100
+Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize 100 0
+Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow grow
+Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize 0 grow
+Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Maximize grow 0
# vim:ft=fvwm
Modified: fvwm/components/decorations/Buttons-windows
===================================================================
--- fvwm/components/decorations/Buttons-windows 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-windows 2019-08-22 23:00:57 UTC (rev 928)
@@ -18,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 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
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Maximize
+Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Maximize 0 100
+Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Maximize 100 0
+Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Maximize grow grow
+Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Maximize 0 grow
+Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Maximize grow 0
Style * Button 4
Style * NoButton 5
Modified: fvwm/components/decorations/Buttons-windows_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-windows_NumLock 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/decorations/Buttons-windows_NumLock 2019-08-22 23:00:57 UTC (rev 928)
@@ -7,11 +7,11 @@
# 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 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
+Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize
+Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize 0 100
+Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize 100 0
+Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize grow grow
+Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize 0 grow
+Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Maximize grow 0
# vim:ft=fvwm
Modified: fvwm/components/functions/Window-Basic
===================================================================
--- fvwm/components/functions/Window-Basic 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/functions/Window-Basic 2019-08-22 23:00:57 UTC (rev 928)
@@ -74,33 +74,22 @@
+ I Layer 0 6
+ I Schedule 12000 Layer Default
-# Variables update, see components/Window-Buttons
-DestroyFunc Window-Save-Geom
-AddToFunc Window-Save-Geom
-+ I SetEnv "CurrentWindowState_$[w.id]" Default
-+ I SetEnv "WindowWidth_$[w.id]" "$[w.width]p"
-+ I SetEnv "WindowHeight_$[w.id]" "$[w.height]p"
-
DestroyFunc Window-Resize-Base
AddToFunc Window-Resize-Base
+ I Resize
-+ I Window-Save-Geom
DestroyFunc Window-Resize-Opaque
AddToFunc Window-Resize-Opaque
+ I Resize Direction $0
-+ I Window-Save-Geom
DestroyFunc Window-Shade-Resize
AddToFunc Window-Shade-Resize
+ C WindowShade toggle
+ M Resize
-+ I Window-Save-Geom
DestroyFunc Window-Resize-Context
AddToFunc Window-Resize-Context
+ I Resize $0p $1p
-+ I Window-Save-Geom
DestroyFunc Window-Shade
AddToFunc Window-Shade
@@ -121,5 +110,4 @@
AddToFunc Window-Increase-Transparency
+ I Exec exec transset --actual --max 1 --inc .05
-
# vim:ft=fvwm
Modified: fvwm/components/functions/Window-Buttons
===================================================================
--- fvwm/components/functions/Window-Buttons 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/functions/Window-Buttons 2019-08-22 23:00:57 UTC (rev 928)
@@ -12,97 +12,39 @@
# menu - name of the menu opened on the mouse hold
# function - function executed after mouse click
-# The windows can have several states: its original or mouse resized state,
-# a minimized state, a maximized state, a fullscreen state, and several other.
-# A mouse click must set the windows into the wanted state, and when in
-# fullscreen, the window must retrun in its precedent state.
-# We need 3 environment variables per windows, 2 will contain its original or
-# mouse resized width and height, the third one will contain a string
-# corresponding to its state (excepted fullscreen).
-# The fullscreen functions are implemented into the Fullscreen file.
+DestroyFunc Minimize
+AddToFunc Minimize
++ I ThisWindow ("URxvt|XTerm|aterm|Terminal|Gnome-terminal|UXTerm|xterm|Xfce4-terminal|Vte") ResizeMaximize direction East 80c 3c
++ I TestRc (NoMatch) ResizeMaximize Direction East 200p 60p
-# Variables creation and destruction {{{1
-# They must survive a restart => SetEnv
-# FvwmEvent will do it.
-DestroyFunc Window-State-Init
-AddToFunc Window-State-Init
-+ I SetEnv "CurrentWindowState_$[w.id]" Default
-+ I SetEnv "WindowWidth_$[w.id]" "$[w.width]p"
-+ I SetEnv "WindowHeight_$[w.id]" "$[w.height]p"
-
-DestroyFunc Window-State-Destroy
-AddToFunc Window-State-Destroy
-+ I UnsetEnv "CurrentWindowState_$[w.id]"
-+ I UnsetEnv "WindowWidth_$[w.id]"
-+ I UnsetEnv "WindowHeight_$[w.id]"
-
-# Variables update, see also components/Window-Basic
-
-# param for fvwm-event: add_window, destroy_window, property_change
-DestroyModuleConfig FvwmEvent-Window-State-Init: *
-*FvwmEvent-Window-State-Init: add_window Window-State-Init
-*FvwmEvent-Window-State-Init: destroy_window Window-State-Destroy
-Module FvwmEvent FvwmEvent-Window-State-Init
-
-## Wrapper function for the resizing functions
-# Logic: if actual_size=size then default_size else size
-# Syntax: Window-Resize <size>
-# Where size is one of Maximize-Minimize-Default-A100-H100-V100-VHgrow-Hgrow-Vgrow
-# For fullscreen see components/Fullscreen
-DestroyFunc Window-Resize
-AddToFunc Window-Resize
-+ I Test (EnvMatch CurrentWindowState_$[w.id] "$0") NS-Default
-+ I TestRc (NoMatch) NS-"$0"
-
-DestroyFunc NS-Maximize
-AddToFunc NS-Maximize
-+ I Maximize True 100 100
-+ I SetEnv CurrentWindowState_$[w.id] Maximize
-
-DestroyFunc NS-Minimize
-AddToFunc NS-Minimize
-+ I ResizeMaximize direction East 200p 60p
-+ I SetEnv CurrentWindowState_$[w.id] Minimize
-
-DestroyFunc NS-Default
-AddToFunc NS-Default
-+ I Maximize $[WindowWidth_$[w.id]] $[WindowHeight_$[w.id]]
-+ I SetEnv CurrentWindowState_$[w.id] Default
-
DestroyFunc NS-A100
AddToFunc NS-A100
+ I Maximize True 100 100
-+ I SetEnv CurrentWindowState_$[w.id] A100
DestroyFunc NS-H100
AddToFunc NS-H100
+ I Maximize True 100 0
-+ I SetEnv CurrentWindowState_$[w.id] H100
DestroyFunc NS-V100
AddToFunc NS-V100
+ I Maximize True 0 100
-+ I SetEnv CurrentWindowState_$[w.id] V100
DestroyFunc NS-Hgrow
AddToFunc NS-Hgrow
+ I Maximize True grow 0
-+ I SetEnv CurrentWindowState_$[w.id] Hgrow
DestroyFunc NS-Vgrow
AddToFunc NS-Vgrow
+ I Maximize True 0 grow
-+ I SetEnv CurrentWindowState_$[w.id] Vgrow
DestroyFunc NS-VHgrow
AddToFunc NS-VHgrow
+ I Maximize True grow grow
-+ I SetEnv CurrentWindowState_$[w.id] VHgrow
# NS-Default rearrange
DestroyFunc NS-Default-Rearrange
AddToFunc NS-Default-Rearrange
-+ I All (CurrentPage, !Iconic, !FvwmButtons, !FvwmPager, !FvwmConsoleNeedsUniqueName, !QuakeConsoleNeedsUniqueName, !FvwmIconMan, !MPlayer) NS-Default
+#+ I All (CurrentPage, !Iconic, !FvwmButtons, !FvwmPager, !FvwmConsoleNeedsUniqueName, !QuakeConsoleNeedsUniqueName, !FvwmIconMan, !MPlayer) NS-Default
+ I All (CurrentPage, !Iconic, !FvwmButtons, !FvwmPager, !FvwmConsoleNeedsUniqueName, !QuakeConsoleNeedsUniqueName, !FvwmIconMan, !MPlayer) PlaceAgain Anim
# Wrapper functions for window decorations {{{1
@@ -137,16 +79,16 @@
DestroyMenu /Window-Menu-Maximize
AddToMenu /Window-Menu-Maximize
-+ '$[gt.Maximize]' Window-Resize Maximize
-+ '$[gt.Minimize]' Window-Resize Minimize
-+ '$[gt.Maximize horizontally]' Window-Resize H100
-+ '$[gt.Maximize vertically]' Window-Resize V100
++ '$[gt.Fullscreen]' Fullscreen
++ '$[gt.Maximize]' Maximize
++ '$[gt.Minimize]' Minimize
+#+ '$[gt.Minimize]' ResizeMaximize direction East 200p 60p
++ '$[gt.Maximize horizontally]' Maximize True 100 0
++ '$[gt.Maximize vertically]' Maximize True 0 100
+ "" Nop
-+ '$[gt.Take all free space]' Window-Resize VHgrow
-+ '$[gt.Take all horizontal space]' Window-Resize Hgrow
-+ '$[gt.Take all vertical space]' Window-Resize Vgrow
-+ "" Nop
-+ '$[gt.Fullscreen]' Fullscreen
++ '$[gt.Take all free space]' Maximize True grow grow
++ '$[gt.Take all horizontal space]' Maximize True grow 0
++ '$[gt.Take all vertical space]' Maximize True 0 grow
DestroyMenu /Window-Menu-Layer
AddToMenu /Window-Menu-Layer
Modified: fvwm/components/functions/Window-Buttons-Vertical
===================================================================
--- fvwm/components/functions/Window-Buttons-Vertical 2019-08-21 20:12:10 UTC (rev 927)
+++ fvwm/components/functions/Window-Buttons-Vertical 2019-08-22 23:00:57 UTC (rev 928)
@@ -14,92 +14,42 @@
# menu - name of the menu opened on the mouse hold
# function - function executed after mouse click
-# The windows can have several states: its original or mouse resized state,
-# a minimized state, a maximized state, a fullscreen state, and several other.
-# A mouse click must set the windows into the wanted state, and when in
-# fullscreen, the window must retrun in its precedent state.
-# We need 3 environment variables per windows, 2 will contain its original or
-# mouse resized width and height, the third one will contain a string
-# corresponding to its state (excepted fullscreen).
-# The fullscreen functions are implemented into the Fullscreen file.
-
-# Variables creation and destruction {{{1
-# They must survive a restart => SetEnv
-# FvwmEvent will do it.
-DestroyFunc Window-State-Init
-AddToFunc Window-State-Init
-+ I SetEnv "CurrentWindowState_$[w.id]" Default
-+ I SetEnv "WindowWidth_$[w.id]" "$[w.width]p"
-+ I SetEnv "WindowHeight_$[w.id]" "$[w.height]p"
-
-DestroyFunc Window-State-Destroy
-AddToFunc Window-State-Destroy
-+ I UnsetEnv "CurrentWindowState_$[w.id]"
-+ I UnsetEnv "WindowWidth_$[w.id]"
-+ I UnsetEnv "WindowHeight_$[w.id]"
-
-# Variables update, see components/Window-Basic
-
-# param for fvwm-event: add_window, destroy_window, property_change
-DestroyModuleConfig FvwmEvent-Window-State-Init: *
-*FvwmEvent-Window-State-Init: add_window Window-State-Init
-*FvwmEvent-Window-State-Init: destroy_window Window-State-Destroy
-Module FvwmEvent FvwmEvent-Window-State-Init
-
-## Wrapper function for the resizing functions {{{1
-# Logic: if actual_size=size then default_size else size
-# Syntax: Window-Resize <size>
-# Where size is one of Maximize-Minimize-Default-A100-H100-V100-VHgrow-Hgrow-Vgrow
-# For fullscreen see components/Fullscreen
-DestroyFunc Window-Resize
-AddToFunc Window-Resize
-+ I Test (EnvMatch CurrentWindowState_$[w.id] "$0") NS-Default
-+ I TestRc (NoMatch) NS-"$0"
-
DestroyFunc NS-Maximize
AddToFunc NS-Maximize
+ I Maximize True 100 100
-+ I SetEnv CurrentWindowState_$[w.id] Maximize
-DestroyFunc NS-Minimize
-AddToFunc NS-Minimize
-+ I ResizeMaximize direction East 200p 60p
-+ I SetEnv CurrentWindowState_$[w.id] Minimize
+DestroyFunc Minimize
+AddToFunc Minimize
++ I This Window ("URxvt|XTerm|aterm|Terminal|Gnome-terminal|UXTerm|xterm|Xfce4-terminal|Vte") ResizeMaximize direction East 80c 3c
++ I TestRc (NoMatch) ResizeMaximize direction East 200p 60p
DestroyFunc NS-Default
AddToFunc NS-Default
+ I Maximize $[WindowWidth_$[w.id]] $[WindowHeight_$[w.id]]
-+ I SetEnv CurrentWindowState_$[w.id] Default
DestroyFunc NS-A100
AddToFunc NS-A100
+ I Maximize True 100 100
-+ I SetEnv CurrentWindowState_$[w.id] A100
DestroyFunc NS-H100
AddToFunc NS-H100
+ I Maximize True 100 0
-+ I SetEnv CurrentWindowState_$[w.id] H100
DestroyFunc NS-V100
AddToFunc NS-V100
+ I Maximize True 0 100
-+ I SetEnv CurrentWindowState_$[w.id] V100
DestroyFunc NS-Hgrow
AddToFunc NS-Hgrow
+ I Maximize True grow 0
-+ I SetEnv CurrentWindowState_$[w.id] Hgrow
DestroyFunc NS-Vgrow
AddToFunc NS-Vgrow
+ I Maximize True 0 grow
-+ I SetEnv CurrentWindowState_$[w.id] Vgrow
DestroyFunc NS-VHgrow
AddToFunc NS-VHgrow
+ I Maximize True grow grow
-+ I SetEnv CurrentWindowState_$[w.id] VHgrow
# Wrapper functions for window decorations {{{1
DestroyFunc Window-MoveToPage-Forward
@@ -135,7 +85,9 @@
DestroyMenu /Window-Menu-Maximize
AddToMenu /Window-Menu-Maximize
-+ '$[gt.Maximize]' Maximize
++ '$[gt.Fullscreen]' Fullscreen
++ '$[gt.Maximize]' Maximize
++ '$[gt.Minimize]' Minimize
+ '$[gt.Maximize horizontally]' Maximize 100 0
+ '$[gt.Maximize vertically]' Maximize 0 100
+ "" Nop
@@ -142,8 +94,6 @@
+ '$[gt.Take all free space]' Maximize grow grow
+ '$[gt.Take all horizontal space]' Maximize grow 0
+ '$[gt.Take all vertical space]' Maximize 0 grow
-+ "" Nop
-+ '$[gt.Fullscreen]' Fullscreen
DestroyMenu /Window-Menu-Layer
AddToMenu /Window-Menu-Layer
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-04 15:58:25
|
Revision: 960
http://sourceforge.net/p/fvwm-crystal/code/960
Author: dominique_libre
Date: 2020-02-04 15:58:23 +0000 (Tue, 04 Feb 2020)
Log Message:
-----------
ScreenLidSuspend: check if running at launch and load its preference at startup
Modified Paths:
--------------
ChangeLog
fvwm/components/desktop/FVWM-Crystal_Preferences
fvwm/components/functions/Exit
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-01-08 22:13:00 UTC (rev 959)
+++ ChangeLog 2020-02-04 15:58:23 UTC (rev 960)
@@ -1,5 +1,9 @@
ChangeLog for FVWM-Crystal
+mardi 4 février 2020
+ fvwm/components/desktop/FVWM-Crystal_Preferences: Add ScreenLidSuspend laoding at startup
+ fvwm/components/functions/Exit: ScreenLidSuspend: check if allready running before to launch it
+
Mercredi 8 janvier 2020
fvwm/components/Fullscreen: workaround buggy browser windows which think they know
better that the window manager.
Modified: fvwm/components/desktop/FVWM-Crystal_Preferences
===================================================================
--- fvwm/components/desktop/FVWM-Crystal_Preferences 2020-01-08 22:13:00 UTC (rev 959)
+++ fvwm/components/desktop/FVWM-Crystal_Preferences 2020-02-04 15:58:23 UTC (rev 960)
@@ -6,5 +6,6 @@
InfoStoreAdd Desk_Pages_Y "1"
DesktopSize $[infostore.Desk_Pages_X]x$[infostore.Desk_Pages_Y]
LoadPreferences AutoHibernation
+LoadPreferences ScreenLidSuspend
# vim:ft=fvwm
Modified: fvwm/components/functions/Exit
===================================================================
--- fvwm/components/functions/Exit 2020-01-08 22:13:00 UTC (rev 959)
+++ fvwm/components/functions/Exit 2020-02-04 15:58:23 UTC (rev 960)
@@ -56,7 +56,7 @@
DestroyFunc ScreenLidSuspend
AddToFunc ScreenLidSuspend
+ I Exec exec $[FVWM_SYSTEMDIR]/scripts/ScreenLidSuspend
-+ I SavePreferences ScreenLidSuspend "Exec exec $[FVWM_SYSTEMDIR]/scripts/ScreenLidSuspend"
++ I SavePreferences ScreenLidSuspend "Exec exec pgrep -f ScreenLidSuspen 1>/dev/null || $[FVWM_SYSTEMDIR]/scripts/ScreenLidSuspend"
DestroyFunc NoScreenLidSuspend
AddToFunc NoScreenLidSuspend
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 21:08:52
|
Revision: 991
http://sourceforge.net/p/fvwm-crystal/code/991
Author: dominique_libre
Date: 2020-02-14 21:08:51 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
Applets: Set WindowPosition outside visual
Modified Paths:
--------------
ChangeLog
fvwm/components/apps/DesktopIcons
fvwm/components/scripts/FvwmScript-AcpiBatt
fvwm/components/scripts/FvwmScript-Clock
fvwm/components/scripts/FvwmScript-Clock-24h
fvwm/components/scripts/FvwmScript-Clock-24h-small_date
fvwm/components/scripts/FvwmScript-Clock-small
fvwm/components/scripts/FvwmScript-Clock-small_date
fvwm/components/scripts/FvwmScript-CpuFreq
fvwm/components/scripts/FvwmScript-CpuFreq-small
fvwm/components/scripts/FvwmScript-CpuTemp
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-14 11:56:01 UTC (rev 990)
+++ ChangeLog 2020-02-14 21:08:51 UTC (rev 991)
@@ -8,6 +8,16 @@
desktop manager button; some comments
recipes/*: fix ewmh working area , this fix the overlapping of the desktop manager
with other buttons
+ fvwm/components/apps/DesktopIcons: cleanup
+ fvwm/components/scripts/FvwmScript-AcpiBatt;
+ fvwm/components/scripts/FvwmScript-Clock;
+ fvwm/components/scripts/FvwmScript-Clock-24h;
+ fvwm/components/scripts/FvwmScript-Clock-24h-small_date;
+ fvwm/components/scripts/FvwmScript-Clock-small;
+ fvwm/components/scripts/FvwmScript-Clock-small_date;
+ fvwm/components/scripts/FvwmScript-CpuFreq;
+ fvwm/components/scripts/FvwmScript-CpuFreq-small;
+ fvwm/components/scripts/FvwmScript-CpuTemp: Set WindowPosition outside visual
mercredi 12 février 2020
fvwm/components/apps/DesktopIcons;
Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/apps/DesktopIcons 2020-02-14 21:08:51 UTC (rev 991)
@@ -187,8 +187,8 @@
AddToFunc LoadDesktopIcons
+ I PipeRead '$[FVWM_SYSTEMDIR]/scripts/desktop_manager \"$[infostore.DeskIconsSign]\" $[infostore.cs_transparent] "$[infostore.SILENT]" \
\"$[infostore.FileBrowser1]\" \"$[infostore.FileBrowser2]\" $[vp.height] $[infostore.tmpdrivefile] \
- $[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] $[vp.width] \
- $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right]'
+ $[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] \
+ $[vp.width] $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right]'
+ I Include tmp/DesktopIcons
+ I RedrawIconBox
Modified: fvwm/components/scripts/FvwmScript-AcpiBatt
===================================================================
--- fvwm/components/scripts/FvwmScript-AcpiBatt 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-AcpiBatt 2020-02-14 21:08:51 UTC (rev 991)
@@ -11,6 +11,7 @@
WindowTitle {FvwmScript-AcpiBatt}
WindowSize 48 24
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=12:Bold"
Colorset 12
@@ -96,4 +97,3 @@
Begin
End
End
-
Modified: fvwm/components/scripts/FvwmScript-Clock
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock 2020-02-14 21:08:51 UTC (rev 991)
@@ -13,6 +13,7 @@
WindowTitle {FvwmScript-Clock}
WindowSize 60 22
+WindowPosition 10000 10000
Font "xft:Verdana:pixelsize=15:Bold"
Colorset 12
@@ -117,4 +118,3 @@
ChangeTitle 1 $tmp
End
End
-
Modified: fvwm/components/scripts/FvwmScript-Clock-24h
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock-24h 2020-02-14 21:08:51 UTC (rev 991)
@@ -5,6 +5,7 @@
WindowTitle {FvwmScript-Clock}
WindowSize 60 22
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=16:Bold"
Colorset 12
Modified: fvwm/components/scripts/FvwmScript-Clock-24h-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h-small_date 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock-24h-small_date 2020-02-14 21:08:51 UTC (rev 991)
@@ -1,5 +1,6 @@
WindowTitle {FvwmScript-Clock}
WindowSize 114 20
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=12:Bold"
Colorset 12
Modified: fvwm/components/scripts/FvwmScript-Clock-small
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-small 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock-small 2020-02-14 21:08:51 UTC (rev 991)
@@ -12,6 +12,7 @@
WindowTitle {FvwmScript-Clock}
WindowSize 60 22
+WindowPosition 10000 10000
Font "xft:Verdana:pixelsize=11:Bold"
Colorset 12
@@ -116,4 +117,3 @@
ChangeTitle 1 $tmp
End
End
-
Modified: fvwm/components/scripts/FvwmScript-Clock-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-small_date 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock-small_date 2020-02-14 21:08:51 UTC (rev 991)
@@ -1,5 +1,6 @@
WindowTitle {FvwmScript-Clock-small_date}
WindowSize 114 20
+WindowPosition 10000 10000
Font "xft:Verdana:pixelsize=12:Bold"
Colorset 12
Modified: fvwm/components/scripts/FvwmScript-CpuFreq
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuFreq 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-CpuFreq 2020-02-14 21:08:51 UTC (rev 991)
@@ -12,6 +12,7 @@
WindowTitle {FvwmScript-CpuFreq}
WindowSize 72 24
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=12:Bold"
Colorset 12
@@ -115,4 +116,3 @@
Begin
End
End
-
Modified: fvwm/components/scripts/FvwmScript-CpuFreq-small
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuFreq-small 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-CpuFreq-small 2020-02-14 21:08:51 UTC (rev 991)
@@ -13,6 +13,7 @@
WindowTitle {FvwmScript-CpuFreq}
WindowSize 60 24
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=10:Bold"
Colorset 12
@@ -116,4 +117,3 @@
Begin
End
End
-
Modified: fvwm/components/scripts/FvwmScript-CpuTemp
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuTemp 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-CpuTemp 2020-02-14 21:08:51 UTC (rev 991)
@@ -8,6 +8,7 @@
UseGettext {$FVWM_USERDIR/locale;fvwm-crystal-script:$FVWM_SYSTEMDIR/locale;fvwm-crystal-script:+}
WindowTitle {FvwmScript-CpuTemp}
WindowSize 48 24
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=12:Bold"
Colorset 12
@@ -80,4 +81,3 @@
Begin
End
End
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-17 12:13:10
|
Revision: 998
http://sourceforge.net/p/fvwm-crystal/code/998
Author: dominique_libre
Date: 2020-02-17 12:13:08 +0000 (Mon, 17 Feb 2020)
Log Message:
-----------
Fix the madia players styles
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Media-Music-functions
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-audacious
fvwm/components/functions/Music-cdcd
fvwm/components/functions/Music-cmus
fvwm/components/functions/Music-mocp
fvwm/components/functions/Music-mpd
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
fvwm/components/functions/Music-quodlibet
fvwm/components/functions/Music-xmms2
fvwm/components/styles/Application-Icons-22-32
Added Paths:
-----------
fvwm/components/styles/MediaPlayers-Style
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-17 12:03:55 UTC (rev 997)
+++ ChangeLog 2020-02-17 12:13:08 UTC (rev 998)
@@ -5,6 +5,21 @@
lundi 17 février
fvwm/components/functions/Exit: cleanup and try our best to find systemctl when present
+ fvwm/components/functions/Media-Music-functions;
+ fvwm/components/functions/Music-alsaplayer;
+ fvwm/components/functions/Music-audacious;
+ fvwm/components/functions/Music-cdcd;
+ fvwm/components/functions/Music-cmus;
+ fvwm/components/functions/Music-mocp;
+ fvwm/components/functions/Music-mpd;
+ fvwm/components/functions/Music-mplayer;
+ fvwm/components/functions/Music-mplayer2;
+ fvwm/components/functions/Music-quodlibet;
+ fvwm/components/functions/Music-xmms2;
+ fvwm/components/styles/Application-Icons-22-32;
++ fvwm/components/styles/MediaPlayers-Style: Fix the madia players styles.
+ This fix the icons at top after a recipe change bug and make the non
+ prefered players to get the defaut style in any case.
samedi 15 février 2020
fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
@@ -3630,3 +3645,4 @@
Thu Jul 7 23:32:06 CEST 2005 Maciej Delmanowski <ha...@po...>
* Initialization of the darcs repository
+M ChangeLog
Modified: fvwm/components/functions/Media-Music-functions
===================================================================
--- fvwm/components/functions/Media-Music-functions 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Media-Music-functions 2020-02-17 12:13:08 UTC (rev 998)
@@ -30,7 +30,7 @@
InfoStoreRemove fvwm_audio_exec
# Styles for media players windows {{{1
-# See components/styles/Applications-Icons-22-32
+Include components/styles/MediaPlayers-Style
############################################################
### We don't want player specific functions lying around ###
@@ -64,6 +64,13 @@
DestroyMenu /Player
# mouse 2 Music-GUI : allready here {{{2
+DestroyFunc Music-Iconify
+AddToFunc Music-Iconify
++ I ThisWindow (Iconic) WindowStyle Icon
++ I TestRc (NoMatch) WindowStyle NoIcon
++ I Iconify toggle
++ I UpdateStyles
+
# mouse 3 Music-QJackGUI (all)
DestroyFunc Music-QJackGUI
AddToFunc Music-QJackGUI
@@ -70,7 +77,7 @@
# startjack first => it is under the other windows
+ I All (start_jack) Iconify toggle
+ I All (qjackctl) Iconify toggle
-+ I All (start_cadence) Iconify toggle
++ I All (start_cadence) Iconify
+ I All (Cadence) Iconify toggle
+ I All (Cadence-*) Iconify toggle
+ I All (Catia) Iconify toggle
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-alsaplayer 2020-02-17 12:13:08 UTC (rev 998)
@@ -5,6 +5,9 @@
# Initialisations, shared functions {{{1
Include components/functions/Music
+Style alsaplayer NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
+Style Alsaplayer UseStyle alsaplayer
+
# Alsaplayer normal speed
InfoStoreAdd speed 1
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-audacious 2020-02-17 12:13:08 UTC (rev 998)
@@ -6,6 +6,10 @@
# Initialisations, shared functions
Include components/functions/Music
+Style audacious StartIconic, NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
+Style Audacious UseStyle audacious
+Style playlist UseStyle audacious
+Style equalizer UseStyle audacious
# First button {{{1
# Player controls and prefs
Modified: fvwm/components/functions/Music-cdcd
===================================================================
--- fvwm/components/functions/Music-cdcd 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-cdcd 2020-02-17 12:13:08 UTC (rev 998)
@@ -11,6 +11,7 @@
# Initialisations, shared functions
Include components/functions/Music
+Style cdcd NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
# First button {{{1
# Player controls and prefs
Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-cmus 2020-02-17 12:13:08 UTC (rev 998)
@@ -11,6 +11,8 @@
# Initialisations, shared functions
Include components/functions/Music
+Style cmus NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style cmus* UseStyle cmus
# First button
# Player controls and prefs {{{1
Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mocp 2020-02-17 12:13:08 UTC (rev 998)
@@ -6,6 +6,8 @@
# Initialisations, shared functions
Include components/functions/Music
+Style mocp NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style MOC* UseStyle mocp
# First button {{{1
# Player controls and prefs
Modified: fvwm/components/functions/Music-mpd
===================================================================
--- fvwm/components/functions/Music-mpd 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mpd 2020-02-17 12:13:08 UTC (rev 998)
@@ -10,6 +10,11 @@
# Initialisations, shared functions
Include components/functions/Music
+Style FvwmApplet-MpdAddSong MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style FvwmApplet-MpdPlEd MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style pympd NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style gmpc UseStyle pympd
+Style Gmpc UseStyle pympd
# Variables {{{1
# mpd know where the playlists are. See 'man mpd.conf'
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mplayer 2020-02-17 12:13:08 UTC (rev 998)
@@ -3,6 +3,9 @@
# Load shared functions and initialisations
Include components/functions/Media
+Style MPlayer !Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style "MPlayer - Video" Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style XDRadio NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
# specific function
AddToMenu /Music/Start
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mplayer2 2020-02-17 12:13:08 UTC (rev 998)
@@ -3,6 +3,9 @@
# Initialisations, shared functions
Include components/functions/Media
+Style MPlayer !Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style "MPlayer - Video" Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style XDRadio NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
# specific function
AddToMenu /Music/Start
Modified: fvwm/components/functions/Music-quodlibet
===================================================================
--- fvwm/components/functions/Music-quodlibet 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-quodlibet 2020-02-17 12:13:08 UTC (rev 998)
@@ -4,14 +4,16 @@
# Modifications, debugging and improvments by Dominique Michel 2008-2019
# <dom...@us...>
-# Initialisations, shared functions
+# Initialisations, shared functions {{{1
Include components/functions/Music
+Style quodlibet NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style Quodlibet UseStyle quodlibet
# First button {{{1
# Player controls and prefs
-# mouse 1 Menu /Player {{{1
+# mouse 1 Menu /Player {{{2
AddToFunc Music-GUI
-+ I All (quodlibet) Iconify toggle
++ I All (Quodlibet) Iconify toggle
AddToFunc Player-generator
+ I DestroyMenu recreate /Player
@@ -27,7 +29,7 @@
# mouse 2 Music-GUI : allready here {{{2
## mouse 3 Music-QJackGUI : in Music
-# mouse 2 Menu /Playback {{{1
+# mouse 2 Menu /Playback
AddToFunc Music-Next
+ I Exec quodlibet --next > /dev/null
@@ -89,6 +91,8 @@
+ I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI
+ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI
+ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Start Quod Libet]' Exec exec quodlibet > /dev/null
++ I AddToMenu /Music '$[gt.Stop player]' Exec exec quodlibet --quit
+ I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer
# Fake button functions {{{1
Modified: fvwm/components/functions/Music-xmms2
===================================================================
--- fvwm/components/functions/Music-xmms2 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-xmms2 2020-02-17 12:13:08 UTC (rev 998)
@@ -6,6 +6,12 @@
# Initialisations, shared functions {{{1
Include components/functions/Music
+Style xmms StaysOnTop
+Style XMMS_Player StartIconic, NoIcon, !Title, Sticky, WindowListSkip, StaysOnTop
+Style XMMS_Playlist UseStyle XMMS_Player
+Style XMMS_Equalizer UseStyle XMMS_Player
+Style Gxmms2 NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style xmms2 UseStyle Gxmms2
InfoStoreAdd fvwm_audio_exec "nyxmms2 add -P"
# First button {{{1
Modified: fvwm/components/styles/Application-Icons-22-32
===================================================================
--- fvwm/components/styles/Application-Icons-22-32 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/styles/Application-Icons-22-32 2020-02-17 12:13:08 UTC (rev 998)
@@ -499,10 +499,6 @@
Style zita* UseStyle Zita-at1
Style zsafe MiniIcon 22x22/apps/zsafe.png, Icon 32x32/apps/zsafe.png
-# We want the media players styles to be applied last {{{1
-Style Alsaplayer NoActiveIconOverride, NoIcon, WindowListSkip, !Sticky, StaysPut
-Style alsaplayer UseStyle Alsaplayer
-
Style Audacious StartIconic, NoActiveIconOverride, NoIcon, !Title, Sticky, WindowListSkip, StaysOnTop
Style playlist StartIconic, !Title, Sticky, WindowListSkip
Style equalizer UseStyle playlist
@@ -509,11 +505,6 @@
Style beep-media-player !Title
-Style cmus NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
-Style mocp UseStyle cmus
-
-Style MPlayer !Title, !Borders, EWMHIgnoreStackingOrderHints
-Style "MPlayer - Video" Title, Borders, EWMHIgnoreStackingOrderHints
Style XDRadio NoIcon, Sticky, WindowListSkip
Style xmms StaysOnTop
@@ -521,8 +512,6 @@
Style XMMS_Playlist UseStyle XMMS_Player
Style XMMS_Equalizer UseStyle XMMS_Player
-Style quodlibet StaysOnTop, NoIcon, Sticky, WindowListSkip
-
Style qjackctl NoactiveIconOverride, NoIcon, Sticky, WindowListSkip
Style start_jack UseStyle qjackctl
Style start_cadence UseStyle qjackctl
Added: fvwm/components/styles/MediaPlayers-Style
===================================================================
--- fvwm/components/styles/MediaPlayers-Style (rev 0)
+++ fvwm/components/styles/MediaPlayers-Style 2020-02-17 12:13:08 UTC (rev 998)
@@ -0,0 +1,67 @@
+# Styles for supported media players
+# The prefered player styles is changed later when it is loaded
+
+Style alsaplayer NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, \
+ MiniIcon 22x22/apps/alsaplayer.png, Icon 32x32/apps/alsaplayer.png
+Style Alsaplayer UseStyle alsaplayer
+
+Style audacious !StartIconic, NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, Title, \
+ MiniIcon 22x22/apps/audacious.png, Icon 32x32/apps/audacious.png
+Style Audacious UseStyle audacious
+Style playlist UseStyle audacious
+Style equalizer UseStyle audacious
+
+Style beep-media-player !Title
+
+Style cdcd NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/cdcd.png, Icon 32x32/apps/cdcd.png
+
+Style cmus NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/cmus.png, Icon 32x32/apps/cmus.png
+Style cmus* UseStyle cmus
+
+Style mocp NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/mocp.png, Icon 32x32/apps/mocp.png
+Style MOC* UseStyle mocp
+
+Style FvwmApplet-MpdAddSong MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style FvwmApplet-MpdPlEd MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style pympd NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/pympd.png, Icon 32x32/apps/pympd.png
+Style gmpc NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style Gmpc UseStyle gmpc
+
+Style MPlayer !Title, !Borders, EWMHIgnoreStackingOrderHints, \
+ MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
+Style "MPlayer - Video" Title, Borders, EWMHIgnoreStackingOrderHints, \
+ MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
+Style XDRadio NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
+
+#mplayer2 as mplayer
+
+Style quodlibet NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
+Style Quodlibet UseStyle quodlibet
+
+Style xmms !StaysOnTop
+Style XMMS_Player !StartIconic, Title, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
+Style XMMS_Playlist UseStyle XMMS_Player
+Style XMMS_Equalizer UseStyle XMMS_Player
+Style Gxmms2 NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/xmms2.png, Icon 32x32/apps/xmms2.png
+Style xmms2 UseStyle Gxmms2
+
+# helpers
+Style qjackctl NoactiveIconOverride, NoIcon, Sticky, WindowListSkip
+Style start_jack UseStyle qjackctl
+Style start_cadence UseStyle qjackctl
+Style Cadence UseStyle qjackctl
+Style Cadence-* UseStyle qjackctl
+Style cadence.py UseStyle qjackctl
+Style Catia UseStyle qjackctl
+Style Claudia UseStyle qjackctl
+Style Logs UseStyle qjackctl
+Style Render UseStyle qjackctl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-19 19:20:35
|
Revision: 1008
http://sourceforge.net/p/fvwm-crystal/code/1008
Author: dominique_libre
Date: 2020-02-19 19:20:33 +0000 (Wed, 19 Feb 2020)
Log Message:
-----------
fix media stuffs styles after (re)start; xmms2 control and crystal version bump to 3.6.1
Modified Paths:
--------------
ChangeLog
NEWS
fvwm/components/functions/About
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-alsaplayerdaemon
fvwm/components/functions/Music-audacious
fvwm/components/functions/Music-cdcd
fvwm/components/functions/Music-cmus
fvwm/components/functions/Music-mocp
fvwm/components/functions/Music-mpd
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
fvwm/components/functions/Music-quodlibet
fvwm/components/styles/MediaPlayers-Style
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-19 14:13:02 UTC (rev 1007)
+++ ChangeLog 2020-02-19 19:20:33 UTC (rev 1008)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+Verion 3.6.1
+------------
+
mercredi 19 février 2020
fvwm/scripts/CustomButtonBar/CustomButtonBat: comment debug line
fvwm/components/functions/Exec-Accelerator: add -name option for urxvtc;
@@ -10,6 +13,11 @@
remove Gxmms2 abandonware style; use XMMS2 style for xmms2d window.
fvwm/components/functions/Music-xmms2: fix for xmms2 current exec name;
fix xmms2, start_jack and start_cadence styles after startup and Restart.
+ fvwm/components/styles/MediaPlayers-Style: cleanup
+ fvwm/components/Music-*: fix styles of start_[jack|cadence] and of the console
+ players after start and Restart
+ fvwm/components/functions/About;
+ NEWS: fvwm-crystal 3.6.1 version bump
Verion 3.6.0
------------
Modified: NEWS
===================================================================
--- NEWS 2020-02-19 14:13:02 UTC (rev 1007)
+++ NEWS 2020-02-19 19:20:33 UTC (rev 1008)
@@ -1,4 +1,17 @@
+Version 3.6.1
+-------------
+
+Fvwm Crystal 3.6.1 is out!
+
+This is a bug fix release:
+
+- Fix media players styles after start and restart.
+- Use new exec name in the xmms2 audio player control.
+
+Have fun!
+Dominique Michel
+
Version 3.6.0
-------------
Code name "Magic Star"
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/About 2020-02-19 19:20:33 UTC (rev 1008)
@@ -5,7 +5,7 @@
*About: Line center
*About: Text "FVWM-Crystal"
*About: Line center
-*About: Text "$[gt.Version]: 3.6.0"
+*About: Text "$[gt.Version]: 3.6.1"
*About: Line center
*About: Text "Magic Star"
*About: Line center
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-alsaplayer 2020-02-19 19:20:33 UTC (rev 1008)
@@ -8,6 +8,14 @@
Style alsaplayer NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
Style Alsaplayer UseStyle alsaplayer
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence]
+Schedule 1 StyleMediaPlayer
+
# Alsaplayer normal speed
InfoStoreAdd speed 1
Modified: fvwm/components/functions/Music-alsaplayerdaemon
===================================================================
--- fvwm/components/functions/Music-alsaplayerdaemon 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-alsaplayerdaemon 2020-02-19 19:20:33 UTC (rev 1008)
@@ -5,6 +5,14 @@
# Initialisations, shared functions {{{1
Include components/functions/Music
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence]
+Schedule 1 StyleMediaPlayer
+
# Alsaplayer normal speed
InfoStoreAdd speed 1
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-audacious 2020-02-19 19:20:33 UTC (rev 1008)
@@ -6,16 +6,21 @@
# Initialisations, shared functions
Include components/functions/Music
-Style audacious StartIconic, NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
-Style Audacious UseStyle audacious
-Style playlist UseStyle audacious
-Style equalizer UseStyle audacious
+Style Audacious StartIconic, NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence]
+Schedule 1 StyleMediaPlayer
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player
AddToFunc Music-GUI
-+ I All (audacious) Iconify toggle
++ I All (Audacious) Iconify toggle
AddToFunc Player-generator
+ I DestroyMenu recreate /Player
Modified: fvwm/components/functions/Music-cdcd
===================================================================
--- fvwm/components/functions/Music-cdcd 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-cdcd 2020-02-19 19:20:33 UTC (rev 1008)
@@ -13,6 +13,14 @@
Include components/functions/Music
Style cdcd NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style cdcd NoIcon
++ I Style start_cadence NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence]
+Schedule 1 StyleMediaPlayer
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player {{{2
Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-cmus 2020-02-19 19:20:33 UTC (rev 1008)
@@ -14,6 +14,15 @@
Style cmus NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
Style cmus* UseStyle cmus
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style cmus NoIcon
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# First button
# Player controls and prefs {{{1
# mouse 1 Menu /Player {{{2
Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-mocp 2020-02-19 19:20:33 UTC (rev 1008)
@@ -9,6 +9,15 @@
Style mocp NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
Style MOC* UseStyle mocp
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style mocp NoIcon
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player {{{2
Modified: fvwm/components/functions/Music-mpd
===================================================================
--- fvwm/components/functions/Music-mpd 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-mpd 2020-02-19 19:20:33 UTC (rev 1008)
@@ -16,6 +16,14 @@
Style gmpc UseStyle pympd
Style Gmpc UseStyle pympd
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# Variables {{{1
# mpd know where the playlists are. See 'man mpd.conf'
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-mplayer 2020-02-19 19:20:33 UTC (rev 1008)
@@ -7,6 +7,14 @@
Style "MPlayer - Video" Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
Style XDRadio NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# specific function
AddToMenu /Music/Start
+ '$[gt.Start MPlayer]' Music-Start $[FVWM_SYSTEMDIR]/scripts/startmplayer mplayer $[infostore.USERDIR] $[infostore.SILENT]
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-mplayer2 2020-02-19 19:20:33 UTC (rev 1008)
@@ -7,6 +7,14 @@
Style "MPlayer - Video" Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
Style XDRadio NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# specific function
AddToMenu /Music/Start
+ '$[gt.Start MPlayer2]' Music-Start $[FVWM_SYSTEMDIR]/scripts/startmplayer mplayer2 $[infostore.USERDIR] $[infostore.SILENT]
Modified: fvwm/components/functions/Music-quodlibet
===================================================================
--- fvwm/components/functions/Music-quodlibet 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-quodlibet 2020-02-19 19:20:33 UTC (rev 1008)
@@ -9,6 +9,14 @@
Style quodlibet NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
Style Quodlibet UseStyle quodlibet
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player {{{2
Modified: fvwm/components/styles/MediaPlayers-Style
===================================================================
--- fvwm/components/styles/MediaPlayers-Style 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/styles/MediaPlayers-Style 2020-02-19 19:20:33 UTC (rev 1008)
@@ -5,11 +5,8 @@
MiniIcon 22x22/apps/alsaplayer.png, Icon 32x32/apps/alsaplayer.png
Style Alsaplayer UseStyle alsaplayer
-Style audacious !StartIconic, NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, Title, \
+Style Audacious !StartIconic, NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, Title, \
MiniIcon 22x22/apps/audacious.png, Icon 32x32/apps/audacious.png
-Style Audacious UseStyle audacious
-Style playlist UseStyle audacious
-Style equalizer UseStyle audacious
Style beep-media-player !Title
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-12-07 09:02:19
|
Revision: 1053
http://sourceforge.net/p/fvwm-crystal/code/1053
Author: dominique_libre
Date: 2020-12-07 09:02:16 +0000 (Mon, 07 Dec 2020)
Log Message:
-----------
Add support for FvwmPrompt in FvwmMiniConsole
Modified Paths:
--------------
ChangeLog
INSTALL
fvwm/components/apps/FvwmMiniConsole
fvwm/components/functions/Exec-Accelerator
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-12-03 00:38:27 UTC (rev 1052)
+++ ChangeLog 2020-12-07 09:02:16 UTC (rev 1053)
@@ -1,5 +1,11 @@
ChangeLog for FVWM-Crystal
+lundi 7 décembre 2020
+ INSTALL: add fvwm3 dependency.
+ fvwm/components/apps/FvwmMiniConsole: add support for FvwmPrompt
+ fvwm/components/functions/Exec-Accelerator: add AGT, as AT but with geometry;
+ needed by FvwmPrompt.
+
Version 3.7.0
-------------
Modified: INSTALL
===================================================================
--- INSTALL 2020-12-03 00:38:27 UTC (rev 1052)
+++ INSTALL 2020-12-07 09:02:16 UTC (rev 1053)
@@ -145,7 +145,7 @@
Needed:
-------
-- fvwm>=2.6.9
+- fvwm>=2.6.9 or fvwm3 with FvwmPrompt (with --enable-golang).
- python3 - tested with 3.6, should work with any python3 version.
python2 is not supported anymore because upstream will end
its support at the end of that year (2019).
Modified: fvwm/components/apps/FvwmMiniConsole
===================================================================
--- fvwm/components/apps/FvwmMiniConsole 2020-12-03 00:38:27 UTC (rev 1052)
+++ fvwm/components/apps/FvwmMiniConsole 2020-12-07 09:02:16 UTC (rev 1053)
@@ -24,7 +24,9 @@
+ I Style FvwmMiniConsoleNeedsUniqueName WindowShadeSteps 16
+ I Style FvwmMiniConsoleNeedsUniqueName WindowShadeShrinks
+ I Style FvwmMiniConsoleNeedsUniqueName TitleAtBottom
-+ I Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
+# fvwm3 version start with 1.0.0
++ I Test (Version >= 2.6.9) Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
++ I TestRc (NoMatch) AGT FvwmMiniConsoleNeedsUniqueName 80x5+0-0 FvwmPrompt
+ I Wait FvwmMiniConsoleNeedsUniqueName
+ I Style FvwmMiniConsoleNeedsUniqueName FixedPosition
+ I All (FvwmMiniConsoleNeedsUniqueName) MoveToDesk 0 666
Modified: fvwm/components/functions/Exec-Accelerator
===================================================================
--- fvwm/components/functions/Exec-Accelerator 2020-12-03 00:38:27 UTC (rev 1052)
+++ fvwm/components/functions/Exec-Accelerator 2020-12-07 09:02:16 UTC (rev 1053)
@@ -22,6 +22,9 @@
# AT
# As 'A' function, but give a Title to the window terminal.
+# ATG
+# As 'AT' function, but give a geometry to the window terminal.
+
# C
# Launches a the fvwm console terminal with optional program as an argument.
# Terminal settings should be set using ~/.Xresources file or (in Eterm) theme file.
@@ -67,6 +70,11 @@
+ I Test (!EnvMatch infostore.DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator, !EnvMatch DefaultTerminal x-terminal-emulator, !EnvMatch DefaultTerminal xfce4-terminal) Exec exec $[infostore.DefaultTerminal] --title "$0" -e $[1-] $[infostore.SILENT]
+ I TestRc (NoMatch) Exec exec $[infostore.DefaultTerminal] --title "$0" -e "$[1-]" $[infostore.SILENT]
+DestroyFunc StartGTitledTerminal
+AddToFunc StartGTitledTerminal
++ I Test (!EnvMatch infostore.DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator, !EnvMatch DefaultTerminal x-terminal-emulator, !EnvMatch DefaultTerminal xfce4-terminal) Exec exec $[infostore.DefaultTerminal] --title "$0" --geometry "$1" -e $[2-] $[infostore.SILENT]
++ I TestRc (NoMatch) Exec exec $[infostore.DefaultTerminal] --title "$0" --geometry "$1" -e "$[2-]" $[infostore.SILENT]
+
# Usage: A [command] [command options]
DestroyFunc A
AddToFunc A
@@ -89,6 +97,13 @@
+ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc --title "$0" -name "$0" -e $[1-]
+ I TestRc (NoMatch) StartTitledTerminal "$0" $[1-]
+# Usage: AGT [title] [geometry] [command] (Use quotes if you want command options or title with spaces)
+DestroyFunc AGT
+AddToFunc AGT
++ I Window-SetPlacementPolicy
++ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc --title "$0" -name "$0" --geometry "$1" -e $[2-]
++ I TestRc (NoMatch) StartGTitledTerminal "$0" "$1" "$[2-]"
+
# Usage: C [command] [command options]
DestroyFunc C
AddToFunc C
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-12-15 21:06:03
|
Revision: 1057
http://sourceforge.net/p/fvwm-crystal/code/1057
Author: dominique_libre
Date: 2020-12-15 21:06:01 +0000 (Tue, 15 Dec 2020)
Log Message:
-----------
Fix the FvwmMiniConssole to work with fvwm3 without golang support; bump to 3.7.1
Modified Paths:
--------------
ChangeLog
NEWS
fvwm/components/apps/FvwmMiniConsole
fvwm/components/functions/About
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-12-15 19:55:25 UTC (rev 1056)
+++ ChangeLog 2020-12-15 21:06:01 UTC (rev 1057)
@@ -1,7 +1,14 @@
ChangeLog for FVWM-Crystal
+Version 3.7.1
+-------------
+
mardi 15 décembre 2020
bin/fvwm-crystal: make dash to be happy with the fvwm* and debug mode tests.
+ fvwm/components/functions/About;
+ fvwm/components/apps/FvwmMiniConsole: make FvwmPrompt/FvwmConsole test to
+ work with fvwm2 and fvwm3 with or without golang support.
+ NEWS: bump to 3.7.1
dimanche 13 décembre 2020
fvwm/preferences/Startup: use StartFunction with Test (Init) instead of
Modified: NEWS
===================================================================
--- NEWS 2020-12-15 19:55:25 UTC (rev 1056)
+++ NEWS 2020-12-15 21:06:01 UTC (rev 1057)
@@ -1,3 +1,30 @@
+Version 3.7.1
+-------------
+
+Fvwm Crystal 3.7.1 is an important bug fix release.
+
+- Fix X failure at fvwm-crystal start when sh is dash (Debian and derivatives).
+
+It introduce some minor bug fixes and feature as well:
+
+- Use StartFunction with Test (Init) instead of the deprecated InitFunction.
+ This male the Startup file in the preferences folder to be more reliable
+ with fvwm3.
+
+- Add alsamixer launcher in the Startup file with support for the current
+ Mixer preference setting.
+
+- Start FvwmMFL when running fvwm3.
+
+- Add support for FvwmPrompt (fvwm3 with golang support only) into the
+ FvwmMiniConsole. Fvwm2 and fvwm3 without golang are supported as before
+ via FvwmConsole.
+
+As always, see ChangeLog for details.
+
+Have fun!
+Dominique Michel
+
Version 3.7.0
-------------
Modified: fvwm/components/apps/FvwmMiniConsole
===================================================================
--- fvwm/components/apps/FvwmMiniConsole 2020-12-15 19:55:25 UTC (rev 1056)
+++ fvwm/components/apps/FvwmMiniConsole 2020-12-15 21:06:01 UTC (rev 1057)
@@ -24,9 +24,10 @@
+ I Style FvwmMiniConsoleNeedsUniqueName WindowShadeSteps 16
+ I Style FvwmMiniConsoleNeedsUniqueName WindowShadeShrinks
+ I Style FvwmMiniConsoleNeedsUniqueName TitleAtBottom
-# fvwm3 version start with 1.0.0
-+ I Test (Version >= 2.6.9) Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
-+ I TestRc (NoMatch) AGT FvwmMiniConsoleNeedsUniqueName 80x5+0-0 FvwmPrompt
+# fvwm3 with golang support
++ I Test (X FvwmPrompt) AGT FvwmMiniConsoleNeedsUniqueName 80x5+0-0 FvwmPrompt
+# fvwm2 (or fvwm3 without golang support at that time of writing 15.12-2020)
++ I TestRc (NoMatch) Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
+ I Wait FvwmMiniConsoleNeedsUniqueName
+ I Style FvwmMiniConsoleNeedsUniqueName FixedPosition
+ I All (FvwmMiniConsoleNeedsUniqueName) MoveToDesk 0 666
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2020-12-15 19:55:25 UTC (rev 1056)
+++ fvwm/components/functions/About 2020-12-15 21:06:01 UTC (rev 1057)
@@ -5,7 +5,7 @@
*About: Line center
*About: Text "FVWM-Crystal"
*About: Line center
-*About: Text "$[gt.Version]: 3.7.0"
+*About: Text "$[gt.Version]: 3.7.1"
*About: Line center
*About: Text "Magic Star"
*About: Line center
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X