Sync updates from desktop that are applicable to both systems.

diff --git a/.gitignore b/.gitignore
index 8f070d655502ce5027ae8455e89a47f8709cd95b..dfe09ea1475d406b979813a50e200272613e549e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 .thumbs
-wallpaper.png
+wallpaper?.png

diff --git a/bindings b/bindings
index cde99b3f2691a1bf1d2c3de3b65ed665a3954261..35ed961a1ae1fa9a7c98d393227477128dbfffe8 100644 (file)
--- a/bindings
+++ b/bindings
@@ -6,6 +6,9 @@ Key Home      A CM Nop
 Key Insert    A CM Nop
 Key N         A CM Nop
 
+# When programs don't set the resolution...
+Key F12 A C Exec exec xrandr -s 0
+
 # For moving windows around desktops.
 Key J WFT CM DoPageMove 0
 Key K WFT CM DoPageMove 1
@@ -22,6 +25,13 @@ Key 4 A CM GotoPage 3 0
 Key 5 A CM GotoPage 4 0
 Key 6 A CM GotoPage 5 0
 
+# Mousewheel stuff
+Mouse 5 R A GotoPage wrapx +1p 0p
+Mouse 4 R A GotoPage wrapx -1p 0p
+
+Mouse 4 T N Windowshade True
+Mouse 5 T N Windowshade False
+
 DestroyFunc DoPageMove
 AddToFunc   DoPageMove
 + I GotoPage   $0 0

diff --git a/panels b/panels
index 745b8d988a2643a868d607679fa87e6a736e571f..a97465bfe24d776a9bf11ad660ac527bae8cef20 100644 (file)
--- a/panels
+++ b/panels
@@ -26,4 +26,5 @@ AddToFunc StartFunction
 
 AddToFunc ExitFunction
 + I KillModule FvwmPager
-+ I Exec kill `pgrep -P $PPID xfce4-panel`
++ I PipeRead 'kill `pgrep -P $PPID xfce4-panel` &>/dev/null'
++ I PipeRead 'kill `pgrep -P $PPID uim-toolbar-gtk` &>/dev/null'

diff --git a/wallpaper b/wallpaper
index e994210ccc96c1dd8d95f869d4bae4733462a32f..5855f74161c21aec7288f27337016b9dcbdeaaad 100644 (file)
--- a/wallpaper
+++ b/wallpaper
@@ -1,6 +1,6 @@
 # Stuff to handle pretty pictures on the background.
 SetEnv SETROOT "fvwm-root -r"
-SetEnv BGFILE  "$[FVWM_USERDIR]/wallpaper.png"
+SetEnv BGFILE  "$[FVWM_USERDIR]/wallpaper$[screen].png"
 SetEnv BGROOT  "$[HOME]/wallpaper"
 
 CopyMenuStyle * MenuWallpaper