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

Conflicts:

	scripts/C/Makefile

diff --git a/config b/config
index b652a53012518910ca3838faa182820ef5524621..b256285d5d72a6acfd4dc537d61368a48454604d 100644 (file)
--- 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 (symlink)
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 (file)
index 0000000..c96079b
--- /dev/null
+++ b/global/appspecific
@@ -0,0 +1 @@
+Style "Guild Wars" StaysOnTop

diff --git a/global/fullscreen b/global/fullscreen
index 42df8579d2eeef09d5f2fd7c97359c49b44c475e..deb5e41b5fba8d0148c4762cabbfa107d87b7838 100644 (file)
--- 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 8e055698e9af30ce906c52f58ec0fa1faf01c11e..342509f12a1acb918726cd15b5db1dabce4888f4 100644 (file)
--- 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) $<