aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2020-08-14 18:12:11 +0100
committerdakkar <dakkar@thenautilus.net>2020-08-14 18:13:18 +0100
commitc586a2b7e8c29102a14ef8ffa4b0b17ce0c0e44c (patch)
tree23968ed6f40a6d6f2c9f288c9cb787f25e51de04
parenttweaks for new version (diff)
parentactually fix trayer (diff)
downloadfvwm-crystal-laptop.tar.gz
fvwm-crystal-laptop.tar.bz2
fvwm-crystal-laptop.zip
Merge remote-tracking branch 'origin/master' into laptoplaptop
-rw-r--r--components/bindings/Multimedia_Keys2
-rw-r--r--components/functions/Mixer4
-rw-r--r--components/styles/Applications2
-rw-r--r--recipes/Dakkar3
4 files changed, 10 insertions, 1 deletions
diff --git a/components/bindings/Multimedia_Keys b/components/bindings/Multimedia_Keys
index 4fa6151..deaf0ab 100644
--- a/components/bindings/Multimedia_Keys
+++ b/components/bindings/Multimedia_Keys
@@ -1,10 +1,12 @@
Key XF86AudioRaiseVolume A $[Mod0] Change-Volume-Up
Key XF86AudioLowerVolume A $[Mod0] Change-Volume-Down
Key XF86AudioMute A $[Mod0] Mixer-Volume-Toggle
+Key XF86AudioMute A $[Mod0]S Mixer-Input-Toggle
Key XF86AudioRaiseVolume A $[Mod1] Change-Volume-Up
Key XF86AudioLowerVolume A $[Mod1] Change-Volume-Down
Key XF86AudioMute A $[Mod1] Mixer-Volume-Toggle
+Key XF86AudioMute A $[Mod1]S Mixer-Input-Toggle
Key XF86Eject A $[Mod0] Mixer-Show
Key F9 A $[Mod1] Mixer-Show
diff --git a/components/functions/Mixer b/components/functions/Mixer
index df236d2..eec5b65 100644
--- a/components/functions/Mixer
+++ b/components/functions/Mixer
@@ -10,6 +10,10 @@ DestroyFunc Mixer-Volume-Toggle
AddToFunc Mixer-Volume-Toggle
+ I exec pactl set-sink-mute '@DEFAULT_SINK@' toggle >/dev/null
+DestroyFunc Mixer-Input-Toggle
+AddToFunc Mixer-Input-Toggle
++ I exec pactl set-source-mute '@DEFAULT_SOURCE@' toggle >/dev/null
+
DestroyFunc Mixer-Show
AddToFunc Mixer-Show
+ I exec pavucontrol &
diff --git a/components/styles/Applications b/components/styles/Applications
index 7302a93..13c9701 100644
--- a/components/styles/Applications
+++ b/components/styles/Applications
@@ -15,3 +15,5 @@ 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/recipes/Dakkar b/recipes/Dakkar
index 124ef4a..91b9348 100644
--- a/recipes/Dakkar
+++ b/recipes/Dakkar
@@ -58,7 +58,8 @@ AddToFunc FvwmPagerWindow
FvwmPagerWindow
-FvwmTrayerPanel request pixel "24" top right "420" "4" ""
+FvwmTrayerPanel request pixel "24" top right "420" "4"
+Style trayer UseStyle FvwmParts
All (FvwmButtons-Panel) Close
DestroyModuleConfig FvwmButtons-Panel: *