aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Version2
-rw-r--r--colorsets/WhiteDesktop.cs92
-rw-r--r--components/apps/QuakeConsole69
-rw-r--r--components/apps/ROX-Filer7
-rw-r--r--components/bindings/Extra-Keybindings15
-rw-r--r--components/functions/FvwmExpose0
-rw-r--r--components/functions/Gather4
-rw-r--r--components/functions/NotificationAreaManager-trayer-srg32
-rw-r--r--components/styles/Applications2
-rw-r--r--preferences/DefaultTerminal2
-rw-r--r--preferences/EDITOR2
-rw-r--r--preferences/EDITOR~1
-rw-r--r--preferences/LastChoosenColorset2
-rw-r--r--preferences/NotificationAreaManager2
-rw-r--r--preferences/ShowDirectories5
-rw-r--r--preferences/ShowDirectories~4
-rw-r--r--preferences/Startup2
-rw-r--r--recipes/Dakkar35
-rwxr-xr-xscripts/fvwm-screen.pl28
19 files changed, 262 insertions, 44 deletions
diff --git a/Version b/Version
index d15b8b0..aaf18d2 100644
--- a/Version
+++ b/Version
@@ -1 +1 @@
-3.6.5
+3.7.5
diff --git a/colorsets/WhiteDesktop.cs b/colorsets/WhiteDesktop.cs
new file mode 100644
index 0000000..e822809
--- /dev/null
+++ b/colorsets/WhiteDesktop.cs
@@ -0,0 +1,92 @@
+# WhiteDesktop colorset
+# Written by: Social
+
+SetEnv Colorset_Name "WhiteDesktop"
+
+# What colorsets do we use?
+Read /usr/share/fvwm-crystal/fvwm/colorsets/colorset-definition
+
+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# QuakeConsole, thumbnailed windows
+Colorset $[infostore.cs_quakeconsole] \
+Foreground "black", Background "black", \
+Hilight "black", Shadow "black", \
+IconAlpha 70
+
+
+Colorset $[infostore.cs_panel_inactive] \
+Foreground "black", Background "#888888", \
+Tint "#aaaaaa" 50, \
+fgTint, IconAlpha, IconTint
+
+Colorset $[infostore.cs_panel_active] \
+Foreground "darkgray", Background "darkgray", \
+Hilight "darkgray", Shadow "darkgray", \
+Tint "#888888" 50
+
+Colorset $[infostore.cs_panel_wininactive] \
+Foreground "#555555", Background "#777777", \
+Hilight "#444444", Shadow "#444444", \
+Tint "#aaaaaa" 60
+
+Colorset $[infostore.cs_panel_winactive] \
+Foreground "black", Background "#777777", \
+Hilight "#666666", Shadow "#666666", \
+Tint "#aaaaaa" 80
+
+Colorset $[infostore.cs_panel_border] \
+Background "#777777"
+
+Colorset $[infostore.cs_menu_inactive] \
+Foreground "black", Background "white", \
+Hilight "white", Shadow "white", \
+Tint "#aaaaaa" 50
+
+Colorset $[infostore.cs_menu_active] \
+Foreground "#333333", Background "white", \
+Hilight "#333333", Shadow "gray"
+
+Colorset $[infostore.cs_icon_active] \
+Foreground "black", Background "white", \
+Hilight "white", Shadow "darkgray", \
+RootTransparent
+
+Colorset $[infostore.cs_transparent] Transparent
+
+Colorset $[infostore.cs_acpibatt_99] \
+Foreground "black", Background "#444444", \
+Tint "#aaaaaa" 50, \
+fgTint "black" 100, IconAlpha, IconTint
+
+Colorset $[infostore.cs_acpibatt_74] \
+Foreground "#0000ff", Background "#444444", \
+Tint "#aaaaaa" 50, \
+fgTint "#0000ff" 100, IconAlpha, IconTint
+
+Colorset $[infostore.cs_acpibatt_49] \
+Foreground "#00ff00", Background "#444444", \
+Tint "#aaaaaa" 50, \
+fgTint "#00ff00" 100, IconAlpha, IconTint
+
+Colorset $[infostore.cs_acpibatt_24] \
+Foreground "#ffff00", Background "#444444", \
+Tint "#aaaaaa" 50, \
+fgTint "#ffff00" 100, IconAlpha, IconTint
+
+Colorset $[infostore.cs_acpibatt_12] \
+Foreground "#ff4400", Background "#444444", \
+Tint "#aaaaaa" 50, \
+fgTint "#ff4400" 100, IconAlpha, IconTint
+
+Colorset $[infostore.cs_acpibatt_0] \
+Foreground "#ff0000", Background "#444444", \
+Tint "#aaaaaa" 50, \
+fgTint "#ff0000" 100, IconAlpha, IconTint
+
+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Additional variables
+SetEnv ThumbBorderColor "black"
+SetEnv ExternalFontColor "gray40"
+
+SetEnv TrayerTint "0xaaaaaa"
+SetEnv TrayerAlpha "128"
diff --git a/components/apps/QuakeConsole b/components/apps/QuakeConsole
new file mode 100644
index 0000000..32df96c
--- /dev/null
+++ b/components/apps/QuakeConsole
@@ -0,0 +1,69 @@
+
+# Variables
+SetEnv QuakeConsole_Border "1"
+#SetEnv QuakeConsoleTerminal "NO_QUAKECONSOLE_TERMINAL_FOUND"
+#SetEnv QuakeConsole_Height "50"
+
+CheckPreferences QuakeConsoleHeight "SavePreferences QuakeConsoleHeight 'SetEnv QuakeConsole_Height 50'"
+LoadPreferences QuakeConsoleHeight
+
+#Include preferences/QuakeConsole_Height
+
+DestroyFunc QuakeConsole
+AddToFunc QuakeConsole
++ I None (QuakeConsoleNeedsUniqueName) QuakeConsole_Init
++ I All (QuakeConsoleNeedsUniqueName, CurrentDesk) QuakeConsole_Hide
++ I TestRc (0) QuakeConsole_Show
+
+DestroyFunc QuakeConsole_Init
+AddToFunc QuakeConsole_Init
++ I Style QuakeConsoleNeedsUniqueName !Title, !Handles, SkipMapping, \
+ WindowListSkip, VariableSize, VariablePosition, NoIcon, StaysOnTop, \
+ !Iconifiable, EWMHMaximizeIgnoreWorkingArea, StickyAcrossPages, \
+ Maximizable, BorderWidth $[QuakeConsole_Border], \
+ Colorset $[infostore.cs_quakeconsole], HilightColorset $[infostore.cs_quakeconsole], \
+ BorderColorset $[infostore.cs_quakeconsole], \
+ HilightBorderColorset $[infostore.cs_quakeconsole], WindowShadeSteps 8, \
+ WindowShadeShrinks
+
+# If you want to change QuakeConsole command, do it here!
++ I Exec exec alacritty --class QuakeConsoleNeedsUniqueName
+# If you want to change QuakeConsole command, do it here!
+
++ I Wait QuakeConsoleNeedsUniqueName
++ I All (QuakeConsoleNeedsUniqueName) Maximize 100 $[QuakeConsole_Height]
+# The folowing line imply a horizontal shift, don't know why it is here:
+#+ I All (QuakeConsoleNeedsUniqueName) Piperead 'echo Move `expr $[vp.width] / 2 - $[w.width] / 2`p w0'
++ I Style QuakeConsoleNeedsUniqueName FixedPosition
++ I All (QuakeConsoleNeedsUniqueName) MoveToDesk 0 666
++ I Style QuakeConsoleNeedsUniqueName VariableSize, !Maximizable
++ I Prev (CurrentPage, AcceptsFocus, Visible) Focus
+
+DestroyFunc QuakeConsole_Show
+AddToFunc QuakeConsole_Show
+#+ I Window-RememberFocused
++ I All (QuakeConsoleNeedsUniqueName) MoveToDesk 0 $[desk.n]
++ I All (QuakeConsoleNeedsUniqueName) Raise
+#+ I All (QuakeConsoleNeedsUniqueName) WindowShade false
++ I All (QuakeConsoleNeedsUniqueName) Focus
+
+DestroyFunc QuakeConsole_Hide
+AddToFunc QuakeConsole_Hide
+#+ I All (QuakeConsoleNeedsUniqueName) WindowShade true
++ I All (QuakeConsoleNeedsUniqueName) MoveToDesk 0 666
+#+ I All (QuakeConsoleNeedsUniqueName) WindowShade false
++ I Window-FocusRemembered
+
+DestroyFunc QuakeConsole-Resize
+AddToFunc QuakeConsole-Resize
++ H Resize Direction S
++ H SetEnv QuakeConsole_Height "$[w.height]p"
++ H SavePreferences QuakeConsoleHeight "SetEnv QuakeConsole_Height $[w.height]p"
+
+Mouse (QuakeConsoleNeedsUniqueName) 2 W $[Mod1] QuakeConsole-Resize
+
+# Dummy functions to avoid error messages
+AddToFunc Window-FocusRemembered I Nop
+AddToFunc Window-RememberFocused I Nop
+
+# vim:ft=fvwm
diff --git a/components/apps/ROX-Filer b/components/apps/ROX-Filer
deleted file mode 100644
index 889b553..0000000
--- a/components/apps/ROX-Filer
+++ /dev/null
@@ -1,7 +0,0 @@
-# Launch the pinboard
-Test (Init) Test (x rox) Exec exec rox --pinboard=Default
-
-# Set the specified wallpaper using ROX-Filer's pinboard
-DestroyFunc Wallpaper-Set
-AddToFunc Wallpaper-Set
-+ I Test (x rox) Exec echo "<?xml version=\"1.0\"?><env:Envelope xmlns:env=\"http://www.w3.org/2001/12/soap-envelope\"><env:Body xmlns=\"http://rox.sourceforge.net/SOAP/ROX-Filer\"><SetBackdrop><Filename>$*</Filename><Style>Fit</Style></SetBackdrop></env:Body></env:Envelope>" | rox -R
diff --git a/components/bindings/Extra-Keybindings b/components/bindings/Extra-Keybindings
index f1f9fef..32eb03f 100644
--- a/components/bindings/Extra-Keybindings
+++ b/components/bindings/Extra-Keybindings
@@ -21,3 +21,18 @@ Key Pause A $[Mod1] Exec xscreensaver-command -lock
Key XF86MonBrightnessDown A $[Mod1] Exec xscreensaver-command -lock
Key Pause A $[Mod1]S Exec xscreensaver-command -lock && sudo pm-suspend
+
+Key F7 A $[Mod1] Exec xbacklight -dec 10
+Key F8 A $[Mod1] Exec xbacklight -inc 10
+
+# remove Expose
+Key E A $[Mod1] -
+Key E A $[Mod1]2 -
+
+# kill crystal's screenshot
+Key Print A $[Mod] -
+# use maim instead
+Key S A $[Mod1]S Exec maim -s | xclip -sel clip -t image/png
+# delayed snapshot; we need that `nohup` otherwise urxvt/bash will
+# take xclip down when they exit
+Key S A $[Mod1]SC Exec urxvt -geometry 20x1-0-0 +sb -b 0 -w 0 -title 'maim+xclip' -bl -e /bin/bash -c 'maim -d 5 -s | nohup xclip -sel clip -t image/png > /dev/null'
diff --git a/components/functions/FvwmExpose b/components/functions/FvwmExpose
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/components/functions/FvwmExpose
diff --git a/components/functions/Gather b/components/functions/Gather
new file mode 100644
index 0000000..ed13afe
--- /dev/null
+++ b/components/functions/Gather
@@ -0,0 +1,4 @@
+DestroyFunc gather
+AddToFunc gather
++ I All (!PlacedByFvwm) MoveToScreen
+
diff --git a/components/functions/NotificationAreaManager-trayer-srg b/components/functions/NotificationAreaManager-trayer-srg
new file mode 100644
index 0000000..795ce41
--- /dev/null
+++ b/components/functions/NotificationAreaManager-trayer-srg
@@ -0,0 +1,32 @@
+# Support for trayer-srg
+# Written by: Dominique Michel <dominique_libre@users.sourceforge.net>
+# for FVWM-Crystal, 2013
+#
+# Version with parameters instead of the environment
+
+# Trayer Syntax:
+# NotificationAera [widthtype <request|pixel|percent>] [heighttype <request|pixel|percent>] \
+# [height <size>] [edge <left|right|top|bottom|none>] [align <left|right|center>] \
+# [margin <n pixels>] [distance <n pixels>] [width <size>]
+
+AddToFunc ExitFunction I Exec exec killall trayer
+
+# Settings of Trayer {{{1
+DestroyFunc FvwmTrayerPanel
+AddToFunc FvwmTrayerPanel
++ I Exec exec trayer-srg \
+--SetDockType false \
+--widthtype $[0] \
+--heighttype $[1] \
+--height $[2] \
+--edge $[3] \
+--align $[4] \
+--transparent true \
+--alpha $[TrayerAlpha] \
+--tint $[TrayerTint] \
+--margin $[5] \
+--distance $[6] \
+$[7] $[infostore.SILENT]
++ I Style trayer-srg !Title, !Icon
+
+# vim:ft=fvwm
diff --git a/components/styles/Applications b/components/styles/Applications
index 13c9701..b40e813 100644
--- a/components/styles/Applications
+++ b/components/styles/Applications
@@ -13,7 +13,5 @@ Style Claws-mail MiniIcon $[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/apps/claws-m
Style Pidgin MiniIcon $[FVWM_USERDIR]/icons/$[Icon_Theme]/22x22/apps/pidgin.png
-Style vlc Unmanaged
-Style "*VLC media player" !Unmanaged
Style Steam MoveByProgramMethod IgnoreGravity
Style "*Arduino*" Lenience
diff --git a/preferences/DefaultTerminal b/preferences/DefaultTerminal
index 516ba78..a97000c 100644
--- a/preferences/DefaultTerminal
+++ b/preferences/DefaultTerminal
@@ -1 +1 @@
-FindCommand DefaultTerminal urxvt terminator urxvt Eterm aterm mrxvt xterm gnome-terminal konsole xfce4-terminal
+FindCommand DefaultTerminal alacritty urxvt xterm
diff --git a/preferences/EDITOR b/preferences/EDITOR
index 88c15af..1aa35f6 100644
--- a/preferences/EDITOR
+++ b/preferences/EDITOR
@@ -1 +1 @@
-SetEnv EDITOR "/bin/nano"
+SetEnv EDITOR "/usr/bin/emacsclient"
diff --git a/preferences/EDITOR~ b/preferences/EDITOR~
new file mode 100644
index 0000000..88c15af
--- /dev/null
+++ b/preferences/EDITOR~
@@ -0,0 +1 @@
+SetEnv EDITOR "/bin/nano"
diff --git a/preferences/LastChoosenColorset b/preferences/LastChoosenColorset
index 0661c12..d756132 100644
--- a/preferences/LastChoosenColorset
+++ b/preferences/LastChoosenColorset
@@ -1 +1 @@
-Colorsets-Set '/usr/bin/../share/fvwm-crystal/fvwm/colorsets/WhiteDesktop.cs'
+Colorsets-Set '/home/dakkar/.fvwm-crystal/colorsets/WhiteDesktop.cs'
diff --git a/preferences/NotificationAreaManager b/preferences/NotificationAreaManager
index 3a9581b..d54b36e 100644
--- a/preferences/NotificationAreaManager
+++ b/preferences/NotificationAreaManager
@@ -1 +1 @@
-FindCommand NotificationAreaManager trayer trayer stalonetray
+FindCommand NotificationAreaManager trayer-srg trayer stalonetray
diff --git a/preferences/ShowDirectories b/preferences/ShowDirectories
index 0240e9a..072783f 100644
--- a/preferences/ShowDirectories
+++ b/preferences/ShowDirectories
@@ -1,4 +1 @@
-~/.fvwm-crystal ~/Developement/FVWM-Crystal/sourceforge/fvwm-crystal-code/
-~/Amiga
-~/Elec
-~/HTC ~/Backup_HTC
+~/.fvwm-crystal
diff --git a/preferences/ShowDirectories~ b/preferences/ShowDirectories~
new file mode 100644
index 0000000..0240e9a
--- /dev/null
+++ b/preferences/ShowDirectories~
@@ -0,0 +1,4 @@
+~/.fvwm-crystal ~/Developement/FVWM-Crystal/sourceforge/fvwm-crystal-code/
+~/Amiga
+~/Elec
+~/HTC ~/Backup_HTC
diff --git a/preferences/Startup b/preferences/Startup
index d750037..bffd8fa 100644
--- a/preferences/Startup
+++ b/preferences/Startup
@@ -1,2 +1,2 @@
# stuff to do after basic functions are loaded, but before
-# applications / bindings are set \ No newline at end of file
+# applications / bindings are set
diff --git a/recipes/Dakkar b/recipes/Dakkar
index d579a88..8ed0aa3 100644
--- a/recipes/Dakkar
+++ b/recipes/Dakkar
@@ -1,6 +1,9 @@
Include components/functions/Music
Include components/functions/Screen-Menu
Include components/functions/Numpad-multihead
+Include components/functions/Gather
+
+Module FvwmCommandS
InfoStoreAdd DeskIconsSign " "
LoadPreferences IconsType
@@ -29,15 +32,15 @@ Style * StickyIcon
Module FvwmAuto 300 -passid -menterleave \
- "Silent raise_pager" \
- "Silent lower_pager"
+ "Silent Raise_Pager" \
+ "Silent Lower_Pager"
-DestroyFunc lower_pager
-AddToFunc lower_pager
+DestroyFunc Lower_Pager
+AddToFunc Lower_Pager
+ I WindowId $0 (FvwmPager|mwatch) Layer 0 2
-DestroyFunc raise_pager
-AddToFunc raise_pager
+DestroyFunc Raise_Pager
+AddToFunc Raise_Pager
+ I WindowId $0 (FvwmPager|mwatch) Layer 0 7
DestroyFunc FvwmPagerWindow
@@ -45,7 +48,7 @@ AddToFunc FvwmPagerWindow
+ I All (FvwmPager) Close
+ I DestroyModuleConfig FvwmPager: *
+ I PipeRead 'echo InfoStoreAdd FvwmPager_Width $((28*$[infostore.Desk_Pages_X])); echo InfoStoreAdd FvwmPager_Height $((24*$[infostore.Desk_Pages_Y]))'
-+ I PipeRead 'echo *FvwmPager: Geometry $[infostore.FvwmPager_Width]x$[infostore.FvwmPager_Height]+$((($[vp.width]-$[infostore.FvwmPager_Width])/2))'
++ I PipeRead 'echo *FvwmPager: Geometry $[infostore.FvwmPager_Width]x$[infostore.FvwmPager_Height]+$(((1920-$[infostore.FvwmPager_Width])/2))'
+ I *FvwmPager: MiniIcons
+ I *FvwmPager: Font none
+ I *FvwmPager: WindowBorderWidth 1
@@ -58,12 +61,12 @@ AddToFunc FvwmPagerWindow
FvwmPagerWindow
-FvwmTrayerPanel request pixel "24" top right "248" "4"
+FvwmTrayerPanel request pixel "24" top right "420" "4"
Style trayer UseStyle FvwmParts
All (FvwmButtons-Panel) Close
DestroyModuleConfig FvwmButtons-Panel: *
-*FvwmButtons-Panel: Geometry -3+3
+*FvwmButtons-Panel: Geometry -3+3@p
*FvwmButtons-Panel: BoxSize smart
*FvwmButtons-Panel: ActiveColorset $[infostore.cs_panel_active]
*FvwmButtons-Panel: Colorset $[infostore.cs_panel_inactive]
@@ -86,6 +89,8 @@ Action (Mouse 3) Window-List-Icons "$[MenuPosition_SW]")
*FvwmButtons-Panel: (1x1, Size 22 22, Icon "22x22/fvwm-crystal/applications.png", \
Action (Mouse 1) Menu /Applications $[MenuPosition_SW])
+*FvwmButtons-Panel: (7x1, Size 165 24, Swallow (Close, Respawn) "dakkar-battery" `Exec /home/dakkar/src/battery/battery`)
+
*FvwmButtons-Panel: (7x1, Size 154 24, \
Swallow (Close, Respawn, FvwmModule) "FvwmScript-Clock" 'Script components/scripts/FvwmScript-Clock', \
Action (Mouse 3) SendToModule *FvwmScript-Clock SendString 1 1 str)
@@ -99,7 +104,15 @@ AddToFunc StartFunction
+ I Style mwatch !FixedPosition
+ I Style gkrellm !FixedPosition
+ I UpdateStyles
-+ I All (mwatch) Move -0 +30p
-+ I All (gkrellm) Move -0 -0
++ I All (mwatch) Move screen p -0 +30p
++ I All (gkrellm) Move screen p -0 -0
+ I Style mwatch FixedPosition
+ I Style gkrellm FixedPosition
+
+DestroyMenu /Keymap
+AddToMenu /Keymap
++ 'Dvorak' Exec /home/dakkar/bin/kbd-dakkar
++ 'QWERTY' Exec /home/dakkar/bin/kbd-qw
+
+AddToMenu /FVWM-Crystal
++ 'Keymap' Popup /Keymap
diff --git a/scripts/fvwm-screen.pl b/scripts/fvwm-screen.pl
index eea4a3c..d462b29 100755
--- a/scripts/fvwm-screen.pl
+++ b/scripts/fvwm-screen.pl
@@ -3,35 +3,35 @@ use strict;
use warnings;
sub sess_names {
- map { m{^ \s* \d+ \. ([^.]+?) (?:\.\w+)? \s+}smx } @_;
+ map { m{^ \s* (\d+) \. (.+?) \s+}smx } @_;
}
# Get list of detached/attached screen sessions and hostname
my @screen_out=qx(screen -list);
-my @detached_sessions=sess_names grep {m{\(Detached\)}} @screen_out;
-my @attached_sessions=sess_names grep {m{\(Attached\)}} @screen_out;
+my %detached_sessions=reverse sess_names grep {m{\(Detached\)}} @screen_out;
+my %attached_sessions=reverse sess_names grep {m{\(Attached\)}} @screen_out;
-print <<'EOL' if @detached_sessions;
- + "Reattach first" A screen -d -RR
+print <<'EOL' if %detached_sessions;
+AddToMenu /Screens "Reattach first" StartTerminal screen -d -RR
EOL
print <<'EOL';
- + "New Session" A screen
+AddToMenu /Screens "New Session" StartTerminal screen
EOL
-print <<'EOL' if @detached_sessions;
- + "" NoP
+print <<'EOL' if %detached_sessions;
+AddToMenu /Screens "" NoP
EOL
-print <<"EOL" for @detached_sessions;
- + "$_ (a)" A screen -r "$_"
+print <<"EOL" for sort keys %detached_sessions;
+AddToMenu /Screens "$_ (a)" StartTerminal screen -r "$detached_sessions{$_}"
EOL
-print <<'EOL' if @attached_sessions;
- + "" NoP
+print <<'EOL' if %attached_sessions;
+AddToMenu /Screens "" NoP
EOL
-print <<"EOL" for @attached_sessions;
- + "$_ (d)" A screen -d "$_"
+print <<"EOL" for sort keys %attached_sessions;
+AddToMenu /Screens "$_ (d)" StartTerminal screen -d "$attached_sessions{$_}"
EOL