From 07d1d1663e4dedea1d2635468297d6e43fc794d3 Mon Sep 17 00:00:00 2001 From: Mid Favila Date: Wed, 7 Apr 2021 20:29:14 -0300 Subject: [PATCH] Small improvements all around. Check README. --- .data/prefrc | 53 +++++++++++++++------------ .data/prefs/cosmetics/font | 1 - .data/prefs/cosmetics/small_font | 1 + .data/prefs/cosmetics/small_font_bold | 1 + .data/prefs/cosmetics/std_font | 2 +- .data/prefs/cosmetics/std_font_bold | 1 + .data/prefs/cosmetics/ui_font | 1 + .data/prefs/cosmetics/ui_font_bold | 1 + .data/prefs/progs/term | 2 +- NEWS | 4 ++ README | 9 +++-- assets | 1 + infra/cosmrc | 2 +- infra/menurc | 8 ++-- modules/pager | 2 +- modules/shelf | 4 +- modules/taskbar | 2 +- scripts/posix/batman | 12 ++++-- 18 files changed, 65 insertions(+), 42 deletions(-) delete mode 100644 .data/prefs/cosmetics/font create mode 100644 .data/prefs/cosmetics/small_font create mode 100644 .data/prefs/cosmetics/small_font_bold create mode 100644 .data/prefs/cosmetics/std_font_bold create mode 100644 .data/prefs/cosmetics/ui_font create mode 100644 .data/prefs/cosmetics/ui_font_bold create mode 120000 assets diff --git a/.data/prefrc b/.data/prefrc index c76651f..47a50ee 100644 --- a/.data/prefrc +++ b/.data/prefrc @@ -1,29 +1,34 @@ # [Preferred Programs] -PipeRead 'echo "InfoStoreAdd term `cat $FVWM_USERDIR/.data/prefs/progs/term`"' -PipeRead 'echo "InfoStoreAdd editor `cat $FVWM_USERDIR/.data/prefs/progs/editor`"' -PipeRead 'echo "InfoStoreAdd deditor `cat $FVWM_USERDIR/.data/prefs/progs/deditor`" -PipeRead 'echo "InfoStoreAdd ide `cat $FVWM_USERDIR/.data/prefs/progs/ide`"' -PipeRead 'echo "InfoStoreAdd filer `cat $FVWM_USERDIR/.data/prefs/progs/filer`"' -PipeRead 'echo "InfoStoreAdd fbrowse `cat $FVWM_USERDIR/.data/prefs/progs/fbrowse`"' -PipeRead 'echo "InfoStoreAdd lbrowse `cat $FVWM_USERDIR/.data/prefs/progs/lbrowse`"' -PipeRead 'echo "InfoStoreAdd im `cat $FVWM_USERDIR/.data/prefs/progs/im`"' -PipeRead 'echo "InfoStoreAdd mail `cat $FVWM_USERDIR/.data/prefs/progs/mail`"' -PipeRead 'echo "InfoStoreAdd news `cat $FVWM_USERDIR/.data/prefs/progs/news`"' -PipeRead 'echo "InfoStoreAdd mplay `cat $FVWM_USERDIR/.data/prefs/progs/music`"' -PipeRead 'echo "InfoStoreAdd vplay `cat $FVWM_USERDIR/.data/prefs/progs/video`"' -PipeRead 'echo "InfoStoreAdd iedit `cat $FVWM_USERDIR/.data/prefs/progs/iedit`"' -PipeRead 'echo "InfoStoreAdd iview `cat $FVWM_USERDIR/.data/prefs/progs/iview`"' -PipeRead 'echo "InfoStoreAdd calc `cat $FVWM_USERDIR/.data/prefs/progs/calc`"' -PipeRead 'echo "InfoStoreAdd dview `cat $FVWM_USERDIR/.data/prefs/progs/dview`"' -PipeRead 'echo "InfoStoreAdd pmon `cat $FVWM_USERDIR/.data/prefs/progs/pmon`"' -PipeRead 'echo "InfoStoreAdd torrent `cat $FVWM_USERDIR/.data/prefs/progs/torrent`"' -PipeRead 'echo "InfoStoreAdd man `cat $FVWM_USERDIR/.data/prefs/progs/man`"' +PipeRead 'echo "InfoStoreAdd term `cat $FVWM_USERDIR/.data/prefs/progs/term`"' +PipeRead 'echo "InfoStoreAdd editor `cat $FVWM_USERDIR/.data/prefs/progs/editor`"' +PipeRead 'echo "InfoStoreAdd deditor `cat $FVWM_USERDIR/.data/prefs/progs/deditor`" +PipeRead 'echo "InfoStoreAdd ide `cat $FVWM_USERDIR/.data/prefs/progs/ide`"' +PipeRead 'echo "InfoStoreAdd filer `cat $FVWM_USERDIR/.data/prefs/progs/filer`"' +PipeRead 'echo "InfoStoreAdd fbrowse `cat $FVWM_USERDIR/.data/prefs/progs/fbrowse`"' +PipeRead 'echo "InfoStoreAdd lbrowse `cat $FVWM_USERDIR/.data/prefs/progs/lbrowse`"' +PipeRead 'echo "InfoStoreAdd im `cat $FVWM_USERDIR/.data/prefs/progs/im`"' +PipeRead 'echo "InfoStoreAdd mail `cat $FVWM_USERDIR/.data/prefs/progs/mail`"' +PipeRead 'echo "InfoStoreAdd news `cat $FVWM_USERDIR/.data/prefs/progs/news`"' +PipeRead 'echo "InfoStoreAdd mplay `cat $FVWM_USERDIR/.data/prefs/progs/music`"' +PipeRead 'echo "InfoStoreAdd vplay `cat $FVWM_USERDIR/.data/prefs/progs/video`"' +PipeRead 'echo "InfoStoreAdd iedit `cat $FVWM_USERDIR/.data/prefs/progs/iedit`"' +PipeRead 'echo "InfoStoreAdd iview `cat $FVWM_USERDIR/.data/prefs/progs/iview`"' +PipeRead 'echo "InfoStoreAdd calc `cat $FVWM_USERDIR/.data/prefs/progs/calc`"' +PipeRead 'echo "InfoStoreAdd dview `cat $FVWM_USERDIR/.data/prefs/progs/dview`"' +PipeRead 'echo "InfoStoreAdd pmon `cat $FVWM_USERDIR/.data/prefs/progs/pmon`"' +PipeRead 'echo "InfoStoreAdd torrent `cat $FVWM_USERDIR/.data/prefs/progs/torrent`"' +PipeRead 'echo "InfoStoreAdd man `cat $FVWM_USERDIR/.data/prefs/progs/man`"' # [Daemons] -PipeRead 'echo "InfoStoreAdd compositor `cat $FVWM_USERDIR/.data/prefs/progs/compositor`"' -PipeRead 'echo "InfoStoreAdd locker `cat $FVWM_USERDIR/.data/prefs/progs/locker`"' +PipeRead 'echo "InfoStoreAdd compositor `cat $FVWM_USERDIR/.data/prefs/progs/compositor`"' +PipeRead 'echo "InfoStoreAdd locker `cat $FVWM_USERDIR/.data/prefs/progs/locker`"' # [Current Theme] -PipeRead 'echo "InfoStoreAdd theme `cat $FVWM_USERDIR/.data/prefs/cosmetics/theme`"' -PipeRead 'echo "InfoStoreAdd pape `cat $FVWM_USERDIR/.data/prefs/cosmetics/pape`"' -PipeRead 'echo "InfoStoreAdd std_font `cat $FVWM_USERDIR/.data/prefs/cosmetics/std_font`"' +PipeRead 'echo "InfoStoreAdd theme `cat $FVWM_USERDIR/.data/prefs/cosmetics/theme`"' +PipeRead 'echo "InfoStoreAdd pape `cat $FVWM_USERDIR/.data/prefs/cosmetics/pape`"' +PipeRead 'echo "InfoStoreAdd std_font `cat $FVWM_USERDIR/.data/prefs/cosmetics/std_font`"' +PipeRead 'echo "InfoStoreAdd ui_font `cat $FVWM_USERDIR/.data/prefs/cosmetics/ui_font`"' +PipeRead 'echo "InfoStoreAdd small_font `cat $FVWM_USERDIR/.data/prefs/cosmetics/ui_font`"' +PipeRead 'echo "InfoStoreAdd std_font_bold `cat $FVWM_USERDIR/.data/prefs/cosmetics/std_font`"' +PipeRead 'echo "InfoStoreAdd ui_font_bold `cat $FVWM_USERDIR/.data/prefs/cosmetics/ui_font`"' +PipeRead 'echo "InfoStoreAdd small_font_bold `cat $FVWM_USERDIR/.data/prefs/cosmetics/ui_font`"' diff --git a/.data/prefs/cosmetics/font b/.data/prefs/cosmetics/font deleted file mode 100644 index 0e53eb3..0000000 --- a/.data/prefs/cosmetics/font +++ /dev/null @@ -1 +0,0 @@ -xft:Cozette 10: diff --git a/.data/prefs/cosmetics/small_font b/.data/prefs/cosmetics/small_font new file mode 100644 index 0000000..f6cb6d0 --- /dev/null +++ b/.data/prefs/cosmetics/small_font @@ -0,0 +1 @@ +"xft:Exo:style=Regular:size=8" diff --git a/.data/prefs/cosmetics/small_font_bold b/.data/prefs/cosmetics/small_font_bold new file mode 100644 index 0000000..8548e35 --- /dev/null +++ b/.data/prefs/cosmetics/small_font_bold @@ -0,0 +1 @@ +"xft:Exo:style=Bold:size=8" diff --git a/.data/prefs/cosmetics/std_font b/.data/prefs/cosmetics/std_font index d2d55a2..064554f 100644 --- a/.data/prefs/cosmetics/std_font +++ b/.data/prefs/cosmetics/std_font @@ -1 +1 @@ -"xft:Monospace:size=14:antialias=True" +"xft:Exo:style=Regular:size=14" diff --git a/.data/prefs/cosmetics/std_font_bold b/.data/prefs/cosmetics/std_font_bold new file mode 100644 index 0000000..9b0c8dc --- /dev/null +++ b/.data/prefs/cosmetics/std_font_bold @@ -0,0 +1 @@ +"xft:Exo:style=Bold:size=14" diff --git a/.data/prefs/cosmetics/ui_font b/.data/prefs/cosmetics/ui_font new file mode 100644 index 0000000..b93821e --- /dev/null +++ b/.data/prefs/cosmetics/ui_font @@ -0,0 +1 @@ +"xft:Exo:style=Regular:size=12" diff --git a/.data/prefs/cosmetics/ui_font_bold b/.data/prefs/cosmetics/ui_font_bold new file mode 100644 index 0000000..8cf67eb --- /dev/null +++ b/.data/prefs/cosmetics/ui_font_bold @@ -0,0 +1 @@ +"xft:Exo:style=Bold:size=12" diff --git a/.data/prefs/progs/term b/.data/prefs/progs/term index d871489..db0c341 100644 --- a/.data/prefs/progs/term +++ b/.data/prefs/progs/term @@ -1 +1 @@ -urxvt +xterm diff --git a/NEWS b/NEWS index 867dea1..f6db300 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ + 7/4/2021: Refine font management and fix some menu bugs. batman no longer + activates on machines lacking a battery, saving some memory and + sanity. README updated. + 6/2/2021: Initial git push to SDF. Split logic and assets. diff --git a/README b/README index 1d11e59..9f663dc 100644 --- a/README +++ b/README @@ -19,11 +19,14 @@ *scrot, for screenshot functionality *stalonetray, for the shelf's tray *libxpm, for rendering window decorations - *xcompmgr, for lightweight and simple compositing (optional) *xclock, for the system clock - *xosview, for system monitors - *xcalendar, for a lightweight scheduling system Any rights to the assets that are distributed with this tarball or recommended for use are reserved by their original authors. If you like them, please support their work. + + Additional software I recommend for use with FXDE is as follows; + + *xcompmgr, lightweight compositing + *xcalendar, simple scheduling + *xosview, realtime system monitors diff --git a/assets b/assets new file mode 120000 index 0000000..c55060f --- /dev/null +++ b/assets @@ -0,0 +1 @@ +../fxde-assets/ \ No newline at end of file diff --git a/infra/cosmrc b/infra/cosmrc index dc2354e..94ad618 100644 --- a/infra/cosmrc +++ b/infra/cosmrc @@ -1,5 +1,5 @@ # Set the standard font for elements. -Style * Font $[infostore.std_font] +Style * Font "$[infostore.std_font]" # Load theme settings. Read $[infostore.theme] diff --git a/infra/menurc b/infra/menurc index 487d589..65935e2 100644 --- a/infra/menurc +++ b/infra/menurc @@ -1,7 +1,9 @@ # The first section of the document defines the look and feel of menus. MenuStyle * PopupDelayed, PopupDelay 300, PopupAsSubmenu, HoldSubmenus \ - PopupOffset 1 100, PopdownImmediately, + PopupOffset 1 100, PopdownImmediately, Font "$[infostore.small_font]", \ + HilightTitleBack, TitleColorset 6, InactiveColorset 5, ActiveColorset 6, \ + HilightBack @@ -53,7 +55,7 @@ AddToMenu MediaMenu "$[gt. Media ]" Title DestroyMenu UtilMenu -AddToMenu UtilMenu "$[gt. Utilities ]" +AddToMenu UtilMenu "$[gt. Utilities ]" Title + "Calculator" Exec exec $[infostore.calc] + "Doc Viewer" Exec exec $[infostore.dview] @@ -66,7 +68,7 @@ AddToMenu UtilMenu "$[gt. Utilities ]" DestroyMenu InfoMenu -AddToMenu InfoMenu "$[gt. Sysinfo ]" +AddToMenu InfoMenu "$[gt. Sysinfo ]" Title + "Task Manager" Exec exec $[infostore.pmon] + "Systems Check" Module FvwmScript $[infostore.fscript]/FXDE-SystemsCheck diff --git a/modules/pager b/modules/pager index 0a52c9e..081b1e3 100644 --- a/modules/pager +++ b/modules/pager @@ -3,7 +3,7 @@ Style "ShelfPager" NoTitle, !Handles, !Borders, Sticky, WindowList DestroyModuleConfig ShelfPager *ShelfPager: Geometry 100+100 -*ShelfPager: Font "xft:Cozette:Medium:Roman:size=8" +*ShelfPager: Font "$[infostore.ui_font_bold]" *ShelfPager: Rows 1 *ShelfPager: Columns 1 *ShelfPager: HilightColorset * 3 diff --git a/modules/shelf b/modules/shelf index ea0c0dd..be9d072 100644 --- a/modules/shelf +++ b/modules/shelf @@ -13,7 +13,7 @@ DestroyModuleConfig Shelf *Shelf: Padding 2 2 *Shelf: Colorset 10 *Shelf: BoxSize fixed -*Shelf: Font $[infostore.font_ui] +*Shelf: Font "$[infostore.ui_font_bold]" *Shelf: Colorset 9 *Shelf: PressColorset 10 # Columns are X, rows are Y @@ -58,6 +58,6 @@ PipeRead 'echo "*Shelf: (Size 131x$(((($[vp.height]/53)*29)))), Frame 0)"' *Shelf: (Size 131x5, Frame 0) -*Shelf: (Action Exec exec xcalendar, Size 131x30, Frame 0, Swallow xclock, 'Exec exec /usr/bin/xclock -digital -strftime "%a %H:%M:%S" -update 1 -bg "#BEBEBE" -sharp -face "xft:Cozette:Medium:Roman:size=13"') +*Shelf: (Action Exec exec xcalendar, Size 131x30, Frame 0, Swallow xclock, 'Exec exec /usr/bin/xclock -digital -strftime "%a %H:%M:%S" -update 1 -bg "#BEBEBE" -sharp -face "$[infostore.small_font]"') *Shelf: (Size 131x130, Frame 0, Swallow ShelfPager) diff --git a/modules/taskbar b/modules/taskbar index c4fe3f4..1c623e9 100644 --- a/modules/taskbar +++ b/modules/taskbar @@ -5,7 +5,7 @@ DestroyModuleConfig TaskBar Style "TaskBar" NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \ CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, \ !Iconifiable, NeverFocus -*TaskBarButtons: Font "xft:Cozette:Medium:Roman:size=8" +*TaskBarButtons: Font "$[infostore.small_font_bold]" PipeRead 'echo "*TaskBar: Geometry $(($[vp.width]-136))x32-136@g)"' *TaskBar: Columns $[vp.width] diff --git a/scripts/posix/batman b/scripts/posix/batman index c3930da..a618a5f 100755 --- a/scripts/posix/batman +++ b/scripts/posix/batman @@ -1,10 +1,14 @@ #!/bin/sh while true -do sleep 60 +do if [ -e /sys/class/power_supply/BAT1/capacity ] # Do we have a battery to monitor? +then sleep 60 x=`cat /sys/class/power_supply/BAT1/capacity` -while [ $x -le 25 ] +if [ $x -le 25 ] # When do we notify the user? do aplay $FVWM_USERDIR/sounds/CritNotif.wav & -printf "Battery alert!\nYour battery only has a remaining capacity of $x!" | xmessage -file - -center -done +printf "Battery alert!\nYour battery only has a remaining capacity of $x%!" | xmessage -file - -center +sleep 300 # Don't spam the user!!! +x=`cat /sys/class/power_supply/BAT1/capacity` # Obtain new value. +else exit +fi done