From 90c16629fb72c78988a1815db9f76569f20ce14d Mon Sep 17 00:00:00 2001
From: Nick Bowler <draconx@gmail.com>
Date: Sun, 20 Apr 2008 02:27:35 -0400
Subject: [PATCH] Sync updates from desktop that are applicable to both
 systems.

---
 .gitignore |  2 +-
 bindings   | 10 ++++++++++
 panels     |  3 ++-
 wallpaper  |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8f070d6..dfe09ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 .thumbs
-wallpaper.png
+wallpaper?.png
diff --git a/bindings b/bindings
index cde99b3..35ed961 100644
--- 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 745b8d9..a97465b 100644
--- 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 e994210..5855f74 100644
--- 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
-- 
2.43.2