Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1039] fvwm/scripts
|
From: <dom...@us...> - 2020-07-28 20:04:45
|
Revision: 1039
http://sourceforge.net/p/fvwm-crystal/code/1039
Author: dominique_libre
Date: 2020-07-28 20:04:43 +0000 (Tue, 28 Jul 2020)
Log Message:
-----------
desktop manager: fix geometry and add EWMH placement and geometry support; add support for non transparent terminals; bump to 3.6.6
Modified Paths:
--------------
ChangeLog
NEWS
addons/README
fvwm/components/functions/About
fvwm/scripts/desktop_manager
Added Paths:
-----------
addons/Xdefaults.no_transparency
addons/Xresources.no_transparency
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-05-02 19:29:26 UTC (rev 1038)
+++ ChangeLog 2020-07-28 20:04:43 UTC (rev 1039)
@@ -1,8 +1,26 @@
ChangeLog for FVWM-Crystal
- fvwm/functions/bindings/Application-Icons-22-32: fix
- libreoffice styles
+Version 3.6.6
+-------------
+mardi 28 juillet 2020
+ fvwm/scripts/desktop_mamager: fix widget geometry;
+ add EWMH support for its placement and geometry.
+ The desktop icons manager will be centerd according to
+ the y EWMH size, which is not necesarily the same than the
+ y center of the screen.
+ fvwm/functions/components/About,
+ NEWS: 3.6.6
+
+26 juin 2020
++ addons/Xdefaults.no_transparency,
++ addons/Xresources.no_transparency,
+ addons/README: add support for non transparent consoles.
+
+vendredi 1 mai 2020
+ fvwm/functions/styles/Application-Icons-22-32: fix
+ libreoffice styles.
+
Version 3.6.5
-------------
Modified: NEWS
===================================================================
--- NEWS 2020-05-02 19:29:26 UTC (rev 1038)
+++ NEWS 2020-07-28 20:04:43 UTC (rev 1039)
@@ -1,3 +1,29 @@
+Version 3.6.6
+-------------
+
+Fvwm Crystal 3.6.6 is out!
+
+This is a bug fix and new features release:
+
+- Fix libreofficce icons styles.
+
+- New addons/Xdefaults.no_transparency and Xresources.no_transparency files;
+ they add support for non transparent terminals.
+
+- Fix the size of the desktop manager (Icons on dekstop).
+ The widget was too big verticaly, which could be an issue when configured
+ to display a lot of icons.
+
+- Add complete EWMH support for the size and the placement of the desktop manager.
+ This fix collision with the magic button bar of the Custom recipe.
+ I never constated such collision, but it was possible in theory.
+
+ Anyway, this should be fixed now and this support, plus the geometry fix,
+ make the visual to lock better.
+
+Enjoy!
+Dominique Michel
+
Version 3.6.5
-------------
Modified: addons/README
===================================================================
--- addons/README 2020-05-02 19:29:26 UTC (rev 1038)
+++ addons/README 2020-07-28 20:04:43 UTC (rev 1039)
@@ -80,8 +80,14 @@
Remove a strange urxwt binding that print garbage at stdout
And more
-Xressources: Xressources example file to use with FVWM-Crystal.
+Xdefaults.no_transparency: same than Xdefault, but with setup
+ for non transparent virtual terminals.
+
+Xresources: Xressources example file to use with FVWM-Crystal.
Read INSTALL in main Crystal folder.
+Xresources.no_transparency: same than Xressources, but with setup
+ for non transparent virtual terminals.
+
Xsession: Xsession example file to use with FVWM-Crystal.
Read INSTALL in main Crystal folder.
Added: addons/Xdefaults.no_transparency
===================================================================
--- addons/Xdefaults.no_transparency (rev 0)
+++ addons/Xdefaults.no_transparency 2020-07-28 20:04:43 UTC (rev 1039)
@@ -0,0 +1,260 @@
+! $Header: /home/taviso/.Xdefaults,v 1.3 2004/04/20 19:52:21 taviso Exp $
+
+! TEST
+!XEmacs*font: -xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-1
+!XEmacs*font: xft:Bistream Vera Sans Mono:pixelsize=20
+XEmacs*font: xft:Monospace:pixelsize=20
+!XEmacs*boldFont: -*-terminus-bold-*-*-*-*-*-*-*-*-*-*-
+XEmacs*boldFont: xft:MonospaceBold:pixelsize=20
+!XEmacs*saveLines: 100000
+! TEST
+
+
+Aterm*colorBD: blue
+Aterm*colorUL: green
+! We don't want to screw up 'shopt login_shell'
+! when used in .bashrc or .bash_profile
+! If you get errors at terminal start up before the prompt
+! comment out the following line (it is 2 other similar lines downer):
+! Aterm*loginShell: true
+Aterm*scrollBar: false
+Aterm*foreground: white
+Aterm*background: #000052
+Aterm*transparent: false
+Aterm*tintingType: true
+Aterm*shading: 90
+Aterm*tinting: white
+!Aterm*font: -monotype-andale mono-medium-r-normal--0-0-0-0-m-0-iso8859-1
+!Aterm*boldFont: -*-terminus-bold-*-*-*-*-*-*-*-*-*-*-*
+Aterm*saveLines: 100000
+
+Rxvt*geometry: 80x60
+Rxvt*colorBD: blue
+Rxvt*colorUL: green
+! Rxvt*loginShell: true
+Rxvt*scrollBar: false
+Rxvt*foreground: white
+Rxvt*background: #577274
+!Rxvt*font: -xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-1
+!Rxvt*font: xft:Bistream Vera Sans Mono:pixelsize=20
+Rxvt*font: xft:Monospace:pixelsize=20
+!Rxvt*boldFont: -*-terminus-bold-*-*-*-*-*-*-*-*-*-*-
+Rxvt*boldFont: xft:MonospaceBold:pixelsize=20
+Rxvt*saveLines: 100000
+
+! ===========================================================================
+! URxvt resources
+
+! Remove garbage with Alt+NumLook+KP_Multiply
+URxvt.keysym.M-N-KP_Multiply: command:
+
+! Look similar to the Linux Console, with transparency
+! ---------------------------------------------------------------------------
+URxvt.background: black
+URxvt.foreground: white
+URxvt.shading: 30
+URxvt.tintColor: white
+URxvt.transparent: false
+URxvt.scrollBar: false
+
+! Font settings
+! URxvt uses UTF-8, so we don't need encoding-specific settings'
+! ---------------------------------------------------------------------------
+! 640x480
+!URxvt.font: xft:Monospace:pixelsize=10
+! 800x600
+!URxvt.font: xft:Monospace:pixelsize=10
+! 1024x768
+!URxvt.font: xft:Monospace:pixelsize=11
+! 1152x864
+!URxvt.font: xft:Monospace:pixelsize=12
+! 1280x1024
+!URxvt.font: xft:Monospace:pixelsize=14
+! 1600x1024
+URxvt.font: xft:Monospace:pixelsize=20
+! 1680x1280
+!URxvt.font: xft:Monospace:pixelsize=20
+
+! Colors similar to Linux console
+! ---------------------------------------------------------------------------
+URxvt.color0: rgb:0/0/0
+URxvt.color1: rgb:cc/00/00
+URxvt.color2: rgb:00/cc/00
+URxvt.color3: #bd5e01
+URxvt.color4: rgb:00/00/cc
+URxvt.color5: rgb:cc/00/cc
+URxvt.color6: rgb:00/cc/cc
+URxvt.color7: rgb:aa/aa/aa
+URxvt.color8: rgb:33/33/33
+URxvt.color9: rgb:ff/00/00
+URxvt.color10: rgb:00/ff/00
+URxvt.color11: rgb:ff/ff/00
+URxvt.color12: rgb:00/00/ff
+URxvt.color13: rgb:ff/00/ff
+URxvt.color14: rgb:00/ff/ff
+URxvt.color15: rgb:ff/ff/ff
+
+! Default URxvt colors
+! ---------------------------------------------------------------------------
+!URxvt.color0: black
+!URxvt.color1: red3
+!URxvt.color2: green3
+!URxvt.color3: brown
+!URxvt.color4: blue3
+!URxvt.color5: magenta3
+!URxvt.color6: cyan3
+!URxvt.color7: gray90
+!URxvt.color8: gray30
+!URxvt.color9: red
+!URxvt.color10: green
+!URxvt.color11: yellow
+!URxvt.color12: blue
+!URxvt.color13: magenta
+!URxvt.color14: cyan
+!URxvt.color15: white
+
+!ascii[-range]:class,...
+!XTerm*VT100*font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
+!XTerm*VT100*widefont: -misc-fixed-medium-r-normal-ja-13-125-75-75-c-120-iso10646-1
+!XTerm*VT100*boldfont: -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1
+XTerm*VT100*Geometry: 80 50
+XTerm*charClass: 33:48,37:48,45-47:48,38:48,58:48
+!XTerm*faceName: Andale Mono Bold:size=11
+XTerm*faceName: Terminus
+XTerm*faceSize: 18
+XTerm*Background: #577274
+XTerm*Foreground: #ffffff
+XTerm*eightBitInput: false
+XTerm*eightBitControl: false
+XTerm*utf8: 1
+XTerm*ActiveIcon: true
+XTerm*AllowWindowOps: true
+! use mouse wheel in mutt
+Mutt*Translations: #override \
+ <Btn5Down>:string("\033[6~") \n\
+ <Btn4Down>:string("\033[5~")
+IDAPro*showBlinkAsBold: true
+! intercept mouse wheel events in ida
+IDAPro*Translations: #override \
+ <Btn5Down>:interpret("\033[?1002l\033[?1002r") string("\033[6~") \n\
+ <Btn5Up>:interpret("\033[?1002s\033[?1002h") \n\
+ <Btn4Down>:interpret("\033[?1002l\033[?1002r") string("\033[5~") \n\
+ <Btn4Up>:interpret("\033[?1002s\033[?1002h")
+
+
+HiddenConsole*faceName: Andale Mono Bold:size=11
+HiddenConsole*Background: #577274
+HiddenConsole*Foreground: #ffffff
+HiddenConsole*eightBitInput: false
+
+! look in /usr/share/cursors/xorg-x11
+! Xcursor.theme: whiteglass
+! Xcursor.theme: tuxcursor
+! Xcursor.theme: Blue
+! Xcursor.theme: Gold
+! Xcursor.theme : ComixCursors-Orange-Regular
+! Xcursor.theme : ComixCursors-Orange-Large
+Xcursor.theme : Oxygen_White_Big
+Xcursor.size: 48
+
+! XTerm*loginShell: true
+
+xosview*title: xosview
+xosview*captions: False
+xosview*labels: False
+xosview*usedlabels: False
+xosview*borderwidth: 0
+xosview*foreground: black
+xosview*transparent: False
+xosview*background: #c6c3c6
+
+xosview*cpuUserColor: #ffe4b5
+xosview*cpuNiceColor: #ffe4b5
+xosview*cpuSystemColor: #ffe4b5
+xosview*cpuInterruptColor: #ffe4b5
+xosview*cpuFreeColor: #c6cbd6
+xosview*cpuDecay: False
+xosview*cpuGraph: False
+xosview*cpuPriority: 2
+
+xosview*memFreeColor: #c6cbd6
+xosview*memInactiveColor: #99b0de
+xosview*memUsedColor: #99b0de
+xosview*memBufferColor: #c6cbd6
+xosview*memCacheColor: #c6cbd6
+xosview*memSharedColor: #99b0de
+xosview*memTextColor: #99b0de
+xosview*memOtherColor: #99b0de
+xosview*memActiveColor: #99b0de
+xosview*memGraph: False
+
+xosview*netBackground: #c6cbd6
+xosview*netInColor: #b5c7b5
+xosview*netOutColor: #b5c7b5
+xosview*netBandwidth: 120000
+xosview*netDecay: False
+xosview*netGraph: False
+
+xosview*swapFreeColor: #c6cbd6
+xosview*swapUsedColor: #7ec0ee
+
+xosview*diskIdleColor: #c6cbd6
+xosview*diskReadColor: #b5aeff
+xosview*diskWriteColor: #b5aeff
+xosview*diskUsedColor: #b5aeff
+xosview*diskGraph: False
+xosview*diskDecay: False
+
+xosview*battery: False
+xosview*gfx: False
+xosview*net: False
+xosview*page: False
+xosview*disk: False
+xosview*interrupts: False
+xosview*load: False
+xosview*swap: False
+xosview*lmstemp: False
+xosview*cpu: False
+xosview*mem: False
+
+*beNiceToColormap: False
+!*shapeStyle: Rectangle
+!*Text.borderWidth: 0
+!*SimpleMenu.borderWidth: 0
+!*Paned.internalBorderWidth: 0
+!SmeBSB.shadowWidth: 0
+
+!## NETSCAPE
+Netscape*drawingArea.translations: #replace \
+<Btn1Down>: ArmLink() \n\
+<Btn2Down>: ArmLink() \n\
+~Shift<Btn1Up>: ActivateLink() \n\
+~Shift<Btn2Up>: ActivateLink(new-window) \
+DisarmLink() \n\
+Shift<Btn1Up>: ActivateLink(save-only) \
+DisarmLink() \n\
+Shift<Btn2Up>: ActivateLink(save-only) \
+DisarmLink() \n\
+<Btn1Motion>: DisarmLinkIfMoved() \n\
+<Btn2Motion>: DisarmLinkIfMoved() \n\
+<Btn3Motion>: DisarmLinkIfMoved() \n\
+<Motion>: DescribeLink() \n\
+<Btn3Down>: xfeDoPopup() \n\
+<Btn3Up>: ActivatePopup() \n\
+Ctrl<Btn4Down>: PageUp()\n\
+Ctrl<Btn5Down>: PageDown()\n\
+Shift<Btn4Down>: LineUp()\n\
+Shift<Btn5Down>: LineDown()\n\
+None<Btn4Down>: LineUp()LineUp()LineUp()LineUp()LineUp()LineUp()\n\
+None<Btn5Down>: LineDown()LineDown()LineDown()LineDown()LineDown()LineDown()\n\
+Alt<Btn4Down>: xfeDoCommand(forward)\n\
+Alt<Btn5Down>: xfeDoCommand(back)\n
+
+ Netscape*globalNonTextTranslations: #override\n\
+ Shift<Btn4Down>: LineUp()\n\
+ Shift<Btn5Down>: LineDown()\n\
+ None<Btn4Down>:LineUp()LineUp()LineUp()LineUp()LineUp()LineUp()\n\
+ None<Btn5Down>:LineDown()LineDown()LineDown()LineDown()LineDown()LineDown()\n\
+ Alt<Btn4Down>: xfeDoCommand(forward)\n\
+ Alt<Btn5Down>: xfeDoCommand(back)\n
+
Added: addons/Xresources.no_transparency
===================================================================
--- addons/Xresources.no_transparency (rev 0)
+++ addons/Xresources.no_transparency 2020-07-28 20:04:43 UTC (rev 1039)
@@ -0,0 +1,202 @@
+! X resources used in FVWM-Crystal project (http://fvwm-crystal.berlios.de/)
+! Written by: Maciej Delmanowski <ha...@po...>
+! Modified for non transparent virtual terminals dom...@us...>
+! Put this file as ~/.Xresources in your home directory
+
+! ===========================================================================
+! XTerm resources
+
+! Look similar to the Linux Console
+! ---------------------------------------------------------------------------
+XTerm*background: black
+XTerm*foreground: white
+XTerm*cursorColor: yellow
+XTerm*Title: XTerm
+XTerm*scrollBar: false
+XTerm*saveLines: 5000
+
+! Fonts for different resolutions and character encodings
+! By default English encoding is set. How to set different encodings:
+! - Polish encoding: apply "-iso8859-2" at the end of the font string
+! ---------------------------------------------------------------------------
+! Englsh encoding
+! 640x480
+!XTerm*font: -misc-fixed-medium-r-normal-*-12-*
+! 800x600
+!XTerm*font: -misc-fixed-medium-r-normal-*-13-*
+! 1024x768
+XTerm*font: -misc-fixed-medium-r-normal-*-14-*
+! 1152x864
+!XTerm*font: -misc-fixed-medium-r-normal-*-14-*
+! 1280x1024
+!XTerm*font: -misc-fixed-medium-r-normal-*-18-*
+
+! Colors similar to those used in Linux Console (ttyX)
+! ---------------------------------------------------------------------------
+XTerm*color0: rgb:0/0/0
+XTerm*color1: rgb:cc/00/00
+XTerm*color2: rgb:00/cc/00
+XTerm*color3: #bd5e01
+XTerm*color4: rgb:00/00/cc
+XTerm*color5: rgb:cc/00/cc
+XTerm*color6: rgb:00/cc/cc
+XTerm*color7: rgb:aa/aa/aa
+XTerm*color8: rgb:33/33/33
+XTerm*color9: rgb:ff/00/00
+XTerm*color10: rgb:00/ff/00
+XTerm*color11: rgb:ff/ff/00
+XTerm*color12: rgb:00/00/ff
+XTerm*color13: rgb:ff/00/ff
+XTerm*color14: rgb:00/ff/ff
+XTerm*color15: rgb:ff/ff/ff
+
+! Default XTerm colors
+! ---------------------------------------------------------------------------
+!XTerm*color0: black
+!XTerm*color1: red3
+!XTerm*color2: green3
+!XTerm*color3: brown
+!XTerm*color4: blue3
+!XTerm*color5: magenta3
+!XTerm*color6: cyan3
+!XTerm*color7: gray90
+!XTerm*color8: gray30
+!XTerm*color9: red
+!XTerm*color10: green
+!XTerm*color11: yellow
+!XTerm*color12: blue
+!XTerm*color13: magenta
+!XTerm*color14: cyan
+!XTerm*color15: white
+
+! Specific settings for QuakeConsole (Alt+`), to get better effect
+! ---------------------------------------------------------------------------
+! 800x600
+!QuakeConsoleNeedsUniqueName*internalBorder: 0
+! 1024x768
+!QuakeConsoleNeedsUniqueName*internalBorder: 0
+! 1152x864
+!QuakeConsoleNeedsUniqueName*internalBorder: 1
+! 1280x1024
+!QuakeConsoleNeedsUniqueName*internalBorder: 0
+
+! Specific settings for FvwmConsole, to remove the menubar
+!FvwmConsole*toolBar: false
+
+! ===========================================================================
+! Aterm resources
+! Aterm can use XTerm's resources, so look also in there
+! Here are only settings specific to Aterm
+
+! Aterm supports transparency, so it's turned off by default
+! ---------------------------------------------------------------------------
+Aterm.transparent: false
+Aterm.shading: 30
+
+! Specific settings for Aterm-based QuakeConsole
+! ---------------------------------------------------------------------------
+! 1152x864
+!QuakeConsoleNeedsUniqueName*font: -misc-fixed-medium-r-normal-*-12-*
+! 1280x1024
+!QuakeConsoleNeedsUniqueName*font: -misc-fixed-medium-r-normal-*-14-*
+
+
+! ===========================================================================
+! mrxvt resources
+! mrxvt can use XTerm's resources, so look also in there
+! Here are only settings specific to mrxvt
+
+! Similar look to the Linux Console, with corresponding tabs
+! ---------------------------------------------------------------------------
+mrxvt.initTermNumber: 1
+mrxvt.protectSecondary: true
+mrxvt.syncTabTitle: true
+mrxvt.bottomTabbar: true
+mrxvt.hideButtons: true
+mrxvt.tabForeground: white
+mrxvt.tabBackground: black
+mrxvt.itabForeground: white
+mrxvt.itabBackground: #555555
+
+! Settings for mrxvt-based QuakeConsole - strongly recommended :)
+! ---------------------------------------------------------------------------
+!QuakeConsoleNeedsUniqueName.initTermNumber: 1
+!QuakeConsoleNeedsUniqueName.protectSecondary: true
+!QuakeConsoleNeedsUniqueName.syncTabTitle: true
+!QuakeConsoleNeedsUniqueName.bottomTabbar: true
+!QuakeConsoleNeedsUniqueName.hideButtons: true
+!QuakeConsoleNeedsUniqueName.tabForeground: white
+!QuakeConsoleNeedsUniqueName.tabBackground: black
+!QuakeConsoleNeedsUniqueName.itabForeground: white
+!QuakeConsoleNeedsUniqueName.itabBackground: #555555
+
+
+! ===========================================================================
+! URxvt resources
+
+! Look similar to the Linux Console, with transparency
+! ---------------------------------------------------------------------------
+URxvt.background: black
+URxvt.foreground: white
+! URxvt shading: 0 to 99 darkens, 101 to 200 lightens
+URxvt.shading: 30
+URxvt.tintColor: white
+URxvt.inheritPixmap: false
+URxvt.scrollBar: false
+
+! Font settings
+! URxvt uses UTF-8, so we don't need encoding-specific settings
+! ---------------------------------------------------------------------------
+! 640x480
+!URxvt.font: xft:Monospace:pixelsize=10
+! 800x600
+!URxvt.font: xft:Monospace:pixelsize=10
+! 1024x768
+URxvt.font: xft:Monospace:pixelsize=11
+! 1152x864
+!URxvt.font: xft:Monospace:pixelsize=12
+! 1280x1024
+!URxvt.font: xft:Monospace:pixelsize=14
+
+! Colors similar to Linux console
+! ---------------------------------------------------------------------------
+URxvt.color0: rgb:0/0/0
+URxvt.color1: rgb:cc/00/00
+URxvt.color2: rgb:00/cc/00
+URxvt.color3: #bd5e01
+URxvt.color4: rgb:00/00/cc
+URxvt.color5: rgb:cc/00/cc
+URxvt.color6: rgb:00/cc/cc
+URxvt.color7: rgb:aa/aa/aa
+URxvt.color8: rgb:33/33/33
+URxvt.color9: rgb:ff/00/00
+URxvt.color10: rgb:00/ff/00
+URxvt.color11: rgb:ff/ff/00
+URxvt.color12: rgb:00/00/ff
+URxvt.color13: rgb:ff/00/ff
+URxvt.color14: rgb:00/ff/ff
+URxvt.color15: rgb:ff/ff/ff
+
+! Default URxvt colors
+! ---------------------------------------------------------------------------
+!URxvt.color0: black
+!URxvt.color1: red3
+!URxvt.color2: green3
+!URxvt.color3: brown
+!URxvt.color4: blue3
+!URxvt.color5: magenta3
+!URxvt.color6: cyan3
+!URxvt.color7: gray90
+!URxvt.color8: gray30
+!URxvt.color9: red
+!URxvt.color10: green
+!URxvt.color11: yellow
+!URxvt.color12: blue
+!URxvt.color13: magenta
+!URxvt.color14: cyan
+!URxvt.color15: white
+
+! Specific settings for QuakeConsole
+! ---------------------------------------------------------------------------
+! 1280x1024
+!QuakeConsoleNeedsUniqueName.font: xft:Monospace:pixelsize=12
Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About 2020-05-02 19:29:26 UTC (rev 1038)
+++ fvwm/components/functions/About 2020-07-28 20:04:43 UTC (rev 1039)
@@ -5,7 +5,7 @@
*About: Line center
*About: Text "FVWM-Crystal"
*About: Line center
-*About: Text "$[gt.Version]: 3.6.5"
+*About: Text "$[gt.Version]: 3.6.6"
*About: Line center
*About: Text "Magic Star"
*About: Line center
Modified: fvwm/scripts/desktop_manager
===================================================================
--- fvwm/scripts/desktop_manager 2020-05-02 19:29:26 UTC (rev 1038)
+++ fvwm/scripts/desktop_manager 2020-07-28 20:04:43 UTC (rev 1039)
@@ -16,6 +16,7 @@
# We must calculate the size of the button box {{{1
# Home: 1 icon, XDG user dirs: 8 icons, partitions: variable, directories: variable
+# Number of icons to show: {{{2
IconNumber=1
if [[ "${ShowXDG}" == "yes" ]]; then IconNumber=9; fi
if [[ "${ShowPartitions}" == "yes" ]]
@@ -23,13 +24,28 @@
IconNumber="$((${IconNumber}+`wc -l < ${7}`))"
IconNumber="$((${IconNumber}+`wc -l < ${HOME}/.fvwm-crystal/preferences/ShowDirectories`))"
fi
-IconRowsNumber="$((((${6}-((${EWMH_BS_Panel_Top}+${EWMH_BS_Panel_Bottom}))))/50))"
-tmpvar=$((${IconNumber}/${IconRowsNumber}))
-if [[ "$((${IconRowsNumber}*${tmpvar}))" != "${IconNumber}" ]]
- then IconColumnsNumber="$((${tmpvar}+1))"
- else IconColumnsNumber="${tmpvar}"
+# Available number of icons on the EWMH screen height: {{{2
+if [ "${10}" -gt "${15}" ]
+ then EWMHTop="${10}"
+ else EWMHTop="${15}"
fi
+if [ "${11}" -gt "${16}" ]
+ then EWMHBottom="${11}"
+ else EWMHBottom="${16}"
+fi
+ScreenIconRowsNumber="$((((${6}-((${EWMHTop}+${EWMHBottom}))))/48))"
+# Widget column and row sizes {{{2
+Rest="$((${IconNumber}%${ScreenIconRowsNumber}))"
+if [ "${Rest}" != "0" ]
+ then IconColumnsNumber="$((((${IconNumber}/${ScreenIconRowsNumber}))+1))"
+ else IconColumnsNumber="$((${IconNumber}/${ScreenIconRowsNumber}))"
+fi
ButtonWidth=$((${IconColumnsNumber}*48))
+Rest="$((${IconNumber}%${IconColumnsNumber}))"
+if [ "${Rest}" != "0" ]
+ then IconRowsNumber="$((((${IconNumber}/${IconColumnsNumber}))+1))"
+ else IconRowsNumber="$((${IconNumber}/${IconColumnsNumber}))"
+fi
# Preference menu
echo "DestroyMenu /Preferences/IconLauncher" >> "${deskmanfile}"
@@ -135,8 +151,9 @@
echo "+ I KillModule FvwmButtons DesktopIcons" >> "${deskmanfile}"
echo "+ I DestroyModuleConfig DesktopIcons: *" >> "${deskmanfile}"
if [ "$1" = "-" ]
- 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}"
+# widget at y center => y = (EWMHTop + ((vp.height - (EWMHTop + EWMHBottom + (IconsRowsNumber * 48))) / 2))
+ then echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+$((${12}-${ButtonXPlace}))+$((${EWMHTop}+((((${6}-((${EWMHTop}+${EWMHBottom}+((${IconRowsNumber}*48))))))/2))))" >> "${deskmanfile}"
+ else echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+${ButtonXPlace}+$((${EWMHTop}+((((${6}-((${EWMHTop}+${EWMHBottom}+((${IconRowsNumber}*48))))))/2))))" >> "${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.
|