Menu
▾
▴
fvwm-crystal-commits
|
From: <dom...@us...> - 2013-04-19 08:21:43
|
Revision: 257
http://sourceforge.net/p/fvwm-crystal/code/257
Author: dominique_libre
Date: 2013-04-19 08:21:36 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
Addec ommented out DVB channel change support. Read the comment and considere to contribute
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Media
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-18 20:29:57 UTC (rev 256)
+++ ChangeLog 2013-04-19 08:21:36 UTC (rev 257)
@@ -1,5 +1,9 @@
ChangeLog for FVWM-Crystal
+Venderedi 19 Avril Dominique Michel
+ functions/Media: Added commented out DVB channel change support. It work
+ for me, but nothing more. Please considere to contribute.
+
Jeudi 18 Avril Dominique Michel
functions/Music; Functions/Media; functions/Music-xmms: Cleanup; moved
to InfoStore; added player volume control; added missing menus;
Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media 2013-04-18 20:29:57 UTC (rev 256)
+++ fvwm/components/functions/Media 2013-04-19 08:21:36 UTC (rev 257)
@@ -353,6 +353,26 @@
+ I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://$[0]@
+ I Exec exec echo "start" > /home/$[infostore.USERDIR]/.mplayer/pipe
+### Comment me {{{1
+# The DVB linux support is messy. Some multituners (frontends) cards (adapters)
+# have their tuners grouped under the same fronted, other use different frontends,
+# To make things worst, mplayer support only the first frontend of a given adapter,
+# and it can use an unique channel list file or several files.
+# So, dvb_set_channel <channel_number> <card_number> is not supported for now
+#DestroyFunc Music-ChannelSet
+#AddToFunc Music-ChannelSet
+#+ I Exec exec echo "dvb_set_channel $0 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
+
+#DestroyFunc Channels-generator
+#AddToFunc Channels-generator
+#+ I DestroyMenu recreate /Music/ChannelSet
+#PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 ]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet "\\1"/\'); echo "$a Music-ChannelSet $i" ; i=$(($i+1)) ; done </home/dom/.mplayer/channels.conf.sat'
+
+#DestroyMenu /Music/ChannelSet
+#AddToMenu /Music/ChannelSet
+#+ DynamicPopupAction Function Channels-generator
+### End comment me {{{1
+#
# mouse 2 Menu /Playback {{{2
# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
DestroyFunc Music-Next
@@ -582,6 +602,9 @@
+ I AddToMenu /Music '$[gt.Mixer]' Popup /Mixer
+ I AddToMenu /Music '$[gt.Speed]' Popup /Speed
+ I AddToMenu /Music '$[gt.Show/Hide QJackCtl]' Music-QJackGUI
+### DVB channel change ### Comment me {{{1
+#+ I AddToMenu /Music 'Chaînes' PopUp /Music/ChannelSet
+### End Comment me
DestroyMenu /Music
AddToMenu /Music
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-19 17:59:47
|
Revision: 260
http://sourceforge.net/p/fvwm-crystal/code/260
Author: dominique_libre
Date: 2013-04-19 17:59:43 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
Updated NEWS + oops
Modified Paths:
--------------
NEWS
fvwm/components/functions/Media
Modified: NEWS
===================================================================
--- NEWS 2013-04-19 15:24:27 UTC (rev 259)
+++ NEWS 2013-04-19 17:59:43 UTC (rev 260)
@@ -1,3 +1,19 @@
+DONE
+----
+- Fix the Amiga (click to focus without raise), MXWindow
+ (click to focus with raise) and FVWM-Crystal with raise
+ (enter to focus with raise) focus policies when NumLock
+ is on.
+
+- Rewrite of the audio and multimedia players.
+ The common functions was moved in 2 files, one for the audio
+ players, the other for mplayer and mplayer2.
+ Some bug fixes.
+ mplayer use now dvdnav for DVD watching.
+ Oreliminary DVB support using mplayer(2).
+ Capture enabled for mplayer(2) using the "c" key (see man mplayer).
+ This will produce usable files only with mpeg sources (man mplayer again).
+
Work in progress
----------------
What is done in the CVS is to eliminate 2 long standing
@@ -24,10 +40,14 @@
TODO
----
What I have at home seam to be less broken than the CVS (which is
-mistly usable anyway), so I will be revieving my changes one by one.
+mostly usable anyway), so I will be revieving my changes one by one.
I don't know exactly how I will merge them, and will decide
case by case.
+Hurray! I find a simple way to fix the long standing issue covered by
+the FVWM FAQ Question 5.5: The NumLonk interferences on the Amiga,
+FVWM-Crystal with raise and MSWindow focus policy styles should
+be history now.
Version 3.0.7
-------------
Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media 2013-04-19 15:24:27 UTC (rev 259)
+++ fvwm/components/functions/Media 2013-04-19 17:59:43 UTC (rev 260)
@@ -193,10 +193,6 @@
DestroyFunc Music-CurrentPlaylist-generator
DestroyMenu /Music/CurrentPlaylist
-# Generate /Music/LoadMovie menu (mplayer)
-DestroyFunc FuncFvwmMenuMovieDirectory
-DestroyMenu /Music/LoadMovie
-
# Load playlist (alsaplayer, audacious, mocp)
DestroyFunc FuncFvwmMenuAudioDirectory
# Load playlist (mpd, xmms2)
@@ -290,7 +286,7 @@
+ '$[gt.Choose playlist to copy]' Nop
+ MissingSubmenuFunction FuncFvwmMenuCopyPlaylistDirectory
+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.AudioPlaylists]
-+ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.AudioPlaylists]
++ '%22x22/categories/video_movies_view.png%$[gt.Browse Medias]' Popup $[infostore.VideoPlaylists]
# button menu (alsaplayer, audacious, mocp, mpd, mplayer, xmms2)
DestroyFunc Playlist-generator-button
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-19 19:35:59
|
Revision: 262
http://sourceforge.net/p/fvwm-crystal/code/262
Author: dominique_libre
Date: 2013-04-19 19:35:55 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
Music*: quoting must survive the PipeReads
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-audacious
fvwm/components/functions/Music-cmus
fvwm/components/functions/Music-mocp
fvwm/components/functions/Music-xmms2
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-19 19:16:42 UTC (rev 261)
+++ ChangeLog 2013-04-19 19:35:55 UTC (rev 262)
@@ -7,7 +7,8 @@
modules.
styles/FocusPoolicy-Amiga; FocusPolicy-FVWM-Crystal-Raise; FocusPolicy-
MSWindow: Added FPFocusClickModifiers to fix wrong behaviour with NumLock
- functions/Media: playlists functions: fic quoting, it must survive the PipeReads
+ functions/Media; functions/Music*: playlists functions: fic quoting,
+ it must survive the PipeReads
Jeudi 18 Avril Dominique Michel
functions/Music; Functions/Media; functions/Music-xmms: Cleanup; moved
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music 2013-04-19 19:35:55 UTC (rev 262)
@@ -146,14 +146,14 @@
# Note: Visualy redundant; TODO: A recursive generator like in remove playlist
DestroyFunc FuncFvwmMenuCopyPlaylistDirectory
AddToFunc FuncFvwmMenuCopyPlaylistDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
"$[infostore.AudioPlaylists]"*) myexec="Exec cp -r \'%f\' \'$[infostore.UserManagedAudioPlaylists]\'";; \
esac; \
- test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
- test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ 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 "-" --command-file "${myexec}" \
+ --dir \"$0\" --exec-title "-" --command-file "${myexec}" \
--func-name "FuncFvwmMenuCopyPlaylistDirectory"'
DestroyMenu /Music/CopyPlaylist
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-alsaplayer 2013-04-19 19:35:55 UTC (rev 262)
@@ -49,15 +49,15 @@
# /Music/LoadPlaylist
AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
"$[infostore.AudioPlaylists]"*) myexec="alsaplayer -e";; \
"$[infostore.UserManagedAudioPlaylists]"*) myexec="alsaplayer -e";; \
esac; \
- test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
- test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ 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}" \
+ --dir \"$0\" --exec-title "-" --exec-file "^${myexec}" \
--func-name "FuncFvwmMenuAudioDirectory"'
AddToFunc Music-ClearPlaylist
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-audacious 2013-04-19 19:35:55 UTC (rev 262)
@@ -57,16 +57,16 @@
# /Music/LoadPlaylist
AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
"$[infostore.AudioPlaylists]"*) myexec="audacious";; \
"$[infostore.UserManagedAudioPlaylists]"*) myexec="audacious";; \
esac; \
- test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
- test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ 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-file "^${myexec}" --dir \"$0\" \
--exec-t="-"'
AddToFunc Music-ClearPlaylist
Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus 2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-cmus 2013-04-19 19:35:55 UTC (rev 262)
@@ -41,15 +41,15 @@
# /Music/LoadPlaylist
AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
"$[infostore.AudioPlaylists]"*) myexec="cmus-remote -l";; \
"$[infostore.UserManagedAudioPlaylists]"*) myexec="cmus-remote -l";; \
esac; \
- test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
- test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ 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}" \
+ --dir \"$0\" --exec-title "-" --exec-file "^${myexec}" \
--func-name "FuncFvwmMenuAudioDirectory"'
AddToFunc Playlist-generator-button
Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp 2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-mocp 2013-04-19 19:35:55 UTC (rev 262)
@@ -36,16 +36,16 @@
# Player controls and main vol
# mouse 1 Menu /Playlist-button {{{1
AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
"$[infostore.AudioPlaylists]"*) myexec="mocp --sync --append";; \
"$[infostore.UserManagedAudioPlaylists]"*) myexec="mocp --sync --append";; \
esac; \
- test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
- test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ 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-file "^${myexec}" --dir \"$0\" \
--exec-t="-"'
AddToFunc Music-ClearPlaylist
Modified: fvwm/components/functions/Music-xmms2
===================================================================
--- fvwm/components/functions/Music-xmms2 2013-04-19 19:16:42 UTC (rev 261)
+++ fvwm/components/functions/Music-xmms2 2013-04-19 19:35:55 UTC (rev 262)
@@ -77,15 +77,15 @@
# /Music/LoadPlaylist
AddToFunc FuncFvwmMenuAudioDirectory
-+ I PipeRead 'case "$0" in \
++ I PipeRead 'case \"$0\" in \
"$[infostore.AudioPlaylists]"*) myexec="$[infostore.fvwm_audio_exec]";; \
"$[infostore.UserManagedAudioPlaylists]"*) myexec="$[infostore.fvwm_audio_exec]";; \
esac; \
- test -f "$0"/.icontitle.png && mytitle="$0"/.icontitle.png; \
- test -f "$0"/.media.png && mypng="$0"/.media.png; \
+ 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}" \
+ --dir \"$0\" --exec-title "-" --exec-file "^${myexec}" \
--func-name "FuncFvwmMenuAudioDirectory"'
AddToFunc Music-RemoveSong
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-19 20:20:16
|
Revision: 263
http://sourceforge.net/p/fvwm-crystal/code/263
Author: dominique_libre
Date: 2013-04-19 20:20:11 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
functions/Media: Load-DVD will play the DVD straight away
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Media
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-19 19:35:55 UTC (rev 262)
+++ ChangeLog 2013-04-19 20:20:11 UTC (rev 263)
@@ -9,6 +9,7 @@
MSWindow: Added FPFocusClickModifiers to fix wrong behaviour with NumLock
functions/Media; functions/Music*: playlists functions: fic quoting,
it must survive the PipeReads
+ functions(Media: Toad-DVD will replace play the DVD stright away
Jeudi 18 Avril Dominique Michel
functions/Music; Functions/Media; functions/Music-xmms: Cleanup; moved
Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media 2013-04-19 19:35:55 UTC (rev 262)
+++ fvwm/components/functions/Media 2013-04-19 20:20:11 UTC (rev 263)
@@ -182,8 +182,10 @@
# Play DVD (mplayer)
DestroyFunc Load-DVD
AddToFunc Load-DVD
++ I Exec exec echo "stop" > /home/$[infostore.USERDIR]/.mplayer/pipe
#+ I Exec exec fvwm-crystal.mplayer-wrapper dvd $[infostore.USERDIR]
+ I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvdnav://
++ I Exec exec echo "start" > /home/$[infostore.USERDIR]/.mplayer/pipe
# Generate /Music/LoadMovie menu (mplayer)
PipeRead '$[FVWM_SYSTEMDIR]/scripts/media_directories $[infostore.USERDIR]'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-19 21:47:21
|
Revision: 265
http://sourceforge.net/p/fvwm-crystal/code/265
Author: dominique_libre
Date: 2013-04-19 21:47:18 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
functions/Fullscreen: converted to infostore
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-19 20:30:40 UTC (rev 264)
+++ ChangeLog 2013-04-19 21:47:18 UTC (rev 265)
@@ -11,6 +11,7 @@
it must survive the PipeReads
functions(Media: Toad-DVD will replace play the DVD stright away
doc/FAQ: added QA about mplayer.
+ functions/fullscrenn: converted to infostore
Jeudi 18 Avril Dominique Michel
functions/Music; Functions/Media; functions/Music-xmms: Cleanup; moved
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2013-04-19 20:30:40 UTC (rev 264)
+++ fvwm/components/functions/Fullscreen 2013-04-19 21:47:18 UTC (rev 265)
@@ -1,8 +1,8 @@
# FVWM-Crystal: Fullscreen
# Written by: Maciej Delmanowski <ha...@li...>
# Modifications: Thomas Adam <th...@ed...>
-# Bug fixes, disapear and restart functions: Dominique Michel
-# <dom...@so...>
+# Bug fixes, disappear and restart functions: Dominique Michel 2008-2013
+# <dom...@us...>
#
# Overview:
# After using this function, current window will lose it's border and title
@@ -29,7 +29,7 @@
# of each window and make it visible here.
# - possibility to cycle trough the fullsceened windows only in the current page
-SetEnv ThumbDirectory "/tmp"
+InfoStoreAdd TmpDirectory "/tmp"
# Wrapper function
# State 19 is used to know if the window is in fullscreen or not.
@@ -51,7 +51,7 @@
+ I WindowStyle !Maximizable, FixedSize
+ I UpdateStyles
# We need 1 temporary file for restoring the window state after restart
-+ I Exec exec touch $[ThumbDirectory]/fullscreen.19.$[w.id].tmp
++ I Exec exec touch $[infostore.TmpDirectory]/fullscreen.19.$[w.id].tmp
DestroyFunc Fullscreen-Stop
AddToFunc Fullscreen-Stop
@@ -59,49 +59,49 @@
+ I WindowStyle Maximizable, !FixedSize
+ I WindowStyle !State 19
+ I WindowStyle !State 20
-+ I Test (f $[ThumbDirectory]/fullscreen.19.$[w.id].tmp) Exec exec rm -f $[ThumbDirectory]/fullscreen.19.$[w.id].tmp
++ I Test (f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].tmp) Exec exec rm -f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].tmp
+ I UpdateStyles
+ I Maximize True $[FSWindowWidth_$[w.id]] $[FSWindowHeight_$[w.id]]
+ I UnsetEnv "FSWindowWidth_$[w.id]"
+ I UnsetEnv "FSWindowHeight_$[w.id]"
###########################################################################
-# The disapear function will cycle through all the fullscreened windows and
+# The disappear function will cycle through all the fullscreened windows and
# the workbench.
-# 'Disapear-On' and 'Disapear-Off' functions shouldn't be called
-# directly, use 'Disapear' function instead.
+# 'Disappear-On' and 'Disappear-Off' functions shouldn't be called
+# directly, use 'Disappear' function instead.
# Wrapper function
-DestroyFunc Disapear
-AddToFunc Disapear
-+ I Next (State 19, !State 20) Disapear-Off
-+ I TestRc (NoMatch) All (State 19, State 20, !Iconic) Disapear-On
+DestroyFunc Disappear
+AddToFunc Disappear
++ I Next (State 19, !State 20) Disappear-Off
++ I TestRc (NoMatch) All (State 19, State 20, !Iconic) Disappear-On
-DestroyFunc Disapear-On
-AddToFunc Disapear-On
+DestroyFunc Disappear-On
+AddToFunc Disappear-On
# Those 2 lines are needed if we want to cycle onto the windows original pages
+ I WarpToWindow $[pointer.x]p $[pointer.y]p
-+ I Exec exec touch $[ThumbDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp
++ I Exec exec touch $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp
+ I WindowStyle !State 20
+ I WindowStyle NoIcon
+ I UpdateStyles
+ I Iconify true
-DestroyFunc Disapear-Off
-AddToFunc Disapear-Off
+DestroyFunc Disappear-Off
+AddToFunc Disappear-Off
# Go to the original page of the window
-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"'
+Test (f $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp) PipeRead 'page=`ls $[infostore.TmpDirectory] | 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 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 $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp) Exec exec rm -f $[infostore.TmpDirectory]/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
# Another wrapper fonction, still needed ?
-DestroyFunc Disapear-Cycle
-AddToFunc Disapear-Cycle
-+ I Prev (!"FvwmPager|FvwmForm*|FvwmButtons",CurrentPage,AnyScreen,Maximized) Disapear
+DestroyFunc Disappear-Cycle
+AddToFunc Disappear-Cycle
++ I Prev (!"FvwmPager|FvwmForm*|FvwmButtons",CurrentPage,AnyScreen,Maximized) Disappear
##################################
# Restore Fullscreen after restart
@@ -117,29 +117,27 @@
+ I WindowStyle !Maximizable, FixedSize
+ I UpdateStyles
-DestroyFunc Disapear-Recover
-AddToFunc Disapear-Recover
-
+DestroyFunc Disappear-Recover
+AddToFunc Disappear-Recover
+ I WindowStyle !State 20
+ I WindowStyle NoIcon
+ I UpdateStyles
+ I Iconify true
-DestroyFunc Disapear-Test
-AddToFunc Disapear-Test
-+ I Test (F $[ThumbDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp) WindowId $[w.id] Disapear-Recover
+DestroyFunc Disappear-Test
+AddToFunc Disappear-Test
++ I Test (F $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp) WindowId $[w.id] Disappear-Recover
DestroyFunc RecoverFullscreen
AddToFunc RecoverFullscreen
-PipeRead 'for i in $[ThumbDirectory]/fullscreen.19.*; do wid=`basename "$i" | awk --field-separator . \'{print $$3}\'`; echo "+ I WindowId ${wid} Fullscreen-Recover"; done'
-PipeRead 'for i in $[ThumbDirectory]/fullscreen.20.*; do wid=`basename "$i" | awk --field-separator . \'{print $$3}\'`; echo "+ I WindowId ${wid} Disapear-Recover"; done'
-#+ I All Test (F $[ThumbDirectory]/fullscreen.20.$[w.id].tmp) WindowId $[w.id] Disapear-Recover
+PipeRead 'for i in $[infostore.TmpDirectory]/fullscreen.19.*; do wid=`basename "$i" | awk --field-separator . \'{print $$3}\'`; echo "+ I WindowId ${wid} Fullscreen-Recover"; done'
+PipeRead 'for i in $[infostore.TmpDirectory]/fullscreen.20.*; do wid=`basename "$i" | awk --field-separator . \'{print $$3}\'`; echo "+ I WindowId ${wid} Disappear-Recover"; done'
++ I All Test (F $[infostore.TmpDirectory]/fullscreen.20.$[w.id].tmp) WindowId $[w.id] Disappear-Recover
AddToFunc StartFunction I RecoverFullscreen
-#AddToFunc StartFunction I All Test (F $[ThumbDirectory]/fullscreen.19.$[w.id].tmp) WindowId $[w.id] Fullscreen-Recover
+#AddToFunc StartFunction I All Test (F $[infostore.TmpDirectory]/fullscreen.19.$[w.id].tmp) WindowId $[w.id] Fullscreen-Recover
-AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[ThumbDirectory]/fullscreen.19.*
-AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[ThumbDirectory]/fullscreen.20.*
+AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.19.*
+AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.20.*
-
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-21 09:08:33
|
Revision: 266
http://sourceforge.net/p/fvwm-crystal/code/266
Author: dominique_libre
Date: 2013-04-21 09:08:31 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
functions/Fullscreen: Disappear workk now on the current page. This fix windows moves between pages when cycling trough the fullscreened windows
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-19 21:47:18 UTC (rev 265)
+++ ChangeLog 2013-04-21 09:08:31 UTC (rev 266)
@@ -1,5 +1,9 @@
ChangeLog for FVWM-Crystal
+Dimanche 21 Avril Dominique Michel
+ functions/Fullscreen: Disappear workk now on the current page. This fix
+ windows moves between pages when cycling trough the fullscreened windows.
+
Venderedi 19 Avril Dominique Michel
functions/Media: Added commented out DVB channel change support. It work
for me, but nothing more. Please considere to contribute.
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2013-04-19 21:47:18 UTC (rev 265)
+++ fvwm/components/functions/Fullscreen 2013-04-21 09:08:31 UTC (rev 266)
@@ -4,7 +4,7 @@
# Bug fixes, disappear and restart functions: Dominique Michel 2008-2013
# <dom...@us...>
#
-# Overview:
+# Fullscreen overview:
# After using this function, current window will lose it's border and title
# and will be maximized to the full screen (wow). After using Fullscreen
# function on a "full-screened" window it will return to it's previous size and
@@ -12,33 +12,36 @@
#
# How to use:
# Bind "Fullscreen" command somewhere, example:
-# Key Q A M Fullscreen
+# Key KP_Multiply A $[Mod1] Fullscreen
#
+# Disappear overview
+# When using this function, Fvwm-Crystal will cycle through all the fullscreened
+# windows and the workbench on the current page.
+# To use it, bind "Disappear" command somewhere.
+#
# The other window size functions are into Window-Buttons.
#
# 'Fullscreen-Start' and 'Fullscreen-Stop' functions shouldn't be called
# directly, use 'Fullscreen' function instead.
+# 'Disappear-On' and 'Disappear-Off' functions shouldn't be called
+# directly, use 'Disappear' function instead.
#
# Recipe : Must be included after the styles otherwise strange results will append
-# when restarting Fvwm. Not sure if this remark is still valid because I done a lot
-# of styles loading order debugging in the maintime.
+# when restarting Fvwm.
#
# 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
InfoStoreAdd TmpDirectory "/tmp"
-# Wrapper function
-# State 19 is used to know if the window is in fullscreen or not.
+# Wrapper function {{{1
+# State 19 = FS (fullscreen), State 20 = visible
DestroyFunc Fullscreen
AddToFunc Fullscreen
+ 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
+# fullscreen
DestroyFunc Fullscreen-Start
AddToFunc Fullscreen-Start
+ I SetEnv "FSWindowWidth_$[w.id]" "$[w.width]p"
@@ -51,62 +54,61 @@
+ I WindowStyle !Maximizable, FixedSize
+ I UpdateStyles
# We need 1 temporary file for restoring the window state after restart
-+ I Exec exec touch $[infostore.TmpDirectory]/fullscreen.19.$[w.id].tmp
++ I Exec exec touch $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp
+# non fullscreen
DestroyFunc Fullscreen-Stop
AddToFunc Fullscreen-Stop
+ I WindowStyle Title, Borders, Iconifiable, !ResizeHintOverride
+ I WindowStyle Maximizable, !FixedSize
+ I WindowStyle !State 19
+ I WindowStyle !State 20
-+ I Test (f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].tmp) Exec exec rm -f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].tmp
++ I Test (f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp) Exec exec rm -f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp
+ I UpdateStyles
+ I Maximize True $[FSWindowWidth_$[w.id]] $[FSWindowHeight_$[w.id]]
+ I UnsetEnv "FSWindowWidth_$[w.id]"
+ I UnsetEnv "FSWindowHeight_$[w.id]"
-###########################################################################
-# The disappear function will cycle through all the fullscreened windows and
-# the workbench.
-# 'Disappear-On' and 'Disappear-Off' functions shouldn't be called
-# directly, use 'Disappear' function instead.
-
-# Wrapper function
+# Wrapper function {{{1
DestroyFunc Disappear
AddToFunc Disappear
-+ I Next (State 19, !State 20) Disappear-Off
-+ I TestRc (NoMatch) All (State 19, State 20, !Iconic) Disappear-On
+# if FS; then if !State20; then show; else hide all; fi
++ I PipeRead 'if [[ "$(ls $[infostore.TmpDirectory]/fullscreen.19.0x???????.$[page.nx].$[page.ny].tmp 2>/dev/null)" != "" ]]; then \
+ for i in $(ls $[infostore.TmpDirectory]/fullscreen.19.0x???????.$[page.nx].$[page.ny].tmp 2>/dev/null); \
+ do file=`echo "${i}"|sed -e \'s:fullscreen.19:fullscreen.20:\'`; \
+ if [ -e "${file}" ]; then echo "WindowId $(echo $file | cut -d . -f 3) Disappear-Off"; exit; \
+ fi; \
+ done; \
+ for i in $(ls $[infostore.TmpDirectory]/fullscreen.19.0x???????.$[page.nx].$[page.ny].tmp 2>/dev/null); \
+ do echo "WindowId $(echo $i | cut -d . -f 3) Disappear-On"; done; fi'
+#+ I Next (State 19, !State 20) Disappear-Off
+#+ I TestRc (NoMatch) All (State 19, State 20, !Iconic) Disappear-On
+# disappear
+# file tmp_dir/fuulscreen.20.* = hidden
DestroyFunc Disappear-On
AddToFunc Disappear-On
# Those 2 lines are needed if we want to cycle onto the windows original pages
+ I WarpToWindow $[pointer.x]p $[pointer.y]p
-+ I Exec exec touch $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp
++ I Exec exec touch $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].$[page.ny].tmp
+ I WindowStyle !State 20
+ I WindowStyle NoIcon
+ I UpdateStyles
+ I Iconify true
+# appear
DestroyFunc Disappear-Off
AddToFunc Disappear-Off
# Go to the original page of the window
-Test (f $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp) PipeRead 'page=`ls $[infostore.TmpDirectory] | grep 20.$[w.id] | awk --field-separator . "{print 4}"`; echo "+ I GotoPage $page 0"'
+#Test (f $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].$[page.ny].tmp) PipeRead 'page=`ls $[infostore.TmpDirectory] | 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 UpdateStyles
-+ I Test (f $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp) Exec exec rm -f $[infostore.TmpDirectory]/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
++ I Test (f $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].$[page.ny].tmp) Exec exec rm -f $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].$[page.ny].tmp
-# Another wrapper fonction, still needed ?
-DestroyFunc Disappear-Cycle
-AddToFunc Disappear-Cycle
-+ I Prev (!"FvwmPager|FvwmForm*|FvwmButtons",CurrentPage,AnyScreen,Maximized) Disappear
-
-##################################
-# Restore Fullscreen after restart
-# Called by the recipe after all the styles are applied.
-
+# Restore Fullscreen after restart {{{1
+# Called by StartFunction
DestroyFunc Fullscreen-Recover
AddToFunc Fullscreen-Recover
+ I WindowStyle !Title, !Borders, Iconifiable, ResizeHintOverride
@@ -126,16 +128,17 @@
DestroyFunc Disappear-Test
AddToFunc Disappear-Test
-+ I Test (F $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].tmp) WindowId $[w.id] Disappear-Recover
++ I Test (F $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].$[page.ny].tmp) WindowId $[w.id] Disappear-Recover
+# wrapper
DestroyFunc RecoverFullscreen
AddToFunc RecoverFullscreen
PipeRead 'for i in $[infostore.TmpDirectory]/fullscreen.19.*; do wid=`basename "$i" | awk --field-separator . \'{print $$3}\'`; echo "+ I WindowId ${wid} Fullscreen-Recover"; done'
PipeRead 'for i in $[infostore.TmpDirectory]/fullscreen.20.*; do wid=`basename "$i" | awk --field-separator . \'{print $$3}\'`; echo "+ I WindowId ${wid} Disappear-Recover"; done'
-+ I All Test (F $[infostore.TmpDirectory]/fullscreen.20.$[w.id].tmp) WindowId $[w.id] Disappear-Recover
++ I All Test (F $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.ny].$[page.ny].tmp) WindowId $[w.id] Disappear-Recover
AddToFunc StartFunction I RecoverFullscreen
-#AddToFunc StartFunction I All Test (F $[infostore.TmpDirectory]/fullscreen.19.$[w.id].tmp) WindowId $[w.id] Fullscreen-Recover
+#AddToFunc StartFunction I All Test (F $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp) WindowId $[w.id] Fullscreen-Recover
AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.19.*
AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.20.*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-21 09:21:58
|
Revision: 267
http://sourceforge.net/p/fvwm-crystal/code/267
Author: dominique_libre
Date: 2013-04-21 09:21:55 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
functions/Fullscreen: Fixed windows overlapping when quiting fullscreen
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-21 09:08:31 UTC (rev 266)
+++ ChangeLog 2013-04-21 09:21:55 UTC (rev 267)
@@ -3,6 +3,7 @@
Dimanche 21 Avril Dominique Michel
functions/Fullscreen: Disappear workk now on the current page. This fix
windows moves between pages when cycling trough the fullscreened windows.
+ Fixed windows overlapping when quitting fullscreen.
Venderedi 19 Avril Dominique Michel
functions/Media: Added commented out DVB channel change support. It work
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2013-04-21 09:08:31 UTC (rev 266)
+++ fvwm/components/functions/Fullscreen 2013-04-21 09:21:55 UTC (rev 267)
@@ -56,7 +56,7 @@
# We need 1 temporary file for restoring the window state after restart
+ I Exec exec touch $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp
-# non fullscreen
+# quit fullscreen
DestroyFunc Fullscreen-Stop
AddToFunc Fullscreen-Stop
+ I WindowStyle Title, Borders, Iconifiable, !ResizeHintOverride
@@ -66,6 +66,7 @@
+ I Test (f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp) Exec exec rm -f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp
+ I UpdateStyles
+ I Maximize True $[FSWindowWidth_$[w.id]] $[FSWindowHeight_$[w.id]]
++ I PlaceAgain
+ I UnsetEnv "FSWindowWidth_$[w.id]"
+ I UnsetEnv "FSWindowHeight_$[w.id]"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-23 17:26:07
|
Revision: 282
http://sourceforge.net/p/fvwm-crystal/code/282
Author: dominique_libre
Date: 2013-04-23 17:26:01 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
functions/Fullscreen: cleanup
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-23 16:03:48 UTC (rev 281)
+++ ChangeLog 2013-04-23 17:26:01 UTC (rev 282)
@@ -6,6 +6,7 @@
recipes/Fullscreen: make the notification area movable and to appear/
disappear with EWMH-Toggle. Work best with StaloneTray.
recipes/Amiga: removed non needed tests
+ functions/Fullscreen: cleanup
Lundi 22 Avril Dominique Michel
recipes/*: move some SetEnv to Infostore; include Fullscreen functions
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2013-04-23 16:03:48 UTC (rev 281)
+++ fvwm/components/functions/Fullscreen 2013-04-23 17:26:01 UTC (rev 282)
@@ -18,6 +18,7 @@
# When using this function, Fvwm-Crystal will cycle through all the fullscreened
# windows and the workbench on the current page.
# To use it, bind "Disappear" command somewhere.
+# Key KP_Multiply A $[Mod2] Disappear
#
# The other window size functions are into Window-Buttons.
#
@@ -26,10 +27,16 @@
# 'Disappear-On' and 'Disappear-Off' functions shouldn't be called
# directly, use 'Disappear' function instead.
#
-# Recipe : Must be included after the styles otherwise strange results will append
-# when restarting Fvwm.
+# Know bugs, limitations:
+# - after a recipe change, if the new desktop geometry is not the same, some
+# window(s) can be lost. Is it needed to add a logic fot that?
+# - some terminals does not scale corectly in full-screen. As example, Terminator
+# scale correctly, Gnome Terminal, ATerm, Xterm and MRxwt does not, URxwt does not scale
+# correctly the first time it is put in full screen, but it does scale OK afterward.
+# If you know how to fix this, please send me a mail:
+# <dom...@us...>
#
-# Todo:
+# TODO:
# - restore the position when restoring the "normal" window
InfoStoreAdd TmpDirectory "/tmp"
@@ -41,26 +48,28 @@
+ I ThisWindow (State 19) Fullscreen-Stop
+ I TestRc (NoMatch) ThisWindow (!State 19) Fullscreen-Start
-# fullscreen
+# fullscreen {{{2
DestroyFunc Fullscreen-Start
AddToFunc Fullscreen-Start
+ I SetEnv "FSWindowWidth_$[w.id]" "$[w.width]p"
+ I SetEnv "FSWindowHeight_$[w.id]" "$[w.height]p"
-+ I WindowStyle !Title, !Borders, Iconifiable, ResizeHintOverride
+#+ I SetEnv "FSWindowX_$[w.id]" "$[cw.x]p"
+#+ I SetEnv "FSWindowY_$[w.id]" "$[cw.y]p"
++ I WindowStyle !Title, !Borders, !Handles, Iconifiable, ResizeHintOverride
+ I UpdateStyles
+ I WindowStyle State 19
+ I WindowStyle State 20
+ I Maximize ewmhiwa True 100 100
-+ I WindowStyle !Maximizable, FixedSize
++ I WindowStyle !Maximizable, FixedSize, FixedPosition
+ I UpdateStyles
# We need 1 temporary file for restoring the window state after restart
+ I Exec exec touch $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp
-# quit fullscreen
+# quit fullscreen {{{2
DestroyFunc Fullscreen-Stop
AddToFunc Fullscreen-Stop
+ I WindowStyle Title, Borders, Iconifiable, !ResizeHintOverride
-+ I WindowStyle Maximizable, !FixedSize
++ I WindowStyle Maximizable, !FixedSize, !FixedPosition
+ I WindowStyle !State 19
+ I WindowStyle !State 20
+ I Test (f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp) Exec exec rm -f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp
@@ -69,6 +78,8 @@
+ I PlaceAgain
+ I UnsetEnv "FSWindowWidth_$[w.id]"
+ I UnsetEnv "FSWindowHeight_$[w.id]"
+#+ I UnsetEnv "FSWindowX_$[w.id]" "$[w.x]p"
+#+ I UnsetEnv "FSWindowY_$[w.id]" "$[w.y]p"
# Wrapper function {{{1
DestroyFunc Disappear
@@ -82,10 +93,8 @@
done; \
for i in $(ls $[infostore.TmpDirectory]/fullscreen.19.0x???????.$[page.nx].$[page.ny].tmp 2>/dev/null); \
do echo "WindowId $(echo $i | cut -d . -f 3) Disappear-On"; done; fi'
-#+ I Next (State 19, !State 20) Disappear-Off
-#+ I TestRc (NoMatch) All (State 19, State 20, !Iconic) Disappear-On
-# disappear
+# disappear {{{2
# file tmp_dir/fuulscreen.20.* = hidden
DestroyFunc Disappear-On
AddToFunc Disappear-On
@@ -97,11 +106,9 @@
+ I UpdateStyles
+ I Iconify true
-# appear
+# appear {{{2
DestroyFunc Disappear-Off
AddToFunc Disappear-Off
-# Go to the original page of the window
-#Test (f $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].$[page.ny].tmp) PipeRead 'page=`ls $[infostore.TmpDirectory] | grep 20.$[w.id] | awk --field-separator . "{print 4}"`; echo "+ I GotoPage $page 0"'
+ I Iconify false
+ I WindowStyle State 20
+ I WindowStyle Icon
@@ -131,7 +138,7 @@
AddToFunc Disappear-Test
+ I Test (F $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.nx].$[page.ny].tmp) WindowId $[w.id] Disappear-Recover
-# wrapper
+# wrapper {{{2
DestroyFunc RecoverFullscreen
AddToFunc RecoverFullscreen
PipeRead 'for i in $[infostore.TmpDirectory]/fullscreen.19.*; do wid=`basename "$i" | awk --field-separator . \'{print $$3}\'`; echo "+ I WindowId ${wid} Fullscreen-Recover"; done'
@@ -139,7 +146,6 @@
+ I All Test (F $[infostore.TmpDirectory]/fullscreen.20.$[w.id].$[page.ny].$[page.ny].tmp) WindowId $[w.id] Disappear-Recover
AddToFunc StartFunction I RecoverFullscreen
-#AddToFunc StartFunction I All Test (F $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp) WindowId $[w.id] Fullscreen-Recover
AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.19.*
AddToFunc ExitFunction I Test (!ToRestart) Exec rm -f $[infostore.TmpDirectory]/fullscreen.20.*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-23 19:33:44
|
Revision: 283
http://sourceforge.net/p/fvwm-crystal/code/283
Author: dominique_libre
Date: 2013-04-23 19:33:39 +0000 (Tue, 23 Apr 2013)
Log Message:
-----------
functions/Icon-Launcher: cleanup; fix for wrong mount point
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Launcher
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-23 17:26:01 UTC (rev 282)
+++ ChangeLog 2013-04-23 19:33:39 UTC (rev 283)
@@ -7,6 +7,7 @@
disappear with EWMH-Toggle. Work best with StaloneTray.
recipes/Amiga: removed non needed tests
functions/Fullscreen: cleanup
+ functions/Icon-Launcher: cleanup; fix for wrong mount point.
Lundi 22 Avril Dominique Michel
recipes/*: move some SetEnv to Infostore; include Fullscreen functions
Modified: fvwm/components/functions/Icon-Launcher
===================================================================
--- fvwm/components/functions/Icon-Launcher 2013-04-23 17:26:01 UTC (rev 282)
+++ fvwm/components/functions/Icon-Launcher 2013-04-23 19:33:39 UTC (rev 283)
@@ -1,5 +1,5 @@
# Desktop icons for the mounted partition(s) and for $HOME.
-# Written by Dominique Michel <dom...@so...>, 2010
+# Written by Dominique Michel <dom...@us...>, 2010
# for Fvwm-Crystal.
#
# From Fvwm FAQ, 7.13 with huge modifications and added functions.
@@ -11,7 +11,7 @@
#
# Requirement: /etc/mtab, sed, Thunar, and Fvwm.
# 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.
+# into some recipe after "Include Icon-Amiga" or "Include Icon-Thumbnails".
#
# Todo: - preference setting for the action
@@ -34,12 +34,12 @@
+ I DestroyModuleConfig $0: *
+ I *$0: Font "xft:$[panel_font]"
+ I *$0: (1x1+0+0)
++ I All ($0) Layer 0 2
++ I Module FvwmButtons $0
++ I Module FvwmAuto 10 -menter "Change-Icon $0 $1" "Restore-Icon $0 $1"
+ I Style $0 UseStyle *
+ I Style $0 Icon $1, StartIconic, !Handles, VariablePosition, BorderWidth 0, \
!Borders, ParentalRelativity
-+ I All ($0) Layer 0 2
-+ I Module FvwmButtons $0
-+ I Module FvwmAuto 10 -menter "Change-Icon $0 $1" "Restore-Icon $0 $1"
DestroyFunc Change-Icon
AddToFunc Change-Icon
@@ -59,7 +59,7 @@
# 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"
+#+ I PipeRead "cat /etc/mtab|grep ^/dev | cut -d " " -f 2 | sort > /tmp/Icon-Drives"
# Root
+ I PipeRead 'Root="/"; echo "Launcher Root 48x48/categories/Boing_4.png"; \
echo "All (Root) Layer 0 0"; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-24 08:09:04
|
Revision: 286
http://sourceforge.net/p/fvwm-crystal/code/286
Author: dominique_libre
Date: 2013-04-24 08:08:57 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
functions/Icon-Launcher: cleanup; fix icon style to work with Icon-Thumbnails
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Launcher
fvwm/components/functions/Icon-Thumbnails
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-23 19:38:00 UTC (rev 285)
+++ ChangeLog 2013-04-24 08:08:57 UTC (rev 286)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+Mercredi 24 Avril 2013 Dominique Michel
+ functions/Icon-Launcher: cleanup; fix icon style to work with Icon-Thumbnails
+
Mardi 23 Avril 2913 Dominique Michl
recipes/*; functions/EWMH-BaseStruts; functions/NotificationAreaManager":
fix EWMH-Toggle
Modified: fvwm/components/functions/Icon-Launcher
===================================================================
--- fvwm/components/functions/Icon-Launcher 2013-04-23 19:38:00 UTC (rev 285)
+++ fvwm/components/functions/Icon-Launcher 2013-04-24 08:08:57 UTC (rev 286)
@@ -1,5 +1,5 @@
# Desktop icons for the mounted partition(s) and for $HOME.
-# Written by Dominique Michel <dom...@us...>, 2010
+# Written by Dominique Michel <dom...@us...>, 2010-2013
# for Fvwm-Crystal.
#
# From Fvwm FAQ, 7.13 with huge modifications and added functions.
@@ -8,11 +8,18 @@
# to the drives. At that time, the only action associated to the icons
# is to launch Thunar into the corresponding mount point.
# You can also move the icons, but the moves will not survive a restart.
+# The icons are like in the AmigaOS with 2 different pictures.
#
-# Requirement: mount, sed, Thunar, and Fvwm.
-# In order to use it, add "Test (x thunar) Include components/functions/Icon-Launcher"
-# into some recipe after "Include Icon-Amiga" or "Include Icon-Thumbnails".
+# Requirement: mount, grep, cut, Thunar, and Fvwm.
+# In order to use it, add
+#
+# Test (x thunar) PipeRead 'pidof rox 1>/dev/null || pidof nautilus 1>/dev/null || echo "Include components/functions/Icon-Launcher"'
#
+# into some recipe after "Include Icon-Amiga" or "Include Icon-Thumbnails". I added almost
+# all the icon styles here, so maybe this will work fine without one of those includes.
+#
+# Note:
+#
# Todo: - preference setting for the action
PipeRead 'echo "Style * IconBox $(($[vp.width]-36))x$(($[vp.height]-92))+18+46, IconFill top left, IconGrid 50 50"'
@@ -38,8 +45,7 @@
+ I Module FvwmButtons $0
+ I Module FvwmAuto 10 -menter "Change-Icon $0 $1" "Restore-Icon $0 $1"
+ I Style $0 UseStyle *
-+ I Style $0 Icon $1, StartIconic, !Handles, VariablePosition, BorderWidth 0, \
- !Borders, ParentalRelativity
++ I Style $0 Icon $1, StartIconic, !Handles, VariablePosition, BorderWidth 0, !Borders, ParentalRelativity, IconTitle, IconTitleColorset $[infostore.cs_menu_active], HilightIconTitleColorset $[infostore.cs_menu_active], IconTitleFormat %n, IconBackgroundColorset $[infostore.cs_icon_inactive], IconBackgroundColorset $[infostore.cs_icon_inactive], IconTitleRelief 0, IconBackgroundRelief 0, IconBackgroundRelief 0, IconFont "xft:$[title_font]:pixelsize=$[title_font_size]", StickyIcon,!StickyStippledIconTitle
DestroyFunc Change-Icon
AddToFunc Change-Icon
@@ -59,13 +65,13 @@
# which drives are mounted into the system
DestroyFunc Make-Icons
AddToFunc Make-Icons
-#+ I PipeRead "cat /etc/mtab|grep ^/dev | cut -d \" \" -f 3 | sort > /tmp/Icon-Drives"
++ I PipeRead "mount | grep ^/dev | cut -d \" \" -f 3 | 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 /"'
+#+ 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
+#+ I Wait Root
# Home
+ I PipeRead 'LocalUser=`id -un`; echo "Launcher Home 48x48/categories/Home.png"; \
echo "All (Home) Layer 0 0"; \
@@ -73,20 +79,19 @@
+ I Wait Home
# Make the icons
# The 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"
+# If you want all the mounted partitions, comment the #Root section in this function.
+# Uncomment also what follow to the end of this function.
+# You may want to comment the #Home function if it is on its own partition.
++ 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
Modified: fvwm/components/functions/Icon-Thumbnails
===================================================================
--- fvwm/components/functions/Icon-Thumbnails 2013-04-23 19:38:00 UTC (rev 285)
+++ fvwm/components/functions/Icon-Thumbnails 2013-04-24 08:08:57 UTC (rev 286)
@@ -1,5 +1,5 @@
# Thumbnails
-# Must be included after Fullscreen otherwise the icons can be moved
+# If included after Fullscreen, the icons cannot be moved
SetEnv ThumbWidth 128
SetEnv ThumbHeight 128
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-24 09:41:14
|
Revision: 287
http://sourceforge.net/p/fvwm-crystal/code/287
Author: dominique_libre
Date: 2013-04-24 09:41:11 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
functions/Icon-Launcher: fix possible freeze at startup; make it more robust and POSIX compliant
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Launcher
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-24 08:08:57 UTC (rev 286)
+++ ChangeLog 2013-04-24 09:41:11 UTC (rev 287)
@@ -10,7 +10,9 @@
disappear with EWMH-Toggle. Work best with StaloneTray.
recipes/Amiga: removed non needed tests; add Icon-Launcher
functions/Fullscreen: cleanup
- functions/Icon-Launcher: cleanup; fix for wrong mount point.
+ functions/Icon-Launcher: cleanup; fix possible freeze at startup wih a
+ check on /proc/ounts instead of a mount command. Replaced cut and grep
+ by awk. This should be POSIX compliant, more robust and show more partitions.
Lundi 22 Avril Dominique Michel
recipes/*: move some SetEnv to Infostore; include Fullscreen functions
Modified: fvwm/components/functions/Icon-Launcher
===================================================================
--- fvwm/components/functions/Icon-Launcher 2013-04-24 08:08:57 UTC (rev 286)
+++ fvwm/components/functions/Icon-Launcher 2013-04-24 09:41:11 UTC (rev 287)
@@ -10,7 +10,7 @@
# You can also move the icons, but the moves will not survive a restart.
# The icons are like in the AmigaOS with 2 different pictures.
#
-# Requirement: mount, grep, cut, Thunar, and Fvwm.
+# Requirement: gawk, sort, Thunar, and Fvwm.
# In order to use it, add
#
# Test (x thunar) PipeRead 'pidof rox 1>/dev/null || pidof nautilus 1>/dev/null || echo "Include components/functions/Icon-Launcher"'
@@ -65,7 +65,7 @@
# which drives are mounted into the system
DestroyFunc Make-Icons
AddToFunc Make-Icons
-+ I PipeRead "mount | grep ^/dev | cut -d \" \" -f 3 | sort > /tmp/Icon-Drives"
++ I PipeRead "gawk \'/^\\/dev\\// { print $$$2; }\' </proc/mounts |sort > /tmp/Icon-Drives"
# Root
#+ I PipeRead 'Root="/"; echo "Launcher Root 48x48/categories/Boing_4.png"; \
# echo "All (Root) Layer 0 0"; \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-24 17:15:18
|
Revision: 288
http://sourceforge.net/p/fvwm-crystal/code/288
Author: dominique_libre
Date: 2013-04-24 17:15:14 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
Re-added Eterm support
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-24 09:41:11 UTC (rev 287)
+++ ChangeLog 2013-04-24 17:15:14 UTC (rev 288)
@@ -2,6 +2,7 @@
Mercredi 24 Avril 2013 Dominique Michel
functions/Icon-Launcher: cleanup; fix icon style to work with Icon-Thumbnails
+ functions/Preferences-Menu: re-added Eterm support
Mardi 23 Avril 2913 Dominique Michl
recipes/*; functions/EWMH-BaseStruts; functions/NotificationAreaManager":
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2013-04-24 09:41:11 UTC (rev 287)
+++ fvwm/components/functions/Preferences-Menu 2013-04-24 17:15:14 UTC (rev 288)
@@ -194,6 +194,7 @@
Test (x mrxvt) + '%22x22/apps/mrxvt.png%MRxvt' SelectDefaultTerminal mrxvt
Test (x urxvt) + '%22x22/apps/urxvt.png%URxvt' SelectDefaultTerminal urxvt
Test (x aterm) + '%22x22/apps/aterm.png%Aterm' SelectDefaultTerminal aterm
+Test (x Eterm) + '%22x22/apps/Eterm.png%Eterm' SelectDefaultTerminal Eterm
Test (x xterm) + '%22x22/apps/xterm.png%XTerm' SelectDefaultTerminal xterm
DestroyFunc SelectDefaultTerminal
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-24 17:36:04
|
Revision: 290
http://sourceforge.net/p/fvwm-crystal/code/290
Author: dominique_libre
Date: 2013-04-24 17:36:01 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
functions(Window-Basic: replaced transset--df by transset
Modified Paths:
--------------
ChangeLog
INSTALL
fvwm/components/functions/Window-Basic
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-24 17:32:20 UTC (rev 289)
+++ ChangeLog 2013-04-24 17:36:01 UTC (rev 290)
@@ -4,6 +4,7 @@
functions/Icon-Launcher: cleanup; fix icon style to work with Icon-Thumbnails
functions/Preferences-Menu: re-added Eterm support
INSTALL: Added xcompmgr and transset into the optional dependencies
+ functions/Window-Basic: replaced transset-df ny transset
Mardi 23 Avril 2913 Dominique Michl
recipes/*; functions/EWMH-BaseStruts; functions/NotificationAreaManager":
Modified: INSTALL
===================================================================
--- INSTALL 2013-04-24 17:32:20 UTC (rev 289)
+++ INSTALL 2013-04-24 17:36:01 UTC (rev 290)
@@ -148,7 +148,7 @@
- At least one of 'mpd', 'mpc', 'gmpc' or 'xmms', 'xmms-shell', 'xmms-find' or 'xmms2' or
'quodlibet' or 'cdcd' or 'cmus' or 'alsaplayer' or 'mplayer' for built-in music
player support (even video support with mplayer)
-- 'transset' and 'xcompmgt'for full transparency support.
+- 'transset' and 'xcompmgr'for full transparency support.
- A mixer application. I recommand alsamixer.
- 'sudo' and 'gksudo' for running text/graphical applications as superuser and
for reboot/shutdown options in the Exit menu
Modified: fvwm/components/functions/Window-Basic
===================================================================
--- fvwm/components/functions/Window-Basic 2013-04-24 17:32:20 UTC (rev 289)
+++ fvwm/components/functions/Window-Basic 2013-04-24 17:36:01 UTC (rev 290)
@@ -47,7 +47,7 @@
+ C Raise
+ M Move
+ C Lower
-+ C All (!Iconic, !Focused, CurrentPage, !Overlapped) Focus
++ C Next (!Iconic, AcceptsFocus, CurrentPage, !Overlapped) Focus
# }
# { Used in recipes/Amiga for the pager
@@ -114,12 +114,13 @@
+ I Iconify
+ I Layer 0 2
+DestroyFunc Window-Decrease-Transparency
+AddToFunc Window-Decrease-Transparency
++ I Exec exec transset --actual --min 0 --dec .05
+
DestroyFunc Window-Increase-Transparency
AddToFunc Window-Increase-Transparency
-+ I Exec exec transset-df --actual --max 1 --inc .05
++ I Exec exec transset --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...> - 2013-04-24 23:38:02
|
Revision: 291
http://sourceforge.net/p/fvwm-crystal/code/291
Author: dominique_libre
Date: 2013-04-24 23:37:59 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
Added DVB channel lists support with preferences (mplayer)
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Media
fvwm/components/functions/Music
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-24 17:36:01 UTC (rev 290)
+++ ChangeLog 2013-04-24 23:37:59 UTC (rev 291)
@@ -5,6 +5,8 @@
functions/Preferences-Menu: re-added Eterm support
INSTALL: Added xcompmgr and transset into the optional dependencies
functions/Window-Basic: replaced transset-df ny transset
+ functions/Media; functions/Music; Functions/Preferences-Menu: Add DVB channel
+ lists support for mplayer with preferences
Mardi 23 Avril 2913 Dominique Michl
recipes/*; functions/EWMH-BaseStruts; functions/NotificationAreaManager":
Modified: fvwm/components/functions/Media
===================================================================
--- fvwm/components/functions/Media 2013-04-24 17:36:01 UTC (rev 290)
+++ fvwm/components/functions/Media 2013-04-24 23:37:59 UTC (rev 291)
@@ -135,7 +135,8 @@
# player quit (alsaplayer, mplayer)
DestroyFunc Music-Kill
AddToFunc Music-Kill
-+ I Exec exec echo "quit" > /home/$[infostore.USERDIR]/.mplayer/pipe
++ I Exec exec killall -9 mplayer
+#+ I Exec exec echo "quit" > /home/$[infostore.USERDIR]/.mplayer/pipe
# show/hyde the player GUI/menu
# (alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet)
@@ -294,12 +295,17 @@
DestroyFunc Playlist-generator-button
AddToFunc Playlist-generator-button
+ I DestroyMenu recreate /Playlist-button
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-button '$[gt.Select channel list]' PopUp /Preferences/MplayerChannelList
+ I AddToMenu /Playlist-button '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
+ I AddToMenu /Playlist-button '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 1' Music-WatchDVB 1
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-button '$[gt.Channels] DVB 1' PopUp /Music/ChannelSet1
Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 2' Music-WatchDVB 2
+Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-button '$[gt.Channels] DVB 2' PopUp /Music/ChannelSet2
Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 3' Music-WatchDVB 3
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-button '$[gt.Channels] DVB 3' PopUp /Music/ChannelSet3
Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-button '$[gt.Watch DVB] 4' Music-WatchDVB 4
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-button '$[gt.Channels] DVB 4' PopUp /Music/ChannelSet4
+ I AddToMenu /Playlist-button '$[gt.Load media file]' Popup /Music/LoadMovie
+ I AddToMenu /Playlist-button '$[gt.Play DVD]' Load-DVD
+ I AddToMenu /Playlist-button '$[gt.Load playlist]' Popup /Music/LoadMediaPlaylist
@@ -309,13 +315,18 @@
+ DynamicPopupAction Function Playlist-generator-button
# mplayer
+Test (F /dev/dvb/adapter0/frontend0) Include preferences/MplayerChannelList1
+Test (F /dev/dvb/adapter0/frontend0) Include preferences/MplayerChannelList2
+Test (F /dev/dvb/adapter0/frontend0) Include preferences/MplayerChannelList3
+Test (F /dev/dvb/adapter0/frontend0) Include preferences/MplayerChannelList4
+
DestroyMenu /Playlist
AddToMenu /Playlist
+ DynamicPopupAction Function /Playlist-generator
-DestroyMenu /Playlist-bot
-AddToMenu /Playlist-bot
-+ DynamicPopupAction Function /Playlist-generator-bot
+#DestroyMenu /Playlist-bot
+#AddToMenu /Playlist-bot
+#+ DynamicPopupAction Function /Playlist-generator-bot
DestroyFunc /Playlist-generator
AddToFunc /Playlist-generator
@@ -331,19 +342,19 @@
+ I AddToMenu /Playlist '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
+ 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/LoadMediaPlaylist
-+ I AddToMenu /Playlist-bot '$[gt.Load media file]' Popup /Music/LoadMovie
-+ I AddToMenu /Playlist-bot '$[gt.Play DVD]' Load-DVD
-Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 1' Music-WatchDVB 1
-Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 2' Music-WatchDVB 2
-Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 3' Music-WatchDVB 3
-Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 4' Music-WatchDVB 4
-#+ I AddToMenu /Playlist-bot '$[gt.Clear playlist]' Music-ClearPlaylist
-+ I AddToMenu /Playlist-bot '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
-+ I AddToMenu /Playlist-bot '$[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/LoadMediaPlaylist
+#+ I AddToMenu /Playlist-bot '$[gt.Load media file]' Popup /Music/LoadMovie
+#+ I AddToMenu /Playlist-bot '$[gt.Play DVD]' Load-DVD
+#Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 1' Music-WatchDVB 1
+#Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 2' Music-WatchDVB 2
+#Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 3' Music-WatchDVB 3
+#Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Playlist-bot '$[gt.Watch DVB] 4' Music-WatchDVB 4
+##+ I AddToMenu /Playlist-bot '$[gt.Clear playlist]' Music-ClearPlaylist
+#+ I AddToMenu /Playlist-bot '$[gt.Copy playlist]' Popup /Music/CopyPlaylist
+#+ I AddToMenu /Playlist-bot '$[gt.Remove playlist]' Popup /Music/RemovePlaylist
DestroyFunc Music-WatchDVB
AddToFunc Music-WatchDVB
@@ -351,26 +362,52 @@
+ I Exec exec fvwm-crystal.mplayer-wrapper file $[infostore.USERDIR] dvb://$[0]@
+ I Exec exec echo "start" > /home/$[infostore.USERDIR]/.mplayer/pipe
-### Comment me {{{1
+# DVD channels {{{1
# The DVB linux support is messy. Some multituners (frontends) cards (adapters)
-# have their tuners grouped under the same fronted, other use different frontends,
+# have their tuners grouped under the same adapter, other use different adapter,
# To make things worst, mplayer support only the first frontend of a given adapter,
# and it can use an unique channel list file or several files.
-# So, dvb_set_channel <channel_number> <card_number> is not supported for now
-#DestroyFunc Music-ChannelSet
-#AddToFunc Music-ChannelSet
-#+ I Exec exec echo "dvb_set_channel $0 0" > /home/$[infostore.USERDIR]/.mplayer/pipe
+# If you are in the first case, you may want to define some custom udev rules.
+DestroyFunc Music-ChannelSet
+AddToFunc Music-ChannelSet
++ I Exec exec echo "dvb_set_channel $0 $1" > /home/$[infostore.USERDIR]/.mplayer/pipe
-#DestroyFunc Channels-generator
-#AddToFunc Channels-generator
-#+ I DestroyMenu recreate /Music/ChannelSet
-#PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet "\\1"/\'); echo "$a Music-ChannelSet $i" ; i=$(($i+1)) ; done </home/dom/.mplayer/channels.conf.sat'
+DestroyFunc Channels-generator1
+AddToFunc Channels-generator1
++ I DestroyMenu recreate /Music/ChannelSet1
+Test (F /dev/dvb/adapter0/frontend0) PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet1 "\\1"/\'); echo "$a Music-ChannelSet $i 0" ; i=$(($i+1)) ; done <$[infostore.MplayerChannelList1]'
-#DestroyMenu /Music/ChannelSet
-#AddToMenu /Music/ChannelSet
-#+ DynamicPopupAction Function Channels-generator
-### End comment me {{{1
-#
+DestroyMenu /Music/ChannelSet1
+AddToMenu /Music/ChannelSet1
++ DynamicPopupAction Function Channels-generator1
+
+DestroyFunc Channels-generator2
+AddToFunc Channels-generator2
++ I DestroyMenu recreate /Music/ChannelSet2
+Test (F /dev/dvb/adapter1/frontend0) PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet2 "\\1"/\'); echo "$a Music-ChannelSet $i 1" ; i=$(($i+1)) ; done <$[infostore.MplayerChannelList2]'
+
+DestroyMenu /Music/ChannelSet2
+AddToMenu /Music/ChannelSet2
++ DynamicPopupAction Function Channels-generator2
+
+DestroyFunc Channels-generator3
+AddToFunc Channels-generator3
++ I DestroyMenu recreate /Music/ChannelSet3
+Test (F /dev/dvb/adapter2/frontend0) PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet3 "\\1"/\'); echo "$a Music-ChannelSet $i 2" ; i=$(($i+1)) ; done <$[infostore.MplayerChannelList3]'
+
+DestroyMenu /Music/ChannelSet3
+AddToMenu /Music/ChannelSet3
++ DynamicPopupAction Function Channels-generator3
+
+DestroyFunc Channels-generator4
+AddToFunc Channels-generator4
++ I DestroyMenu recreate /Music/ChannelSet4
+Test (F /dev/dvb/adapter4/frontend0) PipeRead 'i=0; while read line; do a=$(echo "$line" | sed -e \'s/\\([A-Za-z0-9 -_.]*\\).*/+ I AddToMenu \\/Music\\/ChannelSet4 "\\1"/\'); echo "$a Music-ChannelSet $i 3" ; i=$(($i+1)) ; done <$[infostore.MplayerChannelList4]'
+
+DestroyMenu /Music/ChannelSet4
+AddToMenu /Music/ChannelSet4
++ DynamicPopupAction Function Channels-generator4
+
# mouse 2 Menu /Playback {{{2
# alsaplayer, audacious, cdcd, cmus, mocp, mpd, mplayer, quodlibet, xmms2
DestroyFunc Music-Next
@@ -600,9 +637,11 @@
+ I AddToMenu /Music '$[gt.Mixer]' Popup /Mixer
+ I AddToMenu /Music '$[gt.Speed]' Popup /Speed
+ I AddToMenu /Music '$[gt.Show/Hide QJackCtl]' Music-QJackGUI
-### DVB channel change ### Comment me {{{1
-#+ I AddToMenu /Music 'Chaînes' PopUp /Music/ChannelSet
-### End Comment me
+# DVB channels
+Test (F /dev/dvb/adapter0/frontend0) + I AddToMenu /Music '$[gt.Channels] DVB 1' PopUp /Music/ChannelSet1
+Test (F /dev/dvb/adapter1/frontend0) + I AddToMenu /Music '$[gt.Channels] DVB 2' PopUp /Music/ChannelSet2
+Test (F /dev/dvb/adapter2/frontend0) + I AddToMenu /Music '$[gt.Channels] DVB 3' PopUp /Music/ChannelSet3
+Test (F /dev/dvb/adapter3/frontend0) + I AddToMenu /Music '$[gt.Channels] DVB 4' PopUp /Music/ChannelSet4
DestroyMenu /Music
AddToMenu /Music
Modified: fvwm/components/functions/Music
===================================================================
--- fvwm/components/functions/Music 2013-04-24 17:36:01 UTC (rev 290)
+++ fvwm/components/functions/Music 2013-04-24 23:37:59 UTC (rev 291)
@@ -69,6 +69,12 @@
# speed control (alsaplayer, mplayer) {{{2
InfoStoreRemove speed
+# DVB channel lists (mplayer) {{{2
+InfoStoreRemove MplayerChannelList1
+InfoStoreRemove MplayerChannelList2
+InfoStoreRemove MplayerChannelList3
+InfoStoreRemove MplayerChannelList4
+
# Decimal point in use (alsaplayer) {{{2
InfoStoreRemove dec_point
PipeRead 'if [[ $[infostore.MusicPlayer] == alsaplayer ]]; then echo "InfoStoreAdd dec_point `locale decimal_point`"; fi'
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2013-04-24 17:36:01 UTC (rev 290)
+++ fvwm/components/functions/Preferences-Menu 2013-04-24 23:37:59 UTC (rev 291)
@@ -359,6 +359,39 @@
+ I SavePreferences DefaultMusicPlayer "InfoStoreAdd MusicPlayer $[infostore.MusicPlayer]"
#
+# Mplayer DBD channels list
+#
+DestroyMenu /Preferences/MplayerChannelList
+AddToMenu /Preferences/MplayerChannelList
+Test (F /dev/dvb/adapter0/frontend0) + '%22x22/apps/mplayer.png%DVB 1' Module FvwmForm SelectChannelList-Dialog CARD=1
+Test (F /dev/dvb/adapter1/frontend0) + '%22x22/apps/mplayer.png%DVB 2' Module FvwmForm SelectChannelList-Dialog CARD=2
+Test (F /dev/dvb/adapter2/frontend0) + '%22x22/apps/mplayer.png%DVB 3' Module FvwmForm SelectChannelList-Dialog CARD=3
+Test (F /dev/dvb/adapter3/frontend0) + '%22x22/apps/mplayer.png%DVB 4' Module FvwmForm SelectChannelList-Dialog CARD=4
+
+DestroyFunc SelectMplayerChannelList
+AddToFunc SelectMplayerChannelList
++ I SavePreferences MplayerChannelList$[0] "InfoStoreAdd MplayerChannelList$[0] '$[1]'"
++ I InfoStoreAdd MplayerChannelList$[0] '$[1]'
+
+All (SelectChannelList-Dialog) Close
+DestroyModuleConfig Module SelectChannelList-Dialog: *
+*SelectChannelList-Dialog: Title "$[gt.Select channel list]"
+*SelectChannelList-Dialog: Text "$[gt.Enter the name of the channel list for the DVB input] $CARD"
+*SelectChannelList-Dialog: Line center
+*SelectChannelList-Dialog: Line center
+PipeRead 'echo "*SelectChannelList-Dialog: Text \\"$[gt.It must be in] /home/$(id -un)/.mplayer/\\""'
+*SelectChannelList-Dialog: Line center
+*SelectChannelList-Dialog: Line center
+PipeRead 'echo "*SelectChannelList-Dialog: Input file 40 \\"/home/$(id -un)/.mplayer/channels.conf\\""'
+*SelectChannelList-Dialog: Line center
+*SelectChannelList-Dialog: Line center
+*SelectChannelList-Dialog: Button quit " $[gt.Save] " ^M
+*SelectChannelList-Dialog: Command SelectMplayerChannelList $CARD "$(file)"
+*SelectChannelList-Dialog: Button quit " $[gt.No] " ^[
+*SelectChannelList-Dialog: Command Nop
+*SelectChannelList-Dialog: Line center
+
+#
# Audio mixer
#
DestroyMenu /Preferences/Mixer
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-26 22:34:49
|
Revision: 301
http://sourceforge.net/p/fvwm-crystal/code/301
Author: dominique_libre
Date: 2013-04-26 22:34:45 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
functions/Screenshot-import: added Seconds to the filename; fixed context
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Screenshot-import
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-26 22:13:25 UTC (rev 300)
+++ ChangeLog 2013-04-26 22:34:45 UTC (rev 301)
@@ -5,6 +5,7 @@
Updated fr_FR.UTF-8 translation
Added some symlinks for the translations
styles/FVWM: updated NoHandles to !Handles
+ functions/Screenshot-import: added Seconds to the filename; fixed context.
Jeudi 25 Avril 2013 Dominique Michel
+ assons/10-local.rules: udev rules for some multituners dvb cards.
Modified: fvwm/components/functions/Screenshot-import
===================================================================
--- fvwm/components/functions/Screenshot-import 2013-04-26 22:13:25 UTC (rev 300)
+++ fvwm/components/functions/Screenshot-import 2013-04-26 22:34:45 UTC (rev 301)
@@ -3,17 +3,17 @@
DestroyFunc Screenshot
AddToFunc Screenshot
+ I Exec exec mkdir -p $[FVWM_USERDIR]/screenshots
-+ I Exec exec import -window root -quality 100 $[FVWM_USERDIR]/screenshots/screenshot-`date +%Y%m%d_%H%M`.png
++ I Exec exec import -window root -quality 100 $[FVWM_USERDIR]/screenshots/screenshot-`date +%Y%m%d_%H%M%S`.png
DestroyFunc Screenshot-Delay
AddToFunc Screenshot-Delay
+ I Exec exec mkdir -p $[FVWM_USERDIR]/screenshots
-+ I Exec exec import -pause 10 -window root -quality 100 $[FVWM_USERDIR]/screenshots/screenshot-`date +%Y%m%d_%H%M`.png
++ I Exec exec import -pause 10 -window root -quality 100 $[FVWM_USERDIR]/screenshots/screenshot-`date +%Y%m%d_%H%M%S`.png
DestroyFunc Screenshot-Frame
AddToFunc Screenshot-Frame
+ I Exec exec mkdir -p $[FVWM_USERDIR]/screenshots
-+ I Exec exec import -frame -quality 100 $[FVWM_USERDIR]/screenshots/screenshot-`date +%Y%m%d_%H%M`.png
++ I All (CurrentPage) Exec exec import -frame -quality 100 $[FVWM_USERDIR]/screenshots/screenshot-`date +%Y%m%d_%H%M%S`.png 2>/dev/null
# A little menu...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-27 21:57:27
|
Revision: 304
http://sourceforge.net/p/fvwm-crystal/code/304
Author: dominique_libre
Date: 2013-04-27 21:57:24 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
functions/FvwmExpose: make it to work. A little bit flaky. See commented code for a non flaky version. If you know how to archive non flaky transparency, please drop me a mail.
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/FvwmExpose
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-27 21:51:54 UTC (rev 303)
+++ ChangeLog 2013-04-27 21:57:24 UTC (rev 304)
@@ -4,6 +4,9 @@
bin/fvwm-crystal.videomodeswitch+: video mode switching usingg xrandr;
bin/fvwm-crystal.videomodeswitch-: video mode switching usingg xrandr:
commented debuging function
+ functions/FvwmExpose: make it to work. A little bit flaky. See commented
+ code for a non flaky version. If you know how to archive non flaky transparency,
+ please drop me a mail.
Vendredi 26 Avril 2013 Dominique Michel
+ addons/make_mo: make file for translations
Modified: fvwm/components/functions/FvwmExpose
===================================================================
--- fvwm/components/functions/FvwmExpose 2013-04-27 21:51:54 UTC (rev 303)
+++ fvwm/components/functions/FvwmExpose 2013-04-27 21:57:24 UTC (rev 304)
@@ -1,30 +1,41 @@
-# Expose clone for FVWM
-# Experimental code, needs improvement
+# Expose clone for FVWM-Crystal
+# Original idea from Taviso http://zensites.net/fvwm/guide/advanced_functions.html
+# Modified by Harnir and by me. Dominique Michel <dom...@so...>
+# See ChangeLog
+# Raise the wanted window and kill FvwmExpose
DestroyFunc FvwmExpose-Action
AddToFunc FvwmExpose-Action
+ I WindowId $* Raise
+ I KillModule FvwmButtons FvwmExpose
-
-
+
+# Create 1 picture and 1 FvwmExpose button at a time
+# To use w.name instead of w.class need something like \\\\\"$[w.name]\\\\\"
+# and to filter out or quote the () (they confuse Fvwm-Buttons)
+DestroyFunc FvwmExpose-Thumbnail
+AddToFunc FvwmExpose-Thumbnail
++ I PipeRead \
+ "echo Raise; xwd -id $[w.id] > /tmp/icon.exp.$[w.id].xwd ; convert -scale 300 -quality 0 xwd:/tmp/icon.exp.$[w.id].xwd png:/tmp/icon.exp.$[w.id].png ; \
+ echo '*FvwmExpose: (1x1, Title (Center) $[w.class], Icon /tmp/icon.exp.$[w.id].png, Action FvwmExpose-Action $[w.id] )'"
+# Not flaky, but no transparency:
+# echo '*FvwmExpose: (1x1, Swallow (UseOld,NoKill) IM:$[w.id] `Exec animate -title IM:$[w.id] /tmp/icon.exp.$[w.id].png &`, Action FvwmExpose-Action $[w.id] )'"
+
+# Bind this
DestroyFunc FvwmExpose
AddToFunc FvwmExpose
+ I DestroyModuleConfig FvwmExpose: *
-#+ I PipeRead 'echo "*FvwmExpose: Geometry $[vp.width]x$[vp.height]+0+0"'
-+ I PipeRead 'echo "*FvwmExpose: Geometry $(($[vp.width]-300))x$(($[vp.height]-300))+0+0"'
++ I PipeRead 'echo "*FvwmExpose: Geometry $(($[vp.width]-50))x$(($[vp.height]-300))+25+150"'
+ I *FvwmExpose: BoxSize Fixed
+ I *FvwmExpose: Colorset $[infostore.cs_panel_inactive]
+ I *FvwmExpose: ActiveColorset $[infostore.cs_panel_active]
+ I *FvwmExpose: Padding 4 4
+ I *FvwmExpose: Frame 0
-+ I *FvwmExpose: Font "StringEncoding:UTF-8:xft:Verdana:pixelsize=13"
-+ I All (!Iconic, !FvwmMiniConsoleNeedsUniqueName, !Shaded, CurrentPage, AcceptsFocus) PipeRead \
- "echo Raise; xwd -silent -id $[w.id] > /tmp/icon.exp.$[w.id].xwd ; convert -scale 300 -quality 0 xwd:/tmp/icon.exp.$[w.id].xwd png:$[FVWM_USERDIR]/icon.exp.$[w.id].png && \
- echo '*FvwmExpose: (1x1, Title (Center) \"$[w.name]\", Icon $[FVWM_USERDIR]/icon.exp.$[w.id].png, Action FvwmExpose-Action $[w.id] )'"
++ I *FvwmExpose: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold:Italic:pixelsize=13"
++ I All (!Iconic, !FvwmMiniConsoleNeedsUniqueName, !Shaded, CurrentPage, AcceptsFocus) FvwmExpose-Thumbnail
+ I Module FvwmButtons FvwmExpose
+ I None (FvwmExpose) Wait
+ I All (FvwmExpose) Layer 0 6
+ I All (FvwmExpose) Raise
-+ I Exec exec rm -f $[FVWM_USERDIR]/icon.exp.*
++ I Exec exec rm -f /tmp/icon.exp.*
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-27 22:09:06
|
Revision: 305
http://sourceforge.net/p/fvwm-crystal/code/305
Author: dominique_libre
Date: 2013-04-27 22:09:03 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
functions/Icon-Thumbnails: commented StartFunction, must be at the end of the recipe instead.
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Thumbnails
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-27 21:57:24 UTC (rev 304)
+++ ChangeLog 2013-04-27 22:09:03 UTC (rev 305)
@@ -7,7 +7,9 @@
functions/FvwmExpose: make it to work. A little bit flaky. See commented
code for a non flaky version. If you know how to archive non flaky transparency,
please drop me a mail.
-
+ functions/Icon-Thumbnails: commented StartFunction, must be at the end of the
+ recipe instead.
+
Vendredi 26 Avril 2013 Dominique Michel
+ addons/make_mo: make file for translations
Updated fr_FR.UTF-8 translation
Modified: fvwm/components/functions/Icon-Thumbnails
===================================================================
--- fvwm/components/functions/Icon-Thumbnails 2013-04-27 21:57:24 UTC (rev 304)
+++ fvwm/components/functions/Icon-Thumbnails 2013-04-27 22:09:03 UTC (rev 305)
@@ -90,7 +90,7 @@
AddToFunc RecoverThumbnails
+ I All Test (f $[ThumbDirectory]/icon.tmp.$[w.id].png) WindowId $[w.id] WindowStyle IconOverride, Icon $[ThumbDirectory]/icon.tmp.$[w.id].png
-AddToFunc StartFunction I RecoverThumbnails
+#AddToFunc StartFunction I RecoverThumbnails
DestroyModuleConfig FvwmEvent-Icon-Thumbnails: *
*FvwmEvent-Icon-Thumbnails: deiconify RemoveThumbnail
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-28 16:00:04
|
Revision: 309
http://sourceforge.net/p/fvwm-crystal/code/309
Author: dominique_libre
Date: 2013-04-28 16:00:01 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
functions/Window-Buttons; functions/Fullscreen: cleanup of WindowResize and associated functions. Simpler and better than ever.
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
fvwm/components/functions/Window-Buttons
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-27 23:15:37 UTC (rev 308)
+++ ChangeLog 2013-04-28 16:00:01 UTC (rev 309)
@@ -1,5 +1,9 @@
ChangeLog for FVWM-Crystal
+Dimanche 28 Avril 2013 Dominique Michel
+ functions/Window-Buttons; functions/Fullscreen: cleanup of WindowResize
+ and associated functions. Simpler and better than ever.
+
Samedi 27 Avril 2013 Dominique Michel
bin/fvwm-crystal.videomodeswitch+: video mode switching usingg xrandr;
bin/fvwm-crystal.videomodeswitch-: video mode switching usingg xrandr:
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2013-04-27 23:15:37 UTC (rev 308)
+++ fvwm/components/functions/Fullscreen 2013-04-28 16:00:01 UTC (rev 309)
@@ -57,10 +57,6 @@
# fullscreen {{{2
DestroyFunc Fullscreen-Start
AddToFunc Fullscreen-Start
-+ I SetEnv "FSWindowWidth_$[w.id]" "$[w.width]p"
-+ I SetEnv "FSWindowHeight_$[w.id]" "$[w.height]p"
-#+ I SetEnv "FSWindowX_$[w.id]" "$[cw.x]p"
-#+ I SetEnv "FSWindowY_$[w.id]" "$[cw.y]p"
+ I WindowStyle !Title, !Borders, !Handles, Iconifiable, ResizeHintOverride
+ I UpdateStyles
+ I WindowStyle State 19
@@ -80,12 +76,7 @@
+ I WindowStyle !State 20
+ I Test (f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp) Exec exec rm -f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp
+ I UpdateStyles
-+ I Maximize True $[FSWindowWidth_$[w.id]] $[FSWindowHeight_$[w.id]]
-+ I PlaceAgain
-+ I UnsetEnv "FSWindowWidth_$[w.id]"
-+ I UnsetEnv "FSWindowHeight_$[w.id]"
-#+ I UnsetEnv "FSWindowX_$[w.id]" "$[w.x]p"
-#+ I UnsetEnv "FSWindowY_$[w.id]" "$[w.y]p"
++ I NS-Default
# Wrapper function {{{1
DestroyFunc Disappear
Modified: fvwm/components/functions/Window-Buttons
===================================================================
--- fvwm/components/functions/Window-Buttons 2013-04-27 23:15:37 UTC (rev 308)
+++ fvwm/components/functions/Window-Buttons 2013-04-28 16:00:01 UTC (rev 309)
@@ -23,86 +23,88 @@
#
# Bugs/improvments:
# - Finish to implement the mouse resized state.
-# - When clicking 2 times on the same button, make than the window will return
-# in its preceding state with the second click.
-# Possible sizes: custom-fullscreen-max-normal-min
-## if actual_size=size then previous_size else size
-## Variables creation and destruction
-## FvwmEvent will do it.
+# Variables creation and destruction {{{1
+# They must survive a restart => SetEnv
+# FvwmEvent will do it.
DestroyFunc Window-State-Init
AddToFunc Window-State-Init
+ I SetEnv "CurrentWindowState_$[w.id]" Default
-+ I SetEnv "PreviousWindowState_$[w.id]" Default
+ I SetEnv "WindowWidth_$[w.id]" "$[w.width]p"
+ I SetEnv "WindowHeight_$[w.id]" "$[w.height]p"
DestroyFunc Window-State-Destroy
AddToFunc Window-State-Destroy
+ I UnsetEnv "CurrentWindowState_$[w.id]"
-+ I UnsetEnv "PreviousWindowState_$[w.id]"
+ I UnsetEnv "WindowWidth_$[w.id]"
+ I UnsetEnv "WindowHeight_$[w.id]"
++ I UnsetEnv "WindowX_$[w.id]"
++ I UnsetEnv "WindowY_$[w.id]"
# Variables update, see components/Window-Basic
# param for fvwm-event: add_window, destroy_window, property_change
DestroyModuleConfig FvwmEvent-Window-State-Init: *
-*FvwmEvent-Window-State-Init: add_window Window-State-Init
+*FvwmEvent-Window-State-Init: add_window Window-State-Init
*FvwmEvent-Window-State-Init: destroy_window Window-State-Destroy
-
Module FvwmEvent FvwmEvent-Window-State-Init
## Wrapper function for the resizing functions
-# Logic: if actual_size=size then previous_size else size
+# Logic: if actual_size=size then default_size else size
# Syntax: Window-Resize <size>
-# Where size is one of Maximize-Minimize-Default-A100-H100-V100
+# Where size is one of Maximize-Minimize-Default-A100-H100-V100-VHgrow-Hgrow-Vgrow
# For fullscreen see components/Fullscreen
-
DestroyFunc Window-Resize
AddToFunc Window-Resize
-+ I Test (EnvMatch CurrentWindowState_$[w.id] "$0") NS-$[PreviousWindowState_$[w.id]]
++ I Test (EnvMatch CurrentWindowState_$[w.id] "$0") NS-Default
+ I TestRc (NoMatch) NS-"$0"
DestroyFunc NS-Maximize
AddToFunc NS-Maximize
-+ I Maximize True
-+ I SetEnv "PreviousWindowState_$[w.id]" $[CurrentWindowState_$[w.id]]
++ I Maximize True 100 100
+ I SetEnv CurrentWindowState_$[w.id] Maximize
DestroyFunc NS-Minimize
AddToFunc NS-Minimize
-+ I Maximize True 24 10
-+ I SetEnv "PreviousWindowState_$[w.id]" $[CurrentWindowState_$[w.id]]
++ I ResizeMaximize direction East 200p 60p
+ I SetEnv CurrentWindowState_$[w.id] Minimize
DestroyFunc NS-Default
AddToFunc NS-Default
-+ I Maximize True $[WindowWidth_$[w.id]] $[WindowHeight_$[w.id]]
-+ I SetEnv "PreviousWindowState_$[w.id]" $[CurrentWindowState_$[w.id]]
++ I Maximize $[WindowWidth_$[w.id]] $[WindowHeight_$[w.id]]
+ I SetEnv CurrentWindowState_$[w.id] Default
DestroyFunc NS-A100
AddToFunc NS-A100
-+ I Maximize True grow 0
-+ I Maximize True 0 grow
-+ I SetEnv "PreviousWindowState_$[w.id]" $[CurrentWindowState_$[w.id]]
++ I Maximize True 100 100
+ I SetEnv CurrentWindowState_$[w.id] A100
DestroyFunc NS-H100
AddToFunc NS-H100
-+ I Maximize True grow 0
-+ I SetEnv "PreviousWindowState_$[w.id]" $[CurrentWindowState_$[w.id]]
++ I Maximize True 100 0
+ I SetEnv CurrentWindowState_$[w.id] H100
DestroyFunc NS-V100
AddToFunc NS-V100
-+ I Maximize True 0 grow
-+ I SetEnv "PreviousWindowState_$[w.id]" $[CurrentWindowState_$[w.id]]
++ I Maximize True 0 100
+ I SetEnv CurrentWindowState_$[w.id] V100
-## Other functions
-# Wrapper functions for window decorations
+DestroyFunc NS-Hgrow
+AddToFunc NS-Hgrow
++ I Maximize True grow 0
++ I SetEnv CurrentWindowState_$[w.id] Hgrow
+
+DestroyFunc NS-Vgrow
+AddToFunc NS-Vgrow
++ I Maximize True 0 grow
++ I SetEnv CurrentWindowState_$[w.id] Vgrow
+
+DestroyFunc NS-VHgrow
+AddToFunc NS-VHgrow
++ I Maximize True grow grow
++ I SetEnv CurrentWindowState_$[w.id] VHgrow
+
+# Wrapper functions for window decorations {{{1
DestroyFunc Window-MoveToPage-Forward
AddToFunc Window-MoveToPage-Forward
+ I MoveToPage-Right
@@ -119,13 +121,11 @@
AddToFunc Window-WarpToPage-Backward
+ I WarpToPage-Left
-
DestroyFunc Window-Button-Function
AddToFunc Window-Button-Function
+ H Popup $1 $0 0 100
+ C $2 $3 $4 $5 $6 $7 $8 $9
-
DestroyMenu /Window-Menu-Close
AddToMenu /Window-Menu-Close
+ '$[gt.Iconify]' Window-Iconify
@@ -136,13 +136,14 @@
DestroyMenu /Window-Menu-Maximize
AddToMenu /Window-Menu-Maximize
-+ '$[gt.Maximize]' Maximize
-+ '$[gt.Maximize horizontally]' Maximize 100 0
-+ '$[gt.Maximize vertically]' Maximize 0 100
++ '$[gt.Maximize]' Window-Resize Maximize
++ '$[gt.Minimize]' Window-Resize Minimize
++ '$[gt.Maximize horizontally]' Window-Resize H100
++ '$[gt.Maximize vertically]' Window-Resize V100
+ "" Nop
-+ '$[gt.Take all free space]' Maximize grow grow
-+ '$[gt.Take all horizontal space]' Maximize grow 0
-+ '$[gt.Take all vertical space]' Maximize 0 grow
++ '$[gt.Take all free space]' Window-Resize VHgrow
++ '$[gt.Take all horizontal space]' Window-Resize Hgrow
++ '$[gt.Take all vertical space]' Window-Resize Vgrow
+ "" Nop
+ '$[gt.Fullscreen]' Fullscreen
@@ -173,12 +174,12 @@
+ I PipeRead 'for i in `seq 0 $(($[desk.pagesx]-1))` ; do echo "AddToMenu /Window-Menu-Page \'$[gt.Move to page] $(($i+1))\' MoveToPage $i 0" ; done'
-# Combined version of menu for window styles other than FVWM-Crystal
+# Combined version of menu for window styles other than FVWM-Crystal and Amiga {{{1
DestroyMenu /Window-Menu
AddToMenu /Window-Menu
-+ '$[gt.Iconify]' Window-Iconify
-+ '$[gt.Stick]' Stick
-+ '$[gt.Stay raised]' Layer 0 5
++ '$[gt.Iconify]' Window-Iconify
++ '$[gt.Stick]' Stick
++ '$[gt.Stay raised]' Layer 0 5
+ '$[gt.Normal mode]' Layer 0 4
+ '$[gt.Maximize]' Maximize
+ '$[gt.Fullscreen]' Fullscreen
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-29 10:09:40
|
Revision: 317
http://sourceforge.net/p/fvwm-crystal/code/317
Author: dominique_libre
Date: 2013-04-29 10:09:37 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
functions/Colorsets: fix stalonetray to update its colorset
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Colorsets
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-29 08:24:36 UTC (rev 316)
+++ ChangeLog 2013-04-29 10:09:37 UTC (rev 317)
@@ -2,6 +2,7 @@
Lundi 29 Avril 2013 Dominique Michel
NEWS update
+ functions/Colorsets: fix stalonetray to update its colorset
Dimanche 28 Avril 2013 Dominique Michel
functions/Window-Buttons; functions/Fullscreen: cleanup of WindowResize
Modified: fvwm/components/functions/Colorsets
===================================================================
--- fvwm/components/functions/Colorsets 2013-04-29 08:24:36 UTC (rev 316)
+++ fvwm/components/functions/Colorsets 2013-04-29 10:09:37 UTC (rev 317)
@@ -10,6 +10,11 @@
AddToFunc Colorsets-Set
+ I Read $*
+ I UpdateStyles
+# remove me when stalonetray will be fixed, 4 lines:
++ I Schedule 100 All (FvwmStalonePanel) Iconify True
++ I Schedule 200 All (FvwmStalonePanel) Iconify False
++ I Schedule 100 All (FvwmButtons-BottomNotifAera) Iconify True
++ I Schedule 200 All (FvwmButtons-BottomNotifAera) Iconify False
+ I SavePreferences LastChoosenColorset "Colorsets-Set $*"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-29 20:36:47
|
Revision: 321
http://sourceforge.net/p/fvwm-crystal/code/321
Author: dominique_libre
Date: 2013-04-29 20:36:44 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
Updated and NumLock fix the mouse bindings
Modified Paths:
--------------
ChangeLog
doc/Mouse bindings.txt
fvwm/components/decorations/Buttons-amigaos
fvwm/components/decorations/Buttons-amigaos-MiniIcon
fvwm/components/decorations/Buttons-amigaos_NumLock
fvwm/components/decorations/Buttons-fvwm-crystal
fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon
fvwm/components/decorations/Buttons-fvwm-crystal_NumLock
fvwm/components/decorations/Buttons-macosx
fvwm/components/decorations/Buttons-macosx-MiniIcon
fvwm/components/decorations/Buttons-macosx_NumLock
fvwm/components/decorations/Buttons-os2
fvwm/components/decorations/Buttons-os2-MiniIcon
fvwm/components/decorations/Buttons-os2_NumLock
fvwm/components/decorations/Buttons-windows
fvwm/components/decorations/Buttons-windows_NumLock
fvwm/components/functions/Fullscreen
fvwm/components/functions/Window-Decorations
fvwm/components/functions/Window-Focus
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-29 15:19:55 UTC (rev 320)
+++ ChangeLog 2013-04-29 20:36:44 UTC (rev 321)
@@ -6,6 +6,7 @@
bin: updated some headers
doc: updated some headers, added a few sentences.
doc/FAQ: added 3.7 about flaky MPlayer.
+ updated and NumLock fix the mouse bindings.
Dimanche 28 Avril 2013 Dominique Michel
functions/Window-Buttons; functions/Fullscreen: cleanup of WindowResize
Modified: doc/Mouse bindings.txt
===================================================================
--- doc/Mouse bindings.txt 2013-04-29 15:19:55 UTC (rev 320)
+++ doc/Mouse bindings.txt 2013-04-29 20:36:44 UTC (rev 321)
@@ -29,7 +29,7 @@
Toggle the ability to switch desktop pages using screen edge (off/on,
defult off).
On the Amiga recipe, it will toggle the visibility of the top panel
- between top and bottom.
+ between top and bottom layer.
Alt + MMB
Hide or show desktop panels.
@@ -43,7 +43,7 @@
RMB
Open a terminal window.
-Alt + MMB
+Alt + DoubleClick MMB
Close selected window.
@@ -64,8 +64,6 @@
Alt + MMB
Resize selected window (move bottom-right corner).
-Wheel
- Increase or decrease the transparency of the selected window.
Window's titlebar
-----------------------------------------------------------------------------
@@ -87,14 +85,24 @@
MMB + drag
Resize selected window (choose window edge(s) to move).
+Wheel
+ Increase or decrease the transparency of the selected window.
+
Titlebar buttons
------------------------------------------------------------------------------
+----------------------------------------------------------------------------
+
LMB, RMB, MMB + hold
Show button menu(s).
FVWM-Crystal button model:
- Close buttons:
+ +----------+-----------------+----------+-----------+------------"----------+
+ | Close B. | | Arrows B.| Options B.| Maximize B.| Close B. |
+ +----------+-----------------+----------+-----------+------------+----------+
+This apply also to the Amiga button model, which is the same but with only
+one close button on the left:
+
+ Close buttons:
LMB
Close selected window.
@@ -107,7 +115,7 @@
Alt + MMB
Destroy (kill) selected window.
- Maximize button:
+ Maximize button (toggle between new size and default size):
LMB
Maximize window.
@@ -128,21 +136,26 @@
Window options button:
LMB
- Set window to stay on top.
+ Minimize the window (or toggle to the default size).
Alt + LMB
- Set window to stay on bottom.
+ Toggle sticky window mode.
RMB
- Toggle sticky window mode.
-
- MMB
Set window in "normal" mode (clears stay on
top/bottom).
+ MMB
+ Set window to stay on top.
+
+ Alt + MMB
+ Set window to stay on bottom.
+
+
Arrows button:
LMB
Move selected window to the left (upper) desktop page.
+ Amiga model: Iconify the window.
Alt + LMB
Go to the left (upper) page with selected window.
Modified: fvwm/components/decorations/Buttons-amigaos
===================================================================
--- fvwm/components/decorations/Buttons-amigaos 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-amigaos 2013-04-29 20:36:44 UTC (rev 321)
@@ -21,34 +21,37 @@
# Button 6: iconify (on non transiet window)
-# First button - close, destroy, save default geometry
-Mouse 1 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close Close
-Mouse 2 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent
+# First button - close, destroy, iconify #save default geometry
+Mouse 1 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Close
+Mouse 2 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent
Mouse 2 1 $[Mod1] Window-Button-Function Button1 /Window-Menu-Close Destroy
-Mouse 3 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close SaveWindowGeom
+Mouse 3 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Window-Iconify
+#SaveWindowGeom
Style * Button 1
# Second button - raise/lower and various ways to maximize a window
-Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower
-Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
-Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow
Style * Button 2
Style * NoButton 3
-# 4th button - minimize, default, maximize
-Mouse 1 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize
-Mouse 2 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Default
-Mouse 3 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Maximize
+# 4th button - minimize, stick and layers
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Stick
+Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 5
+Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 3
+Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 4
Style * Button 4
Style * NoButton 5
-# 6th button - move a window between pages
+# 6th button - iconify, move a window between pages
Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-Iconify
#Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-MoveToPage-Backward
Mouse 2 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page MoveToPage-Focus prev
Modified: fvwm/components/decorations/Buttons-amigaos-MiniIcon
===================================================================
--- fvwm/components/decorations/Buttons-amigaos-MiniIcon 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-amigaos-MiniIcon 2013-04-29 20:36:44 UTC (rev 321)
@@ -6,20 +6,21 @@
# to see the popup menu of a certain button.
-# First button - close, destroy, save default geometry
-Mouse 1 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close Close
-Mouse 2 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent
+# First button - close, destroy, iconify #save default geometry
+Mouse 1 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Close
+Mouse 2 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent
Mouse 2 1 $[Mod1] Window-Button-Function Button1 /Window-Menu-Close Destroy
-Mouse 3 1 $[Mod] Window-Button-Function Button1 /Window-Menu-Close SaveWindowGeom
+Mouse 3 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Window-Iconify
+#SaveWindowGeom
Style * Button 1
# Second button -various ways to maximize a window
-Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower
-Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
-Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow
Style * Button 2
#Mouse 1 2 $[Mod0] RaiseLower
@@ -29,15 +30,17 @@
Mouse 3 3 $[Mod] Window-Lower-Move
Style * Button 3
-# 4th button - minimize, default, maximize
-Mouse 1 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize
-Mouse 2 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Default
-Mouse 3 4 $[Mod] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Maximize
+# 4th button - minimize, stick and layers
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Stick
+Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 5
+Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 3
+Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 4
Style * Button 4
Style * NoButton 5
-# 6th button - move a window between pages
+# 6th button - iconify, move a window between pages
Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-Iconify
#Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-MoveToPage-Backward
Mouse 2 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page MoveToPage-Focus prev
Modified: fvwm/components/decorations/Buttons-amigaos_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-amigaos_NumLock 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-amigaos_NumLock 2013-04-29 20:36:44 UTC (rev 321)
@@ -6,23 +6,28 @@
# to see the popup menu of a certain button.
# Additional support for NumLock key
-# First button - close, destroy, save default geometry
+# First button - close, destroy, iconify #save default geometry
+Mouse 1 1 $[Mod0]2 Window-Button-Function Button1 /Window-Menu-Close Close
+Mouse 2 1 $[Mod0]2 Window-Button-Function Button1 /Window-Menu-Close FvwmIdent
Mouse 2 1 $[Mod1]2 Window-Button-Function Button1 /Window-Menu-Close Destroy
+Mouse 3 1 $[Mod0]2 Window-Button-Function Button1 /Window-Menu-Close Window-Iconify
# 2th button - various ways to maximize a window
-Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower
-Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
-Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
+Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow
-# 4th button - minimize, default, maximize
+# 4th button - minimize, stick and layers
Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Minimize
-Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Default
-Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Window-Resize Maximize
+Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Layer Stick
+Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Layer 0 5
+Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Layer Layer 0 3
+Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Layer Layer 0 4
-# 6th button - move a window between pages
+# 6th button - iconify, move a window between pages
Mouse 1 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Page Window-Iconify
#Mouse 1 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Page Window-MoveToPage-Backward
Mouse 2 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Page MoveToPage-Focus prev
Modified: fvwm/components/decorations/Buttons-fvwm-crystal
===================================================================
--- fvwm/components/decorations/Buttons-fvwm-crystal 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-fvwm-crystal 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,5 +1,6 @@
# FVWM-Crystal Button Setup
# Written by Maciej Delmanowski <ha...@li...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the default FVWM-Crystal window button setup. Hold the mouse buttons
# to see the popup menu of a certain button.
@@ -22,21 +23,22 @@
Style * NoButton 3
# 4th button - various ways to maximize a window
-Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower
-Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen
-Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow
Style * Button 4
Style * NoButton 5
# 6th button - additional window commands
-Mouse 1 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5
-Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3
-Mouse 2 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4
-Mouse 3 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Stick
+Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Stick
+Mouse 2 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5
+Mouse 2 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3
+Mouse 3 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4
Style * Button 6
Style * NoButton 7
Modified: fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon
===================================================================
--- fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-fvwm-crystal-MiniIcon 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,5 +1,6 @@
# FVWM-Crystal Button Setup
# Written by Maciej Delmanowski <ha...@po...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the default FVWM-Crystal window button setup. Hold the mouse buttons
# to see the popup menu of a certain button.
@@ -26,21 +27,22 @@
Style * Button 3
# 4th button - various ways to maximize a window
-Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower
-Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen
-Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow
Style * Button 4
Style * NoButton 5
# 6th button - additional window commands
-Mouse 1 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5
-Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3
-Mouse 2 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4
-Mouse 3 6 $[Mod] Window-Button-Function Button6 /Window-Menu-Layer Stick
+Mouse 1 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Stick
+Mouse 2 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5
+Mouse 2 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3
+Mouse 3 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4
Style * Button 6
Style * NoButton 7
Modified: fvwm/components/decorations/Buttons-fvwm-crystal_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-fvwm-crystal_NumLock 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-fvwm-crystal_NumLock 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,5 +1,6 @@
# FVWM-Crystal Button Setup
# Written by Maciej Delmanowski <ha...@li...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the default FVWM-Crystal window button setup. Hold the mouse buttons
# to see the popup menu of a certain button.
@@ -13,15 +14,19 @@
Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Close Destroy
# 4th button - various ways to maximize a window
-Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower
-Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen
-Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow
# 6th button - additional window commands
-Mouse 1 6 $[Mod1]2 Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3
+Mouse 1 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Layer Window-Resize Minimize
+Mouse 1 6 $[Mod1]2 Window-Button-Function Button6 /Window-Menu-Layer Stick
+Mouse 2 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Layer Layer 0 5
+Mouse 2 6 $[Mod1]2 Window-Button-Function Button6 /Window-Menu-Layer Layer 0 3
+Mouse 3 6 $[Mod0]2 Window-Button-Function Button6 /Window-Menu-Layer Layer 0 4
# 8th button - move a window between pages
Mouse 1 8 $[Mod0]2 Window-Button-Function Button8 /Window-Menu-Page Window-MoveToPage-Backward
Modified: fvwm/components/decorations/Buttons-macosx
===================================================================
--- fvwm/components/decorations/Buttons-macosx 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-macosx 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,5 +1,6 @@
# MacOS X Button Setup
# Written by Maciej Delmanowski <ha...@li...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the window titlebar button setup similar to the MacOS X
# buttons on the titlebar
@@ -21,12 +22,12 @@
Style * NoButton 4
# third button - various ways to maximize a window
-Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize RaiseLower
-Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Fullscreen
-Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Hgrow
Style * Button 5
Style * NoButton 6
Modified: fvwm/components/decorations/Buttons-macosx-MiniIcon
===================================================================
--- fvwm/components/decorations/Buttons-macosx-MiniIcon 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-macosx-MiniIcon 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,5 +1,6 @@
# MacOS X Button Setup
# Written by Maciej Delmanowski <ha...@po...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the window titlebar button setup similar to the MacOS X
# buttons on the titlebar
@@ -21,12 +22,12 @@
Style * NoButton 4
# third button - various ways to maximize a window
-Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize RaiseLower
-Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Fullscreen
-Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 5 $[Mod0] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 5 $[Mod1] Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Hgrow
Style * Button 5
Style * NoButton 6
Modified: fvwm/components/decorations/Buttons-macosx_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-macosx_NumLock 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-macosx_NumLock 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,16 +1,17 @@
# MacOS X Button Setup
# Written by Maciej Delmanowski <ha...@li...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the window titlebar button setup similar to the MacOS X
# buttons on the titlebar
# Additional support for NumLock key
# third button - various ways to maximize a window
-Mouse 1 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize RaiseLower
-Mouse 2 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Fullscreen
-Mouse 1 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 5 $[Mod0]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 5 $[Mod1]2 Window-Button-Function Button5 /Window-Menu-Maximize Window-Resize Hgrow
# vim:ft=fvwm
Modified: fvwm/components/decorations/Buttons-os2
===================================================================
--- fvwm/components/decorations/Buttons-os2 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-os2 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,5 +1,6 @@
# OS/2 Button Setup
# Written by Maciej Delmanowski <ha...@li...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the window titlebar button setup similar to the OS/2
# buttons on the titlebar
@@ -11,12 +12,12 @@
Style * Button 1
# 2nd button - various ways to maximize a window
-Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower
-Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
-Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow
Style * Button 2
Style * NoButton 3
Modified: fvwm/components/decorations/Buttons-os2-MiniIcon
===================================================================
--- fvwm/components/decorations/Buttons-os2-MiniIcon 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-os2-MiniIcon 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,5 +1,6 @@
# OS/2 Button Setup
# Written by Maciej Delmanowski <ha...@po...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the window titlebar button setup similar to the OS/2
# buttons on the titlebar
@@ -11,12 +12,12 @@
Style * Button 1
# 2nd button - various ways to maximize a window
-Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower
-Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
-Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow
Style * Button 2
# MiniIcon
Modified: fvwm/components/decorations/Buttons-os2_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-os2_NumLock 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-os2_NumLock 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,16 +1,17 @@
# OS/2 Button Setup
# Written by Maciej Delmanowski <ha...@li...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the window titlebar button setup similar to the OS/2
# buttons on the titlebar
# Additional support for NumLock key
# 2nd button - various ways to maximize a window
-Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize RaiseLower
-Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
-Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 2 $[Mod0]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 2 $[Mod1]2 Window-Button-Function Button2 /Window-Menu-Maximize Window-Resize Hgrow
# vim:ft=fvwm
Modified: fvwm/components/decorations/Buttons-windows
===================================================================
--- fvwm/components/decorations/Buttons-windows 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-windows 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,5 +1,6 @@
# MS Windows Button Setup
# Written by Maciej Delmanowski <ha...@li...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the window titlebar button setup similar to the MS Windows
# buttons on the titlebar
@@ -17,12 +18,12 @@
Style * NoButton 3
# 4th button - various ways to maximize a window
-Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower
-Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen
-Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow
Style * Button 4
Style * NoButton 5
Modified: fvwm/components/decorations/Buttons-windows_NumLock
===================================================================
--- fvwm/components/decorations/Buttons-windows_NumLock 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/decorations/Buttons-windows_NumLock 2013-04-29 20:36:44 UTC (rev 321)
@@ -1,16 +1,17 @@
# MS Windows Button Setup
# Written by Maciej Delmanowski <ha...@li...>
+# Maintained and updated by Dominique Michel <dom...@us...urceforge,net>
#
# This is the window titlebar button setup similar to the MS Windows
# buttons on the titlebar
# Additional support for NumLock key
# 4th button - various ways to maximize a window
-Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize RaiseLower
-Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
-Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Fullscreen
-Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize A100
-Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
-Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 1 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Maximize
+Mouse 2 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize V100
+Mouse 3 4 $[Mod0]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize H100
+Mouse 1 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize VHgrow
+Mouse 2 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Vgrow
+Mouse 3 4 $[Mod1]2 Window-Button-Function Button4 /Window-Menu-Maximize Window-Resize Hgrow
# vim:ft=fvwm
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/functions/Fullscreen 2013-04-29 20:36:44 UTC (rev 321)
@@ -22,10 +22,6 @@
#
# Key KP_Multiply A $[Mod2] Disappear
#
-# and at the end of the recipe, add
-#
-# FullscreenRecover
-#
# The other window size functions are into Window-Buttons.
#
# 'Fullscreen-Start' and 'Fullscreen-Stop' functions shouldn't be called
@@ -41,9 +37,6 @@
# correctly the first time it is put in full screen, but it does scale OK afterward.
# If you know how to fix this, please send me a mail:
# <dom...@us...>
-#
-# TODO:
-# - restore the position when restoring the "normal" window
InfoStoreAdd TmpDirectory "/tmp"
Modified: fvwm/components/functions/Window-Decorations
===================================================================
--- fvwm/components/functions/Window-Decorations 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/functions/Window-Decorations 2013-04-29 20:36:44 UTC (rev 321)
@@ -18,6 +18,7 @@
#+ I TestRc (Match) KeepRc Include components/styles/Window-Decorations
+ I TestRc (Match) KeepRc SavePreferences LastChoosenWindowDecoration "Window-Decorations-Set $*"
+ I UnsetEnv Window_Decorations_ButtonModel-Temp
++ I Style * HandleWidth $[infostore.handle_width]
DestroyMenu /Window-Decorations
Modified: fvwm/components/functions/Window-Focus
===================================================================
--- fvwm/components/functions/Window-Focus 2013-04-29 15:19:55 UTC (rev 320)
+++ fvwm/components/functions/Window-Focus 2013-04-29 20:36:44 UTC (rev 321)
@@ -21,6 +21,7 @@
+ I MoveToPage $[page.nx] $[page.ny]
+ I FlipFocus
#+ I Focus
++ I Layer Default
+ I Raise
#+ I WarpToWindow 50 50
@@ -29,6 +30,7 @@
+ I Iconify False
+ I FlipFocus
#+ I Focus
++ I Layer Default
+ I Raise
#+ I WarpToWindow 50 50
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-29 21:04:54
|
Revision: 323
http://sourceforge.net/p/fvwm-crystal/code/323
Author: dominique_libre
Date: 2013-04-29 21:04:50 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
functions/Window-Buttons-Vertical: zpdated with the new maximize functions
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Window-Buttons
fvwm/components/functions/Window-Buttons-Vertical
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-29 20:50:15 UTC (rev 322)
+++ ChangeLog 2013-04-29 21:04:50 UTC (rev 323)
@@ -7,6 +7,7 @@
doc: updated some headers, added a few sentences.
doc/FAQ: added 3.7 about flaky MPlayer.
updated and NumLock fix the mouse bindings and window decorations.
+ functions/Window-Buttons-Vertical: updated with the new maximize functions
Dimanche 28 Avril 2013 Dominique Michel
functions/Window-Buttons; functions/Fullscreen: cleanup of WindowResize
Modified: fvwm/components/functions/Window-Buttons
===================================================================
--- fvwm/components/functions/Window-Buttons 2013-04-29 20:50:15 UTC (rev 322)
+++ fvwm/components/functions/Window-Buttons 2013-04-29 21:04:50 UTC (rev 323)
@@ -20,9 +20,6 @@
# mouse resized width and height, the third one will contain a string
# corresponding to its state (excepted fullscreen).
# The fullscreen functions are implemented into the Fullscreen file.
-#
-# Bugs/improvments:
-# - Finish to implement the mouse resized state.
# Variables creation and destruction {{{1
# They must survive a restart => SetEnv
Modified: fvwm/components/functions/Window-Buttons-Vertical
===================================================================
--- fvwm/components/functions/Window-Buttons-Vertical 2013-04-29 20:50:15 UTC (rev 322)
+++ fvwm/components/functions/Window-Buttons-Vertical 2013-04-29 21:04:50 UTC (rev 323)
@@ -14,7 +14,96 @@
# menu - name of the menu opened on the mouse hold
# function - function executed after mouse click
-# Wrapper functions for window decorations
+# The windows can have several states: its original or mouse resized state,
+# a minimized state, a maximized state, a fullscreen state, and several other.
+# A mouse click must set the windows into the wanted state, and when in
+# fullscreen, the window must retrun in its precedent state.
+# We need 3 environment variables per windows, 2 will contain its original or
+# mouse resized width and height, the third one will contain a string
+# corresponding to its state (excepted fullscreen).
+# The fullscreen functions are implemented into the Fullscreen file.
+
+# Variables creation and destruction {{{1
+# They must survive a restart => SetEnv
+# FvwmEvent will do it.
+DestroyFunc Window-State-Init
+AddToFunc Window-State-Init
++ I SetEnv "CurrentWindowState_$[w.id]" Default
++ I SetEnv "WindowWidth_$[w.id]" "$[w.width]p"
++ I SetEnv "WindowHeight_$[w.id]" "$[w.height]p"
+
+DestroyFunc Window-State-Destroy
+AddToFunc Window-State-Destroy
++ I UnsetEnv "CurrentWindowState_$[w.id]"
++ I UnsetEnv "WindowWidth_$[w.id]"
++ I UnsetEnv "WindowHeight_$[w.id]"
++ I UnsetEnv "WindowX_$[w.id]"
++ I UnsetEnv "WindowY_$[w.id]"
+
+# Variables update, see components/Window-Basic
+
+# param for fvwm-event: add_window, destroy_window, property_change
+DestroyModuleConfig FvwmEvent-Window-State-Init: *
+*FvwmEvent-Window-State-Init: add_window Window-State-Init
+*FvwmEvent-Window-State-Init: destroy_window Window-State-Destroy
+Module FvwmEvent FvwmEvent-Window-State-Init
+
+## Wrapper function for the resizing functions {{{1
+# Logic: if actual_size=size then default_size else size
+# Syntax: Window-Resize <size>
+# Where size is one of Maximize-Minimize-Default-A100-H100-V100-VHgrow-Hgrow-Vgrow
+# For fullscreen see components/Fullscreen
+DestroyFunc Window-Resize
+AddToFunc Window-Resize
++ I Test (EnvMatch CurrentWindowState_$[w.id] "$0") NS-Default
++ I TestRc (NoMatch) NS-"$0"
+
+DestroyFunc NS-Maximize
+AddToFunc NS-Maximize
++ I Maximize True 100 100
++ I SetEnv CurrentWindowState_$[w.id] Maximize
+
+DestroyFunc NS-Minimize
+AddToFunc NS-Minimize
++ I ResizeMaximize direction East 200p 60p
++ I SetEnv CurrentWindowState_$[w.id] Minimize
+
+DestroyFunc NS-Default
+AddToFunc NS-Default
++ I Maximize $[WindowWidth_$[w.id]] $[WindowHeight_$[w.id]]
++ I SetEnv CurrentWindowState_$[w.id] Default
+
+DestroyFunc NS-A100
+AddToFunc NS-A100
++ I Maximize True 100 100
++ I SetEnv CurrentWindowState_$[w.id] A100
+
+DestroyFunc NS-H100
+AddToFunc NS-H100
++ I Maximize True 100 0
++ I SetEnv CurrentWindowState_$[w.id] H100
+
+DestroyFunc NS-V100
+AddToFunc NS-V100
++ I Maximize True 0 100
++ I SetEnv CurrentWindowState_$[w.id] V100
+
+DestroyFunc NS-Hgrow
+AddToFunc NS-Hgrow
++ I Maximize True grow 0
++ I SetEnv CurrentWindowState_$[w.id] Hgrow
+
+DestroyFunc NS-Vgrow
+AddToFunc NS-Vgrow
++ I Maximize True 0 grow
++ I SetEnv CurrentWindowState_$[w.id] Vgrow
+
+DestroyFunc NS-VHgrow
+AddToFunc NS-VHgrow
++ I Maximize True grow grow
++ I SetEnv CurrentWindowState_$[w.id] VHgrow
+
+# Wrapper functions for window decorations {{{1
DestroyFunc Window-MoveToPage-Forward
AddToFunc Window-MoveToPage-Forward
+ I MoveToPage-Down
@@ -85,7 +174,7 @@
+ I PipeRead 'for i in `seq 0 $(($[desk.pagesy]-1))` ; do echo "AddToMenu /Window-Menu-Page \'$[gt.Move to page] $(($i+1))\' MoveToPage 0 $i" ; done'
-# Combined version of menu for window styles other than FVWM-Crystal
+# Combined version of menu for window styles other than FVWM-Crystal {{{1
DestroyMenu /Window-Menu
AddToMenu /Window-Menu
+ '$[gt.Iconify]' Window-Iconify
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-29 22:46:23
|
Revision: 326
http://sourceforge.net/p/fvwm-crystal/code/326
Author: dominique_libre
Date: 2013-04-29 22:46:19 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
functions/Wallpaper: workaround stalonetray to update its colorset
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Wallpaper
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-29 22:24:06 UTC (rev 325)
+++ ChangeLog 2013-04-29 22:46:19 UTC (rev 326)
@@ -2,7 +2,8 @@
Lundi 29 Avril 2013 Dominique Michel
NEWS update
- functions/Colorsets: fix stalonetray to update its colorset
+ functions/Colorsets; functions/Wallpaper: workaround for stalonetray
+ to update its colorset.
bin: updated some headers
doc: updated some headers, added a few sentences.
doc/FAQ: added 3.7 about flaky MPlayer.
Modified: fvwm/components/functions/Wallpaper
===================================================================
--- fvwm/components/functions/Wallpaper 2013-04-29 22:24:06 UTC (rev 325)
+++ fvwm/components/functions/Wallpaper 2013-04-29 22:46:19 UTC (rev 326)
@@ -8,6 +8,11 @@
+ I TestRc (NoMatch) Test (x hsetroot) Exec hsetroot -fill $*
+ I TestRc (NoMatch) Test (x feh) Exec feh --bg-scale --no-fehbg $*
+ I SavePreferences LastChoosenWallpaper "Wallpaper-Set $*"
+# stalonetray workaround, huge images take time to load
++ I Schedule 1000 All (FvwmStalonePanel) Iconify True
++ I Schedule 1100 All (FvwmStalonePanel) Iconify False
++ I Schedule 1000 All (FvwmButtons-BottomNotifAera) Iconify True
++ I Schedule 1100 All (FvwmButtons-BottomNotifAera) Iconify False
# Select random wallpaper from given directories and set it
DestroyFunc Wallpaper-Random
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-04-30 14:34:17
|
Revision: 331
http://sourceforge.net/p/fvwm-crystal/code/331
Author: dominique_libre
Date: 2013-04-30 14:34:13 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
Oops, Icon-Launcher: start the icons at the bottom of the layer
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Icon-Launcher
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-30 14:27:34 UTC (rev 330)
+++ ChangeLog 2013-04-30 14:34:13 UTC (rev 331)
@@ -7,6 +7,7 @@
bindings/Music*: updated to use the dB step defined in functions/Mixer (1.5 dB)
updated the doc and man pages with those changes
synchronized the FAQ man page with the text file
+ functions/Icon-Launcher: launch the "icons" at the bottom
updated the version and NEWS to 3.1.7
Lundi 29 Avril 2013 Dominique Michel
Modified: fvwm/components/functions/Icon-Launcher
===================================================================
--- fvwm/components/functions/Icon-Launcher 2013-04-30 14:27:34 UTC (rev 330)
+++ fvwm/components/functions/Icon-Launcher 2013-04-30 14:34:13 UTC (rev 331)
@@ -45,7 +45,7 @@
+ I Module FvwmButtons $0
+ I Module FvwmAuto 10 -menter "Change-Icon $0 $1" "Restore-Icon $0 $1"
+ I Style $0 UseStyle *
-+ I Style $0 Icon $1, StartIconic, !Handles, VariablePosition, BorderWidth 0, !Borders, ParentalRelativity, IconTitle, IconTitleColorset $[infostore.cs_menu_active], HilightIconTitleColorset $[infostore.cs_menu_active], IconTitleFormat %n, IconBackgroundColorset $[infostore.cs_icon_inactive], IconBackgroundColorset $[infostore.cs_icon_inactive], IconTitleRelief 0, IconBackgroundRelief 0, IconBackgroundRelief 0, IconFont "xft:$[title_font]:pixelsize=$[title_font_size]", StickyIcon,!StickyStippledIconTitle
++ I Style $0 Icon $1, StartIconic, StartsLowered, !Handles, VariablePosition, BorderWidth 0, !Borders, ParentalRelativity, IconTitle, IconTitleColorset $[infostore.cs_menu_active], HilightIconTitleColorset $[infostore.cs_menu_active], IconTitleFormat %n, IconBackgroundColorset $[infostore.cs_icon_inactive], IconBackgroundColorset $[infostore.cs_icon_inactive], IconTitleRelief 0, IconBackgroundRelief 0, IconBackgroundRelief 0, IconFont "xft:$[title_font]:pixelsize=$[title_font_size]", StickyIcon,!StickyStippledIconTitle
DestroyFunc Change-Icon
AddToFunc Change-Icon
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-05-01 18:17:01
|
Revision: 333
http://sourceforge.net/p/fvwm-crystal/code/333
Author: dominique_libre
Date: 2013-05-01 18:16:56 +0000 (Wed, 01 May 2013)
Log Message:
-----------
Changed svn version to 3.1.8; functions/Icon-Thumbnails: fix for desiconification of fullscreen windows; fix the focus when restoring the window
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/About
fvwm/components/functions/Icon-Thumbnails
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-04-30 14:43:03 UTC (rev 332)
+++ ChangeLog 2013-05-01 18:16:56 UTC (rev 333)
@@ -1,5 +1,10 @@
ChangeLog for FVWM-Crystal
+Mercredi 1 Mai 2913 Dominique Michel
+ updated the version to 3.1.8
+ functions/Icon-Thumbnails: fix for desiconification of fullscreen windows;
+ fix the focus when restoring the window
+
Mardi 30 Avril 2013 Dominique Michel
functions/FvwmExpose: Added comment about synchronization
recipes/Amiga: Commented out FvwmExpose
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2013-04-30 14:43:03 UTC (rev 332)
+++ fvwm/components/functions/About 2013-05-01 18:16:56 UTC (rev 333)
@@ -5,7 +5,7 @@
*About: Line center
*About: Text "FVWM-Crystal"
*About: Line center
-*About: Text "$[gt.Version]: 3.1.7"
+*About: Text "$[gt.Version]: 3.1.8"
*About: Line center
*About: Line center
*About: Text "$[gt.Original author]: Maciej Delmanowski <ha...@gn...>"
Modified: fvwm/components/functions/Icon-Thumbnails
===================================================================
--- fvwm/components/functions/Icon-Thumbnails 2013-04-30 14:43:03 UTC (rev 332)
+++ fvwm/components/functions/Icon-Thumbnails 2013-05-01 18:16:56 UTC (rev 333)
@@ -73,7 +73,8 @@
DestroyFunc RemoveThumbnail
AddToFunc RemoveThumbnail
+ I ThisWindow (!State 5) Break
-+ I WindowId $[w.id] Window-Focus-CurrentDesk
++ I ThisWindow DestroyWindowStyle
++ I Schedule 100 WindowId $[w.id] Window-Focus-CurrentDesk
+ I ThisWindow (!State 4) State 5 false
+ I ThisWindow (!State 4) Break
# Keep this in for the benefit of FVWM 2.5.13, although versions
@@ -81,9 +82,9 @@
+ I PipeRead "echo WindowStyle Icon \\$\\[Icon-$[w.id]\\]"
+ I WindowId $[w.id] Layer 0 4
+ I UnsetEnv Icon-$[w.id]
-+ I DestroyWindowStyle
+ I Test (f $[ThumbDirectory]/icon.tmp.$[w.id].png) Exec exec rm -f $[ThumbDirectory]/icon.tmp.$[w.id].png
+ I State 4 false
++ I Test (f $[infostore.TmpDirectory]/fullscreen.19.$[w.id].$[page.nx].$[page.ny].tmp) ThisWindow Fullscreen-Start
# Restore the thumbnails after session restart
DestroyFunc RecoverThumbnails
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2013-05-03 16:08:35
|
Revision: 336
http://sourceforge.net/p/fvwm-crystal/code/336
Author: dominique_libre
Date: 2013-05-03 16:08:28 +0000 (Fri, 03 May 2013)
Log Message:
-----------
functions/Preferences-Menu: Fixed the styles for save panel_font
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Preferences-Menu
Modified: ChangeLog
===================================================================
--- ChangeLog 2013-05-01 21:22:54 UTC (rev 335)
+++ ChangeLog 2013-05-03 16:08:28 UTC (rev 336)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+Vendredi 3 Mai 2013 Dominique Michel
+ functions/Preferences-Menu: Fixed the styles for save panel_font
+
Mercredi 1 Mai 2913 Dominique Michel
updated the version to 3.1.8
functions/Icon-Thumbnails: fix for desiconification of fullscreen windows;
Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu 2013-05-01 21:22:54 UTC (rev 335)
+++ fvwm/components/functions/Preferences-Menu 2013-05-03 16:08:28 UTC (rev 336)
@@ -95,7 +95,9 @@
AddToFunc PanelFont-Set
+ I SavePreferences PanelFont "SetEnv panel_font \\\""$*"\\\""
+ I SetEnv panel_font "$[0]"
-+ I Style * Font "xft:$[0]:pixelsize=$[panel_font_size]:Bold"
++ I Style FvwmScript Font "xft:$[0]:pixelsize=$[panel_font_size]:Bold"
++ I Style FvwmForm Font "xft:$[0]:pixelsize=$[panel_font_size]:Bold"
++ I Style FvwmIdent Font "xft:$[0]:pixelsize=$[panel_font_size]:Bold"
DestroyFunc TitleFont-Set
AddToFunc TitleFont-Set
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