From d1637e018c846fd9e625533cc3debe130bcb415d Mon Sep 17 00:00:00 2001 From: thomasadam Date: Tue, 25 Mar 2008 01:12:10 +0000 Subject: [PATCH] Update default theme to use features in FVWM 2.5.25+ Some of the style options were a little out of date. This also removes some deprecation warnings from old style changing since the theme was written. --- themes/default/buttons | 4 +- themes/default/globalfeel | 9 ++- themes/default/modules/FvwmPager-Desker | 8 +-- themes/default/modules/FvwmPager-Single | 8 +-- themes/default/modules/main | 4 +- themes/default/modules/normal-icons/no | 2 +- themes/default/modules/winlist/DeskIconBox | 2 +- themes/default/modules/winlist/GlobalIconBox | 2 +- themes/default/settings/ewmh/enabled | 2 + .../settings/iconstyles/style-icon-miniicon | 3 +- themes/default/styles | 82 +++++++++++----------- themes/default/windowlook | 4 +- 12 files changed, 69 insertions(+), 61 deletions(-) rewrite themes/default/styles (69%) diff --git a/themes/default/buttons b/themes/default/buttons index eec57a5..b73c139 100644 --- a/themes/default/buttons +++ b/themes/default/buttons @@ -1,7 +1,9 @@ FuncFvwmDecorBackground Style "*" Button 1, Button 2, Button 4, Button 6 -Style "*" MWMButtons # button relief follows the state + +# button relief follows the state +Style "*" MWMButtons AddButtonStyle 1 Vector 5 25x40@1 25x60@1 75x60@0 75x40@0 25x40@1 AddButtonStyle 2 Vector 16 20x20@1 30x20@1 50x40@1 70x20@1 80x20@1 80x30@0 60x50@0 80x80@0 70x80@0 50x60@0 30x80@0 20x80@0 20x70@0 40x50@1 20x30@0 20x20@1 diff --git a/themes/default/globalfeel b/themes/default/globalfeel index 3edcbfd..2edd8a8 100644 --- a/themes/default/globalfeel +++ b/themes/default/globalfeel @@ -15,8 +15,8 @@ OpaqueMoveSize unlimited Emulate FVWM HideGeometryWindow Never BugOpts FlickeringMoveWorkaround Off -SnapAttraction 0 SameType -SnapGrid 1 1 +Style * SnapAttraction 0 +Style * SnapGrid 1 1 # I am not sure that this portable #XorValue 55555 # Use the default: @@ -25,7 +25,10 @@ XorValue # ---------------------- Paging and Mouse Parameters ---------------------- EdgeScroll 0 0 -EdgeResistance 500 1 +#EdgeResistance 500 1 +Style * EdgeMoveDelay 500 +Style * EdgeMoveResistance 1 + EdgeThickness 1 ClickTime 300 MoveThreshold 3 diff --git a/themes/default/modules/FvwmPager-Desker b/themes/default/modules/FvwmPager-Desker index af5b213..20ee1d3 100644 --- a/themes/default/modules/FvwmPager-Desker +++ b/themes/default/modules/FvwmPager-Desker @@ -5,10 +5,10 @@ AddToMenu MenuFvwmWindowMove "" Nop + "Desk 3%menu/window-move.xpm%" MoveToDesk 0 3 AddToMenu MenuFvwmWindowGroupQuickMove "" Nop -+ "Desk 0%menu/window-move.xpm%" Pick All ($r) MoveToDesk 0 0 -+ "Desk 1%menu/window-move.xpm%" Pick All ($r) MoveToDesk 0 1 -+ "Desk 2%menu/window-move.xpm%" Pick All ($r) MoveToDesk 0 2 -+ "Desk 3%menu/window-move.xpm%" Pick All ($r) MoveToDesk 0 3 ++ "Desk 0%menu/window-move.xpm%" Pick All ($[w.resource]) MoveToDesk 0 0 ++ "Desk 1%menu/window-move.xpm%" Pick All ($[w.resource]) MoveToDesk 0 1 ++ "Desk 2%menu/window-move.xpm%" Pick All ($[w.resource]) MoveToDesk 0 2 ++ "Desk 3%menu/window-move.xpm%" Pick All ($[w.resource]) MoveToDesk 0 3 DestroyModuleConfig FvwmPager-Desker: * *FvwmPager-Desker: Geometry -0+100 diff --git a/themes/default/modules/FvwmPager-Single b/themes/default/modules/FvwmPager-Single index 8f072f5..c29095b 100644 --- a/themes/default/modules/FvwmPager-Single +++ b/themes/default/modules/FvwmPager-Single @@ -9,10 +9,10 @@ AddToMenu MenuFvwmWindowMove "Move to ..." Title DestroyMenu MenuFvwmWindowGroupQuickMove AddToMenu MenuFvwmWindowGroupQuickMove -+ "&Right Page%menu/window-move.xpm%" Pick All ($r) MoveToPage +1p +0p -+ "&Left Page%menu/window-move.xpm%" Pick All ($r) MoveToPage -1p +0p -+ "D&own Page%menu/window-move.xpm%" Pick All ($r) MoveToPage +0p +1p -+ "&Up Page%menu/window-move.xpm%" Pick All ($r) MoveToPage +0p -1p ++ "&Right Page%menu/window-move.xpm%" Pick All ($[w.resource]) MoveToPage +1p +0p ++ "&Left Page%menu/window-move.xpm%" Pick All ($[w.resource]) MoveToPage -1p +0p ++ "D&own Page%menu/window-move.xpm%" Pick All ($[w.resource]) MoveToPage +0p +1p ++ "&Up Page%menu/window-move.xpm%" Pick All ($[w.resource]) MoveToPage +0p -1p DestroyModuleConfig FvwmPager-Single: * diff --git a/themes/default/modules/main b/themes/default/modules/main index 9c36ec3..dea3b35 100644 --- a/themes/default/modules/main +++ b/themes/default/modules/main @@ -6,8 +6,8 @@ # ---------------------------------------------------------------------------- # Icon related configuration -Style "*" IconBox screen w 10 24 -130 -100, IconGrid 64 10, IconFill left top -Style "*" SlipperyIcon, IconTitle +Style * IconBox screen w 10 24 -130 -100, IconGrid 64 10, IconFill left top +Style * SlipperyIcon, IconTitle # ---------------------------------------------------------------------------- # Switch functions diff --git a/themes/default/modules/normal-icons/no b/themes/default/modules/normal-icons/no index b7e4423..8fc1e29 100644 --- a/themes/default/modules/normal-icons/no +++ b/themes/default/modules/normal-icons/no @@ -1,3 +1,3 @@ DestroyFunc FuncFvwmStartNormalIcons AddToFunc FuncFvwmStartNormalIcons -+ I Style * NoIcon ++ I Style * !Icon diff --git a/themes/default/modules/winlist/DeskIconBox b/themes/default/modules/winlist/DeskIconBox index 79adf0f..faeb2fc 100644 --- a/themes/default/modules/winlist/DeskIconBox +++ b/themes/default/modules/winlist/DeskIconBox @@ -1,6 +1,6 @@ *FvwmIconBox: Resolution Desk # Problems!! -Style * NoIcon +Style * !Icon AddToFunc FuncFvwmStartThemeModules + I Module FvwmIconBox diff --git a/themes/default/modules/winlist/GlobalIconBox b/themes/default/modules/winlist/GlobalIconBox index 11cfc72..fd2d743 100644 --- a/themes/default/modules/winlist/GlobalIconBox +++ b/themes/default/modules/winlist/GlobalIconBox @@ -1,6 +1,6 @@ DestroyModuleConfig FvwmIconBox: Resolution # Problems!! -Style * NoIcon +Style * !Icon AddToFunc FuncFvwmStartThemeModules + I Module FvwmIconBox diff --git a/themes/default/settings/ewmh/enabled b/themes/default/settings/ewmh/enabled index 31161cb..50110ea 100644 --- a/themes/default/settings/ewmh/enabled +++ b/themes/default/settings/ewmh/enabled @@ -1,3 +1,5 @@ +# FIXME - Thomas Adam: This needs an overhaul in lieu of what's now in FVWM's core. + DestroyFunc FuncFvwmRestartFvwmNetHints AddToFunc FuncFvwmRestartFvwmNetHints + I SendToModule FvwmNetHints Quit diff --git a/themes/default/settings/iconstyles/style-icon-miniicon b/themes/default/settings/iconstyles/style-icon-miniicon index ac41bab..aee8119 100644 --- a/themes/default/settings/iconstyles/style-icon-miniicon +++ b/themes/default/settings/iconstyles/style-icon-miniicon @@ -470,4 +470,5 @@ Style "ktuberling" Icon norm/game.xpm, MiniIcon mini/gam Style "kwin4" Icon norm/game-logic.xpm, MiniIcon mini/game-logic.xpm # this should be after XTerm Icon, otherwise Icon is not used on reload (bug?) -Style XTerm NoActiveIconOverride # enable: xterm +ai +# enable: xterm +ai +Style XTerm NoActiveIconOverride diff --git a/themes/default/styles b/themes/default/styles dissimilarity index 69% index abcb38f..41ebdac 100644 --- a/themes/default/styles +++ b/themes/default/styles @@ -1,41 +1,41 @@ -# The UsePPosition / NoPPosition for "*" is in globalfeel -# We should force these for proper operations -Style "Netscape" NoPPosition -Style "FreeAmp*" UsePPosition - -Style "Fvwm*" Sticky, Title, Handles, WindowListHit, CirculateSkip -Style "FvwmBanner" NoTitle, StaysOnTop, WindowListSkip, NeverFocus -Style "FvwmPager" NoTitle, NoHandles, WindowListSkip -Style "FvwmButtons" NoTitle, NoHandles, WindowListSkip -Style "FvwmIdent" NoTitle, NoHandles, WindowListSkip -Style "FvwmTaskBar" NoTitle, NoHandles, WindowListSkip -Style "FvwmIconMan" NoTitle, NoHandles, WindowListSkip -Style "FvwmConsole" CirculateHit, GrabFocus -Style "FvwmForm" CirculateHit -Style "FvwmScript" Slippery, CirculateHit -# Simulate transient; it is nicer with title. -Style "FvwmScript-IconBrowser" StaysOnTop, NoHandles -Style "FvwmScript-Browser" StaysOnTop, NoHandles -# Applets are usually swallowed, so disable ActivePlacement if any. -Style "FvwmApplet*" CascadePlacement -# -Style FvwmButtons-ColourTable HandleWidth 2, Title, TitleAtTop - -Style "XNoteMessage" NoTitle, Sticky, StaysOnTop, UsePPosition, \ - BorderWidth 0, NoHandles, WindowListSkip -Style "xclock" Sticky, WindowListSkip, CirculateSkip -# gnome panel and icons -Style "panel" NeverFocus, Sticky, NoTitle, WindowListSkip, \ - CirculateSkip, UsePPosition -Style "desktop_icon" CirculateSkip, Sticky, NoTitle, WindowListSkip, \ - NeverFocus, UsePPosition -Style "gmc-desktop-icon" CirculateSkip, Sticky, NoTitle, WindowListSkip, \ - NeverFocus, UsePPosition -Style "XSm" Sticky -Style "xsm" NeverFocus, NoTitle, WindowListSkip, CirculateSkip -Style "xmessage" UsePPosition - -Style "gkrellm" NeverFocus, Sticky, WindowListSkip, CirculateSkip, UsePPosition - -# this is to override all patterns related to file names that are edited -Style XEmacs Slippery, Title, Handles, WindowListHit, CirculateHit +# The UsePPosition / NoPPosition for "*" is in globalfeel +# We should force these for proper operations +Style Netscape NoPPosition +Style FreeAmp* UsePPosition + +Style Fvwm* Sticky, Title, Handles, WindowListHit, CirculateSkip +Style FvwmBanner !Title, StaysOnTop, WindowListSkip, NeverFocus +Style FvwmPager !Title, !Handles, WindowListSkip +Style FvwmButtons !Title, !Handles, WindowListSkip +Style FvwmIdent !Title, !Handles, WindowListSkip +Style FvwmTaskBar !Title, !Handles, WindowListSkip +Style FvwmIconMan !Title, !Handles, WindowListSkip +Style FvwmConsole CirculateHit, FPGrabFocus, FPReleaseFocus +Style FvwmForm CirculateHit +Style FvwmScript Slippery, CirculateHit +# Simulate transient; it is nicer with title. +Style FvwmScript-IconBrowser StaysOnTop, !Handles +Style FvwmScript-Browser StaysOnTop, !Handles +# Applets are usually swallowed, so disable ActivePlacement if any. +Style FvwmApplet* CascadePlacement +# +Style FvwmButtons-ColourTable HandleWidth 2, Title, TitleAtTop + +Style XNoteMessage !Title, Sticky, StaysOnTop, UsePPosition, \ + BorderWidth 0, HandleWidth 0, !Handles, WindowListSkip +Style xclock Sticky, WindowListSkip, CirculateSkip +# gnome panel and icons +Style panel NeverFocus, Sticky, !Title, WindowListSkip, \ + CirculateSkip, UsePPosition +Style desktop_icon CirculateSkip, Sticky, !Title, WindowListSkip, \ + NeverFocus, UsePPosition +Style gmc-desktop-icon CirculateSkip, Sticky, !Title, WindowListSkip, \ + NeverFocus, UsePPosition +Style XSm Sticky +Style xsm NeverFocus, !Title, WindowListSkip, CirculateSkip +Style xmessage UsePPosition + +Style gkrellm NeverFocus, Sticky, WindowListSkip, CirculateSkip, UsePPosition + +# this is to override all patterns related to file names that are edited +Style XEmacs Slippery, Title, Handles, WindowListHit, CirculateHit diff --git a/themes/default/windowlook b/themes/default/windowlook index 942b227..a4d000e 100644 --- a/themes/default/windowlook +++ b/themes/default/windowlook @@ -1,8 +1,8 @@ FuncFvwmSetFont-WindowTitle * 'shadow=1 r br b:xft:Verdana:pixelsize=14:minspace=true:-adobe-helvetica-medium-r-*-*-14-*-*-*-*-*-*-*' FuncFvwmSetFont-IconTitle * 'shadow=1 r br b:xft:Verdana:pixelsize=12:minspace=true:-adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*' -Style "*" BorderWidth 5, HandleWidth 6 -Style "*" FvwmBorder, FirmBorder +Style * BorderWidth 5, HandleWidth 6 +Style * FvwmBorder, FirmBorder BorderStyle Simple -- 2.11.4.GIT