Merge remote-tracking branch 'origin/master' into laptop

4 files changed, 163 insertions, 2 deletions

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/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/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'