Menu
▾
▴
fvwm-crystal-commits — FVWM-Crystal commits archive
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
(16) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(28) |
| 2011 |
Jan
(33) |
Feb
(10) |
Mar
|
Apr
|
May
(1) |
Jun
(14) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(1) |
Jun
|
Jul
(6) |
Aug
|
Sep
|
Oct
(9) |
Nov
|
Dec
(1) |
| 2013 |
Jan
(2) |
Feb
|
Mar
(1) |
Apr
(192) |
May
(161) |
Jun
(21) |
Jul
(27) |
Aug
(6) |
Sep
(4) |
Oct
|
Nov
|
Dec
(13) |
| 2014 |
Jan
(26) |
Feb
(27) |
Mar
(12) |
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(25) |
Nov
(1) |
Dec
|
| 2015 |
Jan
(16) |
Feb
(4) |
Mar
(5) |
Apr
(1) |
May
(1) |
Jun
(9) |
Jul
|
Aug
|
Sep
(18) |
Oct
(53) |
Nov
(35) |
Dec
(46) |
| 2016 |
Jan
(6) |
Feb
|
Mar
|
Apr
(14) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(5) |
| 2017 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
|
Jul
(2) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
(9) |
Jun
(4) |
Jul
|
Aug
(25) |
Sep
(4) |
Oct
(1) |
Nov
(16) |
Dec
(1) |
| 2020 |
Jan
(4) |
Feb
(63) |
Mar
|
Apr
(15) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(10) |
| 2021 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <dom...@us...> - 2020-02-19 19:20:35
|
Revision: 1008
http://sourceforge.net/p/fvwm-crystal/code/1008
Author: dominique_libre
Date: 2020-02-19 19:20:33 +0000 (Wed, 19 Feb 2020)
Log Message:
-----------
fix media stuffs styles after (re)start; xmms2 control and crystal version bump to 3.6.1
Modified Paths:
--------------
ChangeLog
NEWS
fvwm/components/functions/About
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-alsaplayerdaemon
fvwm/components/functions/Music-audacious
fvwm/components/functions/Music-cdcd
fvwm/components/functions/Music-cmus
fvwm/components/functions/Music-mocp
fvwm/components/functions/Music-mpd
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
fvwm/components/functions/Music-quodlibet
fvwm/components/styles/MediaPlayers-Style
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-19 14:13:02 UTC (rev 1007)
+++ ChangeLog 2020-02-19 19:20:33 UTC (rev 1008)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+Verion 3.6.1
+------------
+
mercredi 19 février 2020
fvwm/scripts/CustomButtonBar/CustomButtonBat: comment debug line
fvwm/components/functions/Exec-Accelerator: add -name option for urxvtc;
@@ -10,6 +13,11 @@
remove Gxmms2 abandonware style; use XMMS2 style for xmms2d window.
fvwm/components/functions/Music-xmms2: fix for xmms2 current exec name;
fix xmms2, start_jack and start_cadence styles after startup and Restart.
+ fvwm/components/styles/MediaPlayers-Style: cleanup
+ fvwm/components/Music-*: fix styles of start_[jack|cadence] and of the console
+ players after start and Restart
+ fvwm/components/functions/About;
+ NEWS: fvwm-crystal 3.6.1 version bump
Verion 3.6.0
------------
Modified: NEWS
===================================================================
--- NEWS 2020-02-19 14:13:02 UTC (rev 1007)
+++ NEWS 2020-02-19 19:20:33 UTC (rev 1008)
@@ -1,4 +1,17 @@
+Version 3.6.1
+-------------
+
+Fvwm Crystal 3.6.1 is out!
+
+This is a bug fix release:
+
+- Fix media players styles after start and restart.
+- Use new exec name in the xmms2 audio player control.
+
+Have fun!
+Dominique Michel
+
Version 3.6.0
-------------
Code name "Magic Star"
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/About 2020-02-19 19:20:33 UTC (rev 1008)
@@ -5,7 +5,7 @@
*About: Line center
*About: Text "FVWM-Crystal"
*About: Line center
-*About: Text "$[gt.Version]: 3.6.0"
+*About: Text "$[gt.Version]: 3.6.1"
*About: Line center
*About: Text "Magic Star"
*About: Line center
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-alsaplayer 2020-02-19 19:20:33 UTC (rev 1008)
@@ -8,6 +8,14 @@
Style alsaplayer NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
Style Alsaplayer UseStyle alsaplayer
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence]
+Schedule 1 StyleMediaPlayer
+
# Alsaplayer normal speed
InfoStoreAdd speed 1
Modified: fvwm/components/functions/Music-alsaplayerdaemon
===================================================================
--- fvwm/components/functions/Music-alsaplayerdaemon 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-alsaplayerdaemon 2020-02-19 19:20:33 UTC (rev 1008)
@@ -5,6 +5,14 @@
# Initialisations, shared functions {{{1
Include components/functions/Music
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence]
+Schedule 1 StyleMediaPlayer
+
# Alsaplayer normal speed
InfoStoreAdd speed 1
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-audacious 2020-02-19 19:20:33 UTC (rev 1008)
@@ -6,16 +6,21 @@
# Initialisations, shared functions
Include components/functions/Music
-Style audacious StartIconic, NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
-Style Audacious UseStyle audacious
-Style playlist UseStyle audacious
-Style equalizer UseStyle audacious
+Style Audacious StartIconic, NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence]
+Schedule 1 StyleMediaPlayer
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player
AddToFunc Music-GUI
-+ I All (audacious) Iconify toggle
++ I All (Audacious) Iconify toggle
AddToFunc Player-generator
+ I DestroyMenu recreate /Player
Modified: fvwm/components/functions/Music-cdcd
===================================================================
--- fvwm/components/functions/Music-cdcd 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-cdcd 2020-02-19 19:20:33 UTC (rev 1008)
@@ -13,6 +13,14 @@
Include components/functions/Music
Style cdcd NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style cdcd NoIcon
++ I Style start_cadence NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence]
+Schedule 1 StyleMediaPlayer
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player {{{2
Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-cmus 2020-02-19 19:20:33 UTC (rev 1008)
@@ -14,6 +14,15 @@
Style cmus NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
Style cmus* UseStyle cmus
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style cmus NoIcon
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# First button
# Player controls and prefs {{{1
# mouse 1 Menu /Player {{{2
Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-mocp 2020-02-19 19:20:33 UTC (rev 1008)
@@ -9,6 +9,15 @@
Style mocp NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
Style MOC* UseStyle mocp
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style mocp NoIcon
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player {{{2
Modified: fvwm/components/functions/Music-mpd
===================================================================
--- fvwm/components/functions/Music-mpd 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-mpd 2020-02-19 19:20:33 UTC (rev 1008)
@@ -16,6 +16,14 @@
Style gmpc UseStyle pympd
Style Gmpc UseStyle pympd
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# Variables {{{1
# mpd know where the playlists are. See 'man mpd.conf'
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-mplayer 2020-02-19 19:20:33 UTC (rev 1008)
@@ -7,6 +7,14 @@
Style "MPlayer - Video" Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
Style XDRadio NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# specific function
AddToMenu /Music/Start
+ '$[gt.Start MPlayer]' Music-Start $[FVWM_SYSTEMDIR]/scripts/startmplayer mplayer $[infostore.USERDIR] $[infostore.SILENT]
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-mplayer2 2020-02-19 19:20:33 UTC (rev 1008)
@@ -7,6 +7,14 @@
Style "MPlayer - Video" Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
Style XDRadio NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# specific function
AddToMenu /Music/Start
+ '$[gt.Start MPlayer2]' Music-Start $[FVWM_SYSTEMDIR]/scripts/startmplayer mplayer2 $[infostore.USERDIR] $[infostore.SILENT]
Modified: fvwm/components/functions/Music-quodlibet
===================================================================
--- fvwm/components/functions/Music-quodlibet 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/functions/Music-quodlibet 2020-02-19 19:20:33 UTC (rev 1008)
@@ -9,6 +9,14 @@
Style quodlibet NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
Style Quodlibet UseStyle quodlibet
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence] and the console players
+Schedule 1 StyleMediaPlayer
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player {{{2
Modified: fvwm/components/styles/MediaPlayers-Style
===================================================================
--- fvwm/components/styles/MediaPlayers-Style 2020-02-19 14:13:02 UTC (rev 1007)
+++ fvwm/components/styles/MediaPlayers-Style 2020-02-19 19:20:33 UTC (rev 1008)
@@ -5,11 +5,8 @@
MiniIcon 22x22/apps/alsaplayer.png, Icon 32x32/apps/alsaplayer.png
Style Alsaplayer UseStyle alsaplayer
-Style audacious !StartIconic, NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, Title, \
+Style Audacious !StartIconic, NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, Title, \
MiniIcon 22x22/apps/audacious.png, Icon 32x32/apps/audacious.png
-Style Audacious UseStyle audacious
-Style playlist UseStyle audacious
-Style equalizer UseStyle audacious
Style beep-media-player !Title
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-19 14:13:04
|
Revision: 1007
http://sourceforge.net/p/fvwm-crystal/code/1007
Author: dominique_libre
Date: 2020-02-19 14:13:02 +0000 (Wed, 19 Feb 2020)
Log Message:
-----------
Various fixes for xmms2
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Music-xmms2
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-19 14:08:53 UTC (rev 1006)
+++ ChangeLog 2020-02-19 14:13:02 UTC (rev 1007)
@@ -8,6 +8,8 @@
which are handled by the media player system.
fvwm/components/styles/MediaPlayers-Style: comment out oudated xmms style;
remove Gxmms2 abandonware style; use XMMS2 style for xmms2d window.
+ fvwm/components/functions/Music-xmms2: fix for xmms2 current exec name;
+ fix xmms2, start_jack and start_cadence styles after startup and Restart.
Verion 3.6.0
------------
Modified: fvwm/components/functions/Music-xmms2
===================================================================
--- fvwm/components/functions/Music-xmms2 2020-02-19 14:08:53 UTC (rev 1006)
+++ fvwm/components/functions/Music-xmms2 2020-02-19 14:13:02 UTC (rev 1007)
@@ -6,20 +6,39 @@
# Initialisations, shared functions {{{1
Include components/functions/Music
-Style xmms StaysOnTop
-Style XMMS_Player StartIconic, NoIcon, !Title, Sticky, WindowListSkip, StaysOnTop
-Style XMMS_Playlist UseStyle XMMS_Player
-Style XMMS_Equalizer UseStyle XMMS_Player
-Style Gxmms2 NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
-Style xmms2 UseStyle Gxmms2
-InfoStoreAdd fvwm_audio_exec "nyxmms2 add -P"
+DestroyFunc StyleMediaPlayer
+AddToFunc StyleMediaPlayer
++ I Style XMMS2 StartIconic, NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
++ I Style start_cadence NoIcon
++ I Style start_jack NoIcon
++ I UpdateStyles
+# Schedule needed at Start and after Restart for start_[jack|cadence]
+Schedule 1 StyleMediaPlayer
+
+InfoStoreAdd fvwm_audio_exec "xmms2 add -P"
+
+# at startup, we cannot de sure of the window's name
+PipeRead 'if pkill -0 xmms2d; \
+ then echo "" 1>/dev/null; \
+ else echo AT XMMS2 xmms2d; fi'
+
+AddToFunc StartFunction
++ I Test (ReStart) StartMediaPlayer
+
+# If no XMMS2 window, start one
+DestroyFunc StartMediaPlayer
+AddToFunc StartMediaPlayer
++ I None (XMMS2) PipeRead 'if pkill -0 xmms2d; \
+ then killall -9 xmms2d; echo AT XMMS2 xmms2d; \
+ else echo AT XMMS2 xmms2d; fi'
+
# First button {{{1
# Player controls and prefs
# mouse 1 Menu /Player {{{2
AddToFunc Music-GUI
-+ I All (gxmms2) Iconify toggle
-+ I TestRc (NoMatch) None (gxmms2) X gxmms2
++ I All (XMMS2) Iconify toggle
++ I TestRc (NoMatch) None (XMMS2) StartMediaPlayer
# Player-generator (All)
AddToFunc Player-generator
@@ -31,7 +50,7 @@
+ I Test (X cadence) AddToMenu /Player '$[gt.Start Cadence]' Exec cadence-session-start --maybe-system-start; cadence
+ I Test (X qjackctl) AddToMenu /Player "" Nop
+ I TestRc (NoMatch) Test (X cadence) AddToMenu /Player "" Nop
-+ I AddToMenu /Player '$[gt.Stop XMMS2]' Exec exec killall -9 xmms2d
++ I AddToMenu /Player '$[gt.Stop XMMS2]' Exec exec xmms2 server shutdown
+ I AddToMenu /Player '$[gt.Show/Hide GXMMS2]' Music-GUI
# Second button {{{1
@@ -39,7 +58,7 @@
# mouse 1 Menu /Playlist-button {{{2
AddToFunc Music-CurrentPlaylist-generator
+ I DestroyMenu recreate /Music/CurrentPlaylist
-+ I PipeRead 'nyxmms2 list | head -n -2 | sed -e "s:^.*\\[\\(.*\\)/.*\\] \\(.*\\)$:AddToMenu /Music/CurrentPlaylist \\\'\\2\\\' Exec nyxmms2 jump \'\\1\':"'
++ I PipeRead 'xmms2 list | head -n -2 | sed -e "s:^.*\\[\\(.*\\)/.*\\] \\(.*\\)$:AddToMenu /Music/CurrentPlaylist \\\'\\2\\\' Exec xmms2 jump \'\\1\':"'
AddToMenu /Music/CurrentPlaylist
+ DynamicPopupAction Function Music-CurrentPlaylist-generator
@@ -47,7 +66,7 @@
AddToFunc Music-LoadPlaylist-generator
+ I DestroyMenu recreate /Music/AddPlaylist
+ I AddToMenu /Music/AddPlaylist '$[gt.Choose a playlist to load]' Nop
-+ I PipeRead 'nyxmms2 playlist list | sed -e "s:^\\( *\\)\\(.*\\):\\2:" | sed -e "s:^.*$:AddToMenu /Music/AddPlaylist \'&\' Exec nyxmms2 playlist switch \'&\':"'
++ I PipeRead 'xmms2 playlist list | sed -e "s:^\\( *\\)\\(.*\\):\\2:" | sed -e "s:^.*$:AddToMenu /Music/AddPlaylist \'&\' Exec xmms2 playlist switch \'&\':"'
+ I AddToMenu /Music/AddPlaylist "" Nop
+ I AddToMenu /Music/AddPlaylist '$[gt.Everything]' Music-LoadAll
@@ -64,7 +83,7 @@
*Music-SavePlaylist-Dialog: Button quit " $[gt.Cancel] " ^[
*Music-SavePlaylist-Dialog: Command Nop
*Music-SavePlaylist-Dialog: Button quit " $[gt.Save] " ^M
-*Music-SavePlaylist-Dialog: Command Exec nyxmms2 playlist create -p _active "$(PlaylistName)"
+*Music-SavePlaylist-Dialog: Command Exec xmms2 playlist create -p _active "$(PlaylistName)"
*Music-SavePlaylist-Dialog: Line center
AddToFunc Music-SavePlaylist
@@ -77,7 +96,7 @@
AddToFunc Music-RemovePlaylist-generator
+ I DestroyMenu recreate /Music/RemovePlaylist
+ I AddToMenu /Music/RemovePlaylist '$[gt.Choose a playlist to remove]' Nop
-+ I PipeRead 'nyxmms2 playlist list | sed -e "s:^\\(* *\\)\\(.*\\):\\2:" | sed -e "s:^\\( *\\)\\(.*\\):\\2:" | sed -e "s:^.*$:AddToMenu /Music/RemovePlaylist \'&\' Exec nyxmms2 playlist remove \'&\':"'
++ I PipeRead 'xmms2 playlist list | sed -e "s:^\\(* *\\)\\(.*\\):\\2:" | sed -e "s:^\\( *\\)\\(.*\\):\\2:" | sed -e "s:^.*$:AddToMenu /Music/RemovePlaylist \'&\' Exec xmms2 playlist remove \'&\':"'
# From Taviso's configuration
# 22x22/categories/Audio-Video.png will be used for all the files that doesn't have a .media.png inside their directory
@@ -97,8 +116,8 @@
--func-name "FuncFvwmMenuAudioDirectory"'
AddToFunc Music-RemoveSong
-+ I Exec nyxmms2 next
-+ I Exec nyxmms2 remove $((`nyxmms2 list | sed -e "s;^->\[;;" | sed -e "s;/.*;;" | sed -e "s; .*;;" | sed -e "s;To.*;;"`-1))
++ I Exec xmms2 next
++ I Exec xmms2 remove $((`xmms2 list | sed -e "s;^->\[;;" | sed -e "s;/.*;;" | sed -e "s; .*;;" | sed -e "s;To.*;;"`-1))
AddToFunc Playlist-generator-button
+ I DestroyMenu recreate /Playlist-button
@@ -117,22 +136,22 @@
# mouse 2 Menu /Playback {{{1
AddToFunc Music-Next
-+ I Exec nyxmms2 next
++ I Exec xmms2 next
AddToFunc Music-Prev
-+ I Exec nyxmms2 prev
++ I Exec xmms2 prev
AddToFunc Music-Stop
-+ I Exec nyxmms2 stop
++ I Exec xmms2 stop
AddToFunc Music-Play
-+ I Exec nyxmms2 play
++ I Exec xmms2 play
AddToFunc Music-Pause
-+ I Exec nyxmms2 pause
++ I Exec xmms2 pause
AddToFunc Music-Shuffle
-+ I Exec nyxmms2 playlist shuffle
++ I Exec xmms2 playlist shuffle
AddToFunc Playback-generator
+ I DestroyMenu recreate /Playback
@@ -150,15 +169,15 @@
AddToMenu /Music/Volume
+ '$[gt.Player volume]' Nop
+ "" Nop
-+ " 0 dB" Exec nyxmms2 server volume 100
-+ "-3 dB" Exec nyxmms2 server volume 84
-+ "-6 dB" Exec nyxmms2 server volume 71
-+ "-12 dB" Exec nyxmms2 server volume 50
-+ "-18 dB" Exec nyxmms2 server volume 35
-+ "-24 dB" Exec nyxmms2 server volume 25
-+ "-30 dB" Exec nyxmms2 server volume 18
-+ "-36 dB" Exec nyxmms2 server volume 12
-+ " 0" Exec nyxmms2 server volume 0
++ " 0 dB" Exec xmms2 server volume 100
++ "-3 dB" Exec xmms2 server volume 84
++ "-6 dB" Exec xmms2 server volume 71
++ "-12 dB" Exec xmms2 server volume 50
++ "-18 dB" Exec xmms2 server volume 35
++ "-24 dB" Exec xmms2 server volume 25
++ "-30 dB" Exec xmms2 server volume 18
++ "-36 dB" Exec xmms2 server volume 12
++ " 0" Exec xmms2 server volume 0
# menus {{{1
AddToFunc Music-generator
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-19 14:08:54
|
Revision: 1006
http://sourceforge.net/p/fvwm-crystal/code/1006
Author: dominique_libre
Date: 2020-02-19 14:08:53 +0000 (Wed, 19 Feb 2020)
Log Message:
-----------
Fix xmms2 style
Modified Paths:
--------------
ChangeLog
fvwm/components/styles/MediaPlayers-Style
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-19 14:04:22 UTC (rev 1005)
+++ ChangeLog 2020-02-19 14:08:53 UTC (rev 1006)
@@ -6,7 +6,9 @@
this change the Ressource hint.
fvwm/components/styles/Applications-Icons-22-32: remove the remaining styles
which are handled by the media player system.
-
+ fvwm/components/styles/MediaPlayers-Style: comment out oudated xmms style;
+ remove Gxmms2 abandonware style; use XMMS2 style for xmms2d window.
+
Verion 3.6.0
------------
Modified: fvwm/components/styles/MediaPlayers-Style
===================================================================
--- fvwm/components/styles/MediaPlayers-Style 2020-02-19 14:04:22 UTC (rev 1005)
+++ fvwm/components/styles/MediaPlayers-Style 2020-02-19 14:08:53 UTC (rev 1006)
@@ -45,14 +45,13 @@
MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
Style Quodlibet UseStyle quodlibet
-Style xmms !StaysOnTop
-Style XMMS_Player !StartIconic, Title, !Sticky, !WindowListSkip, !StaysOnTop, \
- MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
-Style XMMS_Playlist UseStyle XMMS_Player
-Style XMMS_Equalizer UseStyle XMMS_Player
-Style Gxmms2 NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+#Style xmms !StaysOnTop
+#Style XMMS_Player !StartIconic, Title, !Sticky, !WindowListSkip, !StaysOnTop, \
+# MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
+#Style XMMS_Playlist UseStyle XMMS_Player
+#Style XMMS_Equalizer UseStyle XMMS_Player
+Style XMMS2 StartNormal, NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
MiniIcon 22x22/apps/xmms2.png, Icon 32x32/apps/xmms2.png
-Style xmms2 UseStyle Gxmms2
# helpers
Style qjackctl NoactiveIconOverride, NoIcon, Sticky, WindowListSkip
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-19 14:04:24
|
Revision: 1005
http://sourceforge.net/p/fvwm-crystal/code/1005
Author: dominique_libre
Date: 2020-02-19 14:04:22 +0000 (Wed, 19 Feb 2020)
Log Message:
-----------
Applications-Icons-22-32: remove the media player styles handled by the media player system
Modified Paths:
--------------
ChangeLog
fvwm/components/styles/Application-Icons-22-32
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-19 13:44:53 UTC (rev 1004)
+++ ChangeLog 2020-02-19 14:04:22 UTC (rev 1005)
@@ -4,7 +4,9 @@
fvwm/scripts/CustomButtonBar/CustomButtonBat: comment debug line
fvwm/components/functions/Exec-Accelerator: add -name option for urxvtc;
this change the Ressource hint.
-
+ fvwm/components/styles/Applications-Icons-22-32: remove the remaining styles
+ which are handled by the media player system.
+
Verion 3.6.0
------------
Modified: fvwm/components/styles/Application-Icons-22-32
===================================================================
--- fvwm/components/styles/Application-Icons-22-32 2020-02-19 13:44:53 UTC (rev 1004)
+++ fvwm/components/styles/Application-Icons-22-32 2020-02-19 14:04:22 UTC (rev 1005)
@@ -38,7 +38,6 @@
Style aterm MiniIcon 22x22/apps/aterm.png, Icon 32x32/apps/aterm.png
Style atlantik MiniIcon 22x22/apps/atlantik.png, Icon 32x32/apps/atlantik.png
Style atomix MiniIcon 22x22/apps/atomix.png, Icon 32x32/apps/atomix.png
-Style audacious MiniIcon 22x22/apps/audacious.png, NoIcon
Style Audacity MiniIcon 22x22/apps/audacity.png, Icon 32x32/apps/audacity.png
Style aumix MiniIcon 22x22/apps/aumix.png, Icon 32x32/apps/aumix.png
Style avidemux MiniIcon 22x22/apps/avidemux.png, Icon 32x32/apps/avidemux.png
@@ -139,8 +138,6 @@
Style freemind-main-FreeMind MiniIcon 22x22/apps/freemind.png, Icon 32x32/apps/freemind.png
Style Frozen-Bubble MiniIcon 22x22/apps/frozen-bubble.png, Icon 32x32/apps/frozen-bubble.png
Style f-spot MiniIcon 22x22/apps/f-spot.png, Icon 32x32/apps/f-spot.png
-Style FvwmApplet-MpdAddSong MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
-Style FvwmApplet-MpdPlEd MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
Style fwbuilder MiniIcon 22x22/apps/fwbuilder.png, Icon 32x32/apps/fwbuilder.png
Style Gabber MiniIcon 22x22/apps/gabber.png, Icon 32x32/apps/gabber.png
@@ -168,7 +165,6 @@
Style glmix MiniIcon 22x22/apps/glmix.png, Icon 32x32/apps/glmix.png
Style gltron MiniIcon 22x22/apps/gltron.png, Icon 32x32/apps/gltron.png
Style glurp MiniIcon 22x22/apps/glurp.png, Icon 32x32/apps/glurp.png
-Style gmpc MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
Style gnect MiniIcon 22x22/apps/gnect.png, Icon 32x32/apps/gnect.png
Style gnibbles MiniIcon 22x22/apps/gnibbles.png, Icon 32x32/apps/gnibbles.png
Style gnobots2 MiniIcon 22x22/apps/gnobots2.png, Icon 32x32/apps/gnobots2.png
@@ -339,7 +335,6 @@
Style mousepad MiniIcon 22x22/apps/mousepad.png, Icon 32x32/apps/mousepad.png
Style Mozilla MiniIcon 22x22/apps/mozilla.png, Icon 32x32/apps/mozilla.png
Style Mozilla-bin UseStyle Mozilla
-Style MPlayer MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
Style mrxvt MiniIcon 22x22/apps/mrxvt.png, Icon 32x32/apps/mrxvt.png
Style Multi-gnome-terminal MiniIcon 22x22/apps/multi-gnome-terminal.png, Icon 32x32/apps/multi-gnome-terminal.png
Style mutt MiniIcon 22x22/apps/mutt.png, Icon 32x32/apps/mutt.png
@@ -373,7 +368,6 @@
Style psi MiniIcon 22x22/apps/psi.png, Icon 32x32/apps/psi.png
Style pygmy MiniIcon 22x22/apps/pygmy.png, Icon 32x32/apps/pygmy.png
Style PyAlaMode MiniIcon 22x22/apps/pyalamode-2.8.png, Icon 32x32/apps/pyalamode-2.8.png
-Style pympd MiniIcon 22x22/apps/pympd.png, Icon 32x32/apps/pympd.png
Style python MiniIcon 22x22/apps/python.png, Icon 32x32/apps/python.png
Style qcad MiniIcon 22x22/apps/qcad.png, Icon 32x32/apps/qcad.png
@@ -383,7 +377,6 @@
Style qtstalker MiniIcon 22x22/apps/qtstalker.png, Icon 32x32/apps/qtstalker.png
Style "Quake III: Arena" MiniIcon 22x22/apps/quake3.png, Icon 32x32/apps/quake3.png
Style quanta MiniIcon 22x22/apps/quanta.png, Icon 32x32/apps/quanta.png
-Style quodlibet MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
Style realplay.bin MiniIcon 22x22/apps/realplayer.png, Icon 32x32/apps/realplayer.png
Style Rect MiniIcon 22x22/apps/rect.png, Icon 32x32/apps/rect.png
@@ -476,8 +469,6 @@
Style xine MiniIcon 22x22/apps/xine.png, Icon 32x32/apps/xine.png
Style xlincity* MiniIcon 22x22/apps/xlincity.png, Icon 32x32/apps/xlincity.png
Style xmahjongg MiniIcon 22x22/apps/xmahjongg.png, Icon 32x32/apps/xmahjongg.png
-Style xmms MiniIcon 22x22/apps/xmms.png, NoIcon
-Style xmms2 MiniIcon 22x22/apps/xmms2.png, NoIcon
Style xnc MiniIcon 22x22/apps/xnc.png, Icon 32x32/apps/xnc.png
Style ives UseStyle xnc
Style xpat2 MiniIcon 22x22/apps/xpat2.png, Icon 32x32/apps/xpat2.png
@@ -499,28 +490,4 @@
Style zita* UseStyle Zita-at1
Style zsafe MiniIcon 22x22/apps/zsafe.png, Icon 32x32/apps/zsafe.png
-Style Audacious StartIconic, NoActiveIconOverride, NoIcon, !Title, Sticky, WindowListSkip, StaysOnTop
-Style playlist StartIconic, !Title, Sticky, WindowListSkip
-Style equalizer UseStyle playlist
-
-Style beep-media-player !Title
-
-Style XDRadio NoIcon, Sticky, WindowListSkip
-
-Style xmms StaysOnTop
-Style XMMS_Player StartIconic, NoIcon, !Title, Sticky, WindowListSkip
-Style XMMS_Playlist UseStyle XMMS_Player
-Style XMMS_Equalizer UseStyle XMMS_Player
-
-Style qjackctl NoactiveIconOverride, NoIcon, Sticky, WindowListSkip
-Style start_jack UseStyle qjackctl
-Style start_cadence UseStyle qjackctl
-Style Cadence UseStyle qjackctl
-Style Cadence-* UseStyle qjackctl
-Style cadence.py UseStyle qjackctl
-Style Catia UseStyle qjackctl
-Style Claudia UseStyle qjackctl
-Style Logs UseStyle qjackctl
-Style Render UseStyle qjackctl
-
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-19 13:44:55
|
Revision: 1004
http://sourceforge.net/p/fvwm-crystal/code/1004
Author: dominique_libre
Date: 2020-02-19 13:44:53 +0000 (Wed, 19 Feb 2020)
Log Message:
-----------
Exec-Accelerator: add -name option for urxvtc
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Exec-Accelerator
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-19 13:40:59 UTC (rev 1003)
+++ ChangeLog 2020-02-19 13:44:53 UTC (rev 1004)
@@ -2,6 +2,8 @@
mercredi 19 février 2020
fvwm/scripts/CustomButtonBar/CustomButtonBat: comment debug line
+ fvwm/components/functions/Exec-Accelerator: add -name option for urxvtc;
+ this change the Ressource hint.
Verion 3.6.0
------------
Modified: fvwm/components/functions/Exec-Accelerator
===================================================================
--- fvwm/components/functions/Exec-Accelerator 2020-02-19 13:40:59 UTC (rev 1003)
+++ fvwm/components/functions/Exec-Accelerator 2020-02-19 13:44:53 UTC (rev 1004)
@@ -85,7 +85,7 @@
DestroyFunc AT
AddToFunc AT
+ I Window-SetPlacementPolicy
-+ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc "--title "$0" -e $[1-]"
++ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc "--title "$0" -name "$0" -e $[1-]"
+ I TestRc (NoMatch) StartTitledTerminal "$0" $[1-]
# Usage: C [command] [command options]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-19 13:41:00
|
Revision: 1003
http://sourceforge.net/p/fvwm-crystal/code/1003
Author: dominique_libre
Date: 2020-02-19 13:40:59 +0000 (Wed, 19 Feb 2020)
Log Message:
-----------
CustomButtonBat: comment debug line
Modified Paths:
--------------
ChangeLog
fvwm/scripts/CustomButtonBar/CustomButtonBar
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-17 14:25:26 UTC (rev 1002)
+++ ChangeLog 2020-02-19 13:40:59 UTC (rev 1003)
@@ -1,9 +1,12 @@
ChangeLog for FVWM-Crystal
+mercredi 19 février 2020
+ fvwm/scripts/CustomButtonBar/CustomButtonBat: comment debug line
+
Verion 3.6.0
------------
-lundi 17 février
+lundi 17 février 2020
fvwm/components/functions/Exit: cleanup and try our best to find systemctl when present
fvwm/components/functions/Media-Music-functions;
fvwm/components/functions/Music-alsaplayer;
Modified: fvwm/scripts/CustomButtonBar/CustomButtonBar
===================================================================
--- fvwm/scripts/CustomButtonBar/CustomButtonBar 2020-02-17 14:25:26 UTC (rev 1002)
+++ fvwm/scripts/CustomButtonBar/CustomButtonBar 2020-02-19 13:40:59 UTC (rev 1003)
@@ -16,8 +16,9 @@
# ($9 $10 $11) $[infostore.CustomButtonPager] $[infostore.Desk_Pages_X] $[infostore.NotificationAreaManager] \
# ($12 $13 $14 $15) $[infostore.EWMH_DI_Left] $[infostore.EWMH_DI_Right] $[infostore.EWMH_DI_Top] $[infostore.EWMH_DI_Bottom] \
# ($16 $17 $18 $19) $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right] $[infostore.EWMH_Recipe_Top] $[infostore.EWMH_Recipe_Bottom]"
-echo "$0 $@" > ${FVWM_USERDIR}/.commandf
-#{FVWM_USERDIR}/scripts/CustomButtonBar/CustomButtonBar
+
+#echo "$0 $@" > ${FVWM_USERDIR}/.commandf
+
# Preferences files, must be searched in the 3 standard Crystal locations and copied into the user dir. {{{1
PrefFileName="CustomButtonBar"
PrefFile="${FVWM_USERDIR}/preferences/${PrefFileName}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-17 14:25:30
|
Revision: 1002
http://sourceforge.net/p/fvwm-crystal/code/1002
Author: dominique_libre
Date: 2020-02-17 14:25:26 +0000 (Mon, 17 Feb 2020)
Log Message:
-----------
Implement the new button decoration
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Window-Decorations
Added Paths:
-----------
fvwm/decorations/Amiga/AmigaOS 4/Theme.amigaos-fullscreen
fvwm/decorations/Amiga/Aqua/Theme.amigaos-fullscreen
fvwm/decorations/Amiga/DarkAqua/Theme.amigaos-fullscreen
fvwm/decorations/Aqua/Blank buttons/Theme.amigaos-fullscreen
fvwm/decorations/Aqua/Buttons with icons/Theme.amigaos-fullscreen
fvwm/decorations/Clear/Blue/Theme.amigaos-fullscreen
fvwm/decorations/Clear/Green/Theme.amigaos-fullscreen
fvwm/decorations/Clear/Mono/Theme.amigaos-fullscreen
fvwm/decorations/Clear/Navy/Theme.amigaos-fullscreen
fvwm/decorations/Clear/Orange/Theme.amigaos-fullscreen
fvwm/decorations/Clear/Red/Theme.amigaos-fullscreen
fvwm/decorations/Clear/RedDesktop/Theme.amigaos-fullscreen
fvwm/decorations/Clear/RedDesktopTransparent/Theme.amigaos-fullscreen
fvwm/decorations/Clear/Violet/Theme.amigaos-fullscreen
fvwm/decorations/Clearlooks/DeepSky/Theme.amigaos-fullscreen
fvwm/decorations/Clearlooks/Default/Theme.amigaos-fullscreen
fvwm/decorations/Clearlooks/Olive/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/CIOS/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/CIOS-blue/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/CrystalZono/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/DarkDesktop/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/DarkGreen/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/IrishDesktop/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/Original/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/Red - Cyan/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/RedDesktop/Theme.amigaos-fullscreen
fvwm/decorations/Crystal/WhiteDesktop/Theme.amigaos-fullscreen
fvwm/decorations/DarkSky/Black/Theme.amigaos-fullscreen
fvwm/decorations/DarkSky/Gray/Theme.amigaos-fullscreen
fvwm/decorations/Dawn of a Terminal/Blue/Theme.amigaos-fullscreen
fvwm/decorations/Dawn of a Terminal/Green/Theme.amigaos-fullscreen
fvwm/decorations/Dawn of a Terminal/Purple/Theme.amigaos-fullscreen
fvwm/decorations/Dawn of a Terminal/Red/Theme.amigaos-fullscreen
fvwm/decorations/DawnSky/Default/Theme.amigaos-fullscreen
fvwm/decorations/Elberg/Default/Theme.amigaos-fullscreen
fvwm/decorations/Fear/Default/Theme.amigaos-fullscreen
fvwm/decorations/Gentoo/Alternative/Theme.amigaos-fullscreen
fvwm/decorations/Gentoo/Default/Theme.amigaos-fullscreen
fvwm/decorations/Gentoo/Gray/Theme.amigaos-fullscreen
fvwm/decorations/Ish/Aqua/Theme.amigaos-fullscreen
fvwm/decorations/Ish/Black/Theme.amigaos-fullscreen
fvwm/decorations/Ish/Blue/Theme.amigaos-fullscreen
fvwm/decorations/Ish/Green/Theme.amigaos-fullscreen
fvwm/decorations/Ish/Lite/Theme.amigaos-fullscreen
fvwm/decorations/Ish/Orange/Theme.amigaos-fullscreen
fvwm/decorations/Ish/Pink/Theme.amigaos-fullscreen
fvwm/decorations/Ish/Purple/Theme.amigaos-fullscreen
fvwm/decorations/Ish/Red/Theme.amigaos-fullscreen
fvwm/decorations/MicroClear/Default/Theme.amigaos-fullscreen
fvwm/decorations/Mist/Default/Theme.amigaos-fullscreen
fvwm/decorations/Motif/Cyan Gray/Theme.amigaos-fullscreen
fvwm/decorations/Motif/Pink Navy/Theme.amigaos-fullscreen
fvwm/decorations/SystemG/BlueCurve/Theme.amigaos-fullscreen
fvwm/decorations/SystemG/Crux/Theme.amigaos-fullscreen
fvwm/decorations/SystemG/Dawn/Theme.amigaos-fullscreen
fvwm/decorations/SystemG/Debian/Theme.amigaos-fullscreen
fvwm/decorations/SystemG/Default/Theme.amigaos-fullscreen
fvwm/decorations/SystemG/Dusk/Theme.amigaos-fullscreen
fvwm/decorations/SystemG/Geramik/Theme.amigaos-fullscreen
fvwm/decorations/SystemG/SaltLake/Theme.amigaos-fullscreen
fvwm/decorations/Winter/Default/Theme.amigaos-fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-17 13:05:46 UTC (rev 1001)
+++ ChangeLog 2020-02-17 14:25:26 UTC (rev 1002)
@@ -26,7 +26,10 @@
New decorations amigaos-*Fullscreen: A Left click on the second button
will put the window in fullscreen. The other amiga decorations will
maximize the window as the other decorations.
- fvwm/components/About: introduce code name into the version
+ fvwm/components/functions/About: introduce code name into the version
+ fvwm/components/functionsWindow-Decorations;
++ fvwm/decorations/*(/*)/Theme.amigaos-fullscreen: Implement the new
+ button decoration
samedi 15 février 2020
fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
Modified: fvwm/components/functions/Window-Decorations
===================================================================
--- fvwm/components/functions/Window-Decorations 2020-02-17 13:05:46 UTC (rev 1001)
+++ fvwm/components/functions/Window-Decorations 2020-02-17 14:25:26 UTC (rev 1002)
@@ -53,6 +53,7 @@
AddToMenu /Window-Decorations-ButtonModel
+ "FVWM-Crystal" Window-Decorations-SetButtonModel Theme.fvwm-crystal
+ "AmigaOS" Window-Decorations-SetButtonModel Theme.amigaos
++ "AmigaOS Fullscreen" Window-Decorations-SetButtonModel Theme.amigaos-fullscreen
+ "MS Windows" Window-Decorations-SetButtonModel Theme.windows
+ "MacOS X" Window-Decorations-SetButtonModel Theme.macosx
+ "OS/2" Window-Decorations-SetButtonModel Theme.os2
Added: fvwm/decorations/Amiga/AmigaOS 4/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Amiga/AmigaOS 4/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Amiga/AmigaOS 4/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,49 @@
+# AmigaOS version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- Raised
+
++ ButtonStyle 1 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 1 Vector 5 40x24@1 60x24@1 60x76@0 40x76@0 40x24@1
+
++ ButtonStyle 2 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 2 Vector 5 87x87@0 27x87@0 27x27@1 87x27@1 87x87@0
++ AddButtonStyle 2 Vector 5 70x27@1 70x11@1 11x11@0 11x72@0 27x72@1
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 4 Vector 5 87x87@1 87x11@1 11x11@0 11x87@0 87x87@1
++ AddButtonStyle 4 Vector 5 33x55@0 33x11@0 11x11@1 11x55@1 33x55@0
+
++ ButtonStyle 6 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 6 Vector 5 87x87@1 87x11@1 11x11@0 11x87@0 87x87@1
++ AddButtonStyle 6 Vector 5 33x61@0 33x43@0 24x43@1 24x61@1 33x61@0
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * BorderWidth 1, HandleWidth 1
+
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
Added: fvwm/decorations/Amiga/Aqua/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Amiga/Aqua/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Amiga/Aqua/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,50 @@
+# AmigaOS version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- Raised
+
++ ButtonStyle 1 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 1 Vector 5 40x24@1 60x24@1 60x76@0 40x76@0 40x24@1
+
++ ButtonStyle 2 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 2 Vector 5 87x87@0 27x87@0 27x27@1 87x27@1 87x87@0
++ AddButtonStyle 2 Vector 5 70x27@1 70x11@1 11x11@0 11x72@0 27x72@1
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 4 Vector 5 87x87@1 87x11@1 11x11@0 11x87@0 87x87@1
++ AddButtonStyle 4 Vector 5 33x55@0 33x11@0 11x11@1 11x55@1 33x55@0
+
++ ButtonStyle 6 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 6 Vector 5 87x87@1 87x11@1 11x11@0 11x87@0 87x87@1
++ AddButtonStyle 6 Vector 5 33x61@0 33x43@0 24x43@1 24x61@1 33x61@0
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * BorderWidth 1, HandleWidth 1
+
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Amiga/DarkAqua/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Amiga/DarkAqua/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Amiga/DarkAqua/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,49 @@
+# AmigaOS version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- Raised
+
++ ButtonStyle 1 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 1 Vector 5 40x24@1 60x24@1 60x76@0 40x76@0 40x24@1
+
++ ButtonStyle 2 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 2 Vector 5 87x87@0 27x87@0 27x27@1 87x27@1 87x87@0
++ AddButtonStyle 2 Vector 5 70x27@1 70x11@1 11x11@0 11x72@0 27x72@1
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 4 Vector 5 87x87@1 87x11@1 11x11@0 11x87@0 87x87@1
++ AddButtonStyle 4 Vector 5 33x55@0 33x11@0 11x11@1 11x55@1 33x55@0
+
++ ButtonStyle 6 Vector 4 98x98@0 99x2@0 2x2@1 2x98@1 98x98@0
++ AddButtonStyle 6 Vector 5 87x87@1 87x11@1 11x11@0 11x87@0 87x87@1
++ AddButtonStyle 6 Vector 5 33x61@0 33x43@0 24x43@1 24x61@1 33x61@0
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * BorderWidth 1, HandleWidth 1
+
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
Added: fvwm/decorations/Aqua/Blank buttons/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Aqua/Blank buttons/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Aqua/Blank buttons/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,52 @@
+# AmigaOS version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle Inactive AdjustedPixmap $./title-inactive.png
++ TitleStyle Active AdjustedPixmap $./title-active.png
++ TitleStyle Centered
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Inactive AdjustedPixmap $./button-gray.png
++ ButtonStyle 1 ActiveUp AdjustedPixmap $./button-red.png
++ ButtonStyle 1 ActiveDown AdjustedPixmap $./button-red-icon.png
+
+# Maximize
++ ButtonStyle 2 Inactive AdjustedPixmap $./button-gray.png
++ ButtonStyle 2 ActiveUp AdjustedPixmap $./button-green.png
++ ButtonStyle 2 ActiveDown AdjustedPixmap $./button-green-icon.png
+
+# Options
++ ButtonStyle 4 Inactive AdjustedPixmap $./button-gray.png
++ ButtonStyle 4 ActiveUp AdjustedPixmap $./button-violet.png
++ ButtonStyle 4 ActiveDown AdjustedPixmap $./button-violet-icon.png
+
+# Arrows
++ ButtonStyle 6 Inactive AdjustedPixmap $./button-gray.png
++ ButtonStyle 6 ActiveUp AdjustedPixmap $./button-blue.png
++ ButtonStyle 6 ActiveDown AdjustedPixmap $./button-blue-icon.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[cs-window-inactive], \
+ BorderColorset $[cs-window-inactive], \
+ HilightColorset $[cs-window-active], \
+ HilightBorderColorset $[cs-window-active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
Added: fvwm/decorations/Aqua/Buttons with icons/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Aqua/Buttons with icons/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Aqua/Buttons with icons/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,49 @@
+# AmigaOS version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle Inactive AdjustedPixmap $./title-inactive.png
++ TitleStyle Active AdjustedPixmap $./title-active.png
++ TitleStyle Centered
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Inactive AdjustedPixmap $./button-gray-red.png
++ ButtonStyle 1 Active AdjustedPixmap $./button-red-icon.png
+
+# Maximize
++ ButtonStyle 2 Inactive AdjustedPixmap $./button-gray-green.png
++ ButtonStyle 2 Active AdjustedPixmap $./button-green-icon.png
+
+# Options
++ ButtonStyle 4 Inactive AdjustedPixmap $./button-gray-violet.png
++ ButtonStyle 4 Active AdjustedPixmap $./button-violet-icon.png
+
+# Arrows
++ ButtonStyle 6 Inactive AdjustedPixmap $./button-gray-blue.png
++ ButtonStyle 6 Active AdjustedPixmap $./button-blue-icon.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[cs-window-inactive], \
+ BorderColorset $[cs-window-inactive], \
+ HilightColorset $[cs-window-active], \
+ HilightBorderColorset $[cs-window-active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clear/Blue/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clear/Blue/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clear/Blue/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,55 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 22 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Maximize
++ ButtonStyle 2 Vector 18 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Options
++ ButtonStyle 4 Vector 11 23x27@4 70x27@1 \
+ 48x40@4 70x66@1 23x66@1 48x40@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Arrows
++ ButtonStyle 6 Vector 13 20x35@4 40x18@1 40x58@1 20x35@1 52x35@4 \
+ 72x55@1 52x75@1 52x35@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clear/Green/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clear/Green/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clear/Green/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,55 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 22 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Maximize
++ ButtonStyle 2 Vector 18 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Options
++ ButtonStyle 4 Vector 11 23x27@4 70x27@1 \
+ 48x40@4 70x66@1 23x66@1 48x40@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Arrows
++ ButtonStyle 6 Vector 13 20x35@4 40x18@1 40x58@1 20x35@1 52x35@4 \
+ 72x55@1 52x75@1 52x35@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clear/Mono/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clear/Mono/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clear/Mono/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,55 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 22 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Maximize
++ ButtonStyle 2 Vector 18 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Options
++ ButtonStyle 4 Vector 11 23x27@4 70x27@1 \
+ 48x40@4 70x66@1 23x66@1 48x40@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Arrows
++ ButtonStyle 6 Vector 13 20x35@4 40x18@1 40x58@1 20x35@1 52x35@4 \
+ 72x55@1 52x75@1 52x35@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clear/Navy/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clear/Navy/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clear/Navy/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,55 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 22 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Maximize
++ ButtonStyle 2 Vector 18 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Options
++ ButtonStyle 4 Vector 11 23x27@4 70x27@1 \
+ 48x40@4 70x66@1 23x66@1 48x40@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Arrows
++ ButtonStyle 6 Vector 13 20x35@4 40x18@1 40x58@1 20x35@1 52x35@4 \
+ 72x55@1 52x75@1 52x35@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clear/Orange/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clear/Orange/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clear/Orange/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,55 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 22 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Maximize
++ ButtonStyle 2 Vector 18 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Options
++ ButtonStyle 4 Vector 11 23x27@4 70x27@1 \
+ 48x40@4 70x66@1 23x66@1 48x40@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Arrows
++ ButtonStyle 6 Vector 13 20x35@4 40x18@1 40x58@1 20x35@1 52x35@4 \
+ 72x55@1 52x75@1 52x35@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clear/Red/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clear/Red/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clear/Red/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,55 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 22 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Maximize
++ ButtonStyle 2 Vector 18 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Options
++ ButtonStyle 4 Vector 11 23x27@4 70x27@1 \
+ 48x40@4 70x66@1 23x66@1 48x40@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Arrows
++ ButtonStyle 6 Vector 13 20x35@4 40x18@1 40x58@1 20x35@1 52x35@4 \
+ 72x55@1 52x75@1 52x35@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clear/RedDesktop/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clear/RedDesktop/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clear/RedDesktop/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,55 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 22 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Maximize
++ ButtonStyle 2 Vector 18 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Options
++ ButtonStyle 4 Vector 11 23x27@4 70x27@1 \
+ 48x40@4 70x66@1 23x66@1 48x40@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Arrows
++ ButtonStyle 6 Vector 13 20x35@4 40x18@1 40x58@1 20x35@1 52x35@4 \
+ 72x55@1 52x75@1 52x35@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clear/RedDesktopTransparent/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clear/RedDesktopTransparent/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clear/RedDesktopTransparent/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,55 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 22 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Maximize
++ ButtonStyle 2 Vector 18 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Options
++ ButtonStyle 4 Vector 11 23x27@4 70x27@1 \
+ 48x40@4 70x66@1 23x66@1 48x40@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Arrows
++ ButtonStyle 6 Vector 13 20x35@4 40x18@1 40x58@1 20x35@1 52x35@4 \
+ 72x55@1 52x75@1 52x35@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clear/Violet/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clear/Violet/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clear/Violet/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,55 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
+# Close
++ ButtonStyle 1 Vector 22 23x23@4 28x23@1 48x43@1 65x23@1 70x23@1 \
+ 70x28@1 52x48@1 70x65@1 70x70@1 65x70@1 \
+ 48x52@1 28x70@1 23x70@1 23x65@1 43x48@1 \
+ 23x28@1 23x23@1 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Maximize
++ ButtonStyle 2 Vector 18 43x23@4 50x23@1 50x43@1 70x43@1 70x50@1 \
+ 50x50@1 50x70@1 43x70@1 43x50@1 23x50@1 \
+ 23x43@1 43x43@1 43x23@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Options
++ ButtonStyle 4 Vector 11 23x27@4 70x27@1 \
+ 48x40@4 70x66@1 23x66@1 48x40@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
+# Arrows
++ ButtonStyle 6 Vector 13 20x35@4 40x18@1 40x58@1 20x35@1 52x35@4 \
+ 72x55@1 52x75@1 52x35@1 \
+ 8x8@4 88x8@1 88x88@1 8x88@1 8x8@1
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: fvwm/decorations/Clearlooks/DeepSky/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clearlooks/DeepSky/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clearlooks/DeepSky/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,57 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle Active AdjustedPixmap $./window-active-title.png
++ TitleStyle Inactive AdjustedPixmap $./window-inactive-title.png
+PipeRead 'echo "+ TitleStyle Centered Height $(($[title_font_size]+$(($[title_font_size]/3)))) -- flat"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 \
+ ActiveUp (AdjustedPixmap $./window-active-close.png) \
+ ActiveDown (AdjustedPixmap $./window-active-close-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-close.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-close-down.png)
+
++ ButtonStyle 2 \
+ ActiveUp (AdjustedPixmap $./window-active-maximize.png) \
+ ActiveDown (AdjustedPixmap $./window-active-maximize-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-maximize.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-maximize-down.png)
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 \
+ ActiveUp (AdjustedPixmap $./window-active-options.png) \
+ ActiveDown (AdjustedPixmap $./window-active-options-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-options.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-options-down.png)
+
++ ButtonStyle 6 \
+ ActiveUp (AdjustedPixmap $./window-active-arrows.png) \
+ ActiveDown (AdjustedPixmap $./window-active-arrows-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-arrows.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-arrows-down.png)
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactiveborder], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_activeborder]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Clearlooks/Default/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clearlooks/Default/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clearlooks/Default/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,57 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle Active AdjustedPixmap $./window-active-title.png
++ TitleStyle Inactive AdjustedPixmap $./window-inactive-title.png
+PipeRead 'echo "+ TitleStyle Centered Height $(($[title_font_size]+$(($[title_font_size]/3)))) -- flat"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 \
+ ActiveUp (AdjustedPixmap $./window-active-close.png) \
+ ActiveDown (AdjustedPixmap $./window-active-close-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-close.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-close-down.png)
+
++ ButtonStyle 2 \
+ ActiveUp (AdjustedPixmap $./window-active-maximize.png) \
+ ActiveDown (AdjustedPixmap $./window-active-maximize-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-maximize.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-maximize-down.png)
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 \
+ ActiveUp (AdjustedPixmap $./window-active-options.png) \
+ ActiveDown (AdjustedPixmap $./window-active-options-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-options.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-options-down.png)
+
++ ButtonStyle 6 \
+ ActiveUp (AdjustedPixmap $./window-active-arrows.png) \
+ ActiveDown (AdjustedPixmap $./window-active-arrows-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-arrows.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-arrows-down.png)
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactiveborder], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_activeborder]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Clearlooks/Olive/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Clearlooks/Olive/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Clearlooks/Olive/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,57 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle Active AdjustedPixmap $./window-active-title.png
++ TitleStyle Inactive AdjustedPixmap $./window-inactive-title.png
+PipeRead 'echo "+ TitleStyle Centered Height $(($[title_font_size]+$(($[title_font_size]/3)))) -- flat"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 \
+ ActiveUp (AdjustedPixmap $./window-active-close.png) \
+ ActiveDown (AdjustedPixmap $./window-active-close-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-close.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-close-down.png)
+
++ ButtonStyle 2 \
+ ActiveUp (AdjustedPixmap $./window-active-maximize.png) \
+ ActiveDown (AdjustedPixmap $./window-active-maximize-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-maximize.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-maximize-down.png)
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 \
+ ActiveUp (AdjustedPixmap $./window-active-options.png) \
+ ActiveDown (AdjustedPixmap $./window-active-options-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-options.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-options-down.png)
+
++ ButtonStyle 6 \
+ ActiveUp (AdjustedPixmap $./window-active-arrows.png) \
+ ActiveDown (AdjustedPixmap $./window-active-arrows-down.png) \
+ InactiveUp (AdjustedPixmap $./window-inactive-arrows.png) \
+ InactiveDown (AdjustedPixmap $./window-inactive-arrows-down.png)
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactiveborder], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_activeborder]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/CIOS/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/CIOS/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/CIOS/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/CIOS-blue/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/CIOS-blue/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/CIOS-blue/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/CrystalZono/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/CrystalZono/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/CrystalZono/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/DarkDesktop/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/DarkDesktop/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/DarkDesktop/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/DarkGreen/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/DarkGreen/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/DarkGreen/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/IrishDesktop/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/IrishDesktop/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/IrishDesktop/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/Original/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/Original/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/Original/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/Red - Cyan/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/Red - Cyan/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/Red - Cyan/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/RedDesktop/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/RedDesktop/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/RedDesktop/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/Crystal/WhiteDesktop/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/Crystal/WhiteDesktop/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/Crystal/WhiteDesktop/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,43 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- flat
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- HiddenHandles
++ BorderStyle -- Flat
+
++ ButtonStyle 1 AdjustedPixmap $./window-close.png
+
++ ButtonStyle 2 AdjustedPixmap $./window-maximize.png
+
++ ButtonStyle 3 MiniIcon
+
++ ButtonStyle 4 AdjustedPixmap $./window-options.png
+
++ ButtonStyle 6 AdjustedPixmap $./window-arrows.png
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- flat
+
+Style * HandleWidth 1, BorderWidth 1
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactive], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_active]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
+
Added: fvwm/decorations/DarkSky/Black/Theme.amigaos-fullscreen
===================================================================
--- fvwm/decorations/DarkSky/Black/Theme.amigaos-fullscreen (rev 0)
+++ fvwm/decorations/DarkSky/Black/Theme.amigaos-fullscreen 2020-02-17 14:25:26 UTC (rev 1002)
@@ -0,0 +1,54 @@
+# FVWM-Crystal version
+
+# Setup colorsets
+Read $./Colorsets
+
+DestroyDecor recreate WindowDecoration
+AddToDecor WindowDecoration
+
++ TitleStyle InActive Colorset $[infostore.cs_window_inactive]
++ TitleStyle Active Colorset $[infostore.cs_window_active]
++ TitleStyle LeftJustified
++ TitleStyle -- Raised
+PipeRead 'echo "+ TitleStyle Height $(($[title_font_size]+$(($[title_font_size]/3))))"'
+
++ BorderStyle -- Raised HiddenHandles
+
+# Close
++ ButtonStyle 1 \
+ Active (AdjustedPixmap $./button-active-close.png) \
+ Inactive (AdjustedPixmap $./button-inactive-close.png)
+
+# Maximize
++ ButtonStyle 2 \
+ Active (AdjustedPixmap $./button-active-maximize.png) \
+ Inactive (AdjustedPixmap $./button-inactive-maximize.png)
+
+# Options
++ ButtonStyle 4 \
+ Active (AdjustedPixmap $./button-active-options.png) \
+ Inactive (AdjustedPixmap $./button-inactive-options.png)
+
+# Arrows
++ ButtonStyle 6 \
+ Active (AdjustedPixmap $./button-active-arrows.png) \
+ Inactive (AdjustedPixmap $./button-inactive-arrows.png)
+
++ ButtonStyle All -- UseTitleStyle
++ ButtonStyle All -- Raised
+
+Style * HandleWidth 4, BorderWidth 4
+Style * Colorset $[infostore.cs_window_inactive], \
+ BorderColorset $[infostore.cs_window_inactiveborder], \
+ HilightColorset $[infostore.cs_window_active], \
+ HilightBorderColorset $[infostore.cs_window_activeborder]
+
+Style * Font "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
+
+Style * MwmBorder
+
+Style * UseDecor WindowDecoration
+
+# Setup button functions
+Include components/decorations/Buttons-amigaos-Fullscreen
+
Added: ...
[truncated message content] |
|
From: <dom...@us...> - 2020-02-17 13:05:48
|
Revision: 1001
http://sourceforge.net/p/fvwm-crystal/code/1001
Author: dominique_libre
Date: 2020-02-17 13:05:46 +0000 (Mon, 17 Feb 2020)
Log Message:
-----------
Magic Star
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/About
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-17 12:45:49 UTC (rev 1000)
+++ ChangeLog 2020-02-17 13:05:46 UTC (rev 1001)
@@ -26,6 +26,7 @@
New decorations amigaos-*Fullscreen: A Left click on the second button
will put the window in fullscreen. The other amiga decorations will
maximize the window as the other decorations.
+ fvwm/components/About: introduce code name into the version
samedi 15 février 2020
fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2020-02-17 12:45:49 UTC (rev 1000)
+++ fvwm/components/functions/About 2020-02-17 13:05:46 UTC (rev 1001)
@@ -7,7 +7,9 @@
*About: Line center
*About: Text "$[gt.Version]: 3.6.0"
*About: Line center
+*About: Text "Magic Star"
*About: Line center
+*About: Line center
*About: Text "$[gt.Authors]: Maciej Delmanowski <ha...@gn...>"
*About: Line center
*About: Text "Dominique Michel <dom...@us...>"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-17 12:45:52
|
Revision: 1000
http://sourceforge.net/p/fvwm-crystal/code/1000
Author: dominique_libre
Date: 2020-02-17 12:45:49 +0000 (Mon, 17 Feb 2020)
Log Message:
-----------
Some new news
Modified Paths:
--------------
NEWS
Modified: NEWS
===================================================================
--- NEWS 2020-02-17 12:34:56 UTC (rev 999)
+++ NEWS 2020-02-17 12:45:49 UTC (rev 1000)
@@ -1,9 +1,9 @@
Version 3.6.0
-------------
-Code name Magic Star
+Code name "Magic Star"
-Fvwm Crystal 3.6.0 is a step forward.
+Fvwm Crystal 3.6.0 is a big step forward.
- Dependencies updated to >=fvwm-2.6.9 and python3.
- A configurable button bar along with the Custom new recipe are providing
@@ -21,7 +21,7 @@
- Silent the application database. This make the login shell
(and fvwm-crystal logfile if any), to be less poluted
by external applications.
-- Systemd support into the Exit menu
+- Improved the systemd Exit menu with hibernate/resume support.
- Screenlid suspend-hibrid support with preference
- Cadence support into the Music menu and Music GUI key binding
- Mouse velocity preference (default: system value)
@@ -33,6 +33,10 @@
That update simplify this function and make it to work better.
- Improved support of different button sizes into the recipes with preferences.
- The ACPI applets will be shown only when the required hardware is found.
+- New window decorations Buttons-amigaos-Fullscreen
+ and Buttons-amigaos-MiniIcon-Fullscreen. A left click on the second
+ button will bring the window in fullscreen. The existing amigaos button
+ models will now maximize the window.
As always, numerous fixes, bugfixes and new applications and icons
for the application menu. Most important ones:
@@ -43,7 +47,9 @@
- Fix support of svg application icons.
- Temporary fix for the Font preferences applet crashing at launch
with some colorsets (due to a fvwm bug). It can look uggly
- but should work.
+ but should work with all colorsets.
+- Fix the media players styles. This also fix their icons at top layer
+ after a recipe change bug.
See ChangeLog for the details.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-17 12:34:58
|
Revision: 999
http://sourceforge.net/p/fvwm-crystal/code/999
Author: dominique_libre
Date: 2020-02-17 12:34:56 +0000 (Mon, 17 Feb 2020)
Log Message:
-----------
New amigaos-Fullscreen window decoration.
Modified Paths:
--------------
ChangeLog
fvwm/components/decorations/Buttons-amigaos-MiniIcon
Added Paths:
-----------
fvwm/components/decorations/Buttons-amigaos-Fullscreen
fvwm/components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-17 12:13:08 UTC (rev 998)
+++ ChangeLog 2020-02-17 12:34:56 UTC (rev 999)
@@ -20,6 +20,12 @@
+ fvwm/components/styles/MediaPlayers-Style: Fix the madia players styles.
This fix the icons at top after a recipe change bug and make the non
prefered players to get the defaut style in any case.
++ fvwm/components/decorations/Buttons-amigaos-Fullscreen;
+ fvwm/components/decorations/Buttons-amigaos-MiniIcon;
++ fvwm/components/decorations/Buttons-amigaos-MiniIcon-Fullscreen:
+ New decorations amigaos-*Fullscreen: A Left click on the second button
+ will put the window in fullscreen. The other amiga decorations will
+ maximize the window as the other decorations.
samedi 15 février 2020
fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
@@ -3645,4 +3651,3 @@
Thu Jul 7 23:32:06 CEST 2005 Maciej Delmanowski <ha...@po...>
* Initialization of the darcs repository
-M ChangeLog
Added: fvwm/components/decorations/Buttons-amigaos-Fullscreen
===================================================================
--- fvwm/components/decorations/Buttons-amigaos-Fullscreen (rev 0)
+++ fvwm/components/decorations/Buttons-amigaos-Fullscreen 2020-02-17 12:34:56 UTC (rev 999)
@@ -0,0 +1,72 @@
+# Amiga Button Setup
+# From the Fvwm-crystal button setup written by Maciej Delmanowski <ha...@li...>
+# Modified by Dominique Michel in order to reproduce the look and feel
+# of the Amiga OS
+#
+# For the real lock and feel, just find an Amiga. This is not an exact
+# reproduction of the Amiga button setup.
+#
+# This is the AmigaOS window button setup. Hold the mouse button
+# to see the popup menu of a certain button.
+#
+# Mod : any modifier
+# Mod0: no modifier
+# Mod1: Meta (Alt)
+# Mod2: Shift Alt
+#
+# Original Amiga 3.1 button setup
+# Button 1: close
+# Button 2: raise/lower
+# Button 4: minimize|maximize|fullscreen/default (one of 3/default)
+# Button 6: iconify (on non transiet window)
+
+# First button - close, destroy, iconify
+Mouse 1 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Close
+Mouse 2 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent
+Mouse 2 1 $[Mod1] Window-Button-Function Button1 /Window-Menu-Close Destroy
+Mouse 3 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Window-Iconify
+Style * Button 1
+
+# Second button - raise/lower and various ways to maximize a window
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 100 0
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow grow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 grow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow 0
+Style * Button 2
+
+Style * NoButton 3
+
+# 4th button - minimize, stick and layers
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer 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 - 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
+Mouse 3 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-MoveToPage-Forward
+Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Page Window-WarpToPage-Backward
+Mouse 2 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Page WarpToPage prev
+Mouse 3 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Page Window-WarpToPage-Forward
+Style * Button 6
+
+Style * NoButton 7
+
+Style * NoButton 8
+
+Style * NoButton 9
+
+Style * NoButton 0
+
+# NumLock support
+Read $./Buttons-amigaos_NumLock
+
+# vim:ft=fvwm
Modified: fvwm/components/decorations/Buttons-amigaos-MiniIcon
===================================================================
--- fvwm/components/decorations/Buttons-amigaos-MiniIcon 2020-02-17 12:13:08 UTC (rev 998)
+++ fvwm/components/decorations/Buttons-amigaos-MiniIcon 2020-02-17 12:34:56 UTC (rev 999)
@@ -14,7 +14,7 @@
Style * Button 1
# Second button -various ways to maximize a window
-Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize
Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 100
Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 100 0
Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow grow
Added: fvwm/components/decorations/Buttons-amigaos-MiniIcon-Fullscreen
===================================================================
--- fvwm/components/decorations/Buttons-amigaos-MiniIcon-Fullscreen (rev 0)
+++ fvwm/components/decorations/Buttons-amigaos-MiniIcon-Fullscreen 2020-02-17 12:34:56 UTC (rev 999)
@@ -0,0 +1,64 @@
+# FVWM-Crystal Button Setup
+# Written by Dominique Michel <dom...@so...>
+# from the work of Maciej Delmanowski <ha...@po...>
+#
+# This is the AmigaOS window button setup. Hold the mouse buttons
+# to see the popup menu of a certain button.
+
+
+# First button - close, destroy, iconify
+Mouse 1 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Close
+Mouse 2 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close FvwmIdent
+Mouse 2 1 $[Mod1] Window-Button-Function Button1 /Window-Menu-Close Destroy
+Mouse 3 1 $[Mod0] Window-Button-Function Button1 /Window-Menu-Close Window-Iconify
+Style * Button 1
+
+# Second button -various ways to maximize a window
+Mouse 1 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Fullscreen
+Mouse 2 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 100
+Mouse 3 2 $[Mod0] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 100 0
+Mouse 1 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow grow
+Mouse 2 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True 0 grow
+Mouse 3 2 $[Mod1] Window-Button-Function Button2 /Window-Menu-Maximize Maximize True grow 0
+Style * Button 2
+#Mouse 1 2 $[Mod0] RaiseLower
+
+# MiniIcon as the third button
+Mouse 1 3 $[Mod] Window-Raise-MoveRaise
+Mouse 2 3 $[Mod] Window-Shade-Resize
+Mouse 3 3 $[Mod] Window-Lower-Move
+Style * Button 3
+
+# 4th button - minimize, stick and layers
+Mouse 1 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Minimize
+Mouse 1 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Stick
+Mouse 2 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 5
+Mouse 2 4 $[Mod1] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 3
+Mouse 3 4 $[Mod0] Window-Button-Function Button4 /Window-Menu-Layer Layer 0 4
+Style * Button 4
+
+Style * NoButton 5
+
+# 6th button - iconify, move a window between pages
+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
+Mouse 3 6 $[Mod0] Window-Button-Function Button6 /Window-Menu-Page Window-MoveToPage-Forward
+Mouse 1 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Page Window-WarpToPage-Backward
+Mouse 2 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Page WarpToPage prev
+Mouse 3 6 $[Mod1] Window-Button-Function Button6 /Window-Menu-Page Window-WarpToPage-Forward
+Style * Button 6
+
+Style * NoButton 7
+
+# 8th button
+Style * NoButton 8
+
+Style * NoButton 9
+
+Style * NoButton 0
+
+# NumLock support
+Read $./Buttons-amigaos_NumLock
+
+# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-17 12:13:10
|
Revision: 998
http://sourceforge.net/p/fvwm-crystal/code/998
Author: dominique_libre
Date: 2020-02-17 12:13:08 +0000 (Mon, 17 Feb 2020)
Log Message:
-----------
Fix the madia players styles
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Media-Music-functions
fvwm/components/functions/Music-alsaplayer
fvwm/components/functions/Music-audacious
fvwm/components/functions/Music-cdcd
fvwm/components/functions/Music-cmus
fvwm/components/functions/Music-mocp
fvwm/components/functions/Music-mpd
fvwm/components/functions/Music-mplayer
fvwm/components/functions/Music-mplayer2
fvwm/components/functions/Music-quodlibet
fvwm/components/functions/Music-xmms2
fvwm/components/styles/Application-Icons-22-32
Added Paths:
-----------
fvwm/components/styles/MediaPlayers-Style
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-17 12:03:55 UTC (rev 997)
+++ ChangeLog 2020-02-17 12:13:08 UTC (rev 998)
@@ -5,6 +5,21 @@
lundi 17 février
fvwm/components/functions/Exit: cleanup and try our best to find systemctl when present
+ fvwm/components/functions/Media-Music-functions;
+ fvwm/components/functions/Music-alsaplayer;
+ fvwm/components/functions/Music-audacious;
+ fvwm/components/functions/Music-cdcd;
+ fvwm/components/functions/Music-cmus;
+ fvwm/components/functions/Music-mocp;
+ fvwm/components/functions/Music-mpd;
+ fvwm/components/functions/Music-mplayer;
+ fvwm/components/functions/Music-mplayer2;
+ fvwm/components/functions/Music-quodlibet;
+ fvwm/components/functions/Music-xmms2;
+ fvwm/components/styles/Application-Icons-22-32;
++ fvwm/components/styles/MediaPlayers-Style: Fix the madia players styles.
+ This fix the icons at top after a recipe change bug and make the non
+ prefered players to get the defaut style in any case.
samedi 15 février 2020
fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
@@ -3630,3 +3645,4 @@
Thu Jul 7 23:32:06 CEST 2005 Maciej Delmanowski <ha...@po...>
* Initialization of the darcs repository
+M ChangeLog
Modified: fvwm/components/functions/Media-Music-functions
===================================================================
--- fvwm/components/functions/Media-Music-functions 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Media-Music-functions 2020-02-17 12:13:08 UTC (rev 998)
@@ -30,7 +30,7 @@
InfoStoreRemove fvwm_audio_exec
# Styles for media players windows {{{1
-# See components/styles/Applications-Icons-22-32
+Include components/styles/MediaPlayers-Style
############################################################
### We don't want player specific functions lying around ###
@@ -64,6 +64,13 @@
DestroyMenu /Player
# mouse 2 Music-GUI : allready here {{{2
+DestroyFunc Music-Iconify
+AddToFunc Music-Iconify
++ I ThisWindow (Iconic) WindowStyle Icon
++ I TestRc (NoMatch) WindowStyle NoIcon
++ I Iconify toggle
++ I UpdateStyles
+
# mouse 3 Music-QJackGUI (all)
DestroyFunc Music-QJackGUI
AddToFunc Music-QJackGUI
@@ -70,7 +77,7 @@
# startjack first => it is under the other windows
+ I All (start_jack) Iconify toggle
+ I All (qjackctl) Iconify toggle
-+ I All (start_cadence) Iconify toggle
++ I All (start_cadence) Iconify
+ I All (Cadence) Iconify toggle
+ I All (Cadence-*) Iconify toggle
+ I All (Catia) Iconify toggle
Modified: fvwm/components/functions/Music-alsaplayer
===================================================================
--- fvwm/components/functions/Music-alsaplayer 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-alsaplayer 2020-02-17 12:13:08 UTC (rev 998)
@@ -5,6 +5,9 @@
# Initialisations, shared functions {{{1
Include components/functions/Music
+Style alsaplayer NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
+Style Alsaplayer UseStyle alsaplayer
+
# Alsaplayer normal speed
InfoStoreAdd speed 1
Modified: fvwm/components/functions/Music-audacious
===================================================================
--- fvwm/components/functions/Music-audacious 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-audacious 2020-02-17 12:13:08 UTC (rev 998)
@@ -6,6 +6,10 @@
# Initialisations, shared functions
Include components/functions/Music
+Style audacious StartIconic, NoActiveIconOverride, NoIcon, WindowListSkip, Sticky, StaysOnTop
+Style Audacious UseStyle audacious
+Style playlist UseStyle audacious
+Style equalizer UseStyle audacious
# First button {{{1
# Player controls and prefs
Modified: fvwm/components/functions/Music-cdcd
===================================================================
--- fvwm/components/functions/Music-cdcd 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-cdcd 2020-02-17 12:13:08 UTC (rev 998)
@@ -11,6 +11,7 @@
# Initialisations, shared functions
Include components/functions/Music
+Style cdcd NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
# First button {{{1
# Player controls and prefs
Modified: fvwm/components/functions/Music-cmus
===================================================================
--- fvwm/components/functions/Music-cmus 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-cmus 2020-02-17 12:13:08 UTC (rev 998)
@@ -11,6 +11,8 @@
# Initialisations, shared functions
Include components/functions/Music
+Style cmus NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style cmus* UseStyle cmus
# First button
# Player controls and prefs {{{1
Modified: fvwm/components/functions/Music-mocp
===================================================================
--- fvwm/components/functions/Music-mocp 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mocp 2020-02-17 12:13:08 UTC (rev 998)
@@ -6,6 +6,8 @@
# Initialisations, shared functions
Include components/functions/Music
+Style mocp NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style MOC* UseStyle mocp
# First button {{{1
# Player controls and prefs
Modified: fvwm/components/functions/Music-mpd
===================================================================
--- fvwm/components/functions/Music-mpd 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mpd 2020-02-17 12:13:08 UTC (rev 998)
@@ -10,6 +10,11 @@
# Initialisations, shared functions
Include components/functions/Music
+Style FvwmApplet-MpdAddSong MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style FvwmApplet-MpdPlEd MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style pympd NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style gmpc UseStyle pympd
+Style Gmpc UseStyle pympd
# Variables {{{1
# mpd know where the playlists are. See 'man mpd.conf'
Modified: fvwm/components/functions/Music-mplayer
===================================================================
--- fvwm/components/functions/Music-mplayer 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mplayer 2020-02-17 12:13:08 UTC (rev 998)
@@ -3,6 +3,9 @@
# Load shared functions and initialisations
Include components/functions/Media
+Style MPlayer !Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style "MPlayer - Video" Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style XDRadio NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
# specific function
AddToMenu /Music/Start
Modified: fvwm/components/functions/Music-mplayer2
===================================================================
--- fvwm/components/functions/Music-mplayer2 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-mplayer2 2020-02-17 12:13:08 UTC (rev 998)
@@ -3,6 +3,9 @@
# Initialisations, shared functions
Include components/functions/Media
+Style MPlayer !Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style "MPlayer - Video" Title, !Borders, EWMHIgnoreStackingOrderHints, NoIcon
+Style XDRadio NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
# specific function
AddToMenu /Music/Start
Modified: fvwm/components/functions/Music-quodlibet
===================================================================
--- fvwm/components/functions/Music-quodlibet 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-quodlibet 2020-02-17 12:13:08 UTC (rev 998)
@@ -4,14 +4,16 @@
# Modifications, debugging and improvments by Dominique Michel 2008-2019
# <dom...@us...>
-# Initialisations, shared functions
+# Initialisations, shared functions {{{1
Include components/functions/Music
+Style quodlibet NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style Quodlibet UseStyle quodlibet
# First button {{{1
# Player controls and prefs
-# mouse 1 Menu /Player {{{1
+# mouse 1 Menu /Player {{{2
AddToFunc Music-GUI
-+ I All (quodlibet) Iconify toggle
++ I All (Quodlibet) Iconify toggle
AddToFunc Player-generator
+ I DestroyMenu recreate /Player
@@ -27,7 +29,7 @@
# mouse 2 Music-GUI : allready here {{{2
## mouse 3 Music-QJackGUI : in Music
-# mouse 2 Menu /Playback {{{1
+# mouse 2 Menu /Playback
AddToFunc Music-Next
+ I Exec quodlibet --next > /dev/null
@@ -89,6 +91,8 @@
+ I AddToMenu /Music '$[gt.Show/Hide player]' Music-GUI
+ I AddToMenu /Music '$[gt.Show/Hide Audio controls]' Music-QJackGUI
+ I AddToMenu /Music "" Nop
++ I AddToMenu /Music '$[gt.Start Quod Libet]' Exec exec quodlibet > /dev/null
++ I AddToMenu /Music '$[gt.Stop player]' Exec exec quodlibet --quit
+ I AddToMenu /Music '$[gt.Music player]' Popup /Preferences/MusicPlayer
# Fake button functions {{{1
Modified: fvwm/components/functions/Music-xmms2
===================================================================
--- fvwm/components/functions/Music-xmms2 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/functions/Music-xmms2 2020-02-17 12:13:08 UTC (rev 998)
@@ -6,6 +6,12 @@
# Initialisations, shared functions {{{1
Include components/functions/Music
+Style xmms StaysOnTop
+Style XMMS_Player StartIconic, NoIcon, !Title, Sticky, WindowListSkip, StaysOnTop
+Style XMMS_Playlist UseStyle XMMS_Player
+Style XMMS_Equalizer UseStyle XMMS_Player
+Style Gxmms2 NoActiveIconOverride, Sticky, WindowListSkip, StaysOnTop, NoIcon
+Style xmms2 UseStyle Gxmms2
InfoStoreAdd fvwm_audio_exec "nyxmms2 add -P"
# First button {{{1
Modified: fvwm/components/styles/Application-Icons-22-32
===================================================================
--- fvwm/components/styles/Application-Icons-22-32 2020-02-17 12:03:55 UTC (rev 997)
+++ fvwm/components/styles/Application-Icons-22-32 2020-02-17 12:13:08 UTC (rev 998)
@@ -499,10 +499,6 @@
Style zita* UseStyle Zita-at1
Style zsafe MiniIcon 22x22/apps/zsafe.png, Icon 32x32/apps/zsafe.png
-# We want the media players styles to be applied last {{{1
-Style Alsaplayer NoActiveIconOverride, NoIcon, WindowListSkip, !Sticky, StaysPut
-Style alsaplayer UseStyle Alsaplayer
-
Style Audacious StartIconic, NoActiveIconOverride, NoIcon, !Title, Sticky, WindowListSkip, StaysOnTop
Style playlist StartIconic, !Title, Sticky, WindowListSkip
Style equalizer UseStyle playlist
@@ -509,11 +505,6 @@
Style beep-media-player !Title
-Style cmus NoActiveIconOverride, NoIcon, Sticky, WindowListSkip, StaysOnTop
-Style mocp UseStyle cmus
-
-Style MPlayer !Title, !Borders, EWMHIgnoreStackingOrderHints
-Style "MPlayer - Video" Title, Borders, EWMHIgnoreStackingOrderHints
Style XDRadio NoIcon, Sticky, WindowListSkip
Style xmms StaysOnTop
@@ -521,8 +512,6 @@
Style XMMS_Playlist UseStyle XMMS_Player
Style XMMS_Equalizer UseStyle XMMS_Player
-Style quodlibet StaysOnTop, NoIcon, Sticky, WindowListSkip
-
Style qjackctl NoactiveIconOverride, NoIcon, Sticky, WindowListSkip
Style start_jack UseStyle qjackctl
Style start_cadence UseStyle qjackctl
Added: fvwm/components/styles/MediaPlayers-Style
===================================================================
--- fvwm/components/styles/MediaPlayers-Style (rev 0)
+++ fvwm/components/styles/MediaPlayers-Style 2020-02-17 12:13:08 UTC (rev 998)
@@ -0,0 +1,67 @@
+# Styles for supported media players
+# The prefered player styles is changed later when it is loaded
+
+Style alsaplayer NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, \
+ MiniIcon 22x22/apps/alsaplayer.png, Icon 32x32/apps/alsaplayer.png
+Style Alsaplayer UseStyle alsaplayer
+
+Style audacious !StartIconic, NoActiveIconOverride, !WindowListSkip, !Sticky, !StaysOnTop, Title, \
+ MiniIcon 22x22/apps/audacious.png, Icon 32x32/apps/audacious.png
+Style Audacious UseStyle audacious
+Style playlist UseStyle audacious
+Style equalizer UseStyle audacious
+
+Style beep-media-player !Title
+
+Style cdcd NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/cdcd.png, Icon 32x32/apps/cdcd.png
+
+Style cmus NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/cmus.png, Icon 32x32/apps/cmus.png
+Style cmus* UseStyle cmus
+
+Style mocp NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/mocp.png, Icon 32x32/apps/mocp.png
+Style MOC* UseStyle mocp
+
+Style FvwmApplet-MpdAddSong MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style FvwmApplet-MpdPlEd MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style pympd NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/pympd.png, Icon 32x32/apps/pympd.png
+Style gmpc NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/gmpc.png, Icon 32x32/apps/gmpc.png
+Style Gmpc UseStyle gmpc
+
+Style MPlayer !Title, !Borders, EWMHIgnoreStackingOrderHints, \
+ MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
+Style "MPlayer - Video" Title, Borders, EWMHIgnoreStackingOrderHints, \
+ MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
+Style XDRadio NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
+
+#mplayer2 as mplayer
+
+Style quodlibet NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
+Style Quodlibet UseStyle quodlibet
+
+Style xmms !StaysOnTop
+Style XMMS_Player !StartIconic, Title, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/quodlibet.png, Icon 32x32/apps/quodlibet.png
+Style XMMS_Playlist UseStyle XMMS_Player
+Style XMMS_Equalizer UseStyle XMMS_Player
+Style Gxmms2 NoActiveIconOverride, !Sticky, !WindowListSkip, !StaysOnTop, \
+ MiniIcon 22x22/apps/xmms2.png, Icon 32x32/apps/xmms2.png
+Style xmms2 UseStyle Gxmms2
+
+# helpers
+Style qjackctl NoactiveIconOverride, NoIcon, Sticky, WindowListSkip
+Style start_jack UseStyle qjackctl
+Style start_cadence UseStyle qjackctl
+Style Cadence UseStyle qjackctl
+Style Cadence-* UseStyle qjackctl
+Style cadence.py UseStyle qjackctl
+Style Catia UseStyle qjackctl
+Style Claudia UseStyle qjackctl
+Style Logs UseStyle qjackctl
+Style Render UseStyle qjackctl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-17 12:03:56
|
Revision: 997
http://sourceforge.net/p/fvwm-crystal/code/997
Author: dominique_libre
Date: 2020-02-17 12:03:55 +0000 (Mon, 17 Feb 2020)
Log Message:
-----------
Exit: cleanup and try our best to find systemctl when present
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Exit
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-17 12:00:45 UTC (rev 996)
+++ ChangeLog 2020-02-17 12:03:55 UTC (rev 997)
@@ -3,6 +3,9 @@
Verion 3.6.0
------------
+lundi 17 février
+ fvwm/components/functions/Exit: cleanup and try our best to find systemctl when present
+
samedi 15 février 2020
fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
browser FS workaround
Modified: fvwm/components/functions/Exit
===================================================================
--- fvwm/components/functions/Exit 2020-02-17 12:00:45 UTC (rev 996)
+++ fvwm/components/functions/Exit 2020-02-17 12:03:55 UTC (rev 997)
@@ -1,8 +1,19 @@
# Menu for different ways to run away ;)
# Created by: Pawel "NEMO" Drygas <ne...@br...>
# Modified by Dominique Michel <dom...@so...> for use with
-# session managers as gnome-session
+# session managers as gnome-session (its old and outdated now)
+# + pm-utils and systemd supports - anyway, hibernation is much better
+# than session management because it just work and is fast.
+# We don't know how fvwm-crystal is started and what its PATH is
+InfoStoreAdd sysctl no
+Test (x systemctl) InfoStoreAdd sysctl systemctl
+# Fallbacks
+Test (x /usr/bin/systemctl) InfoStoreAdd sysctl /usr/bin/systemctl
+Test (x /bin/systemctl) InfoStoreAdd sysctl /bin/systemctl
+Test (x /usr/sbin/systemctl) InfoStoreAdd sysctl /usr/sbin/systemctl
+Test (x /sbin/systemctl) InfoStoreAdd sysctl /sbin/systemctl
+
# ps -C ... truncate the command name (see man 5 proc); use pgrep -f ...
DestroyFunc KillAutoHibernate
AddToFunc KillAutoHibernate
@@ -41,18 +52,14 @@
DestroyFunc AutoHibernate-generator
AddToFunc AutoHibernate-generator
-+ I InfoStoreAdd sysctl no
-+ I Test (x /usr/bin/systemctl) InfoStoreAdd sysctl /usr/bin/systemctl
-+ I TestRc (NoMatch) Test (x /bin/systemctl) InfoStoreAdd sysctl /bin/systemctl
+ I DestroyMenu recreate /AutoHibernate
+ I Piperead "if test `pkill -0 AutoHibernate`; \
then AddToMenu /AutoHibernate \\'$[gt.Stop]\\' EndAutoHibernate; \
- else if [ $[infostore.sysctl] == no ]; \
+ else if [ $[infostore.sysctl] = no ]; \
then echo AddToMenu /AutoHibernate \\'$[gt.Start when battery is as low as]\\' Popup /AutoHibernatePMValue; \
else echo AddToMenu /AutoHibernate \\'$[gt.Start when battery is as low as]\\' Popup /AutoHibernateSysValue; \
fi; \
fi"
-+ I InfoStoreRemove sysctl
DestroyMenu /AutoHibernate
AddToMenu /AutoHibernate
@@ -70,18 +77,14 @@
DestroyFunc ScreenLidSuspend-generator
AddToFunc ScreenLidSuspend-generator
-+ I InfoStoreAdd sysctl no
-+ I Test (x /usr/bin/systemctl) InfoStoreAdd sysctl /usr/bin/systemctl
-+ I TestRc (NoMatch) Test (x /bin/systemctl) InfoStoreAdd sysctl /bin/systemctl
+ I DestroyMenu recreate /ScreenLidSuspend
+ I Piperead "if [ `pgrep -c ScreenLidSuspen` -gt 0 ]; \
then echo AddToMenu /ScreenLidSuspend \\'$[gt.No resume hybride with screen lid]\\' NoScreenLidSuspend; \
- else if [ $[infostore.sysctl] == no ]; \
+ else if [ $[infostore.sysctl] = no ]; \
then echo AddToMenu /ScreenLidSuspend \\'$[gt.Resume hybride with screen lid]\\' ScreenLidSuspend pm; \
else echo AddToMenu /ScreenLidSuspend \\'$[gt.Resume hybride with screen lid]\\' ScreenLidSuspend sys; \
fi; \
fi"
-+ I InfoStoreRemove sysctl
DestroyMenu /ScreenLidSuspend
AddToMenu /ScreenLidSuspend
@@ -118,9 +121,6 @@
DestroyFunc Exit-Menu
AddToFunc Exit-Menu
-+ I InfoStoreAdd sysctl no
-+ I Test (x /usr/bin/systemctl) InfoStoreAdd sysctl /usr/bin/systemctl
-+ I TestRc (NoMatch) Test (x /bin/systemctl) InfoStoreAdd sysctl /bin/systemctl
+ I DestroyMenu /Exit
+ I AddToMenu /Exit
+ I AddToMenu /Exit '%22x22/fvwm-crystal/view-refresh.png%$[gt.Restart]' Restart
@@ -127,14 +127,12 @@
+ I Test (x /usr/bin/xscreensaver) AddToMenu /Exit '%22x22/fvwm-crystal/system-lock-screen.png%$[gt.Lock screen]' X xscreensaver-command -lock
+ I Test (EnvIsSet SESSION_MANAGER) AddToMenu /Exit '%22x22/fvwm-crystal/system-log-out.png%$[gt.Logout]' QuitSession
+ I Test (!EnvIsSet SESSION_MANAGER) AddToMenu /Exit '%22x22/fvwm-crystal/system-log-out.png%$[gt.Logout]' Quit
-+ I Test (EnvMatch infostore.sysctl no) Test (x /usr/sbin/pm-hibernate) Exit-Menu-pm
-+ I Test (x /bin/systemctl) Exit-Menu-sysctl /bin/systemctl
-+ I Test (x /usr/bin/systemctl) Exit-Menu-sysctl /usr/bin/systemctl
++ I Test (EnvMatch infostore.sysctl no) KeepRc Test (x /usr/sbin/pm-hibernate) Exit-Menu-pm
++ I TestRc (NoMatch) Test (x $[infostore.sysctl]) Exit-Menu-sysctl $[infostore.sysctl]
+ I Test (EnvIsSet SESSION_MANAGER) AddToMenu /Exit '' Nop
Test (EnvIsSet SESSION_MANAGER) AddToMenu /Exit '%22x22/fvwm-crystal/gdm.png%$[gt.Save session]' Exec exec gnome-session-save --gui
Test (EnvIsSet SESSION_MANAGER) AddToMenu /Exit '%22x22/fvwm-crystal/gdm.png%$[gt.Manage session]' Exec exec gnome-session-properties
+ I Test (EnvMatch infostore.sysctl no) Exit-SelectLogoutManager
-+ I InfoStoreRemove sysctl
Exit-Menu
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-17 12:00:46
|
Revision: 996
http://sourceforge.net/p/fvwm-crystal/code/996
Author: dominique_libre
Date: 2020-02-17 12:00:45 +0000 (Mon, 17 Feb 2020)
Log Message:
-----------
Update version to 3.6.0
Modified Paths:
--------------
ChangeLog
NEWS
fvwm/components/functions/About
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-15 10:25:51 UTC (rev 995)
+++ ChangeLog 2020-02-17 12:00:45 UTC (rev 996)
@@ -1,8 +1,13 @@
ChangeLog for FVWM-Crystal
+Verion 3.6.0
+------------
+
samedi 15 février 2020
fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
browser FS workaround
+ NEWS;
+ fvwm/components/functions/About: Update version to 3.6.0
vendredi 14 février 2020
fvwm/components/functions/Fullscreen: fix browser windows behaviour
@@ -881,8 +886,6 @@
functions/Preferences-Menu: force Pager on bottom at recipe change.
functions/Exit, Exit-Safe: changed the order of the Restart and Lock Screen functions into the Exit menu.
-Verion 3.3.2
-------------
Jeudi 20 février 2014 Dominique Michel
scripts/launchwm, functions/Xephyr: remove use of id -un variable and
Modified: NEWS
===================================================================
--- NEWS 2020-02-15 10:25:51 UTC (rev 995)
+++ NEWS 2020-02-17 12:00:45 UTC (rev 996)
@@ -1,3 +1,84 @@
+
+Version 3.6.0
+-------------
+Code name Magic Star
+
+Fvwm Crystal 3.6.0 is a step forward.
+
+- Dependencies updated to >=fvwm-2.6.9 and python3.
+- A configurable button bar along with the Custom new recipe are providing
+ a contemporary look. It have its own preference menu and can be placed
+ on any side of the desktop.
+ - Left click: menu or application launcher
+ - Middle cllick: remove the button and redraw the bar
+ - Right click: preference menu, a new button will be placed at the right
+ of the clicked button
+- New Italian translation
+- Support for FVWM_*DIR at fvwm-crystal invocation, see 'man fvwm-crystal'.
+- Support for Icon and MiniIcon fvwm Styles for each application found
+ during the application menu generation.
+- Support of automatic restart of urxvtc when crashed.
+- Silent the application database. This make the login shell
+ (and fvwm-crystal logfile if any), to be less poluted
+ by external applications.
+- Systemd support into the Exit menu
+- Screenlid suspend-hibrid support with preference
+- Cadence support into the Music menu and Music GUI key binding
+- Mouse velocity preference (default: system value)
+- The python scripts are updated to python 3.
+ They was tested with python 2 and should work, but that's not officialy
+ supported anymore.
+- Update of the Fullscreen fonction to the new fvwm builtin function
+ with workaround about non ewmh compliant browsers
+ That update simplify this function and make it to work better.
+- Improved support of different button sizes into the recipes with preferences.
+- The ACPI applets will be shown only when the required hardware is found.
+
+As always, numerous fixes, bugfixes and new applications and icons
+for the application menu. Most important ones:
+
+- The EWMH working area was reverted to its original function and improved.
+ It should work fine with all recipes and with both the desktop manager
+ and the new button bar when activated.
+- Fix support of svg application icons.
+- Temporary fix for the Font preferences applet crashing at launch
+ with some colorsets (due to a fvwm bug). It can look uggly
+ but should work.
+
+See ChangeLog for the details.
+
+I tested fvwm-crystal with fvwm 3. It mostly work and is usable,
+but that's not supported at that time.
+Anyway, that's a very good news for the future of fvwm-crystal.
+A big thank you to the fwvm workers for their dedication to fvwm
+and for their support!
+
+A big thank you to Star the dog and to the translators!
+
+With the new Custom recipe and its magic button, fvwm-crystal get
+a modern look and a terrific customizable multiple launcher.
+This imply most effort into its development will be focused
+into making it fvwm3 fully compliant.
+Which in turn mostly imply to update the fvwm dialogs
+to fvwm scripts at that time of writing.
+
+Translations, fixes and bugfixes will continue to be applied.
+
+New functions and other improvements will be accepted, but for my part,
+they will be part of a general reflexion about what I want to do
+with fvwm-crystal.
+
+I know what I don't want:
+a full rewrite would be a time consuming catastrophe
+because we will loose all the history including numerous fixes.
+Also, as fvwm-crystal has been more and more extended with time,
+I think a tooltip system must be added.
+Beside that, I would appreciate very much any ideas or contributions.
+
+Enjoy!
+Dominique Michel
+
+
Version 3.4.1
-------------
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2020-02-15 10:25:51 UTC (rev 995)
+++ fvwm/components/functions/About 2020-02-17 12:00:45 UTC (rev 996)
@@ -5,7 +5,7 @@
*About: Line center
*About: Text "FVWM-Crystal"
*About: Line center
-*About: Text "$[gt.Version]: 3.5.1"
+*About: Text "$[gt.Version]: 3.6.0"
*About: Line center
*About: Line center
*About: Text "$[gt.Authors]: Maciej Delmanowski <ha...@gn...>"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-15 10:25:53
|
Revision: 995
http://sourceforge.net/p/fvwm-crystal/code/995
Author: dominique_libre
Date: 2020-02-15 10:25:51 +0000 (Sat, 15 Feb 2020)
Log Message:
-----------
Fullscreen: add Navigator and Firefox into the browser FS workaround
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-14 21:37:12 UTC (rev 994)
+++ ChangeLog 2020-02-15 10:25:51 UTC (rev 995)
@@ -1,5 +1,9 @@
ChangeLog for FVWM-Crystal
+samedi 15 février 2020
+ fvwm/components/functions/Fullscreen: add Navigator and Firefox into the
+ browser FS workaround
+
vendredi 14 février 2020
fvwm/components/functions/Fullscreen: fix browser windows behaviour
fvwm/scripts/FontSelector/FontSelector: change the default Coloset, workaround
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2020-02-14 21:37:12 UTC (rev 994)
+++ fvwm/components/functions/Fullscreen 2020-02-15 10:25:51 UTC (rev 995)
@@ -44,9 +44,9 @@
DestroyFunc ToggleFullscreen
AddToFunc ToggleFullscreen
-+ I ThisWindow (Fullscreen, "Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutOutFSProp
++ I ThisWindow (Fullscreen, "Navigator|Firefox*|Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutOutFSProp
+ I KeepRc Maximize Fullscreen
-+ I TestRc (NoMatch) ThisWindow ("Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutInFSProp
++ I TestRc (NoMatch) ThisWindow ("Navigator|Firefox*|Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutInFSProp
# Disapear functions {{{1
DestroyFunc Disappear
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 21:37:13
|
Revision: 994
http://sourceforge.net/p/fvwm-crystal/code/994
Author: dominique_libre
Date: 2020-02-14 21:37:12 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
fix ewmhwa at recipe change
Modified Paths:
--------------
ChangeLog
fvwm/recipes/Amiga
fvwm/recipes/Clean
fvwm/recipes/Corner
fvwm/recipes/Default
fvwm/recipes/Default with ACPI
fvwm/recipes/Dock
fvwm/recipes/LapLeft
fvwm/recipes/LapLeft with ACPI
fvwm/recipes/LapRight
fvwm/recipes/LapRight with ACPI
fvwm/recipes/Light
fvwm/recipes/Nebulae
fvwm/recipes/Old School
fvwm/recipes/SideLine
fvwm/recipes/SilentHacker
fvwm/recipes/Thin
fvwm/recipes/TopDown
fvwm/recipes/TopLine
fvwm/recipes/Wing-Commander
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-14 21:23:02 UTC (rev 993)
+++ ChangeLog 2020-02-14 21:37:12 UTC (rev 994)
@@ -6,8 +6,8 @@
against a fvwm bug. TODO: reverse it when fvwm is fixed.
fvwm/scripts/CustomButtonBar/CustomButtonBar: Fix overlapping with crystal
desktop manager button; some comments; set Pager Window position outside visual.
- recipes/*: fix ewmh working area , this fix the overlapping of the desktop manager
- with other buttons
+ recipes/*: fix ewmh working area with other buttons, this fix the overlapping
+ of the desktop manager; fix ewmhwa at recipe change
fvwm/components/apps/DesktopIcons: cleanup
fvwm/components/scripts/FvwmScript-AcpiBatt;
fvwm/components/scripts/FvwmScript-Clock;
@@ -20,7 +20,6 @@
fvwm/components/scripts/FvwmScript-CpuTemp: Set WindowPosition outside visual
fvwm/components/apps/DesktopIcons;
fvwm/script/desktop_manager: add support for recipe vertical ewmh borders
-
mercredi 12 février 2020
fvwm/components/apps/DesktopIcons;
Modified: fvwm/recipes/Amiga
===================================================================
--- fvwm/recipes/Amiga 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Amiga 2020-02-14 21:37:12 UTC (rev 994)
@@ -35,6 +35,12 @@
Echo Amiga recipe loading from $.
InfoStoreAdd Recipe "Amiga"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# temporary fix for fvwm<2.6.6
# TODO: test it with 2.6.5, normaly not needed any more
Test (Version <= 2.6.5) SetEnv NotificationAreaManager $[infostore.NotificationAreaManager]
Modified: fvwm/recipes/Clean
===================================================================
--- fvwm/recipes/Clean 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Clean 2020-02-14 21:37:12 UTC (rev 994)
@@ -8,6 +8,12 @@
Echo Clean recipe loading from $.
InfoStoreAdd Recipe "Clean"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
Include components/bindings/Desktop-MMB-EdgeScroll
# Type of icons on the desktop {{{2
Modified: fvwm/recipes/Corner
===================================================================
--- fvwm/recipes/Corner 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Corner 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo Corner recipe loading from $.
InfoStoreAdd Recipe "Corner"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
Include components/bindings/Desktop-MMB-EdgeScroll
# Type of icons on the desktop {{{2
Modified: fvwm/recipes/Default
===================================================================
--- fvwm/recipes/Default 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Default 2020-02-14 21:37:12 UTC (rev 994)
@@ -11,6 +11,12 @@
Echo Default recipe loading from $.
InfoStoreAdd Recipe "Default"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
Include components/bindings/Desktop-MMB-EdgeScroll
Modified: fvwm/recipes/Default with ACPI
===================================================================
--- fvwm/recipes/Default with ACPI 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Default with ACPI 2020-02-14 21:37:12 UTC (rev 994)
@@ -12,6 +12,12 @@
Echo Default with ACPI recipe loading from $.
InfoStoreAdd Recipe "DefaultACPI"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
Include components/bindings/Desktop-MMB-EdgeScroll
Modified: fvwm/recipes/Dock
===================================================================
--- fvwm/recipes/Dock 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Dock 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo Dock recipe loading from $.
InfoStoreAdd Recipe "Dock"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
Include components/bindings/Desktop-MMB-EdgeScroll
# Type of icons on the desktop {{{2
Modified: fvwm/recipes/LapLeft
===================================================================
--- fvwm/recipes/LapLeft 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/LapLeft 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo LapLeft recipe loading from $.
InfoStoreAdd Recipe "LapLeft"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Default FVWM-Crystal functions, initialization {{{2
#Include components/functions/Window-Autohide
@@ -38,9 +44,10 @@
# Desktop panel {{{1
EWMH-Desktop 63 3 3 3
-EWMH-Panel-Bottom 3
-EWMH-Panel-Top 3
-EwmhBaseStruts 63 3 3 3
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/LapLeft with ACPI
===================================================================
--- fvwm/recipes/LapLeft with ACPI 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/LapLeft with ACPI 2020-02-14 21:37:12 UTC (rev 994)
@@ -12,6 +12,12 @@
Echo LapLeft with ACPI recipe loading from $.
InfoStoreAdd Recipe "LapLeftACPI"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Default FVWM-Crystal functions, initialization {{{2
#Include components/functions/Window-Autohide
Modified: fvwm/recipes/LapRight
===================================================================
--- fvwm/recipes/LapRight 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/LapRight 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo LapRight recipe loading from $.
InfoStoreAdd Recipe "LapRight"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Default FVWM-Crystal functions, initialization {{{2
#Include components/functions/Window-Autohide
@@ -38,9 +44,11 @@
# Desktop panel {{{1
EWMH-Desktop 3 63 3 3
-EWMH-Panel-Bottom 3
-EWMH-Panel-Top 3
-EwmhBaseStruts 3 63 3 3
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
+
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/LapRight with ACPI
===================================================================
--- fvwm/recipes/LapRight with ACPI 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/LapRight with ACPI 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo LapRight with ACPI recipe loading from $.
InfoStoreAdd Recipe "LapRightACPI"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Default FVWM-Crystal functions, initialization {{{2
#Include components/functions/Window-Autohide
Modified: fvwm/recipes/Light
===================================================================
--- fvwm/recipes/Light 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Light 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo Light recipe loading from $.
InfoStoreAdd Recipe "Light"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Type of icons on the desktop {{{2
LoadPreferences IconsType
Modified: fvwm/recipes/Nebulae
===================================================================
--- fvwm/recipes/Nebulae 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Nebulae 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo Nebulae recipe loading from $.
InfoStoreAdd Recipe "Nebulae"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Type of icons on the desktop {{{2
LoadPreferences IconsType
@@ -216,7 +222,3 @@
# ViM modeline {{{1
# vim:foldmethod=marker:foldenable:foldlevel=0:ft=fvwm
-InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
-InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
-InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
-InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
Modified: fvwm/recipes/Old School
===================================================================
--- fvwm/recipes/Old School 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Old School 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo OldSchool recipe loading from $.
InfoStoreAdd Recipe "OldSchool"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Media player {{{2
Include components/functions/Music-$[infostore.MusicPlayer]
Modified: fvwm/recipes/SideLine
===================================================================
--- fvwm/recipes/SideLine 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/SideLine 2020-02-14 21:37:12 UTC (rev 994)
@@ -11,6 +11,12 @@
Echo SideLine recipe loading from $.
InfoStoreAdd Recipe "SideLine"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Default FVWM-Crystal functions, initialization {{{2
Include components/functions/Window-Autohide
Modified: fvwm/recipes/SilentHacker
===================================================================
--- fvwm/recipes/SilentHacker 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/SilentHacker 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo SilentHacker recipe loading from $.
InfoStoreAdd Recipe "SilentHacker"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
Include components/bindings/Desktop-MMB-ToggleTopBar
# Type of icons on the desktop {{{2
Modified: fvwm/recipes/Thin
===================================================================
--- fvwm/recipes/Thin 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Thin 2020-02-14 21:37:12 UTC (rev 994)
@@ -18,6 +18,12 @@
Echo Thin recipe loading from $.
InfoStoreAdd Recipe "Thin"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Default FVWM-Crystal functions, initialization {{{2
Include components/functions/Window-Autohide
Modified: fvwm/recipes/TopDown
===================================================================
--- fvwm/recipes/TopDown 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/TopDown 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo TopDown recipe loading from $.
InfoStoreAdd Recipe "TopDown"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# ImagePath {{{1
InfoStoreAdd Icon_Theme "Default"
ImagePath $[FVWM_USERDIR]/icons/$[infostore.Icon_Theme]:$[FVWM_SYSTEMDIR]/icons/$[infostore.Icon_Theme]
Modified: fvwm/recipes/TopLine
===================================================================
--- fvwm/recipes/TopLine 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/TopLine 2020-02-14 21:37:12 UTC (rev 994)
@@ -9,6 +9,12 @@
Echo TopLine recipe loading from $.
InfoStoreAdd Recipe "TopLine"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Type of icons on the desktop {{{2
LoadPreferences IconsType
Modified: fvwm/recipes/Wing-Commander
===================================================================
--- fvwm/recipes/Wing-Commander 2020-02-14 21:23:02 UTC (rev 993)
+++ fvwm/recipes/Wing-Commander 2020-02-14 21:37:12 UTC (rev 994)
@@ -10,6 +10,12 @@
Echo Wing-Commander recipe loading from $.
InfoStoreAdd Recipe "WingCommander"
+# No magic button, we nedd to reset its ewmh values after a recipe change.
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
+
# Includes and FVWM modules {{{1
# Media player {{{2
Include components/functions/Music-$[infostore.MusicPlayer]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 21:23:04
|
Revision: 993
http://sourceforge.net/p/fvwm-crystal/code/993
Author: dominique_libre
Date: 2020-02-14 21:23:02 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
Oops systemdir
Modified Paths:
--------------
fvwm/components/apps/DesktopIcons
Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons 2020-02-14 21:21:30 UTC (rev 992)
+++ fvwm/components/apps/DesktopIcons 2020-02-14 21:23:02 UTC (rev 993)
@@ -185,7 +185,7 @@
DestroyFunc LoadDesktopIcons
AddToFunc LoadDesktopIcons
-+ I PipeRead '$[FVWM_USERDIR]/scripts/desktop_manager \"$[infostore.DeskIconsSign]\" $[infostore.cs_transparent] "$[infostore.SILENT]" \
++ I PipeRead '$[FVWM_SYSTEMDIR]/scripts/desktop_manager \"$[infostore.DeskIconsSign]\" $[infostore.cs_transparent] "$[infostore.SILENT]" \
\"$[infostore.FileBrowser1]\" \"$[infostore.FileBrowser2]\" $[vp.height] $[infostore.tmpdrivefile] \
$[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] \
$[vp.width] $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right] $[infostore.EWMH_Recipe_Top] $[infostore.EWMH_Recipe_Bottom]'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 21:21:32
|
Revision: 992
http://sourceforge.net/p/fvwm-crystal/code/992
Author: dominique_libre
Date: 2020-02-14 21:21:30 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
desktop_manager: add support for recipe vertical ewmh borders; magic button: fix pager visual at stratup
Modified Paths:
--------------
ChangeLog
fvwm/components/apps/DesktopIcons
fvwm/scripts/CustomButtonBar/CustomButtonBar
fvwm/scripts/desktop_manager
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-14 21:08:51 UTC (rev 991)
+++ ChangeLog 2020-02-14 21:21:30 UTC (rev 992)
@@ -5,7 +5,7 @@
fvwm/scripts/FontSelector/FontSelector: change the default Coloset, workaround
against a fvwm bug. TODO: reverse it when fvwm is fixed.
fvwm/scripts/CustomButtonBar/CustomButtonBar: Fix overlapping with crystal
- desktop manager button; some comments
+ desktop manager button; some comments; set Pager Window position outside visual.
recipes/*: fix ewmh working area , this fix the overlapping of the desktop manager
with other buttons
fvwm/components/apps/DesktopIcons: cleanup
@@ -18,6 +18,9 @@
fvwm/components/scripts/FvwmScript-CpuFreq;
fvwm/components/scripts/FvwmScript-CpuFreq-small;
fvwm/components/scripts/FvwmScript-CpuTemp: Set WindowPosition outside visual
+ fvwm/components/apps/DesktopIcons;
+ fvwm/script/desktop_manager: add support for recipe vertical ewmh borders
+
mercredi 12 février 2020
fvwm/components/apps/DesktopIcons;
Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons 2020-02-14 21:08:51 UTC (rev 991)
+++ fvwm/components/apps/DesktopIcons 2020-02-14 21:21:30 UTC (rev 992)
@@ -185,10 +185,10 @@
DestroyFunc LoadDesktopIcons
AddToFunc LoadDesktopIcons
-+ I PipeRead '$[FVWM_SYSTEMDIR]/scripts/desktop_manager \"$[infostore.DeskIconsSign]\" $[infostore.cs_transparent] "$[infostore.SILENT]" \
++ I PipeRead '$[FVWM_USERDIR]/scripts/desktop_manager \"$[infostore.DeskIconsSign]\" $[infostore.cs_transparent] "$[infostore.SILENT]" \
\"$[infostore.FileBrowser1]\" \"$[infostore.FileBrowser2]\" $[vp.height] $[infostore.tmpdrivefile] \
$[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] \
- $[vp.width] $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right]'
+ $[vp.width] $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right] $[infostore.EWMH_Recipe_Top] $[infostore.EWMH_Recipe_Bottom]'
+ I Include tmp/DesktopIcons
+ I RedrawIconBox
Modified: fvwm/scripts/CustomButtonBar/CustomButtonBar
===================================================================
--- fvwm/scripts/CustomButtonBar/CustomButtonBar 2020-02-14 21:08:51 UTC (rev 991)
+++ fvwm/scripts/CustomButtonBar/CustomButtonBar 2020-02-14 21:21:30 UTC (rev 992)
@@ -555,6 +555,7 @@
echo "AddToFunc FvwmPagerWindow" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
echo "+ I All (FvwmPager) Close" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
echo "+ I DestroyModuleConfig FvwmPager: *" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
+ echo "+ I *FvwmPager: Geometry +100000+100000" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
echo "+ I *FvwmPager: MiniIcons" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
echo "+ I *FvwmPager: Font none" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
echo "+ I *FvwmPager: WindowBorderWidth 1" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
Modified: fvwm/scripts/desktop_manager
===================================================================
--- fvwm/scripts/desktop_manager 2020-02-14 21:08:51 UTC (rev 991)
+++ fvwm/scripts/desktop_manager 2020-02-14 21:21:30 UTC (rev 992)
@@ -8,7 +8,7 @@
# ($1 $2 $3) PipeRead '$[FVWM_SYSTEMDIR]/scripts/desktop_manager $[infostore.DeskIconsSign] $[infostore.cs_transparent] $[infostore.SILENT] \
# ($4 $5 $6 $7) $[infostore.FileBrowser1] $[infostore.FileBrowser2] $[vp.height] $[infostore.tmpdrivefile] \
# ($8 $9 $10 $11) $[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] \
-# ($12 13 14) $[vp.width] $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right]'
+# ($12 13 14 15 16) $[vp.width] $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right] $[infostore.EWMH_Recipe_Top] $[infostore.EWMH_Recipe_Bottom]'
# Include tmp/DesktopIcons
deskmanfile="${FVWM_USERDIR}/tmp/DesktopIcons"
@@ -65,7 +65,7 @@
# We want this button to be loaded last.
# The magic button must know the border sizes of that button.
# ${8} to ${11} are the magic buttons borders,
-# ${13} to ${14} are the recipe borders,
+# ${13} to ${16} are the recipe borders,
if [ "$1" = "-" ]
# recipe border > recipe border without button
then if [ ${14} -gt 3 ]
@@ -135,8 +135,8 @@
echo "+ I KillModule FvwmButtons DesktopIcons" >> "${deskmanfile}"
echo "+ I DestroyModuleConfig DesktopIcons: *" >> "${deskmanfile}"
if [ "$1" = "-" ]
- then echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+$((${12}-${ButtonXPlace}))+3" >> "${deskmanfile}"
- else echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+${ButtonXPlace}+3" >> "${deskmanfile}"
+ then echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+$((${12}-${ButtonXPlace}))+${15}" >> "${deskmanfile}"
+ else echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+${ButtonXPlace}+${15}" >> "${deskmanfile}"
fi
echo "+ I *DesktopIcons: Padding 1 1" >> "${deskmanfile}"
echo "+ I *DesktopIcons: BoxSize Fixed" >> "${deskmanfile}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 21:08:52
|
Revision: 991
http://sourceforge.net/p/fvwm-crystal/code/991
Author: dominique_libre
Date: 2020-02-14 21:08:51 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
Applets: Set WindowPosition outside visual
Modified Paths:
--------------
ChangeLog
fvwm/components/apps/DesktopIcons
fvwm/components/scripts/FvwmScript-AcpiBatt
fvwm/components/scripts/FvwmScript-Clock
fvwm/components/scripts/FvwmScript-Clock-24h
fvwm/components/scripts/FvwmScript-Clock-24h-small_date
fvwm/components/scripts/FvwmScript-Clock-small
fvwm/components/scripts/FvwmScript-Clock-small_date
fvwm/components/scripts/FvwmScript-CpuFreq
fvwm/components/scripts/FvwmScript-CpuFreq-small
fvwm/components/scripts/FvwmScript-CpuTemp
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-14 11:56:01 UTC (rev 990)
+++ ChangeLog 2020-02-14 21:08:51 UTC (rev 991)
@@ -8,6 +8,16 @@
desktop manager button; some comments
recipes/*: fix ewmh working area , this fix the overlapping of the desktop manager
with other buttons
+ fvwm/components/apps/DesktopIcons: cleanup
+ fvwm/components/scripts/FvwmScript-AcpiBatt;
+ fvwm/components/scripts/FvwmScript-Clock;
+ fvwm/components/scripts/FvwmScript-Clock-24h;
+ fvwm/components/scripts/FvwmScript-Clock-24h-small_date;
+ fvwm/components/scripts/FvwmScript-Clock-small;
+ fvwm/components/scripts/FvwmScript-Clock-small_date;
+ fvwm/components/scripts/FvwmScript-CpuFreq;
+ fvwm/components/scripts/FvwmScript-CpuFreq-small;
+ fvwm/components/scripts/FvwmScript-CpuTemp: Set WindowPosition outside visual
mercredi 12 février 2020
fvwm/components/apps/DesktopIcons;
Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/apps/DesktopIcons 2020-02-14 21:08:51 UTC (rev 991)
@@ -187,8 +187,8 @@
AddToFunc LoadDesktopIcons
+ I PipeRead '$[FVWM_SYSTEMDIR]/scripts/desktop_manager \"$[infostore.DeskIconsSign]\" $[infostore.cs_transparent] "$[infostore.SILENT]" \
\"$[infostore.FileBrowser1]\" \"$[infostore.FileBrowser2]\" $[vp.height] $[infostore.tmpdrivefile] \
- $[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] $[vp.width] \
- $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right]'
+ $[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] \
+ $[vp.width] $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right]'
+ I Include tmp/DesktopIcons
+ I RedrawIconBox
Modified: fvwm/components/scripts/FvwmScript-AcpiBatt
===================================================================
--- fvwm/components/scripts/FvwmScript-AcpiBatt 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-AcpiBatt 2020-02-14 21:08:51 UTC (rev 991)
@@ -11,6 +11,7 @@
WindowTitle {FvwmScript-AcpiBatt}
WindowSize 48 24
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=12:Bold"
Colorset 12
@@ -96,4 +97,3 @@
Begin
End
End
-
Modified: fvwm/components/scripts/FvwmScript-Clock
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock 2020-02-14 21:08:51 UTC (rev 991)
@@ -13,6 +13,7 @@
WindowTitle {FvwmScript-Clock}
WindowSize 60 22
+WindowPosition 10000 10000
Font "xft:Verdana:pixelsize=15:Bold"
Colorset 12
@@ -117,4 +118,3 @@
ChangeTitle 1 $tmp
End
End
-
Modified: fvwm/components/scripts/FvwmScript-Clock-24h
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock-24h 2020-02-14 21:08:51 UTC (rev 991)
@@ -5,6 +5,7 @@
WindowTitle {FvwmScript-Clock}
WindowSize 60 22
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=16:Bold"
Colorset 12
Modified: fvwm/components/scripts/FvwmScript-Clock-24h-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-24h-small_date 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock-24h-small_date 2020-02-14 21:08:51 UTC (rev 991)
@@ -1,5 +1,6 @@
WindowTitle {FvwmScript-Clock}
WindowSize 114 20
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=12:Bold"
Colorset 12
Modified: fvwm/components/scripts/FvwmScript-Clock-small
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-small 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock-small 2020-02-14 21:08:51 UTC (rev 991)
@@ -12,6 +12,7 @@
WindowTitle {FvwmScript-Clock}
WindowSize 60 22
+WindowPosition 10000 10000
Font "xft:Verdana:pixelsize=11:Bold"
Colorset 12
@@ -116,4 +117,3 @@
ChangeTitle 1 $tmp
End
End
-
Modified: fvwm/components/scripts/FvwmScript-Clock-small_date
===================================================================
--- fvwm/components/scripts/FvwmScript-Clock-small_date 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-Clock-small_date 2020-02-14 21:08:51 UTC (rev 991)
@@ -1,5 +1,6 @@
WindowTitle {FvwmScript-Clock-small_date}
WindowSize 114 20
+WindowPosition 10000 10000
Font "xft:Verdana:pixelsize=12:Bold"
Colorset 12
Modified: fvwm/components/scripts/FvwmScript-CpuFreq
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuFreq 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-CpuFreq 2020-02-14 21:08:51 UTC (rev 991)
@@ -12,6 +12,7 @@
WindowTitle {FvwmScript-CpuFreq}
WindowSize 72 24
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=12:Bold"
Colorset 12
@@ -115,4 +116,3 @@
Begin
End
End
-
Modified: fvwm/components/scripts/FvwmScript-CpuFreq-small
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuFreq-small 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-CpuFreq-small 2020-02-14 21:08:51 UTC (rev 991)
@@ -13,6 +13,7 @@
WindowTitle {FvwmScript-CpuFreq}
WindowSize 60 24
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=10:Bold"
Colorset 12
@@ -116,4 +117,3 @@
Begin
End
End
-
Modified: fvwm/components/scripts/FvwmScript-CpuTemp
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuTemp 2020-02-14 11:56:01 UTC (rev 990)
+++ fvwm/components/scripts/FvwmScript-CpuTemp 2020-02-14 21:08:51 UTC (rev 991)
@@ -8,6 +8,7 @@
UseGettext {$FVWM_USERDIR/locale;fvwm-crystal-script:$FVWM_SYSTEMDIR/locale;fvwm-crystal-script:+}
WindowTitle {FvwmScript-CpuTemp}
WindowSize 48 24
+WindowPosition 10000 10000
Font "xft:Tahoma:pixelsize=12:Bold"
Colorset 12
@@ -80,4 +81,3 @@
Begin
End
End
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 11:56:02
|
Revision: 990
http://sourceforge.net/p/fvwm-crystal/code/990
Author: dominique_libre
Date: 2020-02-14 11:56:01 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
recipes/*: fix ewmh working area and bittons overlapping
Modified Paths:
--------------
ChangeLog
fvwm/recipes/Amiga
fvwm/recipes/Clean
fvwm/recipes/Corner
fvwm/recipes/Custom
fvwm/recipes/Default
fvwm/recipes/Default with ACPI
fvwm/recipes/Dock
fvwm/recipes/LapLeft with ACPI
fvwm/recipes/LapRight with ACPI
fvwm/recipes/Light
fvwm/recipes/Nebulae
fvwm/recipes/Old School
fvwm/recipes/SideLine
fvwm/recipes/SilentHacker
fvwm/recipes/Thin
fvwm/recipes/TopDown
fvwm/recipes/TopLine
fvwm/recipes/Wing-Commander
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-14 11:25:29 UTC (rev 989)
+++ ChangeLog 2020-02-14 11:56:01 UTC (rev 990)
@@ -6,6 +6,8 @@
against a fvwm bug. TODO: reverse it when fvwm is fixed.
fvwm/scripts/CustomButtonBar/CustomButtonBar: Fix overlapping with crystal
desktop manager button; some comments
+ recipes/*: fix ewmh working area , this fix the overlapping of the desktop manager
+ with other buttons
mercredi 12 février 2020
fvwm/components/apps/DesktopIcons;
Modified: fvwm/recipes/Amiga
===================================================================
--- fvwm/recipes/Amiga 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Amiga 2020-02-14 11:56:01 UTC (rev 990)
@@ -134,6 +134,10 @@
PipeRead 'echo EWMH-Desktop 3 3 $(($[infostore.panel_height]+3)) $[infostore.bottom_panel_height]
#EWMH-Panel-Bottom $[infostore.bottom_panel_height]
#EWMH-Panel-Top $[infostore.panel_height]
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Icons on Desktop {{{1
Modified: fvwm/recipes/Clean
===================================================================
--- fvwm/recipes/Clean 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Clean 2020-02-14 11:56:01 UTC (rev 990)
@@ -26,8 +26,8 @@
EdgeThickness 1
EWMH-Desktop 3 3 3 3
-EWMH-Panel-Bottom 30
-EWMH-Panel-Right 32
+PipeRead 'echo "EWMH-Panel-Bottom $((36*$[infostore.Desk_Pages_Y]))"'
+PipeRead 'echo "EWMH-Panel-Right 24"'
# For the desktop manager and the magic buttons
InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
Modified: fvwm/recipes/Corner
===================================================================
--- fvwm/recipes/Corner 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Corner 2020-02-14 11:56:01 UTC (rev 990)
@@ -28,6 +28,10 @@
EWMH-Desktop 3 3 3 3
EWMH-Panel-Right 30
EWMH-Panel-Top 55
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/Custom
===================================================================
--- fvwm/recipes/Custom 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Custom 2020-02-14 11:56:01 UTC (rev 990)
@@ -34,17 +34,6 @@
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
-# Desktop manager {{{2
-DestroyFunc RedrawIconBox
-AddToFunc RedrawIconBox
-+ I PipeRead 'echo "Style * IconBox $(($[vp.width]-((((50*$[IconColumnsNumber]))+46))))x$(($[vp.height]-42))+$((((50*$[IconColumnsNumber]))+18))-39, IconFill left bottom, IconGrid 30 30"'
-LoadPreferences DefaultDesktopManager
-
-# Settings for icons on the desktop {{{1
-Style * StickyIcon
-Test (EnvMatch DefaultDesktopManager Crystal) PipeRead 'echo "Style * IconBox $(($[vp.width]-((((50*$[IconColumnsNumber]))+46))))x$(($[vp.height]-42))+$((((50*$[IconColumnsNumber]))+18))-39, IconFill left bottom, IconGrid 30 30"'
-Test (!EnvMatch DefaultDesktopManager Crystal) PipeRead 'echo "Style * IconBox $(($[vp.width]-36))x$(($[vp.height]-42))+3-39, IconFill left bottom, IconGrid 30 30"'
-
# Applications generator and main menu {{{1
# fvwm-crystal.apps {{{2
PipeRead 'fvwm-crystal.apps --database=$[FVWM_DISTROMENUDIR]/Applications --database=$[FVWM_SYSTEMDIR]/Applications --database=$[FVWM_USERDIR]/Applications --search-icons-in=$[FVWM_USERDIR]/icons/$[infostore.Icon_Theme]/32x32/categories:$[FVWM_USERDIR]/icons/$[infostore.Icon_Theme]/32x32/apps:$[FVWM_SYSTEMDIR]/icons/$[infostore.Icon_Theme]/32x32/categories:$[FVWM_SYSTEMDIR]/icons/$[infostore.Icon_Theme]/32x32/apps:$[FVWM_DISTROMENUDIR]/icons/$[infostore.Icon_Theme]/32x32/categories:$[FVWM_DISTROMENUDIR]/icons/$[infostore.Icon_Theme]/32x32/apps --default-file-icon=32x32/apps/default.png --default-dir-icon=32x32/categories/directory.png --min-submenu-length=5 --sort=prio --no-panel --check-execs'
@@ -55,7 +44,8 @@
#SetEnv DesktopMenu /FVWM-Crystal
SetEnv DesktopMenu /Applications
-# The magic button
+# The buttons {{{1
+# The magic button first
Include components/functions/CustomButtonBar-Menu
# use one of the two following lines:
# safer, just use it
@@ -63,6 +53,17 @@
# faster, but see the comment into components/functions/CustomButtonBar-Menu
#Include tmp/CustomButtonBar
+# Desktop manager
+DestroyFunc RedrawIconBox
+AddToFunc RedrawIconBox
++ I PipeRead 'echo "Style * IconBox $(($[vp.width]-((((50*$[IconColumnsNumber]))+46))))x$(($[vp.height]-42))+$((((50*$[IconColumnsNumber]))+18))-39, IconFill left bottom, IconGrid 30 30"'
+LoadPreferences DefaultDesktopManager
+
+# Settings for icons on the desktop {{{1
+Style * StickyIcon
+Test (EnvMatch DefaultDesktopManager Crystal) PipeRead 'echo "Style * IconBox $(($[vp.width]-((((50*$[IconColumnsNumber]))+46))))x$(($[vp.height]-42))+$((((50*$[IconColumnsNumber]))+18))-39, IconFill left bottom, IconGrid 30 30"'
+Test (!EnvMatch DefaultDesktopManager Crystal) PipeRead 'echo "Style * IconBox $(($[vp.width]-36))x$(($[vp.height]-42))+3-39, IconFill left bottom, IconGrid 30 30"'
+
# Change desktop pages using mouse wheel on pager
Mouse (FvwmPager) 4 W $[Mod] GotoPage-Right
Mouse (FvwmPager) 5 W $[Mod] GotoPage-Left
Modified: fvwm/recipes/Default
===================================================================
--- fvwm/recipes/Default 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Default 2020-02-14 11:56:01 UTC (rev 990)
@@ -30,6 +30,10 @@
EWMH-Desktop 3 3 3 3
EWMH-Panel-Top 30
EWMH-Panel-Bottom 30
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/Default with ACPI
===================================================================
--- fvwm/recipes/Default with ACPI 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Default with ACPI 2020-02-14 11:56:01 UTC (rev 990)
@@ -31,6 +31,10 @@
EWMH-Desktop 3 3 3 3
EWMH-Panel-Top 30
EWMH-Panel-Bottom 30
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/Dock
===================================================================
--- fvwm/recipes/Dock 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Dock 2020-02-14 11:56:01 UTC (rev 990)
@@ -28,6 +28,10 @@
EWMH-Desktop 3 3 3 3
EWMH-Panel-Bottom 40
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/LapLeft with ACPI
===================================================================
--- fvwm/recipes/LapLeft with ACPI 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/LapLeft with ACPI 2020-02-14 11:56:01 UTC (rev 990)
@@ -41,9 +41,10 @@
# Desktop panel {{{1
EWMH-Desktop 63 3 3 3
-EWMH-Panel-Bottom 3
-EWMH-Panel-Top 3
-EwmhBaseStruts 63 3 3 3
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/LapRight with ACPI
===================================================================
--- fvwm/recipes/LapRight with ACPI 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/LapRight with ACPI 2020-02-14 11:56:01 UTC (rev 990)
@@ -40,7 +40,10 @@
EWMH-Desktop 3 63 3 3
EWMH-Panel-Bottom 3
EWMH-Panel-Top 3
-EwmhBaseStruts 3 63 3 3
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/Light
===================================================================
--- fvwm/recipes/Light 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Light 2020-02-14 11:56:01 UTC (rev 990)
@@ -26,8 +26,14 @@
OpaqueMoveSize 100
EdgeThickness 1
-EWMH-Desktop 3 3 3 3
-EWMH-Panel-Top 30
+PipeRead 'echo "EWMH-Desktop 3 3 $(((($[panel_font_size]+(($[panel_font_size]/2))))*$[infostore.Desk_Pages_Y])) 3"'
+PipeRead 'echo "EWMH-Panel-Top $(((((($[panel_font_size]+(($[panel_font_size]/2))))*$[infostore.Desk_Pages_Y]))+3))"'
+# The EWMH-Panel* are set by the desktop manager and the custom bar buttons.
+# For the desktop manager and the magic buttons
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/Nebulae
===================================================================
--- fvwm/recipes/Nebulae 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Nebulae 2020-02-14 11:56:01 UTC (rev 990)
@@ -26,7 +26,11 @@
EdgeThickness 1
EWMH-Desktop 3 3 3 3
-EWMH-Panel-Bottom 28
+PipeRead 'echo "EWMH-Panel-Bottom $(($(($[panel_font_size]*3))/2))"'
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
@@ -212,3 +216,7 @@
# ViM modeline {{{1
# vim:foldmethod=marker:foldenable:foldlevel=0:ft=fvwm
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
Modified: fvwm/recipes/Old School
===================================================================
--- fvwm/recipes/Old School 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Old School 2020-02-14 11:56:01 UTC (rev 990)
@@ -26,6 +26,10 @@
EWMH-Panel-Top 30
EWMH-Panel-Right 30
EWMH-Panel-Bottom 30
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/SideLine
===================================================================
--- fvwm/recipes/SideLine 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/SideLine 2020-02-14 11:56:01 UTC (rev 990)
@@ -32,7 +32,11 @@
EWMH-Desktop 0 0 0 0
EWMH-Panel-Left 52
-EWMH-Panel-Bottom 1
+PipeRead 'echo "EWMH-Panel-Bottom $((24*$[infostore.Desk_Pages_Y]))"'
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/SilentHacker
===================================================================
--- fvwm/recipes/SilentHacker 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/SilentHacker 2020-02-14 11:56:01 UTC (rev 990)
@@ -26,8 +26,15 @@
OpaqueMoveSize 100
EdgeThickness 1
-EWMH-Desktop 0 0 0 0
-EWMH-Panel-Top 30
+PipeRead 'echo "EWMH-Desktop 0 0 0 0"'
+PipeRead 'echo "EWMH-Panel-Top $(($[panel_font_size]+10))"'
+# The EWMH-Panel* can be modified the desktop manager and the custom bar buttons.
+# For the desktop manager and the magic buttons
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
+
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/Thin
===================================================================
--- fvwm/recipes/Thin 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Thin 2020-02-14 11:56:01 UTC (rev 990)
@@ -39,7 +39,11 @@
EdgeThickness 2
EWMH-Desktop 3 3 3 3
-EWMH-Panel-Bottom 28
+PipeRead 'echo "EWMH-Panel-Bottom $(((($[panel_font_size]*3))/2))"'
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/TopDown
===================================================================
--- fvwm/recipes/TopDown 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/TopDown 2020-02-14 11:56:01 UTC (rev 990)
@@ -31,8 +31,12 @@
EdgeThickness 1
EWMH-Desktop 3 3 3 3
-EWMH-Panel-Top 51
-EWMH-Panel-Bottom 30
+PipeRead 'echo "EWMH-Panel-Top $((48*$[infostore.Desk_Pages_Y]))"'
+EWMH-Panel-Bottom 40
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/TopLine
===================================================================
--- fvwm/recipes/TopLine 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/TopLine 2020-02-14 11:56:01 UTC (rev 990)
@@ -28,6 +28,10 @@
EWMH-Desktop 3 3 3 3
EWMH-Panel-Top 30
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/Wing-Commander
===================================================================
--- fvwm/recipes/Wing-Commander 2020-02-14 11:25:29 UTC (rev 989)
+++ fvwm/recipes/Wing-Commander 2020-02-14 11:56:01 UTC (rev 990)
@@ -27,6 +27,10 @@
EWMH-Desktop 3 3 3 3
EWMH-Panel-Top 30
EWMH-Panel-Bottom 30
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 11:25:31
|
Revision: 989
http://sourceforge.net/p/fvwm-crystal/code/989
Author: dominique_libre
Date: 2020-02-14 11:25:29 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
CustomButtonBar: Fix overlapping with desktop manager button
Modified Paths:
--------------
ChangeLog
fvwm/scripts/CustomButtonBar/CustomButtonBar
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-14 11:16:51 UTC (rev 988)
+++ ChangeLog 2020-02-14 11:25:29 UTC (rev 989)
@@ -4,6 +4,8 @@
fvwm/components/functions/Fullscreen: fix browser windows behaviour
fvwm/scripts/FontSelector/FontSelector: change the default Coloset, workaround
against a fvwm bug. TODO: reverse it when fvwm is fixed.
+ fvwm/scripts/CustomButtonBar/CustomButtonBar: Fix overlapping with crystal
+ desktop manager button; some comments
mercredi 12 février 2020
fvwm/components/apps/DesktopIcons;
Modified: fvwm/scripts/CustomButtonBar/CustomButtonBar
===================================================================
--- fvwm/scripts/CustomButtonBar/CustomButtonBar 2020-02-14 11:16:51 UTC (rev 988)
+++ fvwm/scripts/CustomButtonBar/CustomButtonBar 2020-02-14 11:25:29 UTC (rev 989)
@@ -13,8 +13,9 @@
# Syntax: PipeRead "$[FVWM_SYSTEMDIR]/scripts/CustomButtonBar/CustomButtonBar \
# ($1 $2 $3 $4) $[vp.width] $[vp.height] $[infostore.CustomBarLocation] $[infostore.CustomButtonSize] \
# ($5 $6 $7 $8) $[infostore.CustomButtonClock] $[infostore.CustomButtonCpuTemp] $[infostore.CustomButtonAcpiBatt] $[infostore.CustomButtonCpuFreq] \
-# ($9 $10 $11) $[infostore.CustomButtonPager] $[infostore.Desk_Pages_X] $[infostore.NotificationAreaManager]
-# ($12 $13 $14 $15) $[infostore.EWMH_DI_Left] $[infostore.EWMH_DI_Right] $[infostore.EWMH_DI_Top] $[infostore.EWMH_DI_Bottom]
+# ($9 $10 $11) $[infostore.CustomButtonPager] $[infostore.Desk_Pages_X] $[infostore.NotificationAreaManager] \
+# ($12 $13 $14 $15) $[infostore.EWMH_DI_Left] $[infostore.EWMH_DI_Right] $[infostore.EWMH_DI_Top] $[infostore.EWMH_DI_Bottom] \
+# ($16 $17 $18 $19) $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right] $[infostore.EWMH_Recipe_Top] $[infostore.EWMH_Recipe_Bottom]"
echo "$0 $@" > ${FVWM_USERDIR}/.commandf
#{FVWM_USERDIR}/scripts/CustomButtonBar/CustomButtonBar
# Preferences files, must be searched in the 3 standard Crystal locations and copied into the user dir. {{{1
@@ -311,9 +312,17 @@
echo '# All changes will be lost.' >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
# To set the borders of the ewmh working area, we need to know
-# the ones defined by the desktop manager, and to use the biggest of the 2
-# for each direction.
-# left right top bottom for the desktop manager are $12 $13 $14 $15.
+# the borders defined by the recipe and the desktop manager,
+# and make some calculation for each direction.
+# $12 $13 $14 $15 are the left, right, top and bottom borders of the desktop manager.
+# $16 $17 $18 $19 are the left, right, top and bottom borders of the recipe.
+# When both that button and the desktop manafer are present into a recipe,
+# this one must be placed first as it block fvwm during its generation.
+# Hopefully, this will insure they don't overlap each other.
+# The ewmh recipe borderss are not implemented at that time because
+# the Custom recipe is the only one that can have the 2 buttons
+# and it work as it.
+# TODO: - Implement the ewmh borders. This will permit to use that button into the other recipes.
case $3 in
Left)
vertical_button $2 $4
@@ -560,3 +569,6 @@
fi
echo "Module FvwmButtons FvwmButtons-CustomBar" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
+
+# check for existing magic button
+echo 'Any (DesktopIcons) LoadPreferences DefaultDesktopManager' >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 11:16:52
|
Revision: 988
http://sourceforge.net/p/fvwm-crystal/code/988
Author: dominique_libre
Date: 2020-02-14 11:16:51 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
FontSelector: change the default Coloset (workaround)
Modified Paths:
--------------
ChangeLog
fvwm/scripts/FontSelector/FontSelector
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-14 11:12:27 UTC (rev 987)
+++ ChangeLog 2020-02-14 11:16:51 UTC (rev 988)
@@ -2,6 +2,8 @@
vendredi 14 février 2020
fvwm/components/functions/Fullscreen: fix browser windows behaviour
+ fvwm/scripts/FontSelector/FontSelector: change the default Coloset, workaround
+ against a fvwm bug. TODO: reverse it when fvwm is fixed.
mercredi 12 février 2020
fvwm/components/apps/DesktopIcons;
Modified: fvwm/scripts/FontSelector/FontSelector
===================================================================
--- fvwm/scripts/FontSelector/FontSelector 2020-02-14 11:12:27 UTC (rev 987)
+++ fvwm/scripts/FontSelector/FontSelector 2020-02-14 11:16:51 UTC (rev 988)
@@ -8,7 +8,10 @@
WindowLocaleTitle {FVWM-Crystal Font Selector}
WindowSize 705 600
#WindowPosition 300 300
-Colorset 1
+#The following colorsets works with the RedDesktop cs, 5 works with all cs sets (other working cs
+# not tested with other cs sets), the other ones crash that script with the RedDesktop cs
+#Colorset 2 5 8 (9 10) (11)
+Colorset 5
# Dont change it or the text titles will be shorted:
Font "xft:$[panel_font]:pixelsize=12:$[panel_font_style]"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-14 11:12:29
|
Revision: 987
http://sourceforge.net/p/fvwm-crystal/code/987
Author: dominique_libre
Date: 2020-02-14 11:12:27 +0000 (Fri, 14 Feb 2020)
Log Message:
-----------
Fullscreen: fix browser windows behaviour
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/Fullscreen
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-12 11:08:02 UTC (rev 986)
+++ ChangeLog 2020-02-14 11:12:27 UTC (rev 987)
@@ -1,5 +1,8 @@
ChangeLog for FVWM-Crystal
+vendredi 14 février 2020
+ fvwm/components/functions/Fullscreen: fix browser windows behaviour
+
mercredi 12 février 2020
fvwm/components/apps/DesktopIcons;
fvwm/recipes/Clean;
Modified: fvwm/components/functions/Fullscreen
===================================================================
--- fvwm/components/functions/Fullscreen 2020-02-12 11:08:02 UTC (rev 986)
+++ fvwm/components/functions/Fullscreen 2020-02-14 11:12:27 UTC (rev 987)
@@ -20,6 +20,8 @@
# Fullscreen functions {{{1
# Workaround: We need a wrapper because of buggy browser windowss which think they know better than the window manager.
+# TODO: make a preference setting for which window(s) to trick.
+
DestroyFunc Fullscreen
AddToFunc Fullscreen
+ I ThisWindow (!FvwmButtons, !FvwmPager, !FvwmMiniConsoleNeedsUniqueName, !QuakeConsoleNeedsUniqueName, !FvwmIconMan, !MPlayer) ToggleFullscreen
@@ -31,7 +33,7 @@
+ I WindowStyle !Borders, !Title
+ I UpdateStyles
+ I State 4 True
-+ I Current Schedule Periodic 1000 $[w.id] ThisWindow (State 4, !Fullscreen) Maximize FullScreen True
++ I Current Schedule Periodic 1000 FS$[w.id] ThisWindow (State 4, !Fullscreen) Maximize FullScreen True
DestroyFunc PutOutFSProp
AddToFunc PutOutFSProp
@@ -38,13 +40,13 @@
+ I WindowStyle Borders, Title
+ I UpdateStyles
+ I State 4 False
-+ I Current Deschedule $[w.id]
++ I Current Deschedule FS$[w.id]
DestroyFunc ToggleFullscreen
AddToFunc ToggleFullscreen
-+ I ThisWindow (Fullscreen) PutOutFSProp
-+ I TestRc (NoMatch) PutInFSProp
-+ I Maximize Fullscreen
++ I ThisWindow (Fullscreen, "Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutOutFSProp
++ I KeepRc Maximize Fullscreen
++ I TestRc (NoMatch) ThisWindow ("Netscape*|Vivaldi*|Konqueror*|Mozilla*") PutInFSProp
# Disapear functions {{{1
DestroyFunc Disappear
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-12 11:08:03
|
Revision: 986
http://sourceforge.net/p/fvwm-crystal/code/986
Author: dominique_libre
Date: 2020-02-12 11:08:02 +0000 (Wed, 12 Feb 2020)
Log Message:
-----------
make the desktop manager to take in account the recipe and magic button ewmh borders
Modified Paths:
--------------
ChangeLog
fvwm/components/apps/DesktopIcons
fvwm/recipes/Clean
fvwm/recipes/Custom
fvwm/scripts/desktop_manager
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-11 15:40:08 UTC (rev 985)
+++ ChangeLog 2020-02-12 11:08:02 UTC (rev 986)
@@ -1,5 +1,12 @@
ChangeLog for FVWM-Crystal
+mercredi 12 février 2020
+ fvwm/components/apps/DesktopIcons;
+ fvwm/recipes/Clean;
+ fvwm/recipes/Custom;
+ fvwm/scripts/desktop_manager: make the desktop manager to take in account the recipe
+ and magic button ewmh borders.
+
mardi 11 février 2020
fvwm/scripts/CustomButtonBar/CustomButtonBar;
fvwm/components/functions/CustomButtonBar-Menu: use EWMH-Panel-[Left|Right] to set
Modified: fvwm/components/apps/DesktopIcons
===================================================================
--- fvwm/components/apps/DesktopIcons 2020-02-11 15:40:08 UTC (rev 985)
+++ fvwm/components/apps/DesktopIcons 2020-02-12 11:08:02 UTC (rev 986)
@@ -187,7 +187,8 @@
AddToFunc LoadDesktopIcons
+ I PipeRead '$[FVWM_SYSTEMDIR]/scripts/desktop_manager \"$[infostore.DeskIconsSign]\" $[infostore.cs_transparent] "$[infostore.SILENT]" \
\"$[infostore.FileBrowser1]\" \"$[infostore.FileBrowser2]\" $[vp.height] $[infostore.tmpdrivefile] \
- $[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] $[vp.width] '
+ $[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] $[vp.width] \
+ $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right]'
+ I Include tmp/DesktopIcons
+ I RedrawIconBox
Modified: fvwm/recipes/Clean
===================================================================
--- fvwm/recipes/Clean 2020-02-11 15:40:08 UTC (rev 985)
+++ fvwm/recipes/Clean 2020-02-12 11:08:02 UTC (rev 986)
@@ -27,7 +27,14 @@
EWMH-Desktop 3 3 3 3
EWMH-Panel-Bottom 30
-EWMH-Panel-Right 30
+EWMH-Panel-Right 32
+
+# For the desktop manager and the magic buttons
+InfoStoreAdd EWMH_Recipe_Left $[EWMH_BS_Panel_Left]
+InfoStoreAdd EWMH_Recipe_Right $[EWMH_BS_Panel_Right]
+InfoStoreAdd EWMH_Recipe_Top $[EWMH_BS_Panel_Top]
+InfoStoreAdd EWMH_Recipe_Bottom $[EWMH_BS_Panel_Bottom]
+
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
# Desktop manager {{{2
Modified: fvwm/recipes/Custom
===================================================================
--- fvwm/recipes/Custom 2020-02-11 15:40:08 UTC (rev 985)
+++ fvwm/recipes/Custom 2020-02-12 11:08:02 UTC (rev 986)
@@ -26,6 +26,11 @@
EWMH-Desktop 3 3 3 3
# The EWMH-Panel* are set by the desktop manager and the custom bar buttons.
+# For the desktop manager and the magic buttons
+InfoStoreAdd EWMH_Recipe_Left 3
+InfoStoreAdd EWMH_Recipe_Right 3
+InfoStoreAdd EWMH_Recipe_Top 3
+InfoStoreAdd EWMH_Recipe_Bottom 3
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
Modified: fvwm/scripts/desktop_manager
===================================================================
--- fvwm/scripts/desktop_manager 2020-02-11 15:40:08 UTC (rev 985)
+++ fvwm/scripts/desktop_manager 2020-02-12 11:08:02 UTC (rev 986)
@@ -8,7 +8,7 @@
# ($1 $2 $3) PipeRead '$[FVWM_SYSTEMDIR]/scripts/desktop_manager $[infostore.DeskIconsSign] $[infostore.cs_transparent] $[infostore.SILENT] \
# ($4 $5 $6 $7) $[infostore.FileBrowser1] $[infostore.FileBrowser2] $[vp.height] $[infostore.tmpdrivefile] \
# ($8 $9 $10 $11) $[infostore.EWMH_CBB_Left] $[infostore.EWMH_CBB_Right] $[infostore.EWMH_CBB_Top] $[infostore.EWMH_CBB_Bottom] \
-# ($12) $[vp.width]'
+# ($12 13 14) $[vp.width] $[infostore.EWMH_Recipe_Left] $[infostore.EWMH_Recipe_Right]'
# Include tmp/DesktopIcons
deskmanfile="${FVWM_USERDIR}/tmp/DesktopIcons"
@@ -60,28 +60,71 @@
echo "" >> "${deskmanfile}"
# EWMH borders {{{1
-EWMHBorderWidth=$((${ButtonWidth}+3))
+# For each direction, we need to use the biggest border
+# of the reccipe, that button, and the magic button if present.
+# We want this button to be loaded last.
+# The magic button must know the border sizes of that button.
+# ${8} to ${11} are the magic buttons borders,
+# ${13} to ${14} are the recipe borders,
if [ "$1" = "-" ]
- then if [ ${9} -gt ${EWMHBorderWidth} ]; then
- echo "EWMH-Panel-Right ${9}" >> "${deskmanfile}"
- else echo "EWMH-Panel-Right ${EWMHBorderWidth}" >> "${deskmanfile}"
- fi
- if [ ${8} -gt 3 ]; then
- echo "EWMH-Panel-Left ${8}" >> "${deskmanfile}"
- else echo "EWMH-Panel-Left 3" >> "${deskmanfile}"
- fi
- echo "InfoStoreAdd EWMH_DI_Right ${EWMHBorderWidth}" >> "${deskmanfile}"
- echo "InfoStoreAdd EWMH_DI_Left 3" >> "${deskmanfile}"
- else if [ ${8} -gt ${EWMHBorderWidth} ]; then
- echo "EWMH-Panel-Left ${8}" >> "${deskmanfile}"
- else echo "EWMH-Panel-Left ${EWMHBorderWidth}" >> "${deskmanfile}"
- fi
- if [ ${9} -gt 3 ]; then
- echo "EWMH-Panel-Right ${9}" >> "${deskmanfile}"
- else echo "EWMH-Panel-Right 3" >> "${deskmanfile}"
- fi
- echo "InfoStoreAdd EWMH_DI_Left ${EWMHBorderWidth}" >> "${deskmanfile}"
- echo "InfoStoreAdd EWMH_DI_Right 3" >> "${deskmanfile}"
+# recipe border > recipe border without button
+then if [ ${14} -gt 3 ]
+ # magic button border > recipe border without button
+ then if [ ${9} -gt 3 ]; then
+ echo "EWMH-Panel-Right $((${14}+${9}+${ButtonWidth}))" >> "${deskmanfile}"
+ # x placement of the button
+ ButtonXPlace=$((((${14}-3))+${9}+${ButtonWidth}))
+ else echo "EWMH-Panel-Right $((${14}+${ButtonWidth}))" >> "${deskmanfile}"
+ ButtonXPlace=$((((${14}-3))+${ButtonWidth}))
+ fi
+ else if [ ${9} -gt 3 ]; then
+ echo "EWMH-Panel-Right $((${9}+${ButtonWidth}))" >> "${deskmanfile}"
+ ButtonXPlace=$((${9}+${ButtonWidth}))
+ else echo "EWMH-Panel-Right ${ButtonWidth}" >> "${deskmanfile}"
+ ButtonXPlace=${ButtonWidth}
+ fi
+ fi
+ # opposite border
+ if [ ${13} -gt 3 ]; then
+ if [ ${8} -gt 3 ]; then
+ echo "EWMH-Panel-Left $((${13}+${8}))" >> "${deskmanfile}"
+ else echo "EWMH-Panel-Left $((${13}))" >> "${deskmanfile}"
+ fi
+ else if [ ${8} -gt 3 ]; then
+ echo "EWMH-Panel-Left ${8}" >> "${deskmanfile}"
+ else echo "EWMH-Panel-Left 3" >> "${deskmanfile}"
+ fi
+ fi
+ # borders for this button
+ echo "InfoStoreAdd EWMH_DI_Right ${ButtonWidth}" >> "${deskmanfile}"
+ echo "InfoStoreAdd EWMH_DI_Left 3" >> "${deskmanfile}"
+else if [ ${13} -gt 3 ]
+ then if [ ${8} -gt 3 ]; then
+ echo "EWMH-Panel-Left $((${13}+${8}+${ButtonWidth}))" >> "${deskmanfile}"
+ ButtonXPlace=$((${13}+${8}))
+ else echo "EWMH-Panel-Left $((${13}+${ButtonWidth}))" >> "${deskmanfile}"
+ ButtonXPlace=${13}
+ fi
+ else if [ ${8} -gt 3 ]; then
+ echo "EWMH-Panel-Left $((${8}+${ButtonWidth}))" >> "${deskmanfile}"
+ ButtonXPlace=${8}
+ else echo "EWMH-Panel-Left ${ButtonWidth}" >> "${deskmanfile}"
+ ButtonXPlace=3
+ fi
+ fi
+ # opposite border
+ if [ ${14} -gt 3 ]; then
+ if [ ${9} -gt 3 ]; then
+ echo "EWMH-Panel-Right $((${14}+${9}))" >> "${deskmanfile}"
+ else echo "EWMH-Panel-Right $((${14}))" >> "${deskmanfile}"
+ fi
+ else if [ ${9} -gt 3 ]; then
+ echo "EWMH-Panel-Right ${9}" >> "${deskmanfile}"
+ else echo "EWMH-Panel-Right 3" >> "${deskmanfile}"
+ fi
+ fi
+ echo "InfoStoreAdd EWMH_DI_Left ${ButtonWidth}" >> "${deskmanfile}"
+ echo "InfoStoreAdd EWMH_DI_Right 3" >> "${deskmanfile}"
fi
echo "" >> "${deskmanfile}"
@@ -92,8 +135,8 @@
echo "+ I KillModule FvwmButtons DesktopIcons" >> "${deskmanfile}"
echo "+ I DestroyModuleConfig DesktopIcons: *" >> "${deskmanfile}"
if [ "$1" = "-" ]
- then echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+$((${12}-${EWMHBorderWidth}))+3" >> "${deskmanfile}"
- else echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+3+3" >> "${deskmanfile}"
+ then echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+$((${12}-${ButtonXPlace}))+3" >> "${deskmanfile}"
+ else echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+${ButtonXPlace}+3" >> "${deskmanfile}"
fi
echo "+ I *DesktopIcons: Padding 1 1" >> "${deskmanfile}"
echo "+ I *DesktopIcons: BoxSize Fixed" >> "${deskmanfile}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-11 15:40:09
|
Revision: 985
http://sourceforge.net/p/fvwm-crystal/code/985
Author: dominique_libre
Date: 2020-02-11 15:40:08 +0000 (Tue, 11 Feb 2020)
Log Message:
-----------
Move the EWMH infostore variables from the recipe to EWMH-BaseStruts
Modified Paths:
--------------
fvwm/components/functions/EWMH-BaseStruts
fvwm/recipes/Custom
Modified: fvwm/components/functions/EWMH-BaseStruts
===================================================================
--- fvwm/components/functions/EWMH-BaseStruts 2020-02-11 15:22:46 UTC (rev 984)
+++ fvwm/components/functions/EWMH-BaseStruts 2020-02-11 15:40:08 UTC (rev 985)
@@ -19,6 +19,15 @@
# Also desktop borders will be automatycally adjusted to shown/hidden
# state.
+# Used by the desktop icon manager and the magic button bar
+InfoStoreAdd EWMH_DI_Left 3
+InfoStoreAdd EWMH_DI_Right 3
+InfoStoreAdd EWMH_DI_Top 3
+InfoStoreAdd EWMH_DI_Bottom 3
+InfoStoreAdd EWMH_CBB_Left 3
+InfoStoreAdd EWMH_CBB_Right 3
+InfoStoreAdd EWMH_CBB_Top 3
+InfoStoreAdd EWMH_CBB_Bottom 3
DestroyFunc EWMH-Desktop
AddToFunc EWMH-Desktop
@@ -102,3 +111,4 @@
+ I $0 $1 $2 $3 Interface_Show $0 $1 $2 $3
# vim:ft=fvwm
+
Modified: fvwm/recipes/Custom
===================================================================
--- fvwm/recipes/Custom 2020-02-11 15:22:46 UTC (rev 984)
+++ fvwm/recipes/Custom 2020-02-11 15:40:08 UTC (rev 985)
@@ -25,16 +25,7 @@
EdgeThickness 1
EWMH-Desktop 3 3 3 3
-# The desktop manager and the custom bar buttons needs to know what the other one needs.
-# They don't exist now, we use the ewmh default just defined:
-InfoStoreAdd EWMH_DI_Left 3
-InfoStoreAdd EWMH_DI_Right 3
-InfoStoreAdd EWMH_DI_Top 3
-InfoStoreAdd EWMH_DI_Bottom 3
-InfoStoreAdd EWMH_CBB_Left 3
-InfoStoreAdd EWMH_CBB_Right 3
-InfoStoreAdd EWMH_CBB_Top 3
-InfoStoreAdd EWMH_CBB_Bottom 3
+# The EWMH-Panel* are set by the desktop manager and the custom bar buttons.
PipeRead '$[FVWM_SYSTEMDIR]/scripts/set_DesktopIconsGeom $[vp.height]'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dom...@us...> - 2020-02-11 15:22:48
|
Revision: 984
http://sourceforge.net/p/fvwm-crystal/code/984
Author: dominique_libre
Date: 2020-02-11 15:22:46 +0000 (Tue, 11 Feb 2020)
Log Message:
-----------
EWMH-BaseStruts: remove commented out calls
Modified Paths:
--------------
ChangeLog
fvwm/components/functions/EWMH-BaseStruts
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-02-11 15:18:26 UTC (rev 983)
+++ ChangeLog 2020-02-11 15:22:46 UTC (rev 984)
@@ -9,6 +9,7 @@
fvwm/components/apps/DesktopIcons: use EWMH-Panel-[Left|Right] to set the ewmh border hints
fvwm/components/bindings/Desktop-MMB-TogglePanels: restore EWMH-Toggle as panel
visibility function
+ fvwm/components/functions/EWMH-BaseStruts: remove commented out calls
lundi 10 février 2020
fvwm/components/functions/Exit: fix conditional in ScreenLidSuspend preference
Modified: fvwm/components/functions/EWMH-BaseStruts
===================================================================
--- fvwm/components/functions/EWMH-BaseStruts 2020-02-11 15:18:26 UTC (rev 983)
+++ fvwm/components/functions/EWMH-BaseStruts 2020-02-11 15:22:46 UTC (rev 984)
@@ -76,13 +76,7 @@
AddToFunc Interface_Show
+ I All (DesktopIcons) Iconify false
+ I All (FvwmPager) Iconify false
-+ I All (FvwmButtons-*) Iconify false
-#+ I All (FvwmButtons-Pager) Iconify false
-#+ I All (FvwmButtons-Clock) Iconify false
-#+ I All (FvwmButtons-Panel*) Iconify false
-#+ I All (FvwmButtons-MainMenu) Iconify false
-#+ I All (FvwmButtons-Bot*) Iconify false
-#+ I All (FvwmButtons-Musi*) Iconify false
++ I All (FvwmButtons-*) Iconify false
+ I All (ApplicationPanel) Iconify false
+ I All (FvwmIconMan) Iconify false
+ I All (gkrellm) Iconify false
@@ -97,13 +91,7 @@
AddToFunc Interface_Hide
+ I All (DesktopIcons) Iconify true
+ I All (FvwmPager) Iconify true
-+ I All (FvwmButtons-*) Iconify true
-#+ I All (FvwmButtons-Pager) Iconify true
-#+ I All (FvwmButtons-MainMenu) Iconify true
-#+ I All (FvwmButtons-Clock) Iconify true
-#+ I All (FvwmButtons-Panel*) Iconify true
-#+ I All (FvwmButtons-Bot*) Iconify true
-#+ I All (FvwmButtons-Musi*) Iconify true
++ I All (FvwmButtons-*) Iconify true
+ I All (ApplicationPanel) Iconify true
+ I All (FvwmIconMan) Iconify true
+ I All (gkrellm) Iconify true
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
