From 1b329b63d56185f73f3c6890236a8a47a656cccf Mon Sep 17 00:00:00 2001 From: Mid Favila Date: Fri, 30 Apr 2021 23:50:29 -0300 Subject: [PATCH] Stuff. --- docs/Migration | 19 ++ fvwm_mfl_:0.pid | 1 + infra/cosmrc | 6 +- infra/funcrc | 61 ++-- infra/kbindrc | 32 +- infra/menurc | 50 +-- infra/windrc | 27 +- mainrc | 15 +- modules/events | 2 +- modules/pager | 24 +- modules/shelf | 87 ++--- modules/taskbar | 65 ++-- modules/taskbar.broken | 55 +++ modules/taskbar.new | 26 ++ modules/taskbar.old | 54 +++ scripts/fvwmscript/FXDE-SystemsCheck | 323 ++++++++++++++++++ scripts/fvwmscript/fxde-systemscheck | 138 ++++++++ .../{FvwmScript-Sysinfo => sysinfo.old} | 0 scripts/fvwmscript/test | 23 ++ 19 files changed, 817 insertions(+), 191 deletions(-) create mode 100644 docs/Migration create mode 100644 fvwm_mfl_:0.pid create mode 100644 modules/taskbar.broken create mode 100644 modules/taskbar.new create mode 100644 modules/taskbar.old create mode 100644 scripts/fvwmscript/FXDE-SystemsCheck create mode 100644 scripts/fvwmscript/fxde-systemscheck rename scripts/fvwmscript/{FvwmScript-Sysinfo => sysinfo.old} (100%) create mode 100644 scripts/fvwmscript/test diff --git a/docs/Migration b/docs/Migration new file mode 100644 index 0000000..c2f54a2 --- /dev/null +++ b/docs/Migration @@ -0,0 +1,19 @@ + FVWM3 has been available for some time now, and I feel it pertinent to begin + shifting to the new builds. They appear to be more efficient, require fewer + dependencies, and have new features. + + However, due to these new features, there have been breakages in my + configuration; for a long time I've ignored this, but no longer. The most + immediate cause for concern is that the taskbar module does not maintain + positions throughout reboot; instead, it bases its far right edge position on + the current focused page. + + The iconman embedded in the taskbar does not extend across the taskbar's + entirety, either. + + Lastly, the pager's proportions are wildly deviant. + + These three things must be corrected before a permanent shift can take place. + + Pager is corrected + diff --git a/fvwm_mfl_:0.pid b/fvwm_mfl_:0.pid new file mode 100644 index 0000000..90d9e23 --- /dev/null +++ b/fvwm_mfl_:0.pid @@ -0,0 +1 @@ +21847 \ No newline at end of file diff --git a/infra/cosmrc b/infra/cosmrc index 59e38a1..1284d47 100644 --- a/infra/cosmrc +++ b/infra/cosmrc @@ -2,9 +2,9 @@ Style * Font "$[infostore.std_font]" # Set FvwmScript theme settings. -*FvwmScript: DefaultFont "$[infostore.small_font]" +*FvwmScript: DefaultFont "$[infostore.small_font]" *FvwmScript: DefaultColorset 9 # Load theme settings. -Read $[FVWM_USERDIR]/assets/themes/$[infostore.theme]/theme.conf - Read $[FVWM_USERDIR]/assets/cursors/$[infostore.cursor]/theme.conf +Read $[FVWM_USERDIR]/assets/themes/$[infostore.theme]/theme.conf +Read $[FVWM_USERDIR]/assets/cursors/$[infostore.cursor]/theme.conf diff --git a/infra/funcrc b/infra/funcrc index 1197ed0..75d4936 100644 --- a/infra/funcrc +++ b/infra/funcrc @@ -1,75 +1,70 @@ # Test function. You shouldn't be seeing this. - DestroyFunc TestScrotFunc AddToFunc TestScrotFunc - + I Exec exec $[infostore.posix]/hunter -g + + I Exec $[infostore.posix]/hunter -g # Load and restore preferences. - DestroyFunc PrefFunc -AddToFunc PrefFunc +AddToFunc PrefFunc - + I Read $[FVWM_USERDIR]/.data/prefrc - + I Function PaperBoy $[infostore.papedir]/$[infostore.pape] + + I Read $[FVWM_USERDIR]/.data/prefrc + + I Function PaperBoy $[infostore.papedir]/$[infostore.pape] # Start daemons. - DestroyFunc DaemonFunc AddToFunc DaemonFunc - + I Exec exec $[infostore.compositor] -c - + I Exec exec /usr/bin/xssstart $[infostore.locker] - + I Exec exec $[infostore.notifs] - + I Exec exec $[infostore.posix]/batman - + I Module FvwmCommandS + + I Exec $[infostore.compositor] -c + + I Exec /usr/bin/env xssstart $[infostore.locker] + + I Exec $[infostore.notifs] + + I Exec $[infostore.posix]/batman + + I Module FvwmCommandS # Spawn modules and whatnot. +DestroyFunc ModuleFunc +AddToFunc ModuleFunc -AddToFunc ModuleFunc - + I Module FvwmEvent AudioEvents - + I Module FvwmButtons TaskBar - + I Schedule 5 Module FvwmButtons Shelf - + I Schedule 10 Module FvwmPager ShelfPager + + I Module FvwmEvent AudioEvents +# + I Module FvwmButtons TaskBar +# + I Schedule 5 Module FvwmIconMan TaskBarButtons + + I Schedule 5 Module FvwmButtons Shelf + + I Schedule 10 Module FvwmPager ShelfPager # Define how to handle task switching. - DestroyFunc TaskSwitchFunc AddToFunc TaskSwitchFunc - + I Iconify off + + I Iconify off + I Focus + I Raise + I WarpToWindow !raise 5 5 # Define the "Show Desktop" feature - DestroyFunc ShowDeskFunc AddToFunc ShowDeskFunc - + I All (CurrentDesk, Iconic, State 1) HideDeskFunc - + I TestRc (Match) Break - + I All (CurrentDesk, !Iconic, !State 1) ThisWindow State 1 True - + I All (CurrentDesk, !Iconic, State 1) Iconify + + I All (CurrentDesk, Iconic, State 1) HideDeskFunc + + I TestRc (Match) Break + + I All (CurrentDesk, !Iconic, !State 1) ThisWindow State 1 True + + I All (CurrentDesk, !Iconic, State 1) Iconify DestroyFunc HideDeskFunc AddToFunc HideDeskFunc - - + I All (CurrentDesk, Iconic, State 1) Iconify off - + I All (CurrentDesk, State1) ThisWindow State 1 False + + I All (CurrentDesk, Iconic, State 1) Iconify off + + I All (CurrentDesk, State1) ThisWindow State 1 False # Remove widgets and set window dimensions to the size of the screen minus the # UI elements. This simulates "full screen" without covering stuff. - +# Currently a WIP. DestroyFunc LargeifyFunc AddToFunc LargeifyFunc - + I PipeRead "" + + I Maximize # A simple function to set the wallpaper. - DestroyFunc PaperBoy -AddToFunc PaperBoy -+ I InfoStoreAdd pape $[FVWM_USERDIR]/.data/prefs/cosmetics/pape -+ I Exec exec $[infostore.posix]/paperboy $[infostore.papedir]/`cat $[infostore.pape]` +AddToFunc PaperBoy + + I InfoStoreAdd pape $[FVWM_USERDIR]/.data/prefs/cosmetics/pape + + I Exec $[infostore.posix]/paperboy $[infostore.papedir]/`cat $[infostore.pape]` diff --git a/infra/kbindrc b/infra/kbindrc index d7179bb..eee5632 100644 --- a/infra/kbindrc +++ b/infra/kbindrc @@ -2,30 +2,28 @@ IgnoreModifiers L25 # Disable the root menu -Mouse 1 R A +Mouse 1 R A # Bind the session manager and execute dialog -Key Delete A CM Module FvwmScript $[infostore.fscript]/FvwmScript-ConfirmQuit -Key Return A C Module FvwmScript $[infostore.fscript]/FvwmScript-Execute +Key Delete A CM Module FvwmScript $[infostore.fscript]/FvwmScript-ConfirmQuit +Key Return A C Module FvwmScript $[infostore.fscript]/FvwmScript-Execute # Program shortcuts -Key T A CM Exec exec $[infostore.term] -Key E A CM Exec exec $[infostore.editor] -Key F A CM Exec exec $[infostore.filer] -Key B A CM Exec exec $[infostore.lbrowse] -Key M A CM Exec exec $[infostore.mail] -Key N A CM Exec exec $[infostore.news] -Key I A CM Exec exec $[infostore.im] -Key C A CM Exec exec $[infostore.calc] +Key T A CM Exec $[infostore.term] +Key E A CM Exec $[infostore.editor] +Key F A CM Exec $[infostore.filer] +Key B A CM Exec $[infostore.lbrowse] +Key M A CM Exec $[infostore.mail] +Key N A CM Exec $[infostore.news] +Key I A CM Exec $[infostore.im] +Key C A CM Exec $[infostore.calc] # Shortcut for killing stuff -Key Q A CM Close +Key Q A CM Close # Window focus -Key Tab A M Next (CurrentDesk, AcceptsFocus) TaskSwitchFunc -Key Tab A SM Prev (CurrentDesk, AcceptsFocus) TaskSwitchFunc +Key Tab A M Next (CurrentPage, AnyScreen, AcceptsFocus) TaskSwitchFunc +Key Tab A SM Prev (CurrentPage, AnyScreen, AcceptsFocus) TaskSwitchFunc # Maximize -Key F11 A A Maximize - - +Key F11 A A Maximize diff --git a/infra/menurc b/infra/menurc index 2140d2b..c45cc2d 100644 --- a/infra/menurc +++ b/infra/menurc @@ -1,6 +1,6 @@ # The first section of the document defines the look and feel of menus. - MenuStyle * MenuColorset 5, PopupDelayed, PopupDelay 300, PopupAsSubmenu, \ +MenuStyle * MenuColorset 5, PopupDelayed, PopupDelay 300, PopupAsSubmenu, \ HoldSubmenus, PopupOffset 1 100, PopdownImmediately, HilightTitleBack, \ TitleColorset 6, InactiveColorset 5, ActiveColorset 6, HilightBack, \ Font "$[infostore.small_font]" @@ -32,44 +32,44 @@ AddToMenu EditMenu "$[gt. Editors ]" Title DestroyMenu BrowseMenu -AddToMenu BrowseMenu "$[gt. Browsers ]" Title +AddToMenu BrowseMenu "$[gt. Browsers ]" Title - + "Full" Exec exec $[infostore.fbrowse] - + "Lite" Exec exec $[infostore.lbrowse] + + "Full" Exec exec $[infostore.fbrowse] + + "Lite" Exec exec $[infostore.lbrowse] DestroyMenu CommsMenu -AddToMenu CommsMenu "$[gt. Comms ]" Title +AddToMenu CommsMenu "$[gt. Comms ]" Title - + "Mail" Exec exec $[infostore.mail] - + "News" Exec exec $[infostore.news] - + "IM" Exec exec $[infostore.im] + + "Mail" Exec exec $[infostore.mail] + + "News" Exec exec $[infostore.news] + + "IM" Exec exec $[infostore.im] DestroyMenu MediaMenu -AddToMenu MediaMenu "$[gt. Media ]" Title +AddToMenu MediaMenu "$[gt. Media ]" Title - + "Video Player" Exec exec $[infostore.vplay] - + "Music Player" Exec exec $[infostore.mplay] - + "Image Viewer" Exec exec $[infostore.iview] - + "Image Editor" Exec exec $[infostore.iedit] + + "Video Player" Exec exec $[infostore.vplay] + + "Music Player" Exec exec $[infostore.mplay] + + "Image Viewer" Exec exec $[infostore.iview] + + "Image Editor" Exec exec $[infostore.iedit] DestroyMenu UtilMenu -AddToMenu UtilMenu "$[gt. Utilities ]" Title +AddToMenu UtilMenu "$[gt. Utilities ]" Title - + "Calculator" Exec exec $[infostore.calc] - + "Doc Viewer" Exec exec $[infostore.dview] - + "Torrents" Exec exec $[infostore.torrent] - + "" Nop - + "Screenshot" Exec exec $[infostore.posix]/hunter -g - + "Identify" Module FvwmIdent - + "" Nop - + "Manual" Exec exec $[infostore.man] + + "Calculator" Exec exec $[infostore.calc] + + "Doc Viewer" Exec exec $[infostore.dview] + + "Torrents" Exec exec $[infostore.torrent] + + "" Nop + + "Screenshot" Exec exec $[infostore.posix]/hunter -g + + "Identify" Module FvwmIdent + + "" Nop + + "Manual" Exec exec $[infostore.man] DestroyMenu InfoMenu -AddToMenu InfoMenu "$[gt. Sysinfo ]" Title +AddToMenu InfoMenu "$[gt. Sysinfo ]" Title - + "Task Manager" Exec exec $[infostore.pmon] - + "Systems Check" Module FvwmScript $[infostore.fscript]/FXDE-SystemsCheck + + "Task Manager" Exec exec $[infostore.pmon] + + "Systems Check" Module FvwmScript $[infostore.fscript]/FXDE-SystemsCheck diff --git a/infra/windrc b/infra/windrc index 03d923e..9848161 100644 --- a/infra/windrc +++ b/infra/windrc @@ -1,23 +1,28 @@ # Define how to handle windows in general. -EwmhBaseStruts 0 136 32 0 -ClickTime 250 -MoveThreshold 2 +#EwmhBaseStruts 0 136 32 0 +EwmhBaseStruts 0 136 0 0 +ClickTime 250 +MoveThreshold 2 -Style * SloppyFocus -Style * TileCascadePlacement +Style * SloppyFocus +Style * TileCascadePlacement # Define how to handle system windows -Style Session GrabFocus,WindowListSkip,StaysOnTop,Sticky,PositionPlacement Center -Style Run... GrabFocus,WindowListSkip,StaysOnTop,Sticky,PositionPlacement Center +Style Session GrabFocus,WindowListSkip,StaysOnTop,Sticky,PositionPlacement\ + Center +Style Run... GrabFocus,WindowListSkip,StaysOnTop,Sticky,PositionPlacement\ + Center # Define how to handle application windows Style XCalendar !Title,!Borders,!Handles,Sticky,StaysOnTop,WindowListSkip -Style svkbd !Title,!Borders,!Handles,Sticky,StaysOnTop,WindowListSkip,NeverFocus -Style XVkbd !Title,!Borders,!Handles,Sticky,StaysOnTop,WindowListSkip,NeverFocus +Style svkbd !Title,!Borders,!Handles,Sticky,StaysOnTop,WindowListSkip,\ + NeverFocus +Style XVkbd !Title,!Borders,!Handles,Sticky,StaysOnTop,WindowListSkip,\ + NeverFocus # We don't want to worry about rubber-banding freezing the screen... -OpaqueMoveSize unlimited +OpaqueMoveSize unlimited # This is an icon-free zone, ma'am. -Style * NoIcon +Style * NoIcon diff --git a/mainrc b/mainrc index 5425d63..a02b9fa 100644 --- a/mainrc +++ b/mainrc @@ -1,8 +1,5 @@ # StartFunction executes every time FVWM executes. # Load in necessary data. - - - Read .data/prefrc Read infra/funcrc Read infra/varrc @@ -10,19 +7,25 @@ Read infra/cosmrc Read infra/kbindrc Read infra/menurc Read infra/windrc - Read modules/shelf Read modules/taskbar Read modules/pager Read modules/events +# What do we autostart? DestroyFunc StartFunction -AddToFunc StartFunction +AddToFunc StartFunction - + I Exec exec $[infostore.posix]/janitor + + I Exec $[infostore.posix]/janitor + I Function PrefFunc + I Function ModuleFunc + I Schedule 250 Function DaemonFunc # This setting is useful if you have a multi-head system. EdgeScroll 0 0 + +# This controls names and the number of pages you have. +DesktopName 0 General 1 +DesktopName 1 General 2 +DesktopName 2 General 3 +DesktopSize 3x3 diff --git a/modules/events b/modules/events index 600c94f..98e47c5 100644 --- a/modules/events +++ b/modules/events @@ -1,6 +1,6 @@ DestroyModuleConf AudioEvents - *AudioEvents: Cmd "Exec exec /usr/bin/aplay" + *AudioEvents: Cmd "Exec /usr/bin/aplay" *AudioEvents: StartDelay 2.5 *AudioEvents: startup $[FVWM_USERDIR]/assets/audio/Login.wav diff --git a/modules/pager b/modules/pager index 8ad15ab..aaf9345 100644 --- a/modules/pager +++ b/modules/pager @@ -1,14 +1,18 @@ -Style "ShelfPager" NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \ - CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, !Iconifiable +Style "ShelfPager" NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \ + CirculateSkip, StaysOnBottom, FixedPosition, FixedSize,\ + !Iconifiable DestroyModuleConfig ShelfPager -*ShelfPager: Geometry 100+100 -*ShelfPager: Font "$[infostore.ui_font_bold]" -*ShelfPager: Rows 1 -*ShelfPager: Columns 1 -*ShelfPager: Colorset * 13 +*ShelfPager: Geometry 100+100 +*ShelfPager: Font "$[infostore.ui_font_bold]" +*ShelfPager: Rows 1 +*ShelfPager: Columns 1 +*ShelfPager: Colorset * 13 *ShelfPager: HilightColorset * 14 -*ShelfPager: Back rgb:BE/BE/BE -*ShelfPager: WindowColors rgb:A5/A5/A5 rgb:A5/A5/A5 rgb:9B/A9/C9 rgb:9B/A9/C9 +*ShelfPager: Back rgb:BE/BE/BE +*ShelfPager: WindowColors rgb:A5/A5/A5 \ + rgb:A5/A5/A5 \ + rgb:9B/A9/C9 \ + rgb:9B/A9/C9 *ShelfPager: SolidSeparators -*ShelfPager: Label * FXDE +*ShelfPager: Label * FXDE diff --git a/modules/shelf b/modules/shelf index be9d072..cdc6081 100644 --- a/modules/shelf +++ b/modules/shelf @@ -1,43 +1,46 @@ #Define the shelf. -Style "Shelf" NeverFocus, NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \ - CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, \ - !Iconifiable, !Closable, !Maximizable +Style "Shelf" NeverFocus, NoTitle, !Handles, !Borders, Sticky, FixedSize, \ + WindowListSkip, CirculateSkip, StaysOnBottom, FixedPosition,\ + !Iconifiable, !Closable, !Maximizable DestroyModuleConfig Shelf -*Shelf: Geometry 136x$[vp.height]-0-0@g -*Shelf: Columns 136 -*Shelf: Rows $[vp.height] -*Shelf: Frame 2 -*Shelf: Padding 2 2 -*Shelf: Colorset 10 -*Shelf: BoxSize fixed -*Shelf: Font "$[infostore.ui_font_bold]" -*Shelf: Colorset 9 -*Shelf: PressColorset 10 -# Columns are X, rows are Y +*Shelf: Geometry 136x$[vp.height]-0-0@g +*Shelf: Columns 136 +*Shelf: Rows $[vp.height] +*Shelf: Frame 2 +*Shelf: Padding 2 2 +*Shelf: Colorset 10 +*Shelf: BoxSize fixed +*Shelf: Font "$[infostore.ui_font_bold]" +*Shelf: Colorset 9 +*Shelf: PressColorset 10 -*Shelf: (Size 5x$[vp.height]) -*Shelf: (Size 131x5, ActiveColorset 10, PressColorset 10) +# Provide a bevel. +*Shelf: (Size 5x$[vp.height]) +*Shelf: (Size 131x5, ActiveColorset 10, PressColorset 10) -*Shelf: (Size 131x30, Title (Right) Terminal, Action Exec exec $[infostore.term] -*Shelf: (Size 131x30, Title (Right) Editors , Action Menu EditMenu) -*Shelf: (Size 131x30, Title (Right) Files , Action Exec exec $[infostore.filer]) -*Shelf: (Size 131x30, Title (Right) Browsers , Action Menu BrowseMenu) -*Shelf: (Size 131x30, Title (Right) Comms , Action Menu CommsMenu) -*Shelf: (Size 131x30, Title (Right) Media , Action Menu MediaMenu) -*Shelf: (Size 131x30, Title (Right) Utilities , Action Menu UtilMenu) +*Shelf: (Size 131x30, Title (Right) Terminal, Action Exec exec $[infostore.term] +*Shelf: (Size 131x30, Title (Right) Editors , Action Menu EditMenu) +*Shelf: (Size 131x30, Title (Right) Files , Action Exec exec $[infostore.filer]) +*Shelf: (Size 131x30, Title (Right) Browsers , Action Menu BrowseMenu) +*Shelf: (Size 131x30, Title (Right) Comms , Action Menu CommsMenu) +*Shelf: (Size 131x30, Title (Right) Media , Action Menu MediaMenu) +*Shelf: (Size 131x30, Title (Right) Utilities , Action Menu UtilMenu) -*Shelf: (Size 131x15, Frame 0) +*Shelf: (Size 131x15, Frame 0) -*Shelf: (Size 131x30, Title (Right) Run , Action Module FvwmScript $[infostore.fscript]/FvwmScript-Execute) -*Shelf: (Size 131x30, Title (Right) Configure , Action Module FvwmScript $[infostore.fscript]/FXDE-ControlPanel) -*Shelf: (Size 131x30, Title (Right) Sysinfo , Action Menu InfoMenu) -*Shelf: (Size 131x30, Title (Right) Hide , Action Function ShowDeskFunc) -*Shelf: (Size 131x30, Title (Right) Lock , Action Exec exec xset s activate) -*Shelf: (Size 131x30, Title (Right) Logout , Action Module FvwmScript $[infostore.fscript]/FvwmScript-ConfirmQuit) +*Shelf: (Size 131x30, Title (Right) Run , Action Module FvwmScript \ + $[infostore.fscript]/FvwmScript-Execute) +*Shelf: (Size 131x30, Title (Right) Configure , Action Module FvwmScript \ + $[infostore.fscript]/FXDE-ControlPanel) +*Shelf: (Size 131x30, Title (Right) Sysinfo , Action Menu InfoMenu) +*Shelf: (Size 131x30, Title (Right) Hide , Action Function ShowDeskFunc) +*Shelf: (Size 131x30, Title (Right) Lock , Action Exec exec xset s activate) +*Shelf: (Size 131x30, Title (Right) Logout , Action Module FvwmScript \ + $[infostore.fscript]/FvwmScript-ConfirmQuit) PipeRead 'echo "*Shelf: (Size 131x$(((($[vp.height]/106)*1)))), Frame 0)"' @@ -45,19 +48,23 @@ PipeRead 'echo "*Shelf: (Size 131x$(((($[vp.height]/106)*1)))), Frame 0)"' #*Shelf: (Size 64x64, Frame 0, Swallow wmix, 'Exec exec wmix', Frame 1) #*Shelf: (Size 64x64, Frame 0, Swallow wmmon, 'Exec exec wmmon -l', Frame 1) -#*Shelf: (Size 64x64, Frame 0, Swallow wmmon, 'Exec exec wmmon -l -s -b', Frame 1) +#*Shelf: (Size 64x64, Frame 0, Swallow wmmon, 'Exec exec wmmon -l -s -b', \ + Frame 1) #*Shelf: (Size 64x64, Frame 0, Swallow wmcalc, 'Exec exec wmcalc', Frame 1) -#*Shelf: (Size 64x64, Frame 0, Swallow wmmoonclock, 'Exec exec wmmoonclock', Frame 1) +#*Shelf: (Size 64x64, Frame 0, Swallow wmmoonclock, 'Exec exec wmmoonclock', \ + Frame 1) -PipeRead 'echo "*Shelf: (Size 131x$(((($[vp.height]/53)*3)))), Frame 0, Swallow xosview" ", \'Exec exec xosview\')"' +PipeRead 'echo "*Shelf: (Size 131x$(((($[vp.height]/53)*3)))), Frame 0, Swallow \ + xosview" ", \'Exec exec xosview\')"' PipeRead 'echo "*Shelf: (Size 131x$(((($[vp.height]/53)*29)))), Frame 0)"' -*Shelf: (Size 131x60, Frame 0, Swallow stalonetray, 'Exec exec stalonetray --kludges force_icons_size --icon-size 32 --icon-gravity SE --geometry 4x2 --background "#BEBEBE"') - -*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 "$[infostore.small_font]"') - -*Shelf: (Size 131x130, Frame 0, Swallow ShelfPager) +*Shelf: (Size 131x60, Frame 0, Swallow stalonetray, 'Exec exec stalonetray \ + --kludges force_icons_size --icon-size 32 --icon-gravity SE \ + --geometry 4x2 --background "#BEBEBE"') +*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 "$[infostore.small_font]"') +*Shelf: (Size 131x130, Frame 0, Swallow ShelfPager) diff --git a/modules/taskbar b/modules/taskbar index 1c623e9..da49aec 100644 --- a/modules/taskbar +++ b/modules/taskbar @@ -1,54 +1,29 @@ -# Define the taskbar. - +# Taskbar definition. DestroyModuleConfig TaskBar -Style "TaskBar" NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \ - CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, \ - !Iconifiable, NeverFocus -*TaskBarButtons: Font "$[infostore.small_font_bold]" +Style "TaskBar" !Title, !Handles, !Borders, Sticky, WindowListSkip, \ + CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, \ + !Iconifiable, NeverFocus -PipeRead 'echo "*TaskBar: Geometry $(($[vp.width]-136))x32-136@g)"' -*TaskBar: Columns $[vp.width] -*TaskBar: Rows 32 -*TaskBar: Frame 0 -*TaskBar: Colorset 9 + *TaskBar: Geometry $[wa.width]x32-137@g + *TaskBar: Columns $[wa.width] + *TaskBar: Rows 32 + *TaskBar: Frame 0 + *TaskBar: Colorset 9 + *TaskBar: BoxSize fixed -# Swallow the buttonbar. -*TaskBar: (Size $[vp.width]x28, Swallow TaskBarButtons 'Module FvwmIconMan TaskBarButtons')'" +#PipeRead `echo "*TaskBar: (Size 100000x30, Swallow TaskBarButtons 'Module \ +# FvwmIconMan TaskBarButtons')"` -# Define the buttonbar. + +# Buttons definition DestroyModuleConfig TaskBarButtons -*TaskBarButtons: UseWinList true -*TaskBarButtons: Resolution page -*TaskBarButtons: Tips needed + *TaskBarButtons: UseWinList true + *TaskBarButtons: Resolution page + *TaskBarButtons: Sort id + *TaskBarButtons: Tips needed -*TaskBarButtons: ButtonGeometry 125x26 -*TaskBarButtons: MaxButtonWidth $[vp.width] -*TaskBarButtons: ManagerGeometry 1x1+100+0@g - -*TaskBarButtons: DrawIcons always -*TaskBarButtons: ReliefThickness 2 -*TaskBarButtons: IconButton down -*TaskBarButtons: IconAndSelectButton down -*TaskBarButtons: SelectButton up -*TaskBarButtons: FocusAndSelectButton up - -*TaskBarButtons: Colorset 16 -*TaskBarButtons: FocusAndSelectColorset 17 -*TaskBarButtons: IconAndSelectColorset 18 -*TaskBarButtons: Shape true - -# Button actions. - -*TaskBarButtons: Action Mouse 1 A sendcommand Iconify -*TaskBarButtons: Action Mouse 3 A sendcommand "Menu WindowOps Mouse 0 o100" - -# Button logic. - -*TaskBarButtons: Sort id - -# Provide a simple bevel effect. - -*TaskBar: (Size $[vp.width]x4, Frame 2) + *TaskBarButtons: ButtonGeometry 30000x10 + *TaskBarButtons: ManagerGeometry 1x1 diff --git a/modules/taskbar.broken b/modules/taskbar.broken new file mode 100644 index 0000000..4045a15 --- /dev/null +++ b/modules/taskbar.broken @@ -0,0 +1,55 @@ +# Define the taskbar. + +DestroyModuleConfig TaskBar + +Style "TaskBar" NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \ + CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, \ + !Iconifiable, NeverFocus +*TaskBarButtons: Font "$[infostore.small_font_bold]" + +*TaskBar: Geometry $[wa.width]x32-136@g"' +*TaskBar: Columns $[vp.width] +*TaskBar: Rows 32 +*TaskBar: Frame 0 +*TaskBar: Colorset 9 + +# Swallow the buttonbar. +*TaskBar: (Size $[wp.width]x28, Swallow TaskBarButtons 'Module FvwmIconMan TaskBarButtons')'" + +# Define the buttonbar. + +DestroyModuleConfig TaskBarButtons + +*TaskBarButtons: UseWinList true +*TaskBarButtons: Resolution page +*TaskBarButtons: Tips needed + +PipeRead 'echo "*TaskBarButtons: ButtonGeometry $(($[wa.width]-1))x26@g"' +#*TaskBarButtons: ButtonGeometry 100x26 +*TaskBarButtons: MaxButtonWidth $[wa.width] +*TaskBarButtons: ManagerGeometry 1x1 + +*TaskBarButtons: DrawIcons always +*TaskBarButtons: ReliefThickness 2 +*TaskBarButtons: IconButton down +*TaskBarButtons: IconAndSelectButton down +*TaskBarButtons: SelectButton up +*TaskBarButtons: FocusAndSelectButton up + +*TaskBarButtons: Colorset 16 +*TaskBarButtons: FocusAndSelectColorset 17 +*TaskBarButtons: IconAndSelectColorset 18 +*TaskBarButtons: Shape true + +# Button actions. + +*TaskBarButtons: Action Mouse 1 A sendcommand Iconify +*TaskBarButtons: Action Mouse 3 A sendcommand "Menu WindowOps Mouse 0 o100" + +# Button logic. + +*TaskBarButtons: Sort id + +# Provide a simple bevel effect. + +*TaskBar: (Size $[vp.width]x4, Frame 2) diff --git a/modules/taskbar.new b/modules/taskbar.new new file mode 100644 index 0000000..b234dad --- /dev/null +++ b/modules/taskbar.new @@ -0,0 +1,26 @@ +# Taskbar definition. +DestroyModuleConfig TaskBar + +Style "TaskBar" !Title, !Handles, !Borders, Sticky, WindowListSkip, \ + CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, \ + !Iconifiable, NeverFocus + +*TaskBar: Geometry $[wa.width]x32-137@g +*TaskBar: Columns $[wa.width] +*TaskBar: Rows 32 +*TaskBar: Frame 0 +*TaskBar: Colorset 9 +*TaskBar: BoxSize fixed + +PipeRead `echo "*TaskBar: (Size $[wa.width]x32, Swallow TaskBarButtons 'Module \ + FvwmIconMan TaskBarButtons')"` + +# Buttons definition +DestroyModuleConfig TaskBarButtons + +*TaskBarButtons: UseWinList true +*TaskBarButtons: Resolution page +*TaskBarButtons: Sort id +*TaskBarButtons: Tips needed + +*TaskBarButtons: ButtonGeometry 100x28 diff --git a/modules/taskbar.old b/modules/taskbar.old new file mode 100644 index 0000000..dffb802 --- /dev/null +++ b/modules/taskbar.old @@ -0,0 +1,54 @@ +# Define the taskbar. + +DestroyModuleConfig TaskBar + +Style "TaskBar" NoTitle, !Handles, !Borders, Sticky, WindowListSkip, \ + CirculateSkip, StaysOnBottom, FixedPosition, FixedSize, \ + !Iconifiable, NeverFocus +*TaskBarButtons: Font "$[infostore.small_font_bold]" + +PipeRead 'echo "*TaskBar: Geometry $(($[vp.width]-136))x32-136@g)"' +*TaskBar: Columns $[vp.width] +*TaskBar: Rows 32 +*TaskBar: Frame 0 +*TaskBar: Colorset 9 + +# Swallow the buttonbar. +*TaskBar: (Size $[vp.width]x28, Swallow TaskBarButtons 'Module FvwmIconMan TaskBarButtons') + +# Define the buttonbar. + +DestroyModuleConfig TaskBarButtons + +*TaskBarButtons: UseWinList true +*TaskBarButtons: Resolution page +*TaskBarButtons: Tips needed + +*TaskBarButtons: ButtonGeometry 125x26 +*TaskBarButtons: MaxButtonWidth $[vp.width] +*TaskBarButtons: ManagerGeometry 1x1+100+0@g + +*TaskBarButtons: DrawIcons always +*TaskBarButtons: ReliefThickness 2 +*TaskBarButtons: IconButton down +*TaskBarButtons: IconAndSelectButton down +*TaskBarButtons: SelectButton up +*TaskBarButtons: FocusAndSelectButton up + +*TaskBarButtons: Colorset 16 +*TaskBarButtons: FocusAndSelectColorset 17 +*TaskBarButtons: IconAndSelectColorset 18 +*TaskBarButtons: Shape true + +# Button actions. + +*TaskBarButtons: Action Mouse 1 A sendcommand Iconify +*TaskBarButtons: Action Mouse 3 A sendcommand "Menu WindowOps Mouse 0 o100" + +# Button logic. + +*TaskBarButtons: Sort id + +# Provide a simple bevel effect. + +*TaskBar: (Size $[vp.width]x4, Frame 2) diff --git a/scripts/fvwmscript/FXDE-SystemsCheck b/scripts/fvwmscript/FXDE-SystemsCheck new file mode 100644 index 0000000..9c13d92 --- /dev/null +++ b/scripts/fvwmscript/FXDE-SystemsCheck @@ -0,0 +1,323 @@ +WindowTitle {Workstation Information} +WindowSize 486 352 + +Init +Begin + Set $un = { } (GetOutput {id -un} 1 -1) + Set $hn = { } (GetOutput {hostname} 1 -1) + + Set $isa = { } (GetOutput {uname -m} 1 -1) + Set $os = { } (GetOutput {sed 's/^PRETTY_NAME="\(.*\)"/\1/p' /etc/os-release /etc/os-release} 1 -1) + Set $krn = { } (GetOutput {uname -r} 1 -1) + + Set $ip = { } (GetOutput {ifconfig | sed -ne '2s/.*inet addr:\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\) .*/\1/p'} 1 -1) + Set $dn = { } (GetOutput {hostname -d} 1 -1) + + Set $ram = { } (GetOutput {free -m | sed -e 's/ */ /g' -e '2!d' | cut -d ' ' -f2} 1 -1) { MB} + Set $ru = { } (GetOutput {free -m | sed -e 's/ */ /g' -e '2!d' | cut -d ' ' -f3} 1 -1) { MB} + Set $rpct = { } (GetOutput {echo "$((100-$((100*$(free -m | sed -e 's/ */ /g' -e '2!d' | cut -d ' ' -f3)))/$(free -m | sed -e 's/ */ /g' -e '2!d' | cut -d ' ' -f2)))"} 1 -1) + + Set $swp = { } (GetOutput {free -m | sed -e 's/ */ /g' -e '3!d' | cut -d ' ' -f2} 1 -1) { MB} + Set $su = { } (GetOutput {free -m | sed -e 's/ */ /g' -e '3!d' | cut -d ' ' -f3} 1 -1) { MB} + Set $spct = { } (GetOutput {echo "$((100-$((100*$(free -m | sed -e 's/ */ /g' -e '3!d' | cut -d ' ' -f3)))/$(free -m | sed -e 's/ */ /g' -e '3!d' | cut -d ' ' -f2)))"} 1 -1) + + ChangeTitle 14 $un + ChangeTitle 15 $hn + + ChangeTitle 16 $isa + ChangeTitle 17 $os + ChangeTitle 18 $krn + + ChangeTitle 19 $ip + ChangeTitle 20 $dn + + ChangeTitle 21 $ram + ChangeTitle 22 $ru + ChangeValue 23 $rpct + + ChangeTitle 24 $swp + ChangeTitle 25 $su + ChangeValue 26 $spct +End + +Widget 1 +Property + Title {User Name:} + Size 150 0 + Position 10 15 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 2 +Property + Title {Workstation Name:} + Size 150 0 + Position 10 32 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 3 +Property + Title {ISA:} + Size 150 0 + Position 10 62 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 4 +Property + Title {OS:} + Size 150 0 + Position 10 77 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 5 +Property + Title {Kernel:} + Size 150 0 + Position 10 92 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 6 +Property + Title {Local IP:} + Size 150 0 + Position 10 122 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 7 +Property + Title {Domain:} + Size 150 0 + Position 10 137 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 8 +Property + Title {RAM:} + Size 150 0 + Position 10 167 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 9 +Property + Title {In Use:} + Size 150 0 + Position 10 182 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 10 +Property + Title {Available:} + Size 150 0 + Position 10 197 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 11 +Property + Title {Swap:} + Size 150 0 + Position 10 228 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 12 +Property + Title {In Use:} + Size 150 0 + Position 10 243 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 13 +Property + Title {Available:} + Size 150 0 + Position 10 258 + Type ItemDraw + Flags NoReliefString NoFocus Right + Colorset 9 +End + +Widget 14 +Property + Title {} + Size 150 0 + Position 159 15 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 15 +Property + Title {} + Size 150 0 + Position 159 32 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 16 +Property + Title {} + Size 150 0 + Position 159 62 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 17 +Property + Title {} + Size 150 0 + Position 159 77 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 18 +Property + Title {} + Size 150 0 + Position 159 92 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 19 +Property + Title {} + Size 150 0 + Position 159 122 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 20 +Property + Title {} + Size 150 0 + Position 159 137 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 21 +Property + Title {} + Size 150 0 + Position 159 167 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 22 +Property + Title {} + Size 150 0 + Position 159 182 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 23 +Property + Title {} + Value 50 + MaxValue 100 + MinValue 0 + Size 100 0 + Position 169 201 + Type HDipstick + Flags NoFocus + Colorset 9 +End + +Widget 24 +Property + Title {} + Size 150 0 + Position 159 228 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 25 +Property + Title {} + Size 150 0 + Position 159 243 + Type ItemDraw + Flags NoReliefString NoFocus Left + Colorset 9 +End + +Widget 26 +Property + Title {} + Value 50 + MaxValue 100 + MinValue 0 + Size 100 0 + Position 169 262 + Type HDipstick + Flags NoFocus + Colorset 9 +End + +Widget 27 +Property + Title {Dismiss} + Size 71 28 + Position 401 312 + Type PushButton + Flags NoReliefString +Main + Case message of + SingleClic : + Begin + Quit + End +End + diff --git a/scripts/fvwmscript/fxde-systemscheck b/scripts/fvwmscript/fxde-systemscheck new file mode 100644 index 0000000..d994545 --- /dev/null +++ b/scripts/fvwmscript/fxde-systemscheck @@ -0,0 +1,138 @@ +WindowTitle {Workstation Information} +WindowSize 486 352 + +Init +Begin + Set $ip = { } (GetOutput {echo `ifconfig | sed -ne '2s/.*inet addr:\([0-9]*\.[0 + ChangeTitle 50 $ip +End + +Widget 50 +Property + Title {} + Size 100 100 + Position 100 100 + Type ItemDraw + Flags NoReliefString Nofocus + Colorset 9 +End + +Widget 1 +Property + Title {User Name:} + Size 200 30 + Position 75 10 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 2 +Property + Title {Workstation Name:} + Size 100 15 + Position 125 54 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 3 +Property + Title {ISA:} + Size 100 15 + Position 113 74 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 4 +Property + Title {Local IP:} + Size 100 15 + Position 125 94 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 5 +Property + Title {Domain:} + Size 80 15 + Position 125 114 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 6 +Property + Title {ID:} + Size 80 15 + Position 125 114 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 7 +Property + Title {RAM:} + Size 80 15 + Position 125 114 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 8 +Property + Title {In Use:} + Size 80 15 + Position 125 114 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 9 +Property + Title {MB Available:} + Size 80 15 + Position 125 114 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 10 +Property + Title {RAM:} + Size 80 15 + Position 125 114 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 11 +Property + Title {In Use:} + Size 80 15 + Position 125 114 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End + +Widget 12 +Property + Title {MB Available:} + Size 80 15 + Position 125 114 + Type ItemDraw + Flags NoReliefString NoFocus + Colorset 9 +End diff --git a/scripts/fvwmscript/FvwmScript-Sysinfo b/scripts/fvwmscript/sysinfo.old similarity index 100% rename from scripts/fvwmscript/FvwmScript-Sysinfo rename to scripts/fvwmscript/sysinfo.old diff --git a/scripts/fvwmscript/test b/scripts/fvwmscript/test new file mode 100644 index 0000000..30b3103 --- /dev/null +++ b/scripts/fvwmscript/test @@ -0,0 +1,23 @@ +WindowTitle {Run...} +WindowSize 512 64 + +Init +Begin +Set $ip = { } (GetOutput {echo `ifconfig | sed -ne '2s/.*inet addr:\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\) .*/\1/p'`} 1 -1) +ChangeTitle 1 $ip +End + +Widget 1 +Property + Title {} + Size 496 24 + Position 8 4 + Flags NoReliefString + Type ItemDraw + Value 1 +Main + Case message of + SingleClic : + Begin + End +End