v0.0.4 fix want#1,#2

1 files changed, 22 insertions, 12 deletions

diff --git a/src/etc/stackrpms-thinkpad-p50s/fluxbox.keys b/src/etc/stackrpms-thinkpad-p50s/fluxbox.keys
index be0c1a2..2ab169f 100644
--- a/src/etc/stackrpms-thinkpad-p50s/fluxbox.keys
+++ b/src/etc/stackrpms-thinkpad-p50s/fluxbox.keys
@@ -9,6 +9,7 @@
 # History:
 #    2019-12-26 started on ltb-018
 #    2022-11-03 adapted for this package
+#    2023-12-12 revised to be identical for stackrpms-thinkpad-p50s and bgconf
 # Usage:
 #    symlink your ~/.fluxbox/keys to this file with:
 #       ln -sf /etc/stackrpms-thinkpad-p50s/fluxbox.keys ~/.fluxbox/keys
@@ -16,7 +17,7 @@
 #    ltb-018:~/.fluxbox/keys
 # Improve:
 # Documentation:
-#    last modified: 2023-09-09-7 07:46
+#    last modified: 2023-12-12-3 18:25
 
 # click on the desktop to get menus
 OnDesktop Mouse1 :HideMenus
@@ -35,10 +36,12 @@ OnDesktop Mouse5 :NextWorkspace
 #OnToolbar Mouse5 :NextWindow {static groups} (iconhidden=no)
 
 # alt + left/right click to move/resize a window
-OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
+#OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
+OnWindow Mod1 Mouse1 :If {And {Matches (Fullscreen!=yes)} {Matches (@_NET_WM_STATE!=.*_FULLSCREEN.*)} } {MacroCmd {Raise} {Focus} {StartMoving}}
 OnWindowBorder Move1 :StartMoving
 
-OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner}
+#OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner}
+OnWindow Mod1 Mouse3 :If {And {Matches (Fullscreen!=yes)} {Matches (@_NET_WM_STATE!=.*_FULLSCREEN.*)} } {MacroCmd {Raise} {Focus} {StartResizing NearestCorner}}
 OnLeftGrip Move1 :StartResizing bottomleft
 OnRightGrip Move1 :StartResizing bottomright
 
@@ -90,11 +93,18 @@ Mod1 F2 :Exec fbrun
 
 # volume settings, using common keycodes
 # if these don't work, use xev to find out your real keycodes
-# for Thinkpad P50s
-123 :Exec amixer sset Master,0 1+
-122 :Exec amixer sset Master,0 1-
-121 :Exec amixer sset Master,0 toggle
-225 :Exec amixer sset Capture,0 toggle # use Fn+F10 magnifying glass because Fn+F4 mic-mute is blocked by firmware?
+# alsa only, volume control
+#123 :Exec amixer sset Master,0 1+
+#122 :Exec amixer sset Master,0 1-
+#121 :Exec amixer sset Master,0 toggle
+# pulseaudio, volume control
+121 :Exec pulsemixer-notification toggle
+122 :Exec pulsemixer-notification down
+123 :Exec pulsemixer-notification up
+# alsa or pulseaudio, mute mic, on Thinkpad P50s
+# use Fn+F10 magnifying glass because Fn+F4 mic-mute is blocked by firmware?
+225 :Exec amixer sset Capture,0 toggle
+
 # screen brightness for Thinkpad P50s
 232 :Exec /usr/bin/hwset-thinkpad-p50s bright down 85
 233 :Exec /usr/bin/hwset-thinkpad-p50s bright up   85
@@ -164,14 +174,14 @@ Mod4 L :Exec xscreensaver-command -lock
 Mod4 O :Exec scite
 Mod4 R :Exec fbrun
 Mod4 Shift C :Exec x-terminal-emulator
-Mod4 Shift D :Exec apulse discord
-Mod4 Shift F :Exec apulse librewolf
+# librewolf used to use apulse
+Mod4 Shift F :Exec librewolf
+#Mod4 Shift F :Exec newmoon
 Mod4 Shift G :Exec firefox
 Mod4 Shift H :Exec waterfox
 Mod4 Shift I :Exec irfanview
 Mod4 Shift L :Exec keepass2
-Mod4 Shift L :Exec telegram-desktop
-Mod4 Shift V :Exec /usr/bin/vlc
+Mod4 Shift V :Exec vlc
 Mod4 Shift W :Exec libreoffice --writer
 Mod4 Shift X :Exec libreoffice --calc