From: Nick Bowler <nbowler@ellipticsemi.com>
Date: Wed, 21 May 2008 15:56:17 +0000 (-0400)
Subject: Merge git://git.draconx.com/fvwmconf
X-Git-Url: https://git.draconx.ca/gitweb/fvwmconf.git/commitdiff_plain/0e41b01616fa8eecd6054393877a8c048c93889d?hp=b0c2e7aee6eb11bee61a971e2bf530e325378c43

Merge git://git.draconx.com/fvwmconf

Conflicts:

	scripts/C/Makefile
---

diff --git a/config b/config
index b652a53..b256285 100644
--- a/config
+++ b/config
@@ -15,14 +15,18 @@ SetEnv QT_IM_MODULE 'uim'
 Read global/multiscreen
 Read global/fullscreen
 Read global/windowmenu
+Read global/appspecific
 
 # Machine-specific features
-Read $[HOST]/config
+PipeRead "[ -f '$[FVWM_USERDIR]/$[HOST]/config' ] \
+          && echo Read $[HOST]/config \
+	  || echo Read default/config"
 
 # Virtual Desktops
 DesktopSize 6x1
 EdgeThickness 1
-EdgeResistance 1 0
+EdgeResistance 1
+Style * EdgeMoveDelay 1, EdgeMoveResistance 0
 EdgeScroll 0 0
 
 #####
diff --git a/default b/default
new file mode 120000
index 0000000..bb48baf
--- /dev/null
+++ b/default
@@ -0,0 +1 @@
+atropos
\ No newline at end of file
diff --git a/global/appspecific b/global/appspecific
new file mode 100644
index 0000000..c96079b
--- /dev/null
+++ b/global/appspecific
@@ -0,0 +1 @@
+Style "Guild Wars" StaysOnTop
diff --git a/global/fullscreen b/global/fullscreen
index 42df857..deb5e41 100644
--- a/global/fullscreen
+++ b/global/fullscreen
@@ -1,4 +1,4 @@
-Key F10 W A DoFullScreen
+Key F10 W C DoFullScreen
 
 DestroyFunc Fullscreen
 AddToFunc   FullScreen
diff --git a/scripts/C/Makefile b/scripts/C/Makefile
index 8e05569..342509f 100644
--- a/scripts/C/Makefile
+++ b/scripts/C/Makefile
@@ -6,7 +6,7 @@ LD = $(CC)
 
 all: xaspect
 clean:
-	rm -f xaspect *.o
+	rm -f *.o xaspect
 
 .c.o:
 	$(CC) -c -o $@ $(CFLAGS) $<