Merge branch 'master' of git://git.draconx.com/fvwmconf

diff --git a/common/bindings b/common/bindings
index 4d0ce486d2a7132ab320c201461579b7404632e9..dd9f2e2b99caf7e80b9f92cc1898325951da3674 100644 (file)
--- a/common/bindings
+++ b/common/bindings
@@ -37,7 +37,8 @@ Mouse 4 T N Windowshade True
 Mouse 5 T N Windowshade False
 
 # Console
-Key grave A C Exec exec $[TERMINAL]
+Key grave A C  Exec exec $[TERMINAL]
+Key grave A CM Exec exec $[TERMINAL] -e zsh -f
 Key F3 A M  Module FvwmConsole -terminal $[TERMINAL]
 Key F3 A M2 Module FvwmConsole -terminal $[TERMINAL]
 

diff --git a/common/modifier b/common/modifier
index c7b770da57c2154552240d2fc31753e8ef365cb1..cbb89b174cc4878e59b4e878ad320646da636391 100644 (file)
--- a/common/modifier
+++ b/common/modifier
@@ -13,4 +13,4 @@ DestroyFunc Mod_M3Func
 AddToFunc   Mod_M3Func
  + C Lower
  + D Maximize 100 0
- + M PipeRead '. $[FVWM_USERDIR]/scripts/resize.sh $[pointer.wx] $[pointer.wy] $[w.width] $[w.height]'
+ + M PipeRead 'exec $[FVWM_USERDIR]/scripts/resize.sh $[pointer.wx] $[pointer.wy] $[w.width] $[w.height]'

diff --git a/common/wallpaper b/common/wallpaper
index e96f33e8665a20c396801928a7cbf9d628acc0b7..acd270f073984f85bc12bc40e77bd79bd57640c0 100644 (file)
--- a/common/wallpaper
+++ b/common/wallpaper
@@ -15,7 +15,7 @@ DestroyFunc MakeMenuWallpaper
 AddToFunc   MakeMenuWallpaper
  + I DestroyMenu recreate MenuWallpaper
  + I AddToMenu MenuWallpaper Wallpaper Title
- + I PipeRead '. $[FVWM_USERDIR]/scripts/bgmenu.sh $[BGROOT] MenuWallpaper'
+ + I PipeRead 'exec $[FVWM_USERDIR]/scripts/bgmenu.zsh $[BGROOT] MenuWallpaper'
 
 DestroyFunc SetWallpaper
 AddToFunc   SetWallpaper

diff --git a/config b/config
index 9a5a447e096964145fb82d06c1f5c0ee70b9a8bd..8d6372835e9d892ec8370cf1ecdf0a5caa8abeda 100644 (file)
--- a/config
+++ b/config
@@ -4,7 +4,7 @@ ImagePath $[FVWM_USERDIR]/icons:$[FVWM_USERDIR]/pixmaps
 DestroyFunc InitFunction
 DestroyFunc StartFunction
 DestroyFunc ExitFunction
-SetEnv TERMINAL /home/nick/bin/urxvt.sh
+SetEnv TERMINAL $[HOME]/bin/urxvt.sh
 PipeRead 'echo SetEnv HOST `hostname`'
 
 # Global Features

diff --git a/scripts/C/Makefile b/scripts/C/Makefile
index 5d615419fccd772ef756bfffbb8cc030ac6f2d9e..8e055698e9af30ce906c52f58ec0fa1faf01c11e 100644 (file)
--- a/scripts/C/Makefile
+++ b/scripts/C/Makefile
@@ -5,6 +5,8 @@ CC = c89
 LD = $(CC)
 
 all: xaspect
+clean:
+       rm -f xaspect *.o
 
 .c.o:
        $(CC) -c -o $@ $(CFLAGS) $<

diff --git a/scripts/bgmenu.sh b/scripts/bgmenu.zsh
similarity index 83%
rename from scripts/bgmenu.sh
rename to scripts/bgmenu.zsh
index ec6ae8f050dbc21f57551b2404be80041a5f8921..7c0b7d4586cb8590850c9adb083409a58b965d22 100755 (executable)
--- a/scripts/bgmenu.sh
+++ b/scripts/bgmenu.zsh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/zsh
 # Generates an FVWM menu for selecting the PNG images found in a given
 # directory.  Thumbnails for the images are generated on the fly using convert
 # from ImageMagick, and stored in the .thumbs subdirectory.  The menu items
@@ -6,7 +6,7 @@
 
 menu="MenuWallpaper"
 func="SetWallpaper"
-thumber="$HOME/.fvwm/scripts/thumbnail.sh"
+thumber="$FVWM_USERDIR/scripts/thumbnail.sh"
 
 if [ ! -d "$1" ]; then
        echo "usage: $0 <directory> [menuname]" 1>&2
@@ -14,7 +14,7 @@ if [ ! -d "$1" ]; then
 fi
 [ -n "$2" ] && menu="$2"
 
-for i in "$1"/*.png; do
+for i in "$1"/*$($FVWM_USERDIR/scripts/C/xaspect).png; do
        thumb="`$thumber --size x160 "$i"`"
        echo "AddToMenu $menu \"`basename "${i%.png}"`*$thumb*\" $func \"$i\""
 done

diff --git a/scripts/thumbnail.sh b/scripts/thumbnail.sh
index 958092c6fd9207c3dbb770a142eb305cdf44b1c5..b04f2e63d55ce77a677a59eb724354f47ef5de69 100755 (executable)
--- a/scripts/thumbnail.sh
+++ b/scripts/thumbnail.sh
@@ -29,7 +29,7 @@ while [ "${1#--}" != "$1" -a "$1" != "-" ]; do
 done
 [ "$1" = "-" ] && shift
 
-if ! expr match "$size" '^\([0-9]*\(x[0-9]\+\)\?\)$' &>/dev/null; then
+if ! expr match "$size" '^\([0-9]*\(x[0-9]\+\)\?\)$' >/dev/null 2>&1; then
        echo "invalid size specification: $size" 1>&2
        exit 1
 fi