Menu
▾
▴
fvwm-crystal-commits
|
From: <dom...@us...> - 2011-01-29 20:14:04
|
Revision: 62
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=62&view=rev
Author: dominique_libre
Date: 2011-01-29 20:13:58 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Added support for specific elements of the Amiga Recipe into EWMH-BaseStruts
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/EWMH-BaseStruts
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:09:44 UTC (rev 61)
+++ ChangeLog 2011-01-29 20:13:58 UTC (rev 62)
@@ -7,7 +7,9 @@
* Updated About dialog
* Developper menu: replaced man system doc browser by support for info browser
via emacs, pinfo or tkinfo
+ * Added support for specific elements of the Amiga Recipe into EWMH-BaseStruts
+
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
of the current page, if any.
Modified: fvwm/components/functions/EWMH-BaseStruts
===================================================================
--- fvwm/components/functions/EWMH-BaseStruts 2011-01-29 20:09:44 UTC (rev 61)
+++ fvwm/components/functions/EWMH-BaseStruts 2011-01-29 20:13:58 UTC (rev 62)
@@ -77,6 +77,7 @@
+ I All (FvwmPager) Iconify false
+ I All (FvwmButtons-TopPanel) Iconify false
Test (EnvMatch Fvwm_Crystal_Recipe *Amiga*) + I All (FvwmButtons-TopPanelMenu) Iconify false
+Test (EnvMatch Fvwm_Crystal_Recipe *Amiga*) + I All (FvwmButtons-Bottom*) Iconify false
+ I All (FvwmButtons-Pager) Iconify false
+ I All (FvwmButtons-BottomButton) Iconify false
+ I All (FvwmButtons-Musi*) Iconify false
@@ -94,6 +95,7 @@
+ I All (FvwmPager) Iconify true
+ I All (FvwmButtons-TopPanel) Iconify true
Test (EnvMatch Fvwm_Crystal_Recipe *Amiga*) + I All (FvwmButtons-TopPanelMenu) Iconify true
+Test (EnvMatch Fvwm_Crystal_Recipe *Amiga*) + I All (FvwmButtons-Bottom*) Iconify true
+ I All (FvwmButtons-Pager) Iconify true
+ I All (FvwmButtons-BottomButton) Iconify true
+ I All (FvwmButtons-Musi*) Iconify true
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 20:19:10
|
Revision: 63
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=63&view=rev
Author: dominique_libre
Date: 2011-01-29 20:19:04 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Fullscreen: Added comment, cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:13:58 UTC (rev 62)
+++ ChangeLog 2011-01-29 20:19:04 UTC (rev 63)
@@ -8,8 +8,8 @@
* Developper menu: replaced man system doc browser by support for info browser
via emacs, pinfo or tkinfo
* Added support for specific elements of the Amiga Recipe into EWMH-BaseStruts
+ * Fullscreen: Added comment, cleanup
-
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
of the current page, if any.
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2011-01-29 20:13:58 UTC (rev 62)
+++ fvwm/components/functions/Fullscreen 2011-01-29 20:19:04 UTC (rev 63)
@@ -15,12 +15,19 @@
# Key Q A M Fullscreen
#
# The other window size functions are into Window-Buttons.
-#
+#
# 'Fullscreen-Start' and 'Fullscreen-Stop' functions shouldn't be called
# directly, use 'Fullscreen' function instead.
#
# Recipe : Must be included after the styles otherwise strange results will append
-# when restarting Fvwm.
+# when restarting Fvwm. Not sure if this remark is still valid because I done a lot
+# of styles loading order debugging in the maintime.
+#
+# Todo:
+# - restore the position when restoring the "normal" window
+# - when cycling trough the fullscreened windows, go to the original page
+# of each window and make it visible here.
+# - possibility to cycle trough the fullsceened windows only in the current page
SetEnv ThumbDirectory "/tmp"
@@ -31,7 +38,7 @@
+ I ThisWindow (State 19) Fullscreen-Stop
+ I TestRc (NoMatch) ThisWindow (!State 19) Fullscreen-Start
-# State 20 = on => window on screen; State 20 = off => iconified + no icon
+# State 20 = on => window on screen; State 20 = off => iconified + no icon
DestroyFunc Fullscreen-Start
AddToFunc Fullscreen-Start
+ I SetEnv "FSWindowWidth_$[w.id]" "$[w.width]p"
@@ -48,7 +55,7 @@
DestroyFunc Fullscreen-Stop
AddToFunc Fullscreen-Stop
-+ I WindowStyle Title, Borders, Iconifiable, !ResizeHintOverride
++ I WindowStyle Title, Borders, Iconifiable, !ResizeHintOverride
+ I WindowStyle Maximizable, !FixedSize
+ I WindowStyle !State 19
+ I WindowStyle !State 20
@@ -79,8 +86,6 @@
+ I WindowStyle NoIcon
+ I UpdateStyles
+ I Iconify true
-# ? redondant
-#+ I Exec exec touch $[ThumbDirectory]/fullscreen.20.$[w.id].tmp
DestroyFunc Disapear-Off
AddToFunc Disapear-Off
@@ -88,7 +93,7 @@
Test (f $[ThumbDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp) PipeRead 'page=`ls $[ThumbDirectory] | grep 20.$[w.id] | awk --field-separator . "{print 4}"`; echo "+ I GotoPage $page 0"'
+ I Iconify false
+ I WindowStyle State 20
-+ I WindowStyle Icon
++ I WindowStyle Icon
+ I UpdateStyles
+ I Test (f $[ThumbDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp) Exec exec rm -f $[ThumbDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp
#+ I Test (f $[ThumbDirectory]/fullscreen.20.$[w.id].tmp) Exec exec rm -f $[ThumbDirectory]/fullscreen.20.$[w.id].tmp
@@ -104,7 +109,6 @@
DestroyFunc Fullscreen-Recover
AddToFunc Fullscreen-Recover
-+ I Echo "héhé"
+ I WindowStyle !Title, !Borders, Iconifiable, ResizeHintOverride
+ I UpdateStyles
+ I WindowStyle State 19
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 20:22:19
|
Revision: 64
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=64&view=rev
Author: dominique_libre
Date: 2011-01-29 20:22:14 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
FvwmForm use the same font than the menus now
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/FvwmFormDefault
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:19:04 UTC (rev 63)
+++ ChangeLog 2011-01-29 20:22:14 UTC (rev 64)
@@ -9,6 +9,7 @@
via emacs, pinfo or tkinfo
* Added support for specific elements of the Amiga Recipe into EWMH-BaseStruts
* Fullscreen: Added comment, cleanup
+ * FvwmForm use the same font than the menus now
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/FvwmFormDefault
===================================================================
--- fvwm/components/functions/FvwmFormDefault 2011-01-29 20:19:04 UTC (rev 63)
+++ fvwm/components/functions/FvwmFormDefault 2011-01-29 20:22:14 UTC (rev 64)
@@ -1,10 +1,10 @@
# Default settings for FvwmForm
*FvwmFormDefault: Colorset $[cs_panel_inactive]
*FvwmFormDefault: ItemColorset $[cs_panel_active]
-*FvwmFormDefault: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:encoding=iso10646-1"
-*FvwmFormDefault: InputFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:encoding=iso10646-1"
-*FvwmFormDefault: ButtonFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold:encoding=iso10646-1"
-*FvwmFormDefault: TimeoutFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold:encoding=iso10646-1"
+*FvwmFormDefault: Font "xft:$[menu_font]:pixelsize=$[menu_font_size]:encoding=iso10646-1"
+*FvwmFormDefault: InputFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:encoding=iso10646-1"
+*FvwmFormDefault: ButtonFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:Bold:encoding=iso10646-1"
+*FvwmFormDefault: TimeoutFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:Bold:encoding=iso10646-1"
# ViM modeline {{{1
# vim:foldmethod=marker:foldenable:foldlevel=0:filetype=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 20:29:19
|
Revision: 65
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=65&view=rev
Author: dominique_libre
Date: 2011-01-29 20:29:13 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Icon-Amiga: changed the colorsets
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Amiga
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:22:14 UTC (rev 64)
+++ ChangeLog 2011-01-29 20:29:13 UTC (rev 65)
@@ -10,6 +10,7 @@
* Added support for specific elements of the Amiga Recipe into EWMH-BaseStruts
* Fullscreen: Added comment, cleanup
* FvwmForm use the same font than the menus now
+ * Icon-Amiga: changed the colorsets
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/Icon-Amiga
===================================================================
--- fvwm/components/functions/Icon-Amiga 2011-01-29 20:22:14 UTC (rev 64)
+++ fvwm/components/functions/Icon-Amiga 2011-01-29 20:29:13 UTC (rev 65)
@@ -1,9 +1,9 @@
# Icons - Amiga style
Style * IconTitle
-Style * IconTitleColorset $[cs_icon_active]
+Style * IconTitleColorset $[cs_menu_active]
Style * HilightIconTitleColorset $[cs_menu_active]
-Style * IconBackgroundColorset $[cs_icon_active]
+Style * IconBackgroundColorset $[cs_icon_inactive]
Style * IconTitleRelief 0
Style * IconBackgroundRelief 0
Style * IconBackgroundPadding 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 20:33:35
|
Revision: 66
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=66&view=rev
Author: dominique_libre
Date: 2011-01-29 20:33:29 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Icon-Launcher: Added some comment; commented out all the code than can hang the function when some partition is not avaible.
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Launcher
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:29:13 UTC (rev 65)
+++ ChangeLog 2011-01-29 20:33:29 UTC (rev 66)
@@ -11,6 +11,8 @@
* Fullscreen: Added comment, cleanup
* FvwmForm use the same font than the menus now
* Icon-Amiga: changed the colorsets
+ * Icon-Launcher: Added some comment; commented out all the code than can hang the function
+ when some partition is not avaible.
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/Icon-Launcher
===================================================================
--- fvwm/components/functions/Icon-Launcher 2011-01-29 20:29:13 UTC (rev 65)
+++ fvwm/components/functions/Icon-Launcher 2011-01-29 20:33:29 UTC (rev 66)
@@ -1,4 +1,4 @@
-# Desktop icons for the mounted partition(s) and for home.
+# Desktop icons for the mounted partition(s) and for $HOME.
# Written by Dominique Michel <dom...@so...>, 2010
# for Fvwm-Crystal.
#
@@ -10,11 +10,10 @@
# You can also move the icons, but the moves will not survive a restart.
#
# Requirement: /etc/mtab, sed, Thunar, and Fvwm.
-# In order to use it, add "Include components/functions/Icon-Launcher"
-# into some recipe after the "Style * IconBox ..." command.
-
+# In order to use it, add "Test (x thunar) Include components/functions/Icon-Launcher"
+# into some recipe after the "Include Icon-Amiga" command. Not tested with Icon-Thumbnails.
+#
# Todo: - preference setting for the action
-# - style
PipeRead 'echo "Style * IconBox $(($[vp.width]-36))x$(($[vp.height]-92))+18+46, IconFill top left, IconGrid 50 50"'
@@ -31,6 +30,7 @@
# Launcher Home home.xpm
DestroyFunc Launcher
AddToFunc Launcher
++ I KillModule FvwmButtons $0
+ I DestroyModuleConfig $0: *
+ I *$0: Font "xft:$[panel_font]"
+ I *$0: (1x1+0+0)
@@ -44,39 +44,56 @@
DestroyFunc Change-Icon
AddToFunc Change-Icon
+ I ThisWindow ($0) Schedule 10 Style $0 Icon $1.active.png
-#+ I UpdateStyles
DestroyFunc Restore-Icon
AddToFunc Restore-Icon
+ I ThisWindow ($0) Style $0 Icon $1
-#+ I UpdateStyles
+# Wrapper function
+DestroyFunc Generate-Icons
+AddToFunc Generate-Icons
++ I Style * NoIcon
++ I Make-Icons
++ I Style * !NoIcon
+
# which drives are mounted into the system
DestroyFunc Make-Icons
AddToFunc Make-Icons
-+ I PipeRead "cat /etc/mtab|grep ^/dev|sed -e 's,/dev/.... \\(/[^ ]*\\).*,\\1,'|sort > /tmp/Icon-Drives"
-# Make the icons
+#+ I PipeRead "cat /etc/mtab|grep ^/dev|sed -e 's,/dev/.... \\(/[^ ]*\\).*,\\1,'|sort > /tmp/Icon-Drives"
+# Root
++ I PipeRead 'Root="/"; echo "Launcher Root 48x48/categories/Boing_4.png"; \
+ echo "All (Root) Layer 0 0"; \
+ echo "Mouse (Root) 1 I $[Mod] Icon-Launch-CurrentDesk /"'
+# echo "Mouse (Root) 2 I $[Mod] Generate-Icons /"'
++ I Wait Root
# Home
+ I PipeRead 'LocalUser=`id -un`; echo "Launcher Home 48x48/categories/Home.png"; \
- echo "All (Home) Layer 0 2"; \
+ echo "All (Home) Layer 0 0"; \
echo "Mouse (Home) 1 I $[Mod] Icon-Launch-CurrentDesk /home/`id -un`"'
-
++ I Wait Home
+# Make the icons
# The drives
-+ I Wait Home
-+ I PipeRead 'i=2; m=$((((2*(($[panel_font_size]+56))))-32)); j=$m; while read line; do \
- if [[ "${line}" == "/" ]]; \
- then echo "Launcher ${line} 48x48/categories/Boing_4.png"; \
- else echo "Launcher ${line} 48x48/categories/Work_4.png"; \
- fi ; \
- echo "Mouse (${line}) 1 I $[Mod] Icon-Launch-CurrentDesk ${line}"; \
- echo "Wait ${line}"; \
- j=$(($i*$m)); i=$(($i+1)); \
-done </tmp/Icon-Drives'
-+ I PipeRead "rm /tmp/Icon-Drives"
+## If you want all the mounted partitions, uncomment the first 2 pipereads and comment
+## the third one. Uncomment also the last PipeRead, and comment the # Root section.
+## This will freeze fvwm at start/restart if not all those partitions are avaible.
+#+ I Wait Home
+#+ I PipeRead 'i=2; m=$((((2*(($[panel_font_size]+56))))-32)); j=$m; while read line; do \
+# if [[ "${line}" == "/" ]]; \
+# then echo "Launcher ${line} 48x48/categories/Boing_4.png"; \
+# else echo "Launcher ${line} 48x48/categories/Work_4.png"; \
+# fi ; \
+# echo "Mouse (${line}) 1 I $[Mod] Icon-Launch-CurrentDesk ${line}"; \
+# echo "Wait ${line}"; \
+# j=$(($i*$m)); i=$(($i+1)); \
+#done </tmp/Icon-Drives'
+#+ I PipeRead "rm /tmp/Icon-Drives"
+# Do something now !
# The partitions must be first
-Style * NoIcon
+#Style * NoIcon
# Make the icons
-Make-Icons
+#Make-Icons
# We want the other icons
-Style * !NoIcon
+#Style * !NoIcon
+Generate-Icons
+# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 20:51:15
|
Revision: 67
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=67&view=rev
Author: dominique_libre
Date: 2011-01-29 20:51:09 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Icon-Mwm: support for font preference
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Mwm
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:33:29 UTC (rev 66)
+++ ChangeLog 2011-01-29 20:51:09 UTC (rev 67)
@@ -13,6 +13,7 @@
* Icon-Amiga: changed the colorsets
* Icon-Launcher: Added some comment; commented out all the code than can hang the function
when some partition is not avaible.
+ * Icon-Mwm: support for font preference
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/Icon-Mwm
===================================================================
--- fvwm/components/functions/Icon-Mwm 2011-01-29 20:33:29 UTC (rev 66)
+++ fvwm/components/functions/Icon-Mwm 2011-01-29 20:51:09 UTC (rev 67)
@@ -7,8 +7,7 @@
Style * IconTitleRelief 0
Style * IconBackgroundRelief 0
Style * IconBackgroundPadding 10
-Style * IconFont "xft:Verdana:pixelsize=14:Bold"
-Test (EnvIsSet FVWM_FLAG_UTF_8) Style * IconFont "xft:Verdana:pixelsize=14:Bold:encoding=iso10646-1"
+Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:Bold:encoding=iso10646-1"
Style * IndexedIconName
Style * IconSize 48 48
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 20:53:43
|
Revision: 68
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=68&view=rev
Author: dominique_libre
Date: 2011-01-29 20:53:37 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Added functions to make panels and buttons
Modified Paths:
--------------
ChangeLog
Added Paths:
-----------
fvwm/components/functions/MakePanel
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:51:09 UTC (rev 67)
+++ ChangeLog 2011-01-29 20:53:37 UTC (rev 68)
@@ -14,6 +14,7 @@
* Icon-Launcher: Added some comment; commented out all the code than can hang the function
when some partition is not avaible.
* Icon-Mwm: support for font preference
+ * Added functions to make panels and buttons
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Added: fvwm/components/functions/MakePanel
===================================================================
--- fvwm/components/functions/MakePanel (rev 0)
+++ fvwm/components/functions/MakePanel 2011-01-29 20:53:37 UTC (rev 68)
@@ -0,0 +1,43 @@
+# Make a panel
+# make a panel in fvwm-crystal
+# Written by: Dominique Michel <dom...@so...>
+
+
+# <Name> is unique and the same for all the functions in this file.
+
+## Make the panel ##
+####################
+
+# MakePanel <Name> <geometry[pixel]> <boxsize> <rows> <columns> <padding> \
+# <frame>
+AddToFunc MakePanel
+AddToFunc MakePanel
++ I All (FvwmButtons-$0) Close
++ I DestroyModuleConfig FvwmButtons-$0: *
++ I *FvwmButtons-$0: Geometry $1
++ I *FvwmButtons-$0: BoxSize $2
++ I *FvwmButtons-$0: ActiveColorset $[cs_panel_active]
++ I *FvwmButtons-$0: Colorset $[cs_panel_inactive]
++ I *FvwmButtons-$0: Rows $3
++ 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]:encoding=iso10646-1"
+
+## Make a button ##
+###################
+# MakePanelButton <Name> <geometry[button]> <size> <icon> \
+# "<action>" "<action>" "<action>" "<action>" "<action>
+DestroyFunc MakePanelButton
+AddToFunc MakePanelButton
++ I *FvwmButtons-$0: ($1, Size $2, Icon "$3", \
+ Action (Mouse 1) "$4", \
+ Action (Mouse 2) "$5", \
+ Action (Mouse 3) "$6", \
+ Action (Mouse 4) "$7", \
+ Action (Mouse 5) "$8")
+
+## Launch the panel ##
+######################
+# Module FvwmButtons FvwmButtons-<Name>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 20:59:45
|
Revision: 69
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=69&view=rev
Author: dominique_libre
Date: 2011-01-29 20:59:38 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Mixer: cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Mixer
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:53:37 UTC (rev 68)
+++ ChangeLog 2011-01-29 20:59:38 UTC (rev 69)
@@ -15,6 +15,7 @@
when some partition is not avaible.
* Icon-Mwm: support for font preference
* Added functions to make panels and buttons
+ * Mixer: cleanup
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/Mixer
===================================================================
--- fvwm/components/functions/Mixer 2011-01-29 20:53:37 UTC (rev 68)
+++ fvwm/components/functions/Mixer 2011-01-29 20:59:38 UTC (rev 69)
@@ -1,8 +1,8 @@
# Support for mixer controls
-# Written by: Dominique Michel
-# All the previously supported mixers are supported now by this file.
-# New mixers will be added here.
+# Written by: Dominique Michel <dom...@so...>
#
+# This file contain code for all the mixers.
+#
# The original mixers are ALSA mixer (alsamixer, alsamixergui and
# alsamixerguis (a script part of bmpdj)),
# audacious, aumix, cdcd, cmus, mpd, quodlibet, xmms and xmms2.
@@ -15,33 +15,25 @@
#
# Only alsamixer do have direct dB control. It will be approximated for the other mixers.
#
-# TODO: Put alsamixerguis with fvwm-crystal
-# Move the mixer preferences into the mixer menu (left todo: remove it from the normal pref menu)
-# Change the default Mixer preference to amixer into the preferences directory.
+# TODO: Change the default Mixer preference to amixer into the preferences directory.
# Test for Master control for all the mixers when possible.
-# Make a pref setting with the Mixer-Volume-Up(Down) step.
+# Make a pref setting with the Volume step.
# Internationalisation.
#
# WARNINGS: At that time and for what I know, only amixer do have a native dB support.
# I considere this like a must have feature for a professional mixer control.
-#
-# A good sound card is also a must if you want a good sound experience with your box.
-# The value for the Mixer-Volume-Up(Down) and for the % volume scale in dB
-# was setup with amixer and an audiophile 192 for 3 and 6dB steps.
-# Those values can match or not your sound card (read than they can or not be
-# of 3 and 6 dB with your card).
-# The low values of the sound level can also work or not with your card (Mine is
-# a 24 bits sound card, its dynamic is better than with a 16 bits card.). If they
-# are not working, the sound will be muted.
-# Other mixers than amixer will also give you different steps values (the steps
-# will not have the same value than with amixer). Well, the usual sound related mess.
-# The good news is that amixer look like to be the only professional mixer here...
-# So, if you are not sure but want to know what you are doing, use amixer.
+################################################################################
-# Value for 3dB steps when no native dB control is used or found. Modify it here
+# If there is no selected mixer, load the default
+CheckPreferences DefaultMixer "SetEnv Mixer amixer"
+
+# Value for volume steps when no native dB control is used or found. Modify it here
# if you want or need another value. Used here and for the multimedia keys binding.
-SetEnv 3dB_Step "4.5"
+# 3 dB step (determined with an audiphile 192 24 bits sound card):
+#SetEnv Vol_Step "4.5"
+# 1.5 dB step:
+SetEnv Vol_Step "2"
## The following part is for amixer only
# Test with amixer if a Master mixer exist, fallback to PCM
@@ -77,6 +69,7 @@
DestroyFunc Mixer-Volume-Up
AddToFunc Mixer-Volume-Up
+ I Test (EnvMatch Mixer amixer) Exec exec amixer set '$[VolControl]' $0%+ > /dev/null
++ I Test (EnvMatch Mixer amixer) PipeRead 'tmpval=`amixer get $[VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:"`; echo "SetEnv CurrentVolume $tmpval2"'
+ I Test (EnvMatch Mixer audacious) Exec exec audtool set-volume +$0
+ I Test (EnvMatch Mixer aumix) Exec exec aumix -'$[VolControl]' +$0
+ I Test (EnvMatch Mixer cdcd) Nop
@@ -89,6 +82,7 @@
DestroyFunc Mixer-Volume-Down
AddToFunc Mixer-Volume-Down
+ I Test (EnvMatch Mixer amixer) Exec exec amixer set '$[VolControl]' $0%- > /dev/null
++ I Test (EnvMatch Mixer amixer) PipeRead 'tmpval=`amixer get $[VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:"`; echo "SetEnv CurrentVolume $tmpval2"'
+ I Test (EnvMatch Mixer audacious) Exec exec audtool set-volume -$0
+ I Test (EnvMatch Mixer aumix) Exec exec aumix -'$[VolControl]' -$0
+ I Test (EnvMatch Mixer cdcd) Nop
@@ -101,6 +95,7 @@
DestroyFunc Mixer-Volume-dB
AddToFunc Mixer-Volume-dB
+ I Exec exec amixer -c 0 -- set '$[VolControl]' $0 > /dev/null
++ I PipeRead 'tmpval=`amixer get $[VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:"`; echo "SetEnv CurrentVolume $tmpval2"'
DestroyFunc Mixer-GUI
AddToFunc Mixer-GUI
@@ -119,44 +114,91 @@
Test (EnvMatch Mixer xmms2) + I Nop
## Mixer menu
+#DestroyMenu /Mixer
+#AddToMenu /Mixer
+#+ '$[gt.Show main mixer]' Mixer-GUI
+#+ '%22x22/fvwm-crystal/multimedia-volume-control.png%$[gt.Audio mixer]' Popup /Preferences/Mixer
+#+ "" Nop
+#Test (!EnvMatch SnddB 0) + " 0 dB" Mixer-Volume-dB 0dB
+#Test (!EnvMatch SnddB 0) + " -3 dB" Mixer-Volume-dB "-3dB"
+#Test (!EnvMatch SnddB 0) + " -6 dB" Mixer-Volume-dB "-6dB"
+#Test (!EnvMatch SnddB 0) + " -9 dB" Mixer-Volume-dB "-9dB"
+#Test (!EnvMatch SnddB 0) + "-12 dB" Mixer-Volume-dB "-12dB"
+#Test (!EnvMatch SnddB 0) + "-15 dB" Mixer-Volume-dB "-15dB"
+#Test (!EnvMatch SnddB 0) + "-18 dB" Mixer-Volume-dB "-18dB"
+#Test (!EnvMatch SnddB 0) + "-24 dB" Mixer-Volume-dB "-24dB"
+#Test (!EnvMatch SnddB 0) + "-30 dB" Mixer-Volume-dB "-30dB"
+#Test (!EnvMatch SnddB 0) + "-36 dB" Mixer-Volume-dB "-36dB"
+#Test (!EnvMatch SnddB 0) + "-42 dB" Mixer-Volume-dB "-42dB"
+#Test (!EnvMatch SnddB 0) + "-48 dB" Mixer-Volume-dB "-48dB"
+#Test (!EnvMatch SnddB 0) + "-54 dB" Mixer-Volume-dB "-54dB"
+#Test (!EnvMatch SnddB 0) + "-60 dB" Mixer-Volume-dB "-60dB"
+#Test (EnvMatch SnddB 0) + " 0 dB" Mixer-Volume 100
+#Test (EnvMatch SnddB 0) + " -3 dB" Mixer-Volume 95
+#Test (EnvMatch SnddB 0) + " -6 dB" Mixer-Volume 91
+#Test (EnvMatch SnddB 0) + " -9 dB" Mixer-Volume 86
+#Test (EnvMatch SnddB 0) + "-12 dB" Mixer-Volume 81
+#Test (EnvMatch SnddB 0) + "-15 dB" Mixer-Volume 76
+#Test (EnvMatch SnddB 0) + "-18 dB" Mixer-Volume 72
+#Test (EnvMatch SnddB 0) + "-24 dB" Mixer-Volume 62
+#Test (EnvMatch SnddB 0) + "-30 dB" Mixer-Volume 53
+#Test (EnvMatch SnddB 0) + "-36 dB" Mixer-Volume 43
+#Test (EnvMatch SnddB 0) + "-42 dB" Mixer-Volume 34
+#Test (EnvMatch SnddB 0) + "-48 dB" Mixer-Volume 24
+#Test (EnvMatch SnddB 0) + "-54 dB" Mixer-Volume 15
+#Test (EnvMatch SnddB 0) + "-60 dB" Mixer-Volume 6
+#+ " 0" Mixer-Volume 0
+##Test (EnvMatch Mixer amixer) PipeRead 'tmpval=`amixer get $[VolControl]`; tmpval2=`echo $tmpval|sed -e "s:\\(.*\\)\\(\\[.*dB]\\):\\2:"`; echo "+ \'$[gt.Current volume $tmpval2]\' Nop"'
+#Test (!EnvMatch SnddB 0) + "" Nop
+#Test (!EnvMatch SnddB 0) + " +6 dB" Mixer-Volume-dB "6dB+"
+#Test (!EnvMatch SnddB 0) + " +3 dB" Mixer-Volume-dB "3dB+"
+#Test (!EnvMatch SnddB 0) + " -3 dB" Mixer-Volume-dB "3dB-"
+#Test (!EnvMatch SnddB 0) + " -6 dB" Mixer-Volume-dB "6dB-"
+
+DestroyFunc /Mixer-generator
+AddToFunc /Mixer-generator
++ I DestroyMenu recreate /Mixer
++ I AddToMenu /Mixer '$[gt.Show main mixer]' Mixer-GUI
++ I AddToMenu /Mixer '%22x22/fvwm-crystal/multimedia-volume-control.png%$[gt.Audio mixer]' Popup /Preferences/Mixer
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "" Nop
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer " 0 dB" Mixer-Volume-dB 0dB
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer " -3 dB" Mixer-Volume-dB "-3dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer " -6 dB" Mixer-Volume-dB "-6dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer " -9 dB" Mixer-Volume-dB "-9dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-12 dB" Mixer-Volume-dB "-12dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-15 dB" Mixer-Volume-dB "-15dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-18 dB" Mixer-Volume-dB "-18dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-24 dB" Mixer-Volume-dB "-24dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-30 dB" Mixer-Volume-dB "-30dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-36 dB" Mixer-Volume-dB "-36dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-42 dB" Mixer-Volume-dB "-42dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-48 dB" Mixer-Volume-dB "-48dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-54 dB" Mixer-Volume-dB "-54dB"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "-60 dB" Mixer-Volume-dB "-60dB"
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer " 0 dB" Mixer-Volume 100
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer " -3 dB" Mixer-Volume 95
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer " -6 dB" Mixer-Volume 91
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer " -9 dB" Mixer-Volume 86
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-12 dB" Mixer-Volume 81
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-15 dB" Mixer-Volume 76
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-18 dB" Mixer-Volume 72
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-24 dB" Mixer-Volume 62
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-30 dB" Mixer-Volume 53
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-36 dB" Mixer-Volume 43
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-42 dB" Mixer-Volume 34
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-48 dB" Mixer-Volume 24
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-54 dB" Mixer-Volume 15
+Test (EnvMatch SnddB 0) + I AddToMenu /Mixer "-60 dB" Mixer-Volume 6
++ I AddToMenu /Mixer " 0" Mixer-Volume 0
+#+ I AddToMenu /Mixer '$[gt.Currrent volume] $[CurrentVolume]' Nop
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer "" Nop
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer " +6 dB" Mixer-Volume-dB "6dB+"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer " +3 dB" Mixer-Volume-dB "3dB+"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer " -3 dB" Mixer-Volume-dB "3dB-"
+Test (!EnvMatch SnddB 0) + I AddToMenu /Mixer " -6 dB" Mixer-Volume-dB "6dB-"
+
DestroyMenu /Mixer
AddToMenu /Mixer
-+ '$[gt.Show main mixer]' Mixer-GUI
-+ '%22x22/fvwm-crystal/multimedia-volume-control.png%$[gt.Audio mixer]' Popup /Preferences/Mixer
-+ "" Nop
-Test (!EnvMatch SnddB 0) + " 0 dB" Mixer-Volume-dB 0dB
-Test (!EnvMatch SnddB 0) + " -3 dB" Mixer-Volume-dB "-3dB"
-Test (!EnvMatch SnddB 0) + " -6 dB" Mixer-Volume-dB "-6dB"
-Test (!EnvMatch SnddB 0) + " -9 dB" Mixer-Volume-dB "-9dB"
-Test (!EnvMatch SnddB 0) + "-12 dB" Mixer-Volume-dB "-12dB"
-Test (!EnvMatch SnddB 0) + "-15 dB" Mixer-Volume-dB "-15dB"
-Test (!EnvMatch SnddB 0) + "-18 dB" Mixer-Volume-dB "-18dB"
-Test (!EnvMatch SnddB 0) + "-24 dB" Mixer-Volume-dB "-24dB"
-Test (!EnvMatch SnddB 0) + "-30 dB" Mixer-Volume-dB "-30dB"
-Test (!EnvMatch SnddB 0) + "-36 dB" Mixer-Volume-dB "-36dB"
-Test (!EnvMatch SnddB 0) + "-42 dB" Mixer-Volume-dB "-42dB"
-Test (!EnvMatch SnddB 0) + "-48 dB" Mixer-Volume-dB "-48dB"
-Test (!EnvMatch SnddB 0) + "-54 dB" Mixer-Volume-dB "-54dB"
-Test (!EnvMatch SnddB 0) + "-60 dB" Mixer-Volume-dB "-60dB"
-Test (EnvMatch SnddB 0) + " 0 dB" Mixer-Volume 100
-Test (EnvMatch SnddB 0) + " -3 dB" Mixer-Volume 95
-Test (EnvMatch SnddB 0) + " -6 dB" Mixer-Volume 91
-Test (EnvMatch SnddB 0) + " -9 dB" Mixer-Volume 86
-Test (EnvMatch SnddB 0) + "-12 dB" Mixer-Volume 81
-Test (EnvMatch SnddB 0) + "-15 dB" Mixer-Volume 76
-Test (EnvMatch SnddB 0) + "-18 dB" Mixer-Volume 72
-Test (EnvMatch SnddB 0) + "-24 dB" Mixer-Volume 62
-Test (EnvMatch SnddB 0) + "-30 dB" Mixer-Volume 53
-Test (EnvMatch SnddB 0) + "-36 dB" Mixer-Volume 43
-Test (EnvMatch SnddB 0) + "-42 dB" Mixer-Volume 34
-Test (EnvMatch SnddB 0) + "-48 dB" Mixer-Volume 24
-Test (EnvMatch SnddB 0) + "-54 dB" Mixer-Volume 15
-Test (EnvMatch SnddB 0) + "-60 dB" Mixer-Volume 6
-+ " 0" Mixer-Volume 0
-Test (!EnvMatch SnddB 0) + "" Nop
-Test (!EnvMatch SnddB 0) + " +6 dB" Mixer-Volume-dB "6dB+"
-Test (!EnvMatch SnddB 0) + " +3 dB" Mixer-Volume-dB "3dB+"
-Test (!EnvMatch SnddB 0) + " -3 dB" Mixer-Volume-dB "3dB-"
-Test (!EnvMatch SnddB 0) + " -6 dB" Mixer-Volume-dB "6dB-"
++ DynamicPopupAction Function /Mixer-generator
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 21:01:56
|
Revision: 70
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=70&view=rev
Author: dominique_libre
Date: 2011-01-29 21:01:50 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
components/Music: common code to all the players
Modified Paths:
--------------
ChangeLog
Added Paths:
-----------
fvwm/components/functions/Music
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 20:59:38 UTC (rev 69)
+++ ChangeLog 2011-01-29 21:01:50 UTC (rev 70)
@@ -16,6 +16,7 @@
* Icon-Mwm: support for font preference
* Added functions to make panels and buttons
* Mixer: cleanup
+ * components/Music: common code to all the players
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Added: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music (rev 0)
+++ fvwm/components/functions/Music 2011-01-29 21:01:50 UTC (rev 70)
@@ -0,0 +1,351 @@
+# Support for audio players in Fvwm-Crystal:
+# initialisations and some shared functions
+# Written by: Dominique Michel <dom...@so...>
+#
+# This file must be included at the top of the music player control files.
+# Include components/functions/MediaButtons
+#
+# Some recipes do have a media button, the other do have a menu.
+# Recipes with media button: Amiga, Corner, Default, Default with ACPI, Dock
+# The bindings of the media buttons are:
+#
+# n button n button fumction comment
+# Button 1: (Mouse 1) Menu /Player # Main player menu
+# (Mouse 2) Music-GUI # show/hide the player
+# (Mouse 3) Music-QJackGUI # show/hide QJackCtl
+# (Mouse 4) Mixer-Volume-Up # main volume up
+# (Mouse 5) Mixer-Volume-Down # main volume down
+# Button 2: (Mouse 1) Menu /Playlist-button # playlist menu
+# (Mouse 2) Menu /Music/Volume # player volume menu
+# (Mouse 3) Menu /Mixer # main mixer menu
+# (Mouse 4) Music-Next # next media
+# (Mouse 5) Music-Prev # previous media
+# Button 3: (Mouse 1) Music-Play # play
+# (Mouse 2) Music-Pause # pause
+# (Mouse 3) Menu /Playback # playback menu
+# (Mouse 4) Music-Speed-Up # speed up
+# (Mouse 5) Music-Speed-Down # speed down
+# Button 4: (Mouse 1) Menu /Speed # speed control menu
+# (Mouse 4) Music-Seek-+ # seek forward
+# (Mouse 5) Music-Seek-- # seek backward
+# NOTE : the actual bindings are fixed into the recipes.
+#
+# Recipes with media menu: Clean, Clean Vertical, Light, Wing-Commander
+# The media menu is: Popup /Music
+#
+# If you try to launch both /Playlist-button and /Music in one recipe,
+# the menu /Music will get scruved. Auto-generated menus are very sensitive.
+# The only think to do is to not use both the media button and /Music into
+# the recipes, and wait and see if some future fvwm release will fix this.
+# For me, but I can be wrong on this, the way than fvwm-menu-directory use
+# to generate the menu when --reuse --name are not enabled seam to easily
+# confuse fvwm.
+#
+# TODO : - Move the media button here (Idea: one function per button)
+# - Find something to do with mouse 2 and 3 on button 4
+#############################################################################
+
+## Amixer and Mplayer are selected as default mixer and player if the user ##
+## didn't changed it. We keep them or the user settings. ##
+
+ ###########################################################################
+# The playlists was previously in different places. They are now in 3 places:
+# ~/PlaylistsAudio for the playlists of audio files,
+# ~/PlaylistsVideo for the playlists of movie files and
+# ~/Playlists/Audio for "by the user managed" audio playlists
+# ~/Playlists/Video for "by the user managed" video playlists
+#
+# 'Recreate the playlist' will manage ~/PlaylistsAudio and ~/PlaylistsVideo
+# in a very simple way: delete all and recreate all.
+#
+# Todo: function AddFavorite (add a playlist from ~/PlaylistsAudio and
+# ~/PlaylistsVideo to the "by the user managed" playlists
+#
+# WARNING: I cannot test xmms anymore because it compile but just don't run for me.
+# In consequence, xmms support will be removed with the next release.
+###############################################################################
+
+###########
+## Mixer ##
+###########
+Include components/functions/Mixer
+
+###############
+## Variables ##
+###############
+## Where are stored the playlists, needed in all cases (<=recereate playlists)
+Piperead 'echo SetEnv AudioPlaylists "/home/`id -un`/PlaylistsAudio"'
+Piperead 'echo SetEnv VideoPlaylists "/home/`id -un`/PlaylistsVideo"'
+Piperead 'echo SetEnv UserManagedAudioPlaylists "/home/`id -un`/Playlists/Audio"'
+Piperead 'echo SetEnv UserManagedVideoPlaylists "/home/`id -un`/Playlists/Video"'
+## speed control ## (alsaplayer, mplayer)
+# player normal speed (We want normal speed)
+UnSetEnv speed
+Test (EnvMatch MusicPlayer alsaplayer) SetEnv speed "1"
+Test (EnvMatch MusicPlayer mplayer) SetEnv speed "1"
+# Decimal point in use
+UnSetEnv dec_point
+Test (EnvMatch MusicPlayer alsaplayer) PipeRead 'echo SetEnv dec_point `locale decimal_point`'
+Test (EnvMatch MusicPlayer mplayer) PipeRead 'echo SetEnv dec_point `locale decimal_point`'
+## We don't want player specific variables lying around
+# mplayer
+UnSetEnv USERDIR
+UnSetEnv fvwm_video_path
+UnSetEnv fvwm_video_path2
+UnSetEnv fvwm_video_path3
+UnSetEnv fvwm_video_path4
+UnSetEnv fvwm_dvd_path
+UnSetEnv fvwm_video_exec
+# xmms2
+UnSetEnv fvwm_audio_exec
+
+## Styles for media players windows
+###################################
+Style Alsaplayer NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+Style alsaplayer UseStyle Alsaplayer
+
+Style Audacious StaysOnTop
+Style Audacious StartIconic, NoActiveIconOverride, NoIcon, !Title, Sticky, WindowListSkip
+Style playlist StartIconic, NoIcon, !Title, Sticky, WindowListSkip
+Style equalizer UseStyle playlist
+
+Style beep-media-player !Title
+
+# Cmus (NoIcon doesn't work -> ToDo: use FvwmIdent)
+Style cmus NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+# Mocp (NoIcon doesn't work -> ToDo: use FvwmIdent)
+Style mocp NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+
+Style MPlayer !Title, !Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
+Style "MPlayer - Video" Title, Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
+Style XDRadio NoIcon, Sticky, WindowListSkip
+
+Style quodlibet StaysOnTop, NoIcon, Sticky, WindowListSkip
+
+Style xmms StaysOnTop
+Style XMMS_Player StartIconic, NoIcon, !Title, Sticky, WindowListSkip
+Style XMMS_Playlist UseStyle XMMS_Player
+Style XMMS_Equalizer UseStyle XMMS_Player
+
+Style qjackctl NoActiveIconOverride, NoIcon, Sticky, WindowListSkip
+
+############################################################
+### We don't want player specific functions lying around ###
+### otherwise, we put here the functions that doesn't ###
+### change between the players. ###
+############################################################
+
+###############################
+## First button ##
+## Player controls and prefs ##
+###############################
+## mouse 1 Menu /Player
+#######################
+# Recreate the playlists (all)
+DestroyFunc Music-RecreatePlaylist
+AddToFunc Music-RecreatePlaylist
++ I Exec FvwmCommand 'A $[FVWM_USERDIR]/scripts/make_all_playlists $@'
+
+# wrapper for cdcd
+DestroyFunc Music-cdcd
+
+# start the player(s) (alsaplayer, mplayer)
+DestroyFunc Music-Start
+DestroyMenu /Music/Start
+
+# player quit (alsaplayer, mplayer)
+DestroyFunc Music-Kill
+
+# show/hyde the player GUI/menu (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer,
+# quodlibet, xmms)
+DestroyFunc Music-GUI
+
+# Button menu (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms)
+DestroyFunc Player-generator
+# Button menu (all)
+DestroyMenu /Player
+AddToMenu /Player
++ DynamicPopupAction Function Player-generator
+
+## mouse 2 Music-GUI : allready here
+## mouse 3 Music-QJackGUI (all)
+#########################
+DestroyFunc Music-QJackGUI
+AddToFunc Music-QJackGUI
++ I All (qjackctl) Iconify toggle
++ I TestRc (NoMatch) Test (x qjackctl) Exec pidof qjackctl || exec qjackctl
+
+## mouse 4 Mixer-Volume-Up
+## mouse 5 Mixer-Volume-Down
+## are in components/Mixer
+
+####################
+## Second button ###
+## Player controls and main vol ##
+##################################
+## mouse 1 Menu /Playlist-button
+################################
+# Load all the songs (mpd)
+DestroyFunc Music-LoadAll
+
+# Play DVD (mplayer)
+DestroyFunc Load-DVD
+
+# Show current playlist (xmms2)
+DestroyFunc Music-CurrentPlaylist-generator
+DestroyMenu /Music/CurrentPlaylist
+
+# Load movie playlist (mplayer)
+DestroyFunc FuncFvwmMenuMovieDirectory
+DestroyMenu /Music/LoadMovie
+
+# Load playlist (alsaplayer, audacious, mocp, mplayer)
+DestroyFunc FuncFvwmMenuAudioDirectory
+# Load playlist (mpd, xmms, xmms2)
+DestroyFunc Music-LoadPlaylist-generator
+# Load playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms, xmms2)
+DestroyMenu /Music/LoadPlaylist
+
+# Clear playlist (alsaplayer, audacious, mocp, mpd, xmms, xmms2)
+DestroyFunc Music-ClearPlaylist
+
+# Remove song (audacious, mpd, xmms, xmms2)
+DestroyFunc Music-RemoveSong
+
+# Remove playlist (alsaplayer, audacious, mocp, mpd, mplayer, xmms, xmms2)
+DestroyFunc Music-RemovePlaylist-generator
+DestroyFunc FuncFvwmMenuRemovePlaylistDirectory (alsaplayer)
+DestroyMenu /Music/RemovePlaylist
+
+# Save playlist dialog (audacious, mpdm, xmms, xmms2)
+All (Music-SavePlaylist-Dialog) Close
+DestroyModuleConfig Music-SavePlaylist-Dialog: *
+DestroyFunc Music-SavePlaylist
+
+# Add playlist (xmms2)
+DestroyFunc FuncFvwmMenuPlaylistDirectory
+DestroyMenu /Music/LoadPlaylist
+
+# Update the database (mpd)
+DestroyFunc Music-Update
+
+# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms, xmms2)
+DestroyFunc Playlist-generator-button
+DestroyMenu /Playlist-button
+
+## mouse 2 Menu /Playback
+#########################
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms, xmms2
+DestroyFunc Music-Next
+
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms, xmms2
+DestroyFunc Music-Prev
+
+# alsaplayer
+DestroyFunc Music-SongChange
+DestroyMenu /Music/SongChange
+
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet, xmms, xmms2
+DestroyFunc Music-Stop
+
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, quodlibet, xmms, xmms2
+DestroyFunc Music-Play
+
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms, xmms2
+DestroyFunc Music-Pause
+
+# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer (button 3), quodlibet, xmms
+DestroyFunc Music-PlayPause
+
+# cdcd, cmus, mpd, quodlibet, xmms
+DestroyFunc Music-Forward
+
+# cdcd, cmus, mpd, quodlibet, xmms
+DestroyFunc Music-Backward
+
+# audacious, cmus, mpd, quodlibet, xmms
+DestroyFunc Music-ToggleRandom
+
+# alsaplayer, mplayer
+DestroyFunc Music-Jump
+DestroyMenu /Music/Jump
+
+# alsaplayer, mplayer
+DestroyFunc Music-Seek
+DestroyMenu /Music/Seek
+
+# mpd
+DestroyMenu /Music/Crossfade
+
+# mpd, xmms2
+DestroyFunc Music-Shuffle
+
+# xmms
+DestroyFunc Music-Find
+
+# button menu (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, mocp, mpd, mplayer,
+# quodlibet, xmms2)
+DestroyFunc Playback-generator
+# button menu (all)
+DestroyMenu /Playback
+AddToMenu /Playback
++ DynamicPopupAction Function Playback-generator
+
+## mouse 3 Menu /Mixer : in components/Mixer
+## mouse 4 Music-Next : allready here
+## mouse 4 Music-Prev : allready here
+
+####################
+### Third button ###
+## Player controls and vol ##
+#############################
+## mouse 1 Music-Pause : allready here
+## mouse 2 Music-PlayPause : allready here
+## mouse 3 Menu /Music/Volume
+#############################
+# alsaplayer
+DestroyFunc Music-VolumeFr
+DestroyFunc Music-VolumeEn
+# audacious, mplayer
+DestroyFunc Music-Volume
+
+# button menu (alsaplayer, mplayer)
+DestroyMenu /Music/Volume
+
+## mouse 4 Music-Speed-Up
+## mouse 5 Music-Speed-Down
+###########################
+# alsaplayer, mplayer
+DestroyFunc Music-Speed-Up
+DestroyFunc Music-Speed-Down
+
+##################
+## Last button ###
+## speed controls ##
+####################
+## mouse 1 Menu /Speed
+######################
+# alsaplayer, mplayer
+DestroyFunc Music-Speed
+# button menu (alsaplayer, mplayer)
+DestroyMenu /Speed
+
+## mouse 4 Button-Seek-+
+## mouse 5 Button-Seek--
+########################
+# alsaplayer
+DestroyFunc Button-Seek-+
+DestroyFunc Button-Seek--
+
+###############
+# Music menus #
+###############
+# main music menu (alsaplayer, audacious, mocp)
+DestroyFunc Music-generator
+
+DestroyMenu /Music
+AddToMenu /Music
++ DynamicPopupAction Function Music-generator
+
+
+# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 21:10:17
|
Revision: 72
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=72&view=rev
Author: dominique_libre
Date: 2011-01-29 21:10:11 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
StaloneTray: cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/NotificationAreaManager-stalonetray
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 21:05:24 UTC (rev 71)
+++ ChangeLog 2011-01-29 21:10:11 UTC (rev 72)
@@ -18,6 +18,7 @@
* Mixer: cleanup
* components/Music: common code to all the players
* updated the media players for use with components/Music
+ * StaloneTray: cleanup
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/NotificationAreaManager-stalonetray
===================================================================
--- fvwm/components/functions/NotificationAreaManager-stalonetray 2011-01-29 21:05:24 UTC (rev 71)
+++ fvwm/components/functions/NotificationAreaManager-stalonetray 2011-01-29 21:10:11 UTC (rev 72)
@@ -30,8 +30,8 @@
# --withdrawn -w <bool> new in 0.7
# --xsync [bool] slow
-# Settings of Trayer {{{1
-AddToFunc StartFunction I Exec exec killall stalonetray
+# Settings of TrayerPanel {{{1
+AddToFunc ExitFunction I Exec exec killall stalonetray
DestroyFunc TrayerPanel
AddToFunc TrayerPanel
@@ -44,14 +44,18 @@
+ I *FvwmStalonePanel: Columns 1
+ I *FvwmStalonePanel: Rows 1
+ I *FvwmStalonePanel: (1x1, Padding 0 0, Swallow (NoClose) "stalonetray" 'Exec stalonetray \
---dbg-level 1 \
---parent-bg \
+--decorations none \
+--parent-bg true \
-d none \
---window-type normal \
+--ignore-icon-resize true \
+--window-type dock \
--no-shrink true \
--icon-size $[trayer_ic_size] \
--geometry $[trayer_area_width]x$[trayer_area_eigth]$[trayer_x]$[trayer_y] \
+-geometry $[trayer_area_width]x$[trayer_area_heigth]$[trayer_x]$[trayer_y] \
--icon-gravity $[trayer_ic_grav]')
-+ I Module FvwmButtons -g $[trayer_area_width]x$[trayer_area_eigth]$[trayer_x]$[trayer_y] FvwmStalonePanel
++ I Module FvwmButtons -g $[trayer_area_width]x$[trayer_area_heigth]$[trayer_x]$[trayer_y] FvwmStalonePanel
+Style FvwmStalonePanel ParentalRelativity
+Style stalonetray NoTitle, !Borders, NoIcon
+
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 21:13:21
|
Revision: 73
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=73&view=rev
Author: dominique_libre
Date: 2011-01-29 21:13:15 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Trayer: support for into the recipes
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/NotificationAreaManager-trayer
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 21:10:11 UTC (rev 72)
+++ ChangeLog 2011-01-29 21:13:15 UTC (rev 73)
@@ -19,6 +19,7 @@
* components/Music: common code to all the players
* updated the media players for use with components/Music
* StaloneTray: cleanup
+ * Trayer: support for $trayer_height into the recipes
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/NotificationAreaManager-trayer
===================================================================
--- fvwm/components/functions/NotificationAreaManager-trayer 2011-01-29 21:10:11 UTC (rev 72)
+++ fvwm/components/functions/NotificationAreaManager-trayer 2011-01-29 21:13:15 UTC (rev 73)
@@ -27,7 +27,7 @@
--SetDockType false \
--widthtype $[trayer_width_t] \
--heighttype $[trayer_heigth_t] \
---height 24 \
+--height $[trayer_height] \
--edge $[trayer_edge] \
--align $[trayer_align] \
--transparent true \
@@ -37,4 +37,6 @@
--distance $[trayer_dist] \
$[trayer_width_w]
+Style trayer NoTitle, !Borders, NoIcon
+
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 21:16:40
|
Revision: 74
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=74&view=rev
Author: dominique_libre
Date: 2011-01-29 21:16:33 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Preferences-Menu: cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 21:13:15 UTC (rev 73)
+++ ChangeLog 2011-01-29 21:16:33 UTC (rev 74)
@@ -20,6 +20,7 @@
* updated the media players for use with components/Music
* StaloneTray: cleanup
* Trayer: support for $trayer_height into the recipes
+ * Preferences-Menu: cleanup
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2011-01-29 21:13:15 UTC (rev 73)
+++ fvwm/components/functions/Preferences-Menu 2011-01-29 21:16:33 UTC (rev 74)
@@ -1,11 +1,12 @@
# Menu with preferences
#
+# Included in components/desktop/FVWM-Crystal_Functions
# The Music player and Audio mixer prefs menu appears into the Music button menu.
DestroyMenu /Preferences
AddToMenu /Preferences
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Used recipe]' Popup /Preferences/Recipes
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Characters fonts]' Popup /Preferences/Fonts
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Font Sizes]' Popup /Preferences/FontSizes
++ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Fonts sizes]' Popup /Preferences/FontSizes
+ '%22x22/fvwm-crystal/utilities-terminal.png%$[gt.Default terminal]' Popup /Preferences/DefaultTerminal
+ '%22x22/fvwm-crystal/utilities-terminal.png%$[gt.FvwmConsole terminal]' Popup /Preferences/FvwmConsoleTerminal
+ '%22x22/fvwm-crystal/utilities-terminal.png%$[gt.QuakeConsole terminal]' Popup /Preferences/QuakeConsoleTerminal
@@ -36,7 +37,7 @@
AddToFunc Recipe-Set
+ I SetEnv Fvwm_Crystal_Recipe "$*"
+ I SavePreferences LastChoosenRecipe "SetEnv Fvwm_Crystal_Recipe \"$*\""
-+ I AppendPreferences LastChoosenRecipe "Read $[Fvwm_Crystal_Recipe]"
++ I AppendPreferences LastChoosenRecipe "Read \"$*\""
+ I Module FvwmForm Recipe-Restart-Dialog
All (Recipe-Restart-Dialog) Close
@@ -59,12 +60,17 @@
# recipes/* (panel_font panel_font_size)
# components/styles/Menu (menu_font menu_font_size)
+DestroyFunc /Preferences/Fonts-generator
+AddToFunc /Preferences/Fonts-generator
++ I DestroyMenu recreate /Preferences/Fonts
++ I AddToMenu /Preferences/Fonts '%22x22/fvwm-crystal/user-desktop.png%$[gt.Panels] : $[panel_font]' Popup Panel
++ I AddToMenu /Preferences/Fonts '%22x22/fvwm-crystal/user-desktop.png%$[gt.Title bars] : $[title_font]' Popup Title
++ I AddToMenu /Preferences/Fonts '%22x22/fvwm-crystal/user-desktop.png%$[gt.Menus] : $[menu_font]' Popup Menu
+
DestroyMenu /Preferences/Fonts
AddToMenu /Preferences/Fonts
++ DynamicPopupAction Function /Preferences/Fonts-generator
+ MissingSubmenuFunction Fonts-generator
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Panels]' Popup Panel
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Title bars]' Popup Title
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Menus]' Popup Menu
DestroyFunc Fonts-generator
AddToFunc Fonts-generator
@@ -76,23 +82,31 @@
DestroyFunc PanelFont-Set
AddToFunc PanelFont-Set
+ I SavePreferences PanelFont "SetEnv panel_font \\\""$*"\\\""
++ I SetEnv panel_font "$[0]"
+ I Style * Font "xft:$[0]:pixelsize=$[panel_font_size]:Bold:encoding=iso10646-1"
DestroyFunc TitleFont-Set
AddToFunc TitleFont-Set
+ I SavePreferences TitleFont "SetEnv title_font \\\""$*"\\\""
++ I SetEnv title_font "$[0]"
+ I Style * Font "xft:$[0]:pixelsize=$[title_font_size]:Bold:encoding=iso10646-1"
DestroyFunc MenuFont-Set
AddToFunc MenuFont-Set
+ I SavePreferences MenuFont "SetEnv menu_font \\\""$*"\\\""
++ I SetEnv menu_font "$[0]"
+ I MenuStyle * Font "xft:$[0]:pixelsize=$[menu_font_size]:encoding=iso10646-1"
+DestroyFunc /Preferences/FontSizes-generator
+AddToFunc /Preferences/FontSizes-generator
++ I DestroyMenu recreate /Preferences/FontSizes
++ I AddToMenu /Preferences/FontSizes '%22x22/fvwm-crystal/user-desktop.png%$[gt.Panels font size] : $[panel_font_size]' Popup /Preferences/FontSizes/PanelSize
++ I AddToMenu /Preferences/FontSizes '%22x22/fvwm-crystal/user-desktop.png%$[gt.Title bars font size] : $[title_font_size]' Popup /Preferences/FontSizes/TitleSize
++ I AddToMenu /Preferences/FontSizes '%22x22/fvwm-crystal/user-desktop.png%$[gt.Menus font size] : $[menu_font_size]' Popup /Preferences/FontSizes/MenuSize
+
DestroyMenu /Preferences/FontSizes
AddToMenu /Preferences/FontSizes
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Panels font size]' Popup /Preferences/FontSizes/PanelSize
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Title bars font size]' Popup /Preferences/FontSizes/TitleSize
-+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Menus font size]' Popup /Preferences/FontSizes/MenuSize
++ DynamicPopupAction Function /Preferences/FontSizes-generator
DestroyMenu /Preferences/FontSizes/PanelSize
AddToMenu /Preferences/FontSizes/PanelSize
@@ -320,7 +334,7 @@
DestroyFunc SelectMusicPlayer
AddToFunc SelectMusicPlayer
+ I FindCommand MusicPlayer $0 alsaplayer mpd quodlibet audacious xmms xmm2 cmus mocp cdcd mplayer
-+ I Include components/functions/Music
++ I Include components/functions/Music-$[MusicPlayer]
+ I SavePreferences DefaultMusicPlayer "SetEnv MusicPlayer $[MusicPlayer]"
#
@@ -345,7 +359,7 @@
+ I SavePreferences DefaultMixer "SetEnv Mixer $[DefaultMixer]"
+ I PipeRead `echo SetEnv Mixer $[DefaultMixer]`
+ I Include components/functions/Mixer
-+ I AppendPreferences DefaultMixer "Include components/functions/Mixer"
+#+ I AppendPreferences DefaultMixer "Include components/functions/Mixer"
#
# Window focus policy
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 21:22:04
|
Revision: 76
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=76&view=rev
Author: dominique_libre
Date: 2011-01-29 21:21:58 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
Support for multiple wallpapers
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Wallpaper
Added Paths:
-----------
fvwm/components/functions/Tooltip
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 21:19:12 UTC (rev 75)
+++ ChangeLog 2011-01-29 21:21:58 UTC (rev 76)
@@ -22,6 +22,7 @@
* Trayer: support for $trayer_height into the recipes
* Preferences-Menu: cleanup
* Initial support for tooltips (used for the media button)
+ * Support for multiple wallpapers
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Added: fvwm/components/functions/Tooltip
===================================================================
--- fvwm/components/functions/Tooltip (rev 0)
+++ fvwm/components/functions/Tooltip 2011-01-29 21:21:58 UTC (rev 76)
@@ -0,0 +1,34 @@
+# Support for Tooltip
+# Written by: Dominique Michel <dom...@so...>
+#
+# Usage : FvwmButtons-Tooltip <name> <title> <"string to display"> <geometry> <layer> <delay>
+#
+# where <name> is the name of the button such as FvwmButtons-Tooltip-<Name>
+# <title> is the titile to draw on the button. It support gettext.
+# <"string to display"> can be anything, i.e. $[My_Var_Env]
+# <geometry> is in standard X11 notation (+x+y are enough)
+# <layer> is the layer in wich the tooltip will be draw
+# <delay> is the time in msec during wich the tolltip will be visible
+# An argument with a space must be quoted.
+#
+# Example :
+# + I PointerWindow (FvwmButtons-Music) FvwmButtons-Tooltip Volume "Main volume" "$[CurrentVolume]" "+4-40" 20 1000
+# will show a tooltip when the pointer is entering on FvwmButtons-Music.
+
+DestroyFunc FvwmButtons-Tooltip
+AddToFunc FvwmButtons-Tooltip
++ I DestroyModuleConfig FvwmButtons-Tooltip-$0: *
++ I *FvwmButtons-Tooltip-$0: Geometry $3
++ I *FvwmButtons-Tooltip-$0: BoxSize smart
++ I *FvwmButtons-Tooltip-$0: ActiveColorset $[cs_menu_inactive]
++ I *FvwmButtons-Tooltip-$0: Colorset $[cs_menu_inactive]
++ 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]:encoding=iso10646-1"
++ 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
++ I Schedule $5 KillModule FvwmButtons FvwmButtons-Tooltip-$0
+
+# vim:ft=fvwm
Modified: fvwm/components/functions/Wallpaper
===================================================================
--- fvwm/components/functions/Wallpaper 2011-01-29 21:19:12 UTC (rev 75)
+++ fvwm/components/functions/Wallpaper 2011-01-29 21:21:58 UTC (rev 76)
@@ -1,19 +1,80 @@
# Wallpaper menu and functions
# ----------------------------
+# Use FvwmBacker in order to be able to set different wallpapers
+# for each page.
+# EnvVars: Desk_Pages_X, Desk_Pages_Y
+#
+# Recipes Desk_Pages_X Desk_Pages_Y
+# Amiga 8 1
+# Clean 8 1
+# Clean Vertical 1 8
+# Corner 8 1
+# Default 8 1
+# Default with ACPI 8 1
+# Dock 4 1
+# Light 8 1
+# Nebulae 8 1
+# Old School 8 1
+# SideLine 8 1
+# SilentHacker 8 1
+# Thin 8 1
+# TopDown 8 1
+# TopLine 8 1
+#
+# Il est nécessaire de tester Desk_Pages_X et Desk_Pages_Y afin de déterminer
+# la syntaxe de FvwmBacker: *FvwmBacker: Command (Desk d, Page x y) command
+# Ex : *FvwmBacker: Command (Desk *, Page 1 0) Exec habak -ms /home/dom/.fvwm-crystal/wallpapers/Nonnes/146.JPG
+# régle la 2ème page en x de la 1ère colonne de pages de tous les desks.
+#
+# + I Test (x habak) *FvwmBacker: Command (Desk *, Page $0 $1) Exec habak -ms $3
+#
+# La page courante est donnée par
+# $[page.nx] $[page.ny]
+# Menu: Wallpaper -> Toutes les pages -> menu actuel
+# -> Page 1 -> menu actuel
+# -> Page 2 -> menu actuel
+# ...
+# Préférences:
+# 1) Si toutes les pages, effacer toutes les lignes et ajouter cette ligne
+# 2) Si une page, effacer la ligne de toutes les pages si elle existe
+# et écrire cette ligne en l'écrivant par-dessus si besoin.
+#
+#
+
+Module FvwmBacker
+
# Set the specified wallpaper using available programs
-DestroyFunc Wallpaper-Set
-AddToFunc Wallpaper-Set
-+ I Test (x habak) Exec habak -ms $*
-+ I TestRc (NoMatch) Test (x Esetroot) Exec Esetroot -scale $*
-+ I TestRc (NoMatch) Test (x hsetroot) Exec hsetroot -fill $*
-+ I SavePreferences LastChoosenWallpaper "Wallpaper-Set \"$*\""
+DestroyFunc Wallpaper-Set-All
+AddToFunc Wallpaper-Set-All
++ I Test (x habak) *FvwmBacker: Command (Desk *, Page \* \*) Exec habak -ms $0
++ I TestRc (NoMatch) Test (x Esetroot) *FvwmBacker: Command (Desk *, Page * *) Exec Esetroot -scale $0
++ I TestRc (NoMatch) Test (x hsetroot) *FvwmBacker: Command (Desk *, Page * *) Exec hsetroot -fill $0
++ I SavePreferences LastChoosenWallpaper "Wallpaper-Pref-Write \\* \\* \"$0\""
+DestroyFunc Wallpaper-Set-Current
+AddToFunc Wallpaper-Set-Current
++ I Test (x habak) *FvwmBacker: Command (Desk *, Page $[page.nx] $[page.ny]) Exec habak -ms $0
++ I TestRc (NoMatch) Test (x Esetroot) *FvwmBacker: Command (Desk *, Page $[page.nx] $[page.ny]) Exec Esetroot -scale $*
++ I TestRc (NoMatch) Test (x hsetroot) *FvwmBacker: Command (Desk *, Page $[page.nx] $[page.ny]) Exec hsetroot -fill $*
++ I UpdateAppendPreferences LastChoosenWallpaper "Wallpaper-Pref-Write $[page.nx] $[page.ny] \"$0\"" "Wallpaper-Pref-Write $[page.nx] $[page.ny]"
+
+# Write the wallpaper preferences
+DestroyFunc Wallpaper-Pref-Write
+AddToFunc Wallpaper-Pref-Write
++ I Test (x habak) *FvwmBacker: Command (Desk *, Page $0 $1) Exec habak -ms $2
++ I TestRc (NoMatch) Test (x Esetroot) Command (Desk *, Page $0 $1) Exec Esetroot -scale $2
++ I TestRc (NoMatch) Test (x hsetroot) Command (Desk *, Page $0 $1) Exec hsetroot -fill $2
+
# Select random wallpaper from given directories and set it
-DestroyFunc Wallpaper-Random
-AddToFunc Wallpaper-Random
-+ I PipeRead "echo Wallpaper-Set \\'`fvwm-crystal.wallpaper $*`\\'"
+DestroyFunc Wallpaper-Random-All
+AddToFunc Wallpaper-Random-All
++ I PipeRead "echo Wallpaper-Set-All \\'`fvwm-crystal.wallpaper $*`\\'"
+DestroyFunc Wallpaper-Random-Current
+AddToFunc Wallpaper-Random-Current
++ I PipeRead "echo Wallpaper-Set-Current \\'`fvwm-crystal.wallpaper $*`\\'"
+
# Where are kept wallpaper thumbnails?
SetEnv WallpaperThumbnails "$[FVWM_USERDIR]/wallpaper-thumbnails"
@@ -22,26 +83,46 @@
CheckPreferences LastChoosenWallpaper 'SavePreferences LastChoosenWallpaper "Wallpaper-Set $[FVWM_SYSTEMDIR]/wallpapers/fvwm-crystal-dark1-1024x768.jpg"'
# Menu for wallpapers
-DestroyMenu /Wallpaper
-AddToMenu /Wallpaper
-+ MissingSubmenuFunction Wallpaper-Browser
+DestroyMenu /Wallpaper-All
+AddToMenu /Wallpaper-All
++ MissingSubmenuFunction Wallpaper-Browser-All
+ "%22x22/categories/directory.png%FVWM-Crystal" Popup $[FVWM_SYSTEMDIR]/wallpapers
Test (f $[FVWM_USERDIR]/wallpapers) + "%22x22/categories/directory.png%~/.fvwm-crystal/wallpapers" Popup $[FVWM_USERDIR]/wallpapers
-Test (f $[HOME]/wallpapers) + "%22x22/categories/directory.png%~/wallpapers" Popup $[HOME]/wallpapers
Test (f /usr/local/share/wallpapers) + "%22x22/categories/directory.png%/usr/local/share/wallpapers" Popup /usr/local/share/wallpapers
Test (f /usr/share/wallpapers) + "%22x22/categories/directory.png%/usr/share/wallpapers" Popup /usr/share/wallpapers
# Wallpapaer menu generator
-DestroyFunc Wallpaper-Browser
-AddToFunc Wallpaper-Browser I PipeRead 'for i in "$0/"*; do \
+DestroyFunc Wallpaper-Browser-All
+AddToFunc Wallpaper-Browser-All I PipeRead 'for i in "$0/"*; do \
test -d "${i}" && continue; \
mkdir -p "$[WallpaperThumbnails]${i%/*}"; \
test -f "$[WallpaperThumbnails]${i}" -a "$[WallpaperThumbnails]${i}" -nt "${i}" || \
convert -quality 0 -sample 42 "${i}" "png:$[WallpaperThumbnails]${i}" 2>/dev/null & \
done; \
wait && fvwm-menu-directory --title "$[gt.Random]" --icon-title "" --icon-file __PIXMAP__ \
- --icon-dir "22x22/categories/directory.png" --dir "$0" --links --command-file "Wallpaper-Set \'\\"%f\\"\'" \
- --command-t="Wallpaper-Random $0" | sed -e "s#FuncFvwmMenuDirectory#Wallpaper-Browser#g" \
+ --icon-dir "22x22/categories/directory.png" --dir "$0" --links --command-file "Wallpaper-Set-All \'\\"%f\\"\'" \
+ --command-t="Wallpaper-Random-All $0" | sed -e "s#FuncFvwmMenuDirectory#Wallpaper-Browser-All#g" \
-e "s#__PIXMAP__\\(.*\\)\\\"\\(.*/\\)\\(.*\\)\\\"#$[WallpaperThumbnails]/\\2\\3\\1\\2\\3#g"'
+DestroyMenu /Wallpaper-Current
+AddToMenu /Wallpaper-Current
++ MissingSubmenuFunction Wallpaper-Browser-Current
++ "%22x22/categories/directory.png%FVWM-Crystal" Popup $[FVWM_SYSTEMDIR]/wallpapers
+Test (f $[FVWM_USERDIR]/wallpapers) + "%22x22/categories/directory.png%~/.fvwm-crystal/wallpapers" Popup $[FVWM_USERDIR]/wallpapers
+Test (f /usr/local/share/wallpapers) + "%22x22/categories/directory.png%/usr/local/share/wallpapers" Popup /usr/local/share/wallpapers
+Test (f /usr/share/wallpapers) + "%22x22/categories/directory.png%/usr/share/wallpapers" Popup /usr/share/wallpapers
+
+# Wallpapaer menu generator
+DestroyFunc Wallpaper-Browser-Current
+AddToFunc Wallpaper-Browser-Current I PipeRead 'for i in "$0/"*; do \
+ test -d "${i}" && continue; \
+ mkdir -p "$[WallpaperThumbnails]${i%/*}"; \
+ test -f "$[WallpaperThumbnails]${i}" -a "$[WallpaperThumbnails]${i}" -nt "${i}" || \
+ convert -quality 0 -sample 42 "${i}" "png:$[WallpaperThumbnails]${i}" 2>/dev/null & \
+ done; \
+ wait && fvwm-menu-directory --title "$[gt.Random]" --icon-title "" --icon-file __PIXMAP__ \
+ --icon-dir "22x22/categories/directory.png" --dir "$0" --links --command-file "Wallpaper-Set-Current \'\\"%f\\"\'" \
+ --command-t="Wallpaper-Random-Current $0" | sed -e "s#FuncFvwmMenuDirectory#Wallpaper-Browser-Current#g" \
+ -e "s#__PIXMAP__\\(.*\\)\\\"\\(.*/\\)\\(.*\\)\\\"#$[WallpaperThumbnails]/\\2\\3\\1\\2\\3#g"'
+
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-01-29 21:05:33
|
Revision: 71
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=71&view=rev
Author: dominique_libre
Date: 2011-01-29 21:05:24 +0000 (Sat, 29 Jan 2011)
Log Message:
-----------
updated the media players for use with components/Music
Modified Paths:
--------------
ChangeLog
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-quodlibet
fvwm/components/functions/Music-xmms
fvwm/components/functions/Music-xmms2
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-01-29 21:01:50 UTC (rev 70)
+++ ChangeLog 2011-01-29 21:05:24 UTC (rev 71)
@@ -17,6 +17,7 @@
* Added functions to make panels and buttons
* Mixer: cleanup
* components/Music: common code to all the players
+ * updated the media players for use with components/Music
Samedi 1 janvier 2011 Dominique Michel
* Wimdow-Raise-Move-Lover witll focus on a non overlapped window
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2011-01-29 21:01:50 UTC (rev 70)
+++ fvwm/components/functions/Music-alsaplayer 2011-01-29 21:05:24 UTC (rev 71)
@@ -1,49 +1,58 @@
-# Support for Alsaplayer music player
-# Written by: Dominique Michel <dom...@ci...>
+# Support for Alsaplayer in Fvwm-Crystal
+# Written by: Dominique Michel <dom...@so...>
-# Alsaplayer normal speed
-SetEnv speed "1"
+###############################
+# Media control writing style #
+###############################
+# Some recipes do have a media button, the other do have a menu.
+# Recipes with media button: Amiga, Corner, Default, Default with ACPI, Dock
+# The bindings of the media buttons into the recipes are:
+# Button 1: (Mouse 1) Menu /Player # Main player menu
+# (Mouse 2) Music-GUI # show/hide the player
+# (Mouse 3) Music-QJackGUI # show/hide QJackCtl
+# (Mouse 4) Mixer-Volume-Up # main volume up
+# (Mouse 5) Mixer-Volume-Down # main volume down
+# Button 2: (Mouse 1) Menu /Playlist-button # playlist menu
+# (Mouse 2) Menu /Playback # playback menu
+# (Mouse 3) Menu /Mixer # main mixer menu
+# (Mouse 4) Music-Next # next media
+# (Mouse 5) Music-Prev # previous media
+# Button 3: (Mouse 1) Music-Pause # pause
+# (Mouse 2) Music-PlayPause # play/pause
+# (Mouse 3) Menu /Music/Volume # player volume menu
+# (Mouse 4) Music-Speed-Up # speed up
+# (Mouse 5) Music-Speed-Down # speed down
+# Button 4: (Mouse 1) Menu /Speed # speed control menu
+# (Mouse 4) Button-Seek-+ # seek forward
+# (Mouse 5) Button-Seek-- # seek backward
+#
+# Recipes with media menu: Clean, Clean Vertical, Light, Wing-Commander
+# The media menu for those recipes is: Popup /Music
+# Popup /Music can reuse the finctions/menu defined for the bouton or use their own.
+####################################################################################
-# Decimal point in use
-PipeRead 'echo SetEnv dec_point `locale decimal_point`'
+#######################################
+## Initialisations, shared functions ##
+#######################################
+Include components/functions/Music
-# Where are stored Alsaplayer playlists
-Piperead 'echo SetEnv Alsaplayer_Playlists "/home/`id -un`/Alsaplayer-playlists"'
-# Some commands for playlist operation
-#SetEnv Load_Pl_Command "exec alsaplayer -e"
-#SetEnv Remove_Pl_Command "rm -f"
+###############################
+## First button ##
+## Player controls and prefs ##
+###############################
+## mouse 1 Menu /Player
+#######################
+# Recreate the playlists : in Music
-# Styles for Alsaplayer windows
-Style AlsaPlayer NoIcon, Sticky, WindowListSkip, StaysOnTop
-Style alsaplayer NoIcon, Sticky, WindowListSkip, StaysOnTop
-
-#-------------------------
-# Multimedia keys keybinding, see
-# http:///gentoo-wiki.com/HOWTO_Use_Multimedia_Keys
-# to setup xmodmap
-
-Key XF86AudioLowerVolume A C Music-Speed-Down
-Key XF86AudioRaiseVolume A C Music-Speed-Up
-Key XF86AudioMute A $[Mod0] Exec exec alsaplayer --volume 0
-key XF86AudioMute A C Exec exec alsaplayer --volume 1
-key XF86AudioPlay A $[Mod0] Music-PlayPause
-key XF86AudioPlay A $[Mod1] Music-Speed normal
-key XF86AudioPlay A C Music-Pause
-key XF86AudioStop A $[Mod0] Music-Stop
-key XF86AudioStop A C Music-Pause
-key XF86AudioStop A $[Mod1] Music-Play
-Key XF86AudioNext A $[Mod] Music-Next
-Key XF86AudioPrev A $[Mod] Music-Prev
-Key XF86AudioMedia A $[Mod] Music-GUI
-
-
-# ---------------------------------------------------------------------------
-# Basic control functions
-
DestroyFunc Music-Start
AddToFunc Music-Start
+ I Exec exec $0
+DestroyMenu /Music/Start
+AddToMenu /Music/Start
++ "Alsa" Music-Start "alsaplayer -o alsa -s alsa"
++ "Jack" Music-Start "alsaplayer -o jack -F 48000 -s Alsaplayer"
+
DestroyFunc Music-Kill
AddToFunc Music-Kill
+ I Exec exec alsaplayer --quit
@@ -52,26 +61,94 @@
AddToFunc Music-GUI
+ I All (alsaplayer) Iconify toggle
-DestroyFunc Music-QJackGUI
-AddToFunc Music-QJackGUI
-+ I All (qjackctl) Iconify toggle
+# Player-generator (All)
+DestroyFunc Player-generator
+AddToFunc Player-generator
++ I DestroyMenu recreate /Player
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start Alsaplayer]' Popup /Music/Start
++ I AddToMenu /Player '$[gt.Stop player]' Music-Kill
++ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI
-DestroyFunc Music-Stop
-AddToFunc Music-Stop
-+ I Exec exec alsaplayer --stop
+## mouse 2 Music-GUI : allready here
+## mouse 3 Music-QJackGUI : in Music
+##
+## mouse 4 Mixer-Volume-Up
+## mouse 5 Mixer-Volume-Down
+## are in components/Mixer
-DestroyFunc Music-Play
-AddToFunc Music-Play
-+ I Exec exec alsaplayer --start
+####################
+## Second button ###
+## Player controls and main vol ##
+##################################
+## mouse 1 Menu /Playlist-button
+################################
+DestroyFunc FuncFvwmMenuAudioDirectory
+AddToFunc FuncFvwmMenuAudioDirectory
++ I PipeRead 'case "$0" in \
+ "$[AudioPlaylists]"*) myexec="alsaplayer -e";; \
+ "$[NonManagedPlaylists]"*) myexec="alsaplayer -e";; \
+ esac; \
+ test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
+ test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
+ --icon-file "${mypng:-22x22/categories/Audio.png}" \
+ --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
+ --func-name "FuncFvwmMenuAudioDirectory"'
-DestroyFunc Music-Pause
-AddToFunc Music-Pause
-+ I Exec exec alsaplayer --speed 0
+DestroyMenu /Music/LoadPlaylist
+AddToMenu /Music/LoadPlaylist
++ '$[gt.Choose playlist to load]' Nop
++ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[NonManagedPlaylists]
-DestroyFunc Music-PlayPause
-AddToFunc Music-PlayPause
-+ I Exec exec alsaplayer --speed $[speed] > /dev/null
+DestroyFunc Music-ClearPlaylist
+AddToFunc Music-ClearPlaylist
++ I Exec exec alsaplayer --clear
+DestroyFunc FuncFvwmMenuRemovePlaylistDirectory
+AddToFunc FuncFvwmMenuRemovePlaylistDirectory
++ I PipeRead 'case "$0" in \
+ "$[NonManagedPlaylists]"*) myexec="rm -f";; \
+ esac; \
+ test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
+ test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
+ --icon-file "${mypng:-22x22/categories/Audio.png}" \
+ --dir "$0" --exec-title "-" --exec-file "^${myexec}" \
+ --func-name "FuncFvwmMenuRemovePlaylistDirectory"'
+
+DestroyMenu /Music/RemovePlaylist
+AddToMenu /Music/RemovePlaylist
++ '$[gt.Choose playlist to remove]' Nop
++ MissingSubmenuFunction FuncFvwmMenuRemovePlaylistDirectory
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[NonManagedPlaylists]
+
+DestroyFunc Playlist-generator-button
+AddToFunc Playlist-generator-button
++ I DestroyMenu recreate /Playlist-button
++ I AddToMenu /Playlist-button '$[gt.Playlists operations]' Nop
+## The following line will screw up the menu. One time on two, it work well,
+## the other time /Music/LoadPlaylist and /Music/RemovePlaylist get shifted.
+## As workaround, I added a title in this menu... How much time to find it!
+## Damn, it doesn't work with /music! the whole menu get screwed with this.
+## At least, it work from the button. I don't have any fix for /Music at that time.
++ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
+##
++ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
++ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
+
+DestroyMenu /Playlist-button
+AddToMenu /Playlist-button
++ DynamicPopupAction Function Playlist-generator-button
+
+## mouse 2 Menu /Playback
+#########################
DestroyFunc Music-Next
AddToFunc Music-Next
+ I Exec exec alsaplayer --next
@@ -80,125 +157,53 @@
AddToFunc Music-Prev
+ I Exec exec alsaplayer --prev
-DestroyFunc Music-VolumeFr
-AddToFunc Music-VolumeFr
-+ I Exec exec alsaplayer --volume $0
+DestroyFunc Music-SongChange
+AddToFunc Music-SongChange
++ I Exec exec alsaplayer --jump $0
-DestroyFunc Music-VolumeEn
-AddToFunc Music-VolumeEn
-+ I Exec exec alsaplayer --volume $0
+DestroyMenu /Music/SongChange
+AddToMenu /Music/SongChange
++ " 1" Music-SongChange '1'
++ " 2" Music-SongChange '2'
++ " 3" Music-SongChange '3'
++ " 4" Music-SongChange '4'
++ " 5" Music-SongChange '5'
++ " 6" Music-SongChange '6'
++ " 7" Music-SongChange '7'
++ " 8" Music-SongChange '8'
++ " 9" Music-SongChange '9'
++ "10" Music-SongChange '10'
++ "11" Music-SongChange '11'
++ "12" Music-SongChange '12'
++ "13" Music-SongChange '13'
++ "14" Music-SongChange '14'
++ "15" Music-SongChange '15'
++ "16" Music-SongChange '16'
++ "17" Music-SongChange '17'
++ "18" Music-SongChange '18'
++ "19" Music-SongChange '19'
++ "20" Music-SongChange '20'
-DestroyFunc Music-Speed
-AddToFunc Music-Speed
-+ I PipeRead 'echo SetEnv speed `$[FVWM_USERDIR]/scripts/speed_value $0`'
-+ I Exec exec alsaplayer --speed $[speed] > /dev/null
+DestroyFunc Music-Stop
+AddToFunc Music-Stop
++ I Exec exec alsaplayer --stop
-DestroyFunc Music-Speed-Up
-AddToFunc Music-Speed-Up
-+ I PipeRead 'echo SetEnv speed `$[FVWM_USERDIR]/scripts/speed_value +1comma`'
-+ I Exec exec alsaplayer --speed $[speed] > /dev/null
+DestroyFunc Music-Play
+AddToFunc Music-Play
++ I Exec exec alsaplayer --start
-DestroyFunc Music-Speed-Down
-AddToFunc Music-Speed-Down
-+ I PipeRead 'echo SetEnv speed `$[FVWM_USERDIR]/scripts/speed_value -1comma`'
+DestroyFunc Music-Pause
+AddToFunc Music-Pause
++ I Exec exec alsaplayer --speed 0
+
+DestroyFunc Music-PlayPause
+AddToFunc Music-PlayPause
+ I Exec exec alsaplayer --speed $[speed] > /dev/null
-DestroyFunc Music-SongChange
-AddToFunc Music-SongChange
-+ I Exec exec alsaplayer --jump $0
-
DestroyFunc Music-Jump
AddToFunc Music-Jump
+ I Exec exec alsaplayer --seek $0
-DestroyFunc Music-Seek
-AddToFunc Music-Seek
-+ I Exec exec alsaplayer --relative $0
-
-#------------------------------------------------------------------
-# Basic menus
-
-DestroyMenu /Music/Start
-AddToMenu /Music/Start
-+ "Alsa" Music-Start "alsaplayer -o alsa -s alsa"
-+ "Jack" Music-Start "alsaplayer -o jack -F 48000 -s Alsaplayer"
-
-DestroyMenu /Music/Volume
-AddToMenu /Music/Volume
-+ '$[gt.Player volume]'
-+ "" Nop
-Test (EnvMatch dec_point ",") + " 0 db%" Music-VolumeFr '1,0'
-Test (EnvMatch dec_point ",") + "-3 db%" Music-VolumeFr '0,707'
-Test (EnvMatch dec_point ",") + "-6 db%" Music-VolumeFr '0,5'
-Test (EnvMatch dec_point ",") + "-12 dB%" Music-VolumeFr '0,25'
-Test (EnvMatch dec_point ",") + "-18 db%" Music-VolumeFr '0,125'
-Test (EnvMatch dec_point ",") + "-24 db%" Music-VolumeFr '0,0625'
-Test (EnvMatch dec_point ",") + "-30 db%" Music-VolumeFr '0,03125'
-Test (EnvMatch dec_point ",") + "-36 db%" Music-VolumeFr '0,015625'
-Test (EnvMatch dec_point ",") + " 0%" Music-VolumeFr '0,0'
-Test (EnvMatch dec_point ".") + " 0 db%" Music-VolumeEn '1.0'
-Test (EnvMatch dec_point ".") + "-3 db%" Music-VolumeEn '0.707'
-Test (EnvMatch dec_point ".") + "-6 db%" Music-VolumeEn '0.5'
-Test (EnvMatch dec_point ".") + "-12 dB%" Music-VolumeEn '0.25'
-Test (EnvMatch dec_point ".") + "-18 db%" Music-VolumeEn '0.125'
-Test (EnvMatch dec_point ".") + "-24 db%" Music-VolumeEn '0.0625'
-Test (EnvMatch dec_point ".") + "-30 db%" Music-VolumeEn '0.03125'
-Test (EnvMatch dec_point ".") + "-36 db%" Music-VolumeEn '0.015625'
-Test (EnvMatch dec_point ".") + " 0%" Music-VolumeEn '0.0'
-
-DestroyMenu /Speed
-AddToMenu /Speed
-+ '$[gt.Speed control]'
-+ "" Nop
-+ "Max%" Music-Speed 'max'
-+ "+ 1 octave%" Music-Speed '+1octave'
-+ '$[gt.+1 seventh]' Music-Speed '+1septieme'
-+ '$[gt.+1 sixth]' Music-Speed '+1sixte'
-+ '$[gt.+1 fifth]' Music-Speed '+1quinte'
-+ '$[gt.+1 fourth]' Music-Speed '+1quarte'
-+ '$[gt.+1 third]' Music-Speed '+1tierce'
-+ '$[gt.+1 tone]' Music-Speed '+1ton'
-+ '$[gt.+1/2 tone]' Music-Speed '+1/2ton'
-+ "" Nop
-+ '$[gt.-1/2 tone]' Music-Speed '-1/2ton'
-+ '$[gt.-1 tone]' Music-Speed '-1ton'
-+ '$[gt.-1 third]' Music-Speed '-1tierce'
-+ '$[gt.-1 fourth]' Music-Speed '-1quarte'
-+ '$[gt.-1 fifth]' Music-Speed '-1quinte'
-+ '$[gt.-1 sixth]' Music-Speed '-1sixte'
-+ '$[gt.-1 seventh]' Music-Speed '-1septieme'
-+ "-1 octave%" Music-Speed '-1octave'
-+ '$[gt.Max back]' Music-Speed 'min'
-+ "" Nop
-+ '$[gt.Normal backward]' Music-Speed 'back'
-+ "Pause%" Music-Speed 'pause'
-+ "+ 1 comma%" Music-Speed '+1comma'
-+ "Normal%" Music-Speed 'normal'
-+ "-1 comma%" Music-Speed '-1comma'
-
-DestroyMenu /Music/SongChange
-AddToMenu /Music/SongChange
-+ " 1%" Music-SongChange '1'
-+ " 2%" Music-SongChange '2'
-+ " 3%" Music-SongChange '3'
-+ " 4%" Music-SongChange '4'
-+ " 5%" Music-SongChange '5'
-+ " 6%" Music-SongChange '6'
-+ " 7%" Music-SongChange '7'
-+ " 8%" Music-SongChange '8'
-+ " 9%" Music-SongChange '9'
-+ "10%" Music-SongChange '10'
-+ "11%" Music-SongChange '11'
-+ "12%" Music-SongChange '12'
-+ "13%" Music-SongChange '13'
-+ "14%" Music-SongChange '14'
-+ "15%" Music-SongChange '15'
-+ "16%" Music-SongChange '16'
-+ "17%" Music-SongChange '17'
-+ "18%" Music-SongChange '18'
-+ "19%" Music-SongChange '19'
-+ "20%" Music-SongChange '20'
-
DestroyMenu /Music/Jump
AddToMenu /Music/Jump
+ " 15 min" Music-Jump '900'
@@ -209,7 +214,12 @@
+ "1 min 30" Music-Jump '90'
+ " 1 min" Music-Jump '60'
+ " 30 sec" Music-Jump '30'
++ " 10 sec" Music-Jump '10'
+DestroyFunc Music-Seek
+AddToFunc Music-Seek
++ I Exec exec alsaplayer --relative $0
+
DestroyMenu /Music/Seek
AddToMenu /Music/Seek
+ " 10 min" Music-Seek '600'
@@ -218,14 +228,11 @@
+ " 2 min" Music-Seek '120'
+ "1 min 30" Music-Seek '90'
+ " 1 min" Music-Seek '60'
-+ " 45 sec" Music-Seek '45'
+ " 30 sec" Music-Seek '30'
-+ " 20 sec" Music-Seek '20'
+ " 10 sec" Music-Seek '10'
++ "" Nop
+ "-10 sec" Music-Seek '-10'
-+ "-20 sec" Music-Seek '-20'
+ "-30 sec" Music-Seek '-30'
-+ "-45 sec" Music-Seek '-45'
+ " -1 min" Music-Seek '-60'
+ "-1 min 30" Music-Seek '-90'
+ " -2 min" Music-Seek '-120'
@@ -233,107 +240,146 @@
+ " -5 min" Music-Seek '-300'
+ "-10 min" Music-Seek '-600'
-# ---------------------------------------------------------------------------
-# Playlist functions and menus
+DestroyFunc Playback-generator
+AddToFunc Playback-generator
++ I DestroyMenu recreate /Playback
++ I AddToMenu /Playback '$[gt.Next]' Music-Next
++ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
++ I AddToMenu /Playback '$[gt.Song change]' Popup /Music/SongChange
++ I AddToMenu /Playback "" Nop
++ I AddToMenu /Playback '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Playback '$[gt.Play]' Music-Play
++ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
++ I AddToMenu /Playback '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Playback '$[gt.Jump]' Popup /Music/Jump
++ I AddToMenu /Playback '$[gt.Seek]' Popup /Music/Seek
-DestroyFunc Music-LoadPlaylist-generator
-AddToFunc Music-LoadPlaylist-generator
-+ I DestroyMenu recreate /Music/LoadPlaylist
-+ I AddToMenu /Music/LoadPlaylist
-+ I PipeRead 'for i in $[Alsaplayer_Playlists]/*.m3u $[Alsaplayer_Playlists]/*.pls; do \
- name=$(basename "$i"); \
- sname=${name%%.m3u}; \
- sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/LoadPlaylist \'$sname\' Exec exec alsaplayer -e \'$i\'\"; done'
+## mouse 3 Menu /Mixer : in components/Mixer
+## mouse 4 Music-Next : allready here
+## mouse 4 Music-Prev : allready here
-#DestroyFunc Music-RemovePlaylist-generator
-#AddToFunc Music-RemovePlaylist-generator
-#+ I DestroyMenu recreate /Music/RemovePlaylist
-#+ I AddToMenu /Music/RemovePlaylist
-#+ I PipeRead 'for i in $[Alsaplayer_Playlists]/*.m3u $[Alsaplayer_Playlists]/*.pls; do \
-# name=$(basename "$i"); \
-# sname=${name%%.m3u}; \
-# sname=${sname%%.pls}; \
-# echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
+####################
+## Third button ###
+## Player controls and vol ##
+#############################
+## mouse 1 Music-Pause : allready here
+## mouse 2 Music-PlayPause : allready here
+## mouse 3 Menu /Music/Volume
+#############################
-DestroyFunc Music-ClearPlaylist
-AddToFunc Music-ClearPlaylist
-+ I Exec exec alsaplayer --clear
+DestroyFunc Music-VolumeFr
+AddToFunc Music-VolumeFr
++ I Exec exec alsaplayer --volume $0
-DestroyMenu /Music/LoadPlaylist
-AddToMenu /Music/LoadPlaylist
-+ DynamicPopupAction Function Music-LoadPlaylist-generator
+DestroyFunc Music-VolumeEn
+AddToFunc Music-VolumeEn
++ I Exec exec alsaplayer --volume $0
-#DestroyMenu /Music/RemovePlaylist
-#AddToMenu /Music/RemovePlaylist
-#+ DynamicPopupAction Function Music-RemovePlaylist-generator
+DestroyMenu /Music/Volume
+AddToMenu /Music/Volume
++ '$[gt.Player volume]' Nop
++ "" Nop
+Test (EnvMatch dec_point ",") + " 0 dB" Music-VolumeFr '1,0'
+Test (EnvMatch dec_point ",") + "-3 dB" Music-VolumeFr '0,707'
+Test (EnvMatch dec_point ",") + "-6 dB" Music-VolumeFr '0,5'
+Test (EnvMatch dec_point ",") + "-12 dB" Music-VolumeFr '0,25'
+Test (EnvMatch dec_point ",") + "-18 dB" Music-VolumeFr '0,125'
+Test (EnvMatch dec_point ",") + "-24 dB" Music-VolumeFr '0,0625'
+Test (EnvMatch dec_point ",") + "-30 dB" Music-VolumeFr '0,03125'
+Test (EnvMatch dec_point ",") + "-36 dB" Music-VolumeFr '0,015625'
+Test (EnvMatch dec_point ",") + " 0" Music-VolumeFr '0,0'
+Test (EnvMatch dec_point ".") + " 0 dB" Music-VolumeEn '1.0'
+Test (EnvMatch dec_point ".") + "-3 dB" Music-VolumeEn '0.707'
+Test (EnvMatch dec_point ".") + "-6 dB" Music-VolumeEn '0.5'
+Test (EnvMatch dec_point ".") + "-12 dB" Music-VolumeEn '0.25'
+Test (EnvMatch dec_point ".") + "-18 dB" Music-VolumeEn '0.125'
+Test (EnvMatch dec_point ".") + "-24 dB" Music-VolumeEn '0.0625'
+Test (EnvMatch dec_point ".") + "-30 dB" Music-VolumeEn '0.03125'
+Test (EnvMatch dec_point ".") + "-36 dB" Music-VolumeEn '0.015625'
+Test (EnvMatch dec_point ".") + " 0" Music-VolumeEn '0.0'
-DestroyMenu /Playback
-AddToMenu /Playback
-+ DynamicPopupAction Function /Playback-generator
+## mouse 4 Music-Speed-Up
+## mouse 5 Music-Speed-Down
+###########################
+DestroyFunc Music-Speed-Up
+AddToFunc Music-Speed-Up
++ I PipeRead 'echo SetEnv speed `$[FVWM_SYSTEMDIR]/scripts/speed_value +1comma`'
++ I Exec exec alsaplayer --speed $[speed] > /dev/null
-DestroyMenu /Playlist
-AddToMenu /Playlist
-+ DynamicPopupAction Function /Playlist-generator
+DestroyFunc Music-Speed-Down
+AddToFunc Music-Speed-Down
++ I PipeRead 'echo SetEnv speed `$[FVWM_SYSTEMDIR]/scripts/speed_value -1comma`'
++ I Exec exec alsaplayer --speed $[speed] > /dev/null
-DestroyMenu /Playlist-bot
-AddToMenu /Playlist-bot
-+ DynamicPopupAction Function /Playlist-generator-bot
+##################
+## Last button ###
+## speed controls ##
+####################
+## mouse 1 Menu /Speed
+######################
+DestroyFunc Music-Speed
+AddToFunc Music-Speed
++ I PipeRead 'echo SetEnv speed `$[FVWM_SYSTEMDIR]/scripts/speed_value $0`'
++ I Exec exec alsaplayer --speed $[speed] > /dev/null
-DestroyMenu /Player
-AddToMenu /Player
-+ DynamicPopupAction Function /Player-generator
+DestroyMenu /Speed
+AddToMenu /Speed
++ '$[gt.Speed control]'
++ "" Nop
++ "Max" Music-Speed 'max'
++ "+ 1 octave" Music-Speed '+1octave'
++ '$[gt.+1 seventh]' Music-Speed '+1septieme'
++ '$[gt.+1 sixth]' Music-Speed '+1sixte'
++ '$[gt.+1 fifth]' Music-Speed '+1quinte'
++ '$[gt.+1 fourth]' Music-Speed '+1quarte'
++ '$[gt.+1 third]' Music-Speed '+1tierce'
++ '$[gt.+1 tone]' Music-Speed '+1ton'
++ '$[gt.+1/2 tone]' Music-Speed '+1/2ton'
++ "" Nop
++ '$[gt.-1/2 tone]' Music-Speed '-1/2ton'
++ '$[gt.-1 tone]' Music-Speed '-1ton'
++ '$[gt.-1 third]' Music-Speed '-1tierce'
++ '$[gt.-1 fourth]' Music-Speed '-1quarte'
++ '$[gt.-1 fifth]' Music-Speed '-1quinte'
++ '$[gt.-1 sixth]' Music-Speed '-1sixte'
++ '$[gt.-1 seventh]' Music-Speed '-1septieme'
++ "-1 octave" Music-Speed '-1octave'
++ '$[gt.Max back]' Music-Speed 'min'
++ "" Nop
++ '$[gt.Normal backward]' Music-Speed 'back'
++ "Pause" Music-Speed 'pause'
++ "+ 1 comma" Music-Speed '+1comma'
++ "Normal" Music-Speed 'normal'
++ "-1 comma" Music-Speed '-1comma'
-#-----------------------------------------------------------------------------------
-# Main functions and menus
+## mouse 4 Button-Seek-+
+## mouse 5 Button-Seek--
+DestroyFunc Button-Seek-+
+AddToFunc Button-Seek-+
++ I Music-Seek '15'
-DestroyFunc /Playback-generator
-AddToFunc /Playback-generator
-+ I DestroyMenu recreate /Playback
-+ I AddToMenu /Playback '$[gt.Stop playback]' Music-Stop
-+ I AddToMenu /Playback '$[gt.Play]' Music-Play
-+ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
-+ I AddToMenu /Playback '$[gt.Play/Pause]' Music-PlayPause
-+ I AddToMenu /Playback "" Nop
-+ I AddToMenu /Playback '$[gt.Next]' Music-Next
-+ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
-+ I AddToMenu /Playback '$[gt.Song change]' Popup /Music/SongChange
-+ I AddToMenu /Playback '$[gt.Jump]' Popup /Music/Jump
-+ I AddToMenu /Playback '$[gt.Seek]' Popup /Music/Seek
+DestroyFunc Button-Seek--
+AddToFunc Button-Seek--
++ I Music-Seek '-15'
-DestroyFunc /Playlist-generator
-AddToFunc /Playlist-generator
-+ I DestroyMenu recreate /Playlist
-+ I AddToMenu /Playlist '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Playlist '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-#+ I AddToMenu /Playlist '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-
-DestroyFunc /Playlist-generator-bot
-AddToFunc /Playlist-generator-bot
-+ I DestroyMenu recreate /Playlist-bot
-+ I AddToMenu /Playlist-bot '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Playlist-bot '$[gt.Clear playlist]' Music-ClearPlaylist
-
-DestroyFunc /Player-generator
-AddToFunc /Player-generator
-+ I DestroyMenu recreate /Player
-+ I AddToMenu /Player '$[gt.Start player]' Popup /Music/Start
-+ I AddToMenu /Player '$[gt.Stop player]' Music-Kill
-+ I AddToMenu /Player '$[gt.Show/hide player]' Music-GUI
-
+###############
+# Music menus #
+###############
# Recipe without audio buttons use the following:
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function /Music-generator
+# Popup /Music
-DestroyFunc /Music-generator
-AddToFunc /Music-generator
+DestroyFunc Music-generator
+AddToFunc Music-generator
+ I DestroyMenu recreate /Music
+ I AddToMenu /Music '$[gt.Player]' Popup /Player
-+ I AddToMenu /Music '$[gt.show/hide GUI]' Music-GUI
++ I AddToMenu /Music '$[gt.Show/Hide Alsaplayer]' Music-GUI
+ I AddToMenu /Music '$[gt.Playback]' Popup /Playback
-+ I AddToMenu /Music '$[gt.Control]' Popup /Music/Volume
++ I AddToMenu /Music '$[gt.Player volume]' Popup /Music/Volume
+ I AddToMenu /Music '$[gt.Speed]' Popup /Speed
-+ I AddToMenu /Music '$[gt.show/hide QJackCtl]' Music-QJackGUI
+## The following line will screw up the menu. One time on two, it work well,
+## the other time /Music/LoadPlaylist and /Music/RemovePlaylist get shifted.
+#+ I AddToMenu /Music '$[gt.Playlists]' Popup /Playlist-button
++ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
++ I AddToMenu /Music '$[gt.Show/Hide QJackCtl]' Music-QJackGUI
# vim:ft=fvwm
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2011-01-29 21:01:50 UTC (rev 70)
+++ fvwm/components/functions/Music-audacious 2011-01-29 21:05:24 UTC (rev 71)
@@ -1,112 +1,73 @@
-# Support for Audacious music player
+# Support for Audacious in Fvwm-Crystal
# Written by: Rafael Antonio Porras Samaniego <sp...@di...>
+# Modifications, debugging and improvments by Dominique Michel
+# <dom...@so...>
-# Where are stored Audacious playlists
-SetEnv Audacious_Playlists "$[FVWM_USERDIR]/playlists"
+# Initialisations, shared functions
+Include components/functions/Music
-# Styles for Audacious windows
-Style audacious StaysOnTop
-Style audacious StartIconic, NoIcon, NoTitle, Sticky, WindowListSkip
-Style playlist StartIconic, NoIcon, NoTitle, Sticky, WindowListSkip
-Style equalizer StartIconic, NoIcon, NoTitle, Sticky, WindowListSkip
+###################
+## First button ###
+## Player controls and prefs ##
+###############################
+## mouse 1 Menu /Player
+#######################
+#DestroyFunc Music-Start
+#AddToFunc Music-Start
+#+ I Exec exec $0
-# If there is no selected mixer, load the default
-CheckPreferences DefaultMixer "Include components/functions/Mixer-audacious"
+#DestroyMenu /Music/Start
+#AddToMenu /Music/Start
+#+ '$[gt.Start Audacious]' Music-Start "audacious"
-# Main functions and menus
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function /Music-generator
+DestroyFunc Music-GUI
+AddToFunc Music-GUI
++ I All (audacious) Iconify toggle
-DestroyFunc /Music-generator
-AddToFunc /Music-generator
-+ I DestroyMenu recreate /Music
-+ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Music '$[gt.Save playlist...]' Music-SavePlaylist
-+ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Music '$[gt.Remove current song]' Music-RemoveSong
-+ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-+ I AddToMenu /Music "" Nop
-+ I PipeRead 'audtool get-volume | sed -e "s:[ \t]::g" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Volume] \(&%%\)\' Popup /Mixer:"'
+DestroyFunc Player-generator
+AddToFunc Player-generator
++ I DestroyMenu recreate /Player
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start Audacious]' Exec exec audacious
++ I AddToMenu /Player '$[gt.Stop Audacious]' Exec exec killall -9 audacious
++ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI
-+ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
-+ I AddToMenu /Music '$[gt.Toggle repeat]' Exec exec audtool playlist-repeat-toggle
-+ I AddToMenu /Music "" Nop
-+ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
-+ I AddToMenu /Music '$[gt.Show/hide player]' Music-GUI
-+ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
+## mouse 2 Music-GUI : allready here
+## mouse 3 Music-QJackGUI : in Music
+##
+## mouse 4 Mixer-Volume-Up
+## mouse 5 Mixer-Volume-Down
+## are in components/Mixer
-# ---------------------------------------------------------------------------
-# Basic control functions
-DestroyFunc Music-Play
-AddToFunc Music-Play
-+ I Exec exec audtool playback-play
-
-DestroyFunc Music-Pause
-AddToFunc Music-Pause
-+ I Exec exec audtool playback-pause
-
-DestroyFunc Music-Stop
-AddToFunc Music-Stop
-+ I Exec exec audtool playback-stop
-
-DestroyFunc Music-PlayPause
-AddToFunc Music-PlayPause
-+ I Exec exec audacious -t
-
-DestroyFunc Music-Next
-AddToFunc Music-Next
-+ I Exec exec audtool playlist-advance
-
-DestroyFunc Music-Prev
-AddToFunc Music-Prev
-+ I Exec exec audtool playlist-reverse
-
-DestroyFunc Music-Forward
-AddToFunc Music-Forward
-+ I Nop
-
-DestroyFunc Music-Backward
-AddToFunc Music-Backward
-+ I Nop
-
-DestroyFunc Music-ToggleRandom
-AddToFunc Music-ToggleRandom
-+ I Exec exec audtool playlist-shuffle-toggle
-
+# Modifications, debugging and improvments by Dominique Michel
+# <dom...@so...>
+####################
+## Second button ###
+## Player controls and main vol ##
+##################################
+## mouse 1 Menu /Playlist-button
+################################
DestroyFunc Music-RemoveSong
AddToFunc Music-RemoveSong
+ I Exec exec audtool playlist-delete `audtool playlist-position`
-DestroyFunc Music-GUI
-AddToFunc Music-GUI
-+ I All (audacious) Iconify toggle
-
-DestroyFunc Music-Find
-AddToFunc Music-Find
-+ I Nop
-
-# ---------------------------------------------------------------------------
-# Playlist functions
-
-DestroyMenu /Music/LoadPlaylist
-AddToMenu /Music/LoadPlaylist
-+ DynamicPopupAction Function /Music/LoadPlaylist-generator
-
-DestroyFunc /Music/LoadPlaylist-generator
-AddToFunc /Music/LoadPlaylist-generator
-+ I DestroyMenu recreate /Music/LoadPlaylist
-+ I AddToMenu /Music/LoadPlaylist
-+ I PipeRead 'for i in $[Audacious_Playlists]/*.m3u $[Audacious_Playlists]/*.pls; do \
+DestroyFunc Music-RemovePlaylist-generator
+AddToFunc Music-RemovePlaylist-generator
++ I DestroyMenu recreate /Music/RemovePlaylist
++ I AddToMenu /Music/RemovePlaylist
++ I PipeRead 'for i in $[NonManagedPlaylists]/*.{m3u,pls}; do \
name=$(basename "$i"); \
sname=${name%%.m3u}; \
sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/LoadPlaylist \'$sname\' Exec exec audacious \'$i\'\"; done'
+ echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
-DestroyFunc Music-SavePlaylist
-AddToFunc Music-SavePlaylist
-+ I Exec exec mkdir -p $[Audacious_Playlists]
-+ I Module FvwmForm Music-SavePlaylist-Dialog
+DestroyMenu /Music/RemovePlaylist
+AddToMenu /Music/RemovePlaylist
++ DynamicPopupAction Function Music-RemovePlaylist-generator
All (Music-SavePlaylist-Dialog) Close
DestroyModuleConfig Music-SavePlaylist-Dialog: *
@@ -119,29 +80,152 @@
*Music-SavePlaylist-Dialog: Button quit " $[gt.Cancel] " ^[
*Music-SavePlaylist-Dialog: Command Nop
*Music-SavePlaylist-Dialog: Button quit " $[gt.Save] " ^M
-*Music-SavePlaylist-Dialog: Command PipeRead 'numero=1; echo "#EXTM3U" > $[Audacious_Playlists]/$(PlaylistName).m3u; while [ $numero -le `audtool playlist-length` ]; do \
- echo "#EXTINF:-1,"`audtool playlist-song $numero` >> $[Audacious_Playlists]/$(PlaylistName).m3u; \
- audtool playlist-song-filename $numero >> $[Audacious_Playlists]/$(PlaylistName).m3u; \
+*Music-SavePlaylist-Dialog: Command PipeRead 'numero=1; echo "#EXTM3U" > $[NonManagedPlaylists]/$(PlaylistName).m3u; while [ $numero -le `audtool playlist-length` ]; do \
+ echo "#EXTINF:-1,"`audtool playlist-song $numero` >> $[NonManagedPlaylists]/$(PlaylistName).m3u; \
+ audtool playlist-song-filename $numero >> $[NonManagedPlaylists]/$(PlaylistName).m3u; \
numero=`expr $numero + 1`; \
done'
*Music-SavePlaylist-Dialog: Line center
+DestroyFunc Music-SavePlaylist
+AddToFunc Music-SavePlaylist
++ I Exec exec mkdir -p $[NonManagedPlaylists]
++ I Module FvwmForm Music-SavePlaylist-Dialog
+
+DestroyFunc FuncFvwmMenuAudioDirectory
+AddToFunc FuncFvwmMenuAudioDirectory
++ I PipeRead 'case "$0" in \
+ "$[AudioPlaylists]"*) myexec="audacious";; \
+ "$[NonManagedPlaylists]"*) myexec="audacious";; \
+ esac; \
+ test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
+ test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
+ --icon-file "${mypng:-22x22/categories/Audio.png}" \
+ --func="FuncFvwmMenuAudioDirectory" \
+ --exec-file "^${myexec}" --dir "$0" \
+ --exec-t="-"'
+
+DestroyMenu /Music/LoadPlaylist
+AddToMenu /Music/LoadPlaylist
++ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[NonManagedPlaylists]
+
DestroyFunc Music-ClearPlaylist
AddToFunc Music-ClearPlaylist
+ I Exec exec audtool playlist-clear
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ DynamicPopupAction Function /Music/RemovePlaylist-generator
+DestroyFunc Playlist-generator-button
+AddToFunc Playlist-generator-button
++ I DestroyMenu recreate /Playlist-button
++ I AddToMenu /Playlist-button '$[gt.Remove current song]' Music-RemoveSong
++ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ I AddToMenu /Playlist-button '$[gt.Save playlist...]' Music-SavePlaylist
++ I AddToMenu /Playlist-button "" Nop
++ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
++ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
-DestroyFunc /Music/RemovePlaylist-generator
-AddToFunc /Music/RemovePlaylist-generator
-+ I DestroyMenu recreate /Music/RemovePlaylist
-+ I AddToMenu /Music/RemovePlaylist
-+ I PipeRead 'for i in $[Audacious_Playlists]/*.m3u $[Audacious_Playlists]/*.pls; do \
- name=$(basename "$i"); \
- sname=${name%%.m3u}; \
- sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
+DestroyMenu /Playlist-button
+AddToMenu /Playlist-button
++ DynamicPopupAction Function Playlist-generator-button
+## mouse 2 Menu /Playback
+#########################
+DestroyFunc Music-Next
+AddToFunc Music-Next
++ I Exec exec audtool playlist-advance
+
+DestroyFunc Music-Prev
+AddToFunc Music-Prev
++ I Exec exec audtool playlist-reverse
+
+DestroyFunc Music-Stop
+AddToFunc Music-Stop
++ I Exec exec audtool playback-stop
+
+DestroyFunc Music-Play
+AddToFunc Music-Play
++ I Exec exec audtool playback-play
+
+DestroyFunc Music-Pause
+AddToFunc Music-Pause
++ I Exec exec audtool playback-pause
+
+DestroyFunc Music-PlayPause
+AddToFunc Music-PlayPause
++ I Exec exec audacious -t
+
+DestroyFunc Music-ToggleRandom
+AddToFunc Music-ToggleRandom
++ I Exec exec audtool playlist-shuffle-toggle
+
+DestroyFunc Playback-generator
+AddToFunc Playback-generator
++ I DestroyMenu recreate /Playback
++ I AddToMenu /Playback '$[gt.Next]' Music-Next
++ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
++ I AddToMenu /Playback "" Nop
++ I AddToMenu /Playback '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Playback '$[gt.Play]' Music-Play
++ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
++ I AddToMenu /Playback '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Playback '$[gt.Toggle random]' Music-ToggleRandom
++ I AddToMenu /Playback '$[gt.Toggle repeat]' Exec exec audtool playlist-repeat-toggle
+
+## mouse 3 Menu /Mixer : in components/Mixer
+## mouse 4 Music-Next : allready here
+## mouse 4 Music-Prev : allready here
+
+####################
+## Third button ###
+## Player controls and vol ##
+#############################
+## mouse 1 Music-Pause : allready here
+## mouse 2 Music-PlayPause : allready here
+## mouse 3 Menu /Music/Volume
+#############################
+DestroyFunc Music-Volume
+AddToFunc Music-Volume
++ I Exec exec audtool set-volume $0
+
+DestroyMenu /Music/Volume
+AddToMenu /Music/Volume
++ '$[gt.Player volume]'
++ "" Nop
++ " 0 dB" Music-Volume '100'
++ "-3 dB" Music-Volume '71'
++ "-6 dB" Music-Volume '50'
++ "-12 dB" Music-Volume '25'
++ "-18 dB" Music-Volume '12'
++ "-24 dB" Music-Volume '6'
++ "-30 dB" Music-Volume '3'
++ " 0" Music-Volume '0'
+
+###############
+# Music menus #
+###############
+# Recipe without audio buttons use the following:
+# Popup /Music
+DestroyFunc Music-generator
+AddToFunc Music-generator
++ I DestroyMenu recreate /Music
++ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
++ I AddToMenu /Music '$[gt.Save playlist...]' Music-SavePlaylist
++ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
++ I AddToMenu /Music '$[gt.Remove current song]' Music-RemoveSong
++ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ I AddToMenu /Music "" Nop
++ I PipeRead 'audtool get-volume | sed -e "s:[ \t]::g" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Volume] \(&%%\)\' Popup /Mixer:"'
++ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
++ I AddToMenu /Music '$[gt.Toggle repeat]' Exec exec audtool playlist-repeat-toggle
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI
++ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
+
+DestroyMenu /Music
+AddToMenu /Music
++ DynamicPopupAction Function Music-generator
+
# vim:ft=fvwm
Modified: fvwm/components/functions/Music-cdcd
===================================================================
--- fvwm/components/functions/Music-cdcd 2011-01-29 21:01:50 UTC (rev 70)
+++ fvwm/components/functions/Music-cdcd 2011-01-29 21:05:24 UTC (rev 71)
@@ -1,30 +1,71 @@
-# Support for CDCD CDAudio player
+# Support for CDCD CDAudio player into Fvwm-Crystal
# Written by: Maciej Delmanowski <ha...@po...>
# sed commands by: Grzegorz Niew\xEAg\xB3owski <ho...@do...>
+# Modifications, debugging and improvments by Dominique Michel
+# <dom...@so...>
# Overview:
# This is a set of function for controlling the CDCD CD Audio player
# (http://libcdaudio.sourceforge.net/).
+# Initialisations, shared functions
+Include components/functions/Music
-# If there is no selected mixer, load the default
-CheckPreferences DefaultMixer "Include components/functions/Mixer-cdcd"
-
-# ---------------------------------------------------------------------------
-# Main menu
-DestroyMenu /Music
-AddToMenu /Music
-+ '$[gt.Volume]' Popup /Mixer
-+ "" Nop
-+ '$[gt.Stop playback]' Music-Stop
-+ '$[gt.Show/hide player]' Music-GUI
-+ '$[gt.Play/Pause]' Music-PlayPause
-
-# ---------------------------------------------------------------------------
-# Basic control functions
+###################
+## First button ###
+## Player controls and prefs ##
+###############################
+## mouse 1 Menu /Player
+#######################
DestroyFunc Music-cdcd
+AddToFunc Music-cdcd
+ I Exec exec cdcd $0 > /dev/null
+DestroyFunc Music-GUI
+AddToFunc Music-GUI
++ I All (cdcd) Close
++ I TestRc (NoMatch) None (cdcd) AT cdcd cdcd
+
+# Player-generator (All)
+DestroyFunc Player-generator
+AddToFunc Player-generator
++ I DestroyMenu recreate /Player
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start CDCD]' Music-cdcd play
++ I AddToMenu /Player '$[gt.Stop player]' Music-cdcd quit
++ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI
+
+## mouse 2 Music-GUI : allready here
+## mouse 3 Music-QJackGUI : in Music
+##
+## mouse 4 Mixer-Volume-Up
+## mouse 5 Mixer-Volume-Down
+## are in components/Mixer
+
+####################
+## Second button ###
+## Player controls and main vol ##
+##################################
+## mouse 1 Menu /Playlist-button
+################################
+## mouse 2 Menu /Playback
+#########################
+DestroyFunc Music-Next
+AddToFunc Music-Next
++ I Music-cdcd next
+
+DestroyFunc Music-Prev
+AddToFunc Music-Prev
++ I Music-cdcd prev
+
+DestroyFunc Music-Stop
+AddToFunc Music-Stop
++ I Music-cdcd stop
+
DestroyFunc Music-Play
AddToFunc Music-Play
+ I Music-cdcd play
@@ -33,22 +74,10 @@
AddToFunc Music-Pause
+ I Music-cdcd toggle
-DestroyFunc Music-Stop
-AddToFunc Music-Stop
-+ I Music-cdcd stop
-
DestroyFunc Music-PlayPause
AddToFunc Music-PlayPause
+ I Music-cdcd toggle
-DestroyFunc Music-Next
-AddToFunc Music-Next
-+ I Music-cdcd next
-
-DestroyFunc Music-Prev
-AddToFunc Music-Prev
-+ I Music-cdcd prev
-
DestroyFunc Music-Forward
AddToFunc Music-Forward
+ I Music-cdcd ff
@@ -57,17 +86,32 @@
AddToFunc Music-Backward
+ I Muisc-cdcd rew
-DestroyFunc Music-GUI
-AddToFunc Music-GUI
-+ I All (cdcd) Close
-+ I TestRc (NoMatch) None (cdcd) A cdcd
+DestroyFunc Playback-generator
+AddToFunc Playback-generator
++ I DestroyMenu recreate /Playback
++ I AddToMenu /Playback '$[gt.Next]' Music-Next
++ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
++ I AddToMenu /Playback "" Nop
++ I AddToMenu /Playback '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Playback '$[gt.Play]' Music-Play
++ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
++ I AddToMenu /Playback '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Playback '$[gt.Forward]' Music-Forward
++ I AddToMenu /Playback '$[gt.Backward]' Music-Backward
-DestroyFunc Music-Find
-#AddToFunc Music-Find
-#+ I Nop
+## mouse 3 Menu /Mixer : in components/Mixer
+## mouse 4 Music-Next : allready here
+## mouse 4 Music-Prev : allready here
-DestroyFunc Music-ToggleRandom
-#AddToFunc Music-ToggleRandom
-#i+ I Nop
+# ---------------------------------------------------------------------------
+# Main menu
+DestroyMenu /Music
+AddToMenu /Music
++ '$[gt.Volume]' Popup /Mixer
++ "" Nop
++ '$[gt.Stop playback]' Music-Stop
++ '$[gt.Show/Hide player]' Music-GUI
++ '$[gt.Play/Pause]' Music-PlayPause
+
# vim:ft=fvwm
Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus 2011-01-29 21:01:50 UTC (rev 70)
+++ fvwm/components/functions/Music-cmus 2011-01-29 21:05:24 UTC (rev 71)
@@ -1,28 +1,69 @@
# Support for C* Music Player
# Written by: Maciej Delmanowski <ha...@po...>
+# Modifications, debugging and improvments by Dominique Michel
+# <dom...@so...>
# Overview:
# This is a set of function for controlling the C* Music Player
# (http://onion.dynserv.net/~timo/cmus.html). It is done using the
# 'cmus-remote' command-line frontend.
+# Initialisations, shared functions
+Include components/functions/Music
-# If there is no selected mixer, load the default
-CheckPreferences DefaultMixer "Include components/functions/Mixer-cmus"
+###################
+## First button ###
+## Player controls and prefs ##
+###############################
+## mouse 1 Menu /Player
+#######################
+DestroyFunc Music-GUI
+AddToFunc Music-GUI
++ I All (cmus) Iconify toggle
-# ---------------------------------------------------------------------------
-# Main menu
-DestroyMenu /Music
-AddToMenu /Music
-+ '$[gt.Volume]' Popup /Mixer
-+ '$[gt.Toggle random]' Music-ToggleRandom
-+ '$[gt.Toggle repeat]' Exec mpc repeat
-+ "" Nop
-+ '$[gt.Stop playback]' Music-Stop
-+ '$[gt.Play/Pause]' Music-PlayPause
+# Player-generator (All)
+DestroyFunc Player-generator
+AddToFunc Player-generator
++ I DestroyMenu recreate /Player
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start C* Music Player]' AT cmus cmus
++ I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 cmus
-# ---------------------------------------------------------------------------
-# Basic control functions
+## mouse 2 Music-GUI : allready here
+## mouse 3 Music-QJackGUI : in Music
+##
+## mouse 4 Mixer-Volume-Up
+## mouse 5 Mixer-Volume-Down
+## are in components/Mixer
+
+####################
+## Second button ###
+## Player controls and main vol ##
+##################################
+## mouse 1 Menu /Playlist-button
+################################
+## mouse 2 Menu /Playback
+#########################
+DestroyFunc Music-Next
+AddToFunc Music-Next
++ I Exec cmus-remote --next > /dev/null
+
+DestroyFunc Music-Prev
+AddToFunc Music-Prev
++ I Exec cmus-remote --prev > /dev/null
+
+DestroyFunc Music-ToggleRandom
+AddToFunc Music-ToggleRandom
++ I Exec cmus-remote --shuffle > /dev/null
+
+DestroyFunc Music-Stop
+AddToFunc Music-Stop
++ I Exec cmus-remote --stop > /dev/null
+
DestroyFunc Music-Play
AddToFunc Music-Play
+ I Exec cmus-remote --play > /dev/null
@@ -31,22 +72,10 @@
AddToFunc Music-Pause
+ I Exec cmus-remote --pause > /dev/null
-DestroyFunc Music-Stop
-AddToFunc Music-Stop
-+ I Exec cmus-remote --stop > /dev/null
-
DestroyFunc Music-PlayPause
AddToFunc Music-PlayPause
+ I Exec cmus-remote --pause > /dev/null
-DestroyFunc Music-Next
-AddToFunc Music-Next
-+ I Exec cmus-remote --next > /dev/null
-
-DestroyFunc Music-Prev
-AddToFunc Music-Prev
-+ I Exec cmus-remote --prev > /dev/null
-
DestroyFunc Music-Forward
AddToFunc Music-Forward
+ I Exec cmus-remote --shuffle > /dev/null; cmus-remote --next > /dev/null; cmus-remote --shuffle > /dev/null
@@ -55,16 +84,29 @@
AddToFunc Music-Backward
+ I Exec cmus-remote --shuffle > /dev/null; cmus-remote --prev > /dev/null; cmus-remote --shuffle > /dev/null
-DestroyFunc Music-ToggleRandom
-AddToFunc Music-ToggleRandom
-+ I Exec cmus-remote --shuffle > /dev/null
+DestroyFunc Playback-generator
+AddToFunc Playback-generator
++ I DestroyMenu recreate /Playback
++ I AddToMenu /Playback '$[gt.Next]' Music-Next
++ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
++ I AddToMenu /Playback '$[gt.Toggle random]' Music-ToggleRandom
++ I AddToMenu /Playback "" Nop
++ I AddToMenu /Playback '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Playback '$[gt.Play]' Music-Play
++ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
++ I AddToMenu /Playback '$[gt.Play/Pause]' Music-PlayPause
++ I AddToMenu /Playback '$[gt.Forward]' Music-Forward
++ I AddToMenu /Playback '$[gt.Backward]' Music-Backward
-DestroyFunc Music-GUI
-AddToFunc Music-GUI
-+ I Nop
+# ---------------------------------------------------------------------------
+# Main menu
+DestroyMenu /Music
+AddToMenu /Music
++ '$[gt.Volume]' Popup /Mixer
++ '$[gt.Toggle random]' Music-ToggleRandom
++ '$[gt.Toggle repeat]' Exec mpc repeat
++ "" Nop
++ '$[gt.Stop playback]' Music-Stop
++ '$[gt.Play/Pause]' Music-PlayPause
-DestroyFunc Music-Find
-AddToFunc Music-Find
-+ I Nop
-
# vim:ft=fvwm
Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp 2011-01-29 21:01:50 UTC (rev 70)
+++ fvwm/components/functions/Music-mocp 2011-01-29 21:05:24 UTC (rev 71)
@@ -1,43 +1,96 @@
# Support for 'Music On Console' music player
# Written by: Maciej Delmanowski <ha...@po...>
# Modded by: rysiul <tu...@o2...>
+# Modifications, debugging and improvments by Dominique Michel
+# <dom...@so...>
-# Where are stored XMMS playlists
-SetEnv XMMS_Playlists "$[FVWM_USERDIR]/playlists"
+# Initialisations, shared functions
+Include components/functions/Music
-# Main functions and menus
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function /Music-generator
+###################
+## First button ###
+## Player controls and prefs ##
+###############################
+## mouse 1 Menu /Player
+#######################
+DestroyFunc Music-GUI
+AddToFunc Music-GUI
++ I All (mocp) Close
++ I TestRc (NoMatch) None (mocp) AT mocp mocp
-DestroyFunc /Music-generator
-AddToFunc /Music-generator
-+ I DestroyMenu recreate /Music
-+ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-+ I AddToMenu /Music "" Nop
-+ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
-+ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
+# Player-generator (All)
+DestroyFunc Player-generator
+AddToFunc Player-generator
++ I DestroyMenu recreate /Player
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start Music On Console]' AT mocp mocp
++ I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 mocp
++ I AddToMenu /Player '$[gt.Show/Hide player]' Music-GUI
-# ---------------------------------------------------------------------------
-# Basic control functions
-DestroyFunc Music-Play
-AddToFunc Music-Play
-+ I Exec exec mocp --sync --play
+## mouse 2 Music-GUI : allready here
+## mouse 3 Music-QJackGUI : in Music
+##
+## mouse 4 Mixer-Volume-Up
+## mouse 5 Mixer-Volume-Down
+## are in components/Mixer
-DestroyFunc Music-Pause
-AddToFunc Music-Pause
-+ I Exec exec mocp --sync --pause
+####################
+## Second button ###
+## Player controls and main vol ##
+##################################
+## mouse 1 Menu /Playlist-button
+################################
+DestroyFunc FuncFvwmMenuAudioDirectory
+AddToFunc FuncFvwmMenuAudioDirectory
++ I PipeRead 'case "$0" in \
+ "$[AudioPlaylists]"*) myexec="mocp --sync --append";; \
+ "$[NonManagedPlaylists]"*) myexec="mocp --sync --append";; \
+ esac; \
+ test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
+ test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ fvwm-menu-directory --icon-title "${mytitle:-22x22/categories/directory.png}" \
+ --icon-file "${mypng:-22x22/categories/Audio.png}" \
+ --func="FuncFvwmMenuAudioDirectory" \
+ --exec-file "^${myexec}" --dir "$0" \
+ --exec-t="-"'
-DestroyFunc Music-Stop
-AddToFunc Music-Stop
-+ I Exec exec mocp --sync --stop
+DestroyMenu /Music/LoadPlaylist
+AddToMenu /Music/LoadPlaylist
++ MissingSubmenuFunction FuncFvwmMenuAudioDirectory
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[NonManagedPlaylists]
-DestroyFunc Music-PlayPause
-AddToFunc Music-PlayPause
-+ I Exec exec mocp --sync --toggle-pause
+DestroyFunc Music-ClearPlaylist
+AddToFunc Music-ClearPlaylist
++ I Exec exec mocp --sync --clear
+DestroyFunc Music-RemovePlaylist-generator
+AddToFunc Music-RemovePlaylist-generator
++ I DestroyMenu recreate /Music/RemovePlaylist
++ I AddToMenu /Music/RemovePlaylist
++ I PipeRead 'for i in $[NonManagedPlaylists]/*.{m3u,pls}; do name=$(basename "$i"); sname=${name%%.m3u}; sname=${sname%%.pls}; echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
+
+DestroyMenu /Music/RemovePlaylist
+AddToMenu /Music/RemovePlaylist
++ DynamicPopupAction Function Music-RemovePlaylist-generator
+
+DestroyFunc Playlist-generator-button
+AddToFunc Playlist-generator-button
++ I DestroyMenu recreate /Playlist-button
++ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadPlaylist
++ I AddToMenu /Playlist-button '$[gt.Clear playlist]' Music-ClearPlaylist
++ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
+
+DestroyMenu /Playlist-button
+AddToMenu /Playlist-button
++ DynamicPopupAction Function Playlist-generator-button
+
+## mouse 2 Menu /Playback
+#########################
DestroyFunc Music-Next
AddToFunc Music-Next
+ I Exec exec mocp --sync --next
@@ -46,41 +99,51 @@
AddToFunc Music-Prev
+ I Exec exec mocp --sync --previous
+DestroyFunc Music-Stop
+AddToFunc Music-Stop
++ I Exec exec mocp --sync --stop
-# ---------------------------------------------------------------------------
-# Playlist functions
+DestroyFunc Music-Play
+AddToFunc Music-Play
++ I Exec exec mocp --sync --play
-DestroyMenu /Music/LoadPlaylist
-AddToMenu /Music/LoadPlaylist
-+ DynamicPopupAction Function /Music/LoadPlaylist-generator
+DestroyFunc Music-Pause
+AddToFunc Music-Pause
++ I Exec exec mocp --sync --pause
-DestroyFunc /Music/LoadPlaylist-generator
-AddToFunc /Music/LoadPlaylist-generator
-+ I DestroyMenu recreate /Music/LoadPlaylist
-+ I AddToMenu /Music/LoadPlaylist
-+ I PipeRead 'for i in $[XMMS_Playlists]/*.m3u $[XMMS_Playlists]/*.pls; do \
- name=$(basename "$i"); \
- sname=${name%%.m3u}; \
- sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/LoadPlaylist \'$sname\' Exec exec mocp --sync --append \'$i\'\"; done'
+DestroyFunc Music-PlayPause
+AddToFunc Music-PlayPause
++ I Exec exec mocp --sync --toggle-pause
+DestroyFunc Playback-generator
+AddToFunc Playback-generator
++ I DestroyMenu recreate /Playback
++ I AddToMenu /Playback '$[gt.Next]' Music-Next
++ I AddToMenu /Playback '$[gt.Prev]' Music-Prev
++ I AddToMenu /Playback "" Nop
++ I AddToMenu /Playback '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Playback '$[gt.Play]' Music-Play
++ I AddToMenu /Playback '$[gt.Pause]' Music-Pause
++ I AddToMenu /Playback '$[gt.Play/Pause]' Music-PlayPause
-DestroyFunc Music-ClearPlaylist
-AddToFunc Music-ClearPlaylist
-+ I Exec exec mocp --sync --clear
+## mouse 3 Menu /Mixer : in components/Mixer
+## mouse 4 Music-Next : allready here
+## mouse 4 Music-Prev : allready here
-DestroyMenu /Music/RemovePlaylist
-AddToMenu /Music/RemovePlaylist
-+ DynamicPopupAction Function /Music/RemovePlaylist-generator
+########################
+# Main functions and menus
+DestroyMenu /Music
+AddToMenu /Music
++ DynamicPopupAction Function Music-generator
-DestroyFunc /Music/RemovePlaylist-generator
-AddToFunc /Music/RemovePlaylist-generator
-+ I DestroyMenu recreate /Music/RemovePlaylist
-+ I AddToMenu /Music/RemovePlaylist
-+ I PipeRead 'for i in $[XMMS_Playlists]/*.m3u $[XMMS_Playlists]/*.pls; do \
- name=$(basename "$i"); \
- sname=${name%%.m3u}; \
- sname=${sname%%.pls}; \
- echo \"AddToMenu /Music/RemovePlaylist \'$sname\' Exec rm -f \'$i\'\"; done'
+DestroyFunc Music-generator
+AddToFunc Music-generator
++ I DestroyMenu recreate /Music
++ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
++ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
++ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
++ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
++ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
# vim:ft=fvwm
Modified: fvwm/components/functions/Music-mpd
===================================================================
--- fvwm/components/functions/Music-mpd 2011-01-29 21:01:50 UTC (rev 70)
+++ fvwm/components/functions/Music-mpd 2011-01-29 21:05:24 UTC (rev 71)
@@ -1,61 +1,142 @@
# Support for MPD music player
# Written by: Maciej Delmanowski <ha...@po...>
# sed commands by: Grzegorz Niew�owski <ho...@do...>
+# Modifications, debugging and improvments by Dominique Michel
+# <dom...@so...>
# Overview:
# This is a set of function for controlling the Music Player Daemon
# (http://www.musicpd.org/). It is done using the 'mpc' command-line frontend.
+# Initialisations, shared functions
+Include components/functions/Music
-# If there is no selected mixer, load the default
-CheckPreferences DefaultMixer "Include components/functions/Mixer-mpd"
+#############
+# Variables #
+#############
+# mpd know where the playlists are. See 'man mpd.conf'
+###################
+## First button ###
+## Player controls and prefs ##
+###############################
+## mouse 1 Menu /Player
+#######################
+# Show or hile a Gnome mpd frontend
+DestroyFunc Music-GUI
+AddToFunc Music-GUI
++ I All (gmpc) Close
++ I TestRc (NoMatch) None (gmpc) X gmpc
-# ---------------------------------------------------------------------------
-# Main menu
-DestroyMenu /Music
-AddToMenu /Music
-+ DynamicPopupAction Function /Music-generator
+DestroyFunc Player-generator
+AddToFunc Player-generator
++ I DestroyMenu recreate /Player
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Recreate the Playlists]' Music-RecreatePlaylist
++ I AddToMenu /Player '%22x22/fvwm-crystal/audio-x-generic.png%$[gt.Music player]' Popup /Preferences/MusicPlayer
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start QJackCtl]' Exec exec qjackctl
++ I AddToMenu /Player "" Nop
++ I AddToMenu /Player '$[gt.Start Music Player Daemon]' Exec exec mpd
++ I AddToMenu /Player '$[gt.Stop player]' Exec exec killall -9 mpd
++ I AddToMenu /Player '$[gt.Show/Hide GMPC]' Music-GUI
-DestroyFunc /Music-generator
-AddToFunc /Music-generator
-+ I DestroyMenu recreate /Music
-+ I PipeRead 'mpc | head -n 1 | sed -e "s;volume:\d*.*;$[gt.Player is stopped];" | sed -e "s:^.*$:AddToMenu /Music \'&\' :"'
-+ I AddToMenu /Music "" Nop
-+ I AddToMenu /Music '$[gt.Load playlist]' Popup /Music/LoadPlaylist
-+ I AddToMenu /Music '$[gt.Save playlist...]' Music-SavePlaylist
-+ I AddToMenu /Music '$[gt.Shuffle playlist]' Music-Shuffle
-+ I AddToMenu /Music '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Music '$[gt.Update database]' Music-Update
-+ I AddToMenu /Music '$[gt.Remove current song]' Music-RemoveSong
-+ I AddToMenu /Music '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
-+ I AddToMenu /Music '$[gt.Playlist editor]' Script scripts/FvwmMPD/FvwmApplet-MpdPlEd
+## mouse 2 Music-GUI : allready here
+## mouse 3 Music-QJackGUI : in Music
+##
+## mouse 4 Mixer-Volume-Up
+## mouse 5 Mixer-Volume-Down
+## are in components/Mixer
-+ I AddToMenu /Music "" Nop
-+ I PipeRead 'mpc crossfade | sed -e "s/crossfade:\ //" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Crossfade] \(&\)\' Popup /Music/Crossfade:"'
-+ I PipeRead 'mpc volume | sed -e "s/volume:\ //" | sed -e "s:%:%%:" | sed -e "s:[ \t]::g" | sed -e "s:^.\\+$:AddToMenu\ /Music \'$[gt.Volume] \(&\)\' Popup /Mixer:"'
-+ I AddToMenu /Music '$[gt.Toggle random]' Music-ToggleRandom
-+ I AddToMenu /Music '$[gt.Toggle repeat]' Exec mpc repeat
-# Function below doesn't work for me (harnir), if it does for you, conatct me
-# (ha...@po...).
-+ I PipeRead 'mpc | sed -ne "s=.*repeat: \(on\|off\).*random: \(on\|off\).*=AddToMenu\ \/Music \'Toggle repeat (\1)\' Exec mpc repeat\nAddToMenu \/Music \'Toggle random (\2)\' Exec mpc random=gp"'
-+ I AddToMenu /Music "" Nop
-+ I AddToMenu /Music '$[gt.Stop playback]' Music-Stop
-+ I AddToMenu /Music '$[gt.Show/hide player]' Music-GUI
-+ I AddToMenu /Music '$[gt.Play/Pause]' Music-PlayPause
+####################
+## Second button ###
+## Player controls and main vol ##
+##################################
+## mouse 1 Menu /Playlist-button
+################################
+DestroyFunc Music-LoadAll
+AddToFunc Music-LoadAll
++ I Exec mpc ls | mpc add > /dev/null
-DestroyMenu /Music/Crossfade
-AddToMenu /Music/Crossfade
-+ "0" Exec mpc crossfade 0
-+ "" Nop
-+ "1" Exec mpc crossfade 1
-+ "2" Exec mpc crossfade 2
-+ "4" Exec mpc crossfade 4
-+ "6" Exec mpc crossfade 6
-+ "8" Exec mpc crossfade 8
-+ "10" Exec mpc crossfade 10
+DestroyFunc Music-LoadPlaylist-generator
+AddToFunc Music-LoadPlaylist-generator
++ I DestroyMenu recreate /Music/LoadPlaylist
++ I PipeRead 'mpc lsplaylists | sed -e "s:^.*$:AddToMenu /Music/LoadPlaylist \'&\' Exec mpc load \'&\' \> /dev/null:"'
++ I AddToMenu /Music/LoadPlaylist "" Nop
++ I AddToMenu /Music/LoadPlaylist '$[gt.Everything]' Music-LoadAll
-# ---------------------------------------------------------------------------
-# Basic control functions
+DestroyMenu /Music/LoadPlaylist
+AddToMenu /Music/LoadPlaylist
++ DynamicPopupAction Function Music-LoadPlaylist-generator
+
+All (Music-SavePlaylist-Dialog) Cl...
[truncated message content] |
|
From: <dom...@us...> - 2011-02-07 00:18:25
|
Revision: 90
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=90&view=rev
Author: dominique_libre
Date: 2011-02-07 00:18:19 +0000 (Mon, 07 Feb 2011)
Log Message:
-----------
typo
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-02-03 19:58:33 UTC (rev 89)
+++ ChangeLog 2011-02-07 00:18:19 UTC (rev 90)
@@ -1,6 +1,9 @@
ChangeLog for FVWM-Crystal
-Jeudi 3 février 2001 Dominique Michel
+Lundi 7 février 2011 Dominique Michel
+ * Typo
+
+Jeudi 3 février 2011 Dominique Michel
* Updated the AUTHORS, INSTALL, NEWS and README files
Samedi 28 janvier 2011 Dominique Michel
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2011-02-03 19:58:33 UTC (rev 89)
+++ fvwm/components/functions/Music 2011-02-07 00:18:19 UTC (rev 90)
@@ -144,7 +144,7 @@
# Recreate the playlists (all)
DestroyFunc Music-RecreatePlaylist
AddToFunc Music-RecreatePlaylist
-+ I Exec FvwmCommand 'A $[FVWM_USERDIR]/scripts/make_all_playlists $@'
++ I Exec FvwmCommand 'A $[FVWM_SYSTEMDIR]/scripts/make_all_playlists $@'
# wrapper for cdcd
DestroyFunc Music-cdcd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-02-08 21:54:42
|
Revision: 93
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=93&view=rev
Author: dominique_libre
Date: 2011-02-08 21:54:36 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
Fix for non working recipe preference with space in the recipe name
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-02-08 21:09:16 UTC (rev 92)
+++ ChangeLog 2011-02-08 21:54:36 UTC (rev 93)
@@ -4,6 +4,7 @@
* Fixed typo into most recipes that was causing erratic placement of the
Notification Aera and probably random crashes of modules
* Clean recipe: fixed FvwmPager syntax
+ * Fix for non working recipe preference with space in the recipe name
Lundi 7 février 2011 Dominique Michel
* Typo
Modified: fvwm/components/functions/Preferences
===================================================================
--- fvwm/components/functions/Preferences 2011-02-08 21:09:16 UTC (rev 92)
+++ fvwm/components/functions/Preferences 2011-02-08 21:54:36 UTC (rev 93)
@@ -18,16 +18,13 @@
DestroyFunc SavePreferences
AddToFunc SavePreferences
+ I Exec echo $1 > $[FVWM_USERDIR]/preferences/$0
-# + I Exec exec echo "$1" > "$[FVWM_USERDIR]/preferences/$0"
# Modification of SavePreferences: add more lines to the preferences file
#
DestroyFunc AppendPreferences
AddToFunc AppendPreferences
-+ I Exec exec touch $[FVWM_USERDIR]/preferences/"$0"
-+ I Exec exec echo "$1" >> $[FVWM_USERDIR]/preferences/"$0"
-# + I Exec touch $[FVWM_USERDIR]/preferences/$0
-# + I Exec echo $1 >> $[FVWM_USERDIR]/preferences/$0
++ I Exec touch $[FVWM_USERDIR]/preferences/$0
++ I Exec echo $1 >> $[FVWM_USERDIR]/preferences/$0
# add or update one line into the preferences file
#
@@ -35,7 +32,7 @@
# where <begining of the line> must be unique into the file.
DestroyFunc UpdateAppendPreferences
AddToFunc UpdateAppendPreferences
-+ I Exec exec touch $[FVWM_USERDIR]/preferences/"$0"
++ I Exec touch $[FVWM_USERDIR]/preferences/"$0"
+ I PipeRead 'mv $[FVWM_USERDIR]/preferences/"$0" $[FVWM_USERDIR]/preferences/"$0".tmp; \
sed "/^$2.*/d" $[FVWM_USERDIR]/preferences/"$0".tmp > $[FVWM_USERDIR]/preferences/"$0"; \
rm $[FVWM_USERDIR]/preferences/"$0".tmp; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-06-12 08:27:32
|
Revision: 106
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=106&view=rev
Author: dominique_libre
Date: 2011-06-12 08:27:26 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
Tooltip: kill the module before showing a new one
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Tooltip
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-06-11 08:50:41 UTC (rev 105)
+++ ChangeLog 2011-06-12 08:27:26 UTC (rev 106)
@@ -1,7 +1,10 @@
ChangeLog for FVWM-Crystal
-Vendredi 10 Juin 2011 Dominique Michel
- " Reversed wallpaper changes. Use the same wallpaper on all the desk pages.
+Dimanche 12 juin 2011 Dominique Michel
+ * Tooltip: KillModule ToolTip* before changing it
+
+Vendredi 10 juin 2011 Dominique Michel
+ * Reversed wallpaper changes. Use the same wallpaper on all the desk pages.
Different wallpapers will be fopr some future release.
* Removed outdated stuff about session management and sys doc browser.
Modified: fvwm/components/functions/Tooltip
===================================================================
--- fvwm/components/functions/Tooltip 2011-06-11 08:50:41 UTC (rev 105)
+++ fvwm/components/functions/Tooltip 2011-06-12 08:27:26 UTC (rev 106)
@@ -17,6 +17,7 @@
DestroyFunc FvwmButtons-Tooltip
AddToFunc FvwmButtons-Tooltip
++ I KillModule FvwmButtons-Tooltip-$0
+ I DestroyModuleConfig FvwmButtons-Tooltip-$0: *
+ I *FvwmButtons-Tooltip-$0: Geometry $3
+ I *FvwmButtons-Tooltip-$0: BoxSize smart
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-06-12 11:58:16
|
Revision: 108
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=108&view=rev
Author: dominique_libre
Date: 2011-06-12 11:58:10 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
Added missing speed variable initialisation
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-06-12 11:35:04 UTC (rev 107)
+++ ChangeLog 2011-06-12 11:58:10 UTC (rev 108)
@@ -3,6 +3,7 @@
Dimanche 12 juin 2011 Dominique Michel
* Tooltip: KillModule ToolTip* before changing it
* Added support for MPlayer2
+ * Added missing speed variable initialisation
Vendredi 10 juin 2011 Dominique Michel
* Reversed wallpaper changes. Use the same wallpaper on all the desk pages.
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2011-06-12 11:35:04 UTC (rev 107)
+++ fvwm/components/functions/Music-alsaplayer 2011-06-12 11:58:10 UTC (rev 108)
@@ -35,6 +35,7 @@
## Initialisations, shared functions ##
#######################################
Include components/functions/Music
+SetEnv speed "1"
###############################
## First button ##
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2011-06-12 11:35:04 UTC (rev 107)
+++ fvwm/components/functions/Music-mplayer 2011-06-12 11:58:10 UTC (rev 108)
@@ -27,6 +27,8 @@
# Command line for FvwmMenuDirectory media browser
SetEnv fvwm_video_exec "fvwm-crystal.mplayer-wrapper file $USERDIR"
+# SetEnv speed "1"
+
###################
## First button ###
## Player controls and prefs ##
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2011-06-12 11:35:04 UTC (rev 107)
+++ fvwm/components/functions/Music-mplayer2 2011-06-12 11:58:10 UTC (rev 108)
@@ -27,6 +27,9 @@
# Command line for FvwmMenuDirectory media browser
SetEnv fvwm_video_exec "fvwm-crystal.mplayer-wrapper file $USERDIR"
+# Normal speed
+SetEnv speed "1"
+
###################
## First button ###
## Player controls and prefs ##
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-06-12 12:04:02
|
Revision: 109
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=109&view=rev
Author: dominique_libre
Date: 2011-06-12 12:03:56 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
oops
Modified Paths:
--------------
fvwm/components/functions/Music
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2011-06-12 11:58:10 UTC (rev 108)
+++ fvwm/components/functions/Music 2011-06-12 12:03:56 UTC (rev 109)
@@ -83,6 +83,7 @@
UnSetEnv speed
Test (EnvMatch MusicPlayer alsaplayer) SetEnv speed "1"
Test (EnvMatch MusicPlayer mplayer) SetEnv speed "1"
+Test (EnvMatch MusicPlayer mplayer2) SetEnv speed "1"
# Decimal point in use
UnSetEnv dec_point
Test (EnvMatch MusicPlayer alsaplayer) PipeRead 'echo SetEnv dec_point `locale decimal_point`'
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2011-06-12 11:58:10 UTC (rev 108)
+++ fvwm/components/functions/Music-alsaplayer 2011-06-12 12:03:56 UTC (rev 109)
@@ -35,7 +35,6 @@
## Initialisations, shared functions ##
#######################################
Include components/functions/Music
-SetEnv speed "1"
###############################
## First button ##
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2011-06-12 11:58:10 UTC (rev 108)
+++ fvwm/components/functions/Music-mplayer 2011-06-12 12:03:56 UTC (rev 109)
@@ -27,8 +27,6 @@
# Command line for FvwmMenuDirectory media browser
SetEnv fvwm_video_exec "fvwm-crystal.mplayer-wrapper file $USERDIR"
-# SetEnv speed "1"
-
###################
## First button ###
## Player controls and prefs ##
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2011-06-12 11:58:10 UTC (rev 108)
+++ fvwm/components/functions/Music-mplayer2 2011-06-12 12:03:56 UTC (rev 109)
@@ -27,9 +27,6 @@
# Command line for FvwmMenuDirectory media browser
SetEnv fvwm_video_exec "fvwm-crystal.mplayer-wrapper file $USERDIR"
-# Normal speed
-SetEnv speed "1"
-
###################
## First button ###
## Player controls and prefs ##
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2011-06-12 20:55:46
|
Revision: 112
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=112&view=rev
Author: dominique_libre
Date: 2011-06-12 20:55:38 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
Initial transparency support
Modified Paths:
--------------
ChangeLog
README
doc/Mouse bindings.txt
fvwm/components/functions/Preferences-Menu
fvwm/components/functions/Window-Basic
Added Paths:
-----------
fvwm/components/bindings/Window-Transparency
Modified: ChangeLog
===================================================================
--- ChangeLog 2011-06-12 20:08:48 UTC (rev 111)
+++ ChangeLog 2011-06-12 20:55:38 UTC (rev 112)
@@ -6,6 +6,7 @@
* Added missing speed variable initialisation
* Updated DesktopDir in fvwm-crystal.generate-menu
* Added font icons
+ * Added initial support for transparency using transset-df and xcompmgr
Vendredi 10 juin 2011 Dominique Michel
* Reversed wallpaper changes. Use the same wallpaper on all the desk pages.
Modified: README
===================================================================
--- README 2011-06-12 20:08:48 UTC (rev 111)
+++ README 2011-06-12 20:55:38 UTC (rev 112)
@@ -18,6 +18,8 @@
- Transparent elements of the interface: panels, menus, dialogs
(pseudo-transparency, doesn't show windows underneath).
+ The windows can be made transparent if xcompmgr and transset-df are installed
+ (real transparency).
- Window decorations, panel/menu color-sets and desktop wallpaper changeable
from the main menu; choice saved for next X sessions.
Modified: doc/Mouse bindings.txt
===================================================================
--- doc/Mouse bindings.txt 2011-06-12 20:08:48 UTC (rev 111)
+++ doc/Mouse bindings.txt 2011-06-12 20:55:38 UTC (rev 112)
@@ -13,6 +13,7 @@
LMB - Left Mouse Button
RMB - Right Mouse Button
MMB - Middle Mouse Button
+ Wheel - The mouse wheel
The Desktop
@@ -62,6 +63,8 @@
Alt + MMB
Resize selected window (move bottom-right corner).
+Wheel
+ Increase or decrease the transparency of the selected window.
Window's titlebar
-----------------------------------------------------------------------------
Added: fvwm/components/bindings/Window-Transparency
===================================================================
--- fvwm/components/bindings/Window-Transparency (rev 0)
+++ fvwm/components/bindings/Window-Transparency 2011-06-12 20:55:38 UTC (rev 112)
@@ -0,0 +1,6 @@
+# Basic window transparency bindings
+
+Mouse 4 T $[Mod] Window-Increase-Transparency
+Mouse 5 T $[Mod] Window-Decrease-Transparency
+
+# vim:ft=fvwm
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2011-06-12 20:08:48 UTC (rev 111)
+++ fvwm/components/functions/Preferences-Menu 2011-06-12 20:55:38 UTC (rev 112)
@@ -8,6 +8,7 @@
+ '%22x22/fvwm-crystal/user-desktop.png%$[gt.Used recipe]' Popup /Preferences/Recipes
+ '%22x22/fvwm-crystal/font.png%$[gt.Characters fonts]' Popup /Preferences/Fonts
+ '%22x22/fvwm-crystal/font.png%$[gt.Fonts sizes]' Popup /Preferences/FontSizes
+Test (x xcompmgr) Test (x transset-df) + '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Transparency]' Popup /Preferences/Transparency
+ '%22x22/fvwm-crystal/utilities-terminal.png%$[gt.Default terminal]' Popup /Preferences/DefaultTerminal
+ '%22x22/fvwm-crystal/utilities-terminal.png%$[gt.FvwmConsole terminal]' Popup /Preferences/FvwmConsoleTerminal
+ '%22x22/fvwm-crystal/utilities-terminal.png%$[gt.QuakeConsole terminal]' Popup /Preferences/QuakeConsoleTerminal
@@ -164,6 +165,14 @@
+ I MenuStyle * Font "xft:$[menu_font]:pixelsize=$[0]:encoding=iso10646-1"
#
+# Transparency
+#
+DestroyMenu /Preferences/Transparency
+AddToMenu /Preferences/Transparency
++ '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Start transparency]' Exec exec xcompmgr
++ '%22x22/fvwm-crystal/fvwm-crystal.png%$[gt.Stop transparency]' Exec exec killall -9 xcompmgr
+
+#
# Default terminal
#
DestroyMenu /Preferences/DefaultTerminal
Modified: fvwm/components/functions/Window-Basic
===================================================================
--- fvwm/components/functions/Window-Basic 2011-06-12 20:08:48 UTC (rev 111)
+++ fvwm/components/functions/Window-Basic 2011-06-12 20:55:38 UTC (rev 112)
@@ -114,4 +114,12 @@
+ I Iconify
+ I Layer 0 2
+DestroyFunc Window-Increase-Transparency
+AddToFunc Window-Increase-Transparency
++ I Exec exec transset-df --actual --max 1 --inc .05
+
+DestroyFunc Window-Decrease-Transparency
+AddToFunc Window-Decrease-Transparency
++ I Exec exec transset-df --actual --min 0 --dec .05
+
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2012-10-07 15:31:46
|
Revision: 132
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=132&view=rev
Author: dominique_libre
Date: 2012-10-07 15:31:40 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
more style update
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Amiga
fvwm/components/functions/Icon-Mwm
Modified: ChangeLog
===================================================================
--- ChangeLog 2012-10-07 15:06:13 UTC (rev 131)
+++ ChangeLog 2012-10-07 15:31:40 UTC (rev 132)
@@ -4,7 +4,8 @@
Added a few needed icons
components/functions/Preferences-Menu:
* icons fix
- components/styles/FVWM:
+ components/styles/FVWM, components/functions/Icon-Amiga,
+ vomponents/functions/Icon-Mwm:
* Style fix for new syntax
components/bindings/Misc-Keybindings_NumLock:
* Bindings fix
Modified: fvwm/components/functions/Icon-Amiga
===================================================================
--- fvwm/components/functions/Icon-Amiga 2012-10-07 15:06:13 UTC (rev 131)
+++ fvwm/components/functions/Icon-Amiga 2012-10-07 15:31:40 UTC (rev 132)
@@ -8,7 +8,7 @@
Style * IconBackgroundRelief 0
Style * IconBackgroundPadding 0
Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:encoding=iso10646-1"
-Style * IndexedIconName
+Style * IconTitleFormat %n %(t)
Style * StickyIcon
Style * IconSize 68 68
Style * !StickyStippledIconTitle
Modified: fvwm/components/functions/Icon-Mwm
===================================================================
--- fvwm/components/functions/Icon-Mwm 2012-10-07 15:06:13 UTC (rev 131)
+++ fvwm/components/functions/Icon-Mwm 2012-10-07 15:31:40 UTC (rev 132)
@@ -8,7 +8,7 @@
Style * IconBackgroundRelief 0
Style * IconBackgroundPadding 10
Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:Bold:encoding=iso10646-1"
-Style * IndexedIconName
+Style * IconTitleFormat %n %(t)
Style * IconSize 48 48
# Icons can be moved around
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2012-10-07 15:39:43
|
Revision: 133
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=133&view=rev
Author: dominique_libre
Date: 2012-10-07 15:39:37 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
oops
Modified Paths:
--------------
fvwm/components/functions/Icon-Amiga
fvwm/components/functions/Icon-Mwm
Modified: fvwm/components/functions/Icon-Amiga
===================================================================
--- fvwm/components/functions/Icon-Amiga 2012-10-07 15:31:40 UTC (rev 132)
+++ fvwm/components/functions/Icon-Amiga 2012-10-07 15:39:37 UTC (rev 133)
@@ -8,7 +8,7 @@
Style * IconBackgroundRelief 0
Style * IconBackgroundPadding 0
Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:encoding=iso10646-1"
-Style * IconTitleFormat %n %(t)
+Style * IconTitleFormat %n (%t)
Style * StickyIcon
Style * IconSize 68 68
Style * !StickyStippledIconTitle
Modified: fvwm/components/functions/Icon-Mwm
===================================================================
--- fvwm/components/functions/Icon-Mwm 2012-10-07 15:31:40 UTC (rev 132)
+++ fvwm/components/functions/Icon-Mwm 2012-10-07 15:39:37 UTC (rev 133)
@@ -8,7 +8,7 @@
Style * IconBackgroundRelief 0
Style * IconBackgroundPadding 10
Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:Bold:encoding=iso10646-1"
-Style * IconTitleFormat %n %(t)
+Style * IconTitleFormat %n (%t)
Style * IconSize 48 48
# Icons can be moved around
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-03 12:46:15
|
Revision: 147
http://sourceforge.net/p/fvwm-crystal/code/147
Author: dominique_libre
Date: 2013-04-03 12:46:11 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
components/functions/Wallpaper: Replaced habak support by xloadimage: solve a bug at restart (X Error of failed request: BadValue (integer parameter out of range...))
Modified Paths:
--------------
ChangeLog
README
fvwm/components/functions/Wallpaper
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-03 07:44:34 UTC (rev 146)
+++ ChangeLog 2013-04-03 12:46:11 UTC (rev 147)
@@ -4,6 +4,8 @@
fvwm-crystal.generate-menu: run convert on the generated icon to
remove the libpng gAMA warnings.
INSTALL: added a section about this issue.
+ Replaced habak support by xloadimage: solve a bug at restart (X Error
+ of failed request: BadValue (integer parameter out of range...))
Mardi 2 Avril 2013 Dominique Michel
recipes/*: Add support for nested X session
Modified: README
===================================================================
--- README 2013-04-03 07:44:34 UTC (rev 146)
+++ README 2013-04-03 12:46:11 UTC (rev 147)
@@ -101,7 +101,9 @@
xterm, aterm, Eterm, mrxvt, urxvt or terminator.
Be aware that the Quake console need one of mrxvt, urxwt, aterm or xterm.
- A program for setting a wallpaper such as Esetroot (orphaned here), hsetroot
- or habak (only needed if ROX-Filer or Nautilus are not used as suggested above).
+ or xloadimage (only needed if ROX-Filer or Nautilus are not used as suggested above).
+ Habak support was removed due to X Errord st restart. xloadimage will be used first
+ if present.
- A music player - At least one of Music Player Daemon (+ mpc), X MultiMedia
System (+ xmms-shell and XMMSFind) (orphaned now on most distribution, you
will be better with another one), AlsaPlayer, cmus, mocp, mplayer, XMMS2,
Modified: fvwm/components/functions/Wallpaper
===================================================================
--- fvwm/components/functions/Wallpaper 2013-04-03 07:44:34 UTC (rev 146)
+++ fvwm/components/functions/Wallpaper 2013-04-03 12:46:11 UTC (rev 147)
@@ -4,7 +4,7 @@
# Set the specified wallpaper using available programs
DestroyFunc Wallpaper-Set
AddToFunc Wallpaper-Set
-+ I Test (x habak) Exec habak -ms $*
++ I Test (x xloadimage) Exec xloadimage -onroot -quiet -fullscreen -shrink -tile $*
+ I TestRc (NoMatch) Test (x Esetroot) Exec Esetroot -scale $*
+ I TestRc (NoMatch) Test (x hsetroot) Exec hsetroot -fill $*
+ I SavePreferences LastChoosenWallpaper "Wallpaper-Set \"$*\""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-03 17:14:20
|
Revision: 148
http://sourceforge.net/p/fvwm-crystal/code/148
Author: dominique_libre
Date: 2013-04-03 17:14:16 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
Wallpaper-Set: hsetroot is now the 1st choice to load wallpapers
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Wallpaper
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-03 12:46:11 UTC (rev 147)
+++ ChangeLog 2013-04-03 17:14:16 UTC (rev 148)
@@ -5,7 +5,8 @@
remove the libpng gAMA warnings.
INSTALL: added a section about this issue.
Replaced habak support by xloadimage: solve a bug at restart (X Error
- of failed request: BadValue (integer parameter out of range...))
+ of failed request: BadValue (integer parameter out of range...));
+ hsetroot is now the prereded choice to load wallpapers
Mardi 2 Avril 2013 Dominique Michel
recipes/*: Add support for nested X session
Modified: fvwm/components/functions/Wallpaper
===================================================================
--- fvwm/components/functions/Wallpaper 2013-04-03 12:46:11 UTC (rev 147)
+++ fvwm/components/functions/Wallpaper 2013-04-03 17:14:16 UTC (rev 148)
@@ -4,9 +4,9 @@
# Set the specified wallpaper using available programs
DestroyFunc Wallpaper-Set
AddToFunc Wallpaper-Set
-+ I Test (x xloadimage) Exec xloadimage -onroot -quiet -fullscreen -shrink -tile $*
-+ I TestRc (NoMatch) Test (x Esetroot) Exec Esetroot -scale $*
++ I Test (x Esetroot) Exec Esetroot -scale $*
+ I TestRc (NoMatch) Test (x hsetroot) Exec hsetroot -fill $*
++ I TestRc (NoMatch) Test (x xloadimage) Exec xloadimage -onroot -tile -quiet -fullscreen -shrink $*
+ I SavePreferences LastChoosenWallpaper "Wallpaper-Set \"$*\""
# Select random wallpaper from given directories and set it
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-03 18:49:30
|
Revision: 149
http://sourceforge.net/p/fvwm-crystal/code/149
Author: dominique_libre
Date: 2013-04-03 18:49:27 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
Because xloadimage doesnt support layers, replaced by feh in Wallpaper-Set
Modified Paths:
--------------
ChangeLog
README
fvwm/components/functions/Wallpaper
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-03 17:14:16 UTC (rev 148)
+++ ChangeLog 2013-04-03 18:49:27 UTC (rev 149)
@@ -4,7 +4,7 @@
fvwm-crystal.generate-menu: run convert on the generated icon to
remove the libpng gAMA warnings.
INSTALL: added a section about this issue.
- Replaced habak support by xloadimage: solve a bug at restart (X Error
+ Replaced habak support by feh: solve a bug at restart (X Error
of failed request: BadValue (integer parameter out of range...));
hsetroot is now the prereded choice to load wallpapers
Modified: README
===================================================================
--- README 2013-04-03 17:14:16 UTC (rev 148)
+++ README 2013-04-03 18:49:27 UTC (rev 149)
@@ -101,8 +101,8 @@
xterm, aterm, Eterm, mrxvt, urxvt or terminator.
Be aware that the Quake console need one of mrxvt, urxwt, aterm or xterm.
- A program for setting a wallpaper such as Esetroot (orphaned here), hsetroot
- or xloadimage (only needed if ROX-Filer or Nautilus are not used as suggested above).
- Habak support was removed due to X Errord st restart. xloadimage will be used first
+ or feh (only needed if ROX-Filer or Nautilus are not used as suggested above).
+ Habak support was removed due to X Errord st restart. hsetroot will be used first
if present.
- A music player - At least one of Music Player Daemon (+ mpc), X MultiMedia
System (+ xmms-shell and XMMSFind) (orphaned now on most distribution, you
Modified: fvwm/components/functions/Wallpaper
===================================================================
--- fvwm/components/functions/Wallpaper 2013-04-03 17:14:16 UTC (rev 148)
+++ fvwm/components/functions/Wallpaper 2013-04-03 18:49:27 UTC (rev 149)
@@ -6,7 +6,7 @@
AddToFunc Wallpaper-Set
+ I Test (x Esetroot) Exec Esetroot -scale $*
+ I TestRc (NoMatch) Test (x hsetroot) Exec hsetroot -fill $*
-+ I TestRc (NoMatch) Test (x xloadimage) Exec xloadimage -onroot -tile -quiet -fullscreen -shrink $*
++ I TestRc (NoMatch) Test (x feh) Exec feh --bg-scale --no-fehbg $*
+ I SavePreferences LastChoosenWallpaper "Wallpaper-Set \"$*\""
# Select random wallpaper from given directories and set it
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