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

Conflicts:

	scripts/C/Makefile

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 2dc1e51063e601ce685440208d29251dd86415c7..b256285d5d72a6acfd4dc537d61368a48454604d 100644 (file)
--- a/config
+++ b/config
@@ -4,9 +4,13 @@ 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`'
 
+SetEnv XMODIFIERS '@im=uim'
+SetEnv GTK_IM_MODULE 'uim'
+SetEnv QT_IM_MODULE 'uim'
+
 # Global Features
 Read global/multiscreen
 Read global/fullscreen

diff --git a/finial/config b/finial/config
new file mode 100644 (file)
index 0000000..b1b4221
--- /dev/null
+++ b/finial/config
@@ -0,0 +1,25 @@
+# Import common features
+Read common/bindings
+Read common/nickstheme
+
+# Bigger fonts must be set before including rootmenu
+Style * Font 'xft:M+1P+IPAG:Bold:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
+Style * IconFont 'xft:M+1P+IPAG:Bold:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
+MenuStyle * Font 'xft:M+1P+IPAG:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
+MenuStyle * TitleFont 'xft:M+1P+IPAG:Bold:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
+
+Read finial/rootmenu
+Read common/wallpaper
+Read common/panels
+Read common/modifier
+
+# Bindings for the modifier key
+Mouse 1 WFT 4  Mod_M1Func
+Mouse 2 WFT 4  Mod_M2Func
+Mouse 3 WFT 4  Mod_M3Func
+Mouse 1 WFT 42 Mod_M1Func
+Mouse 2 WFT 42 Mod_M2Func
+Mouse 3 WFT 42 Mod_M3Func
+
+# Struts for the pager.
+EwmhBaseStruts 0 0 0 42

diff --git a/finial/rootmenu b/finial/rootmenu
new file mode 100644 (file)
index 0000000..6d13d18
--- /dev/null
+++ b/finial/rootmenu
@@ -0,0 +1,43 @@
+MenuStyle * !TitleWarp
+
+CopyMenuStyle * MenuMPD
+MenuStyle MenuMPD ItemFormat "%.2|%3.5l%.5l%2.3>%-65.5r%.5i%1|"
+
+DestroyMenu MenuFvwmRoot
+AddToMenu   MenuFvwmRoot
++ DynamicPopupAction MakeMenuFvwmRoot
+
+DestroyFunc MakeMenuFvwmRoot
+AddToFunc   MakeMenuFvwmRoot
++ I DestroyMenu recreate MenuFvwmRoot
++ I PipeRead 'echo AddToMenu MenuFvwmRoot "$USER@`hostname`" Title'
++ I AddToMenu MenuFvwmRoot "Terminal%terminal.svg:16x16%" Exec exec $[TERMINAL]
++ I AddToMenu MenuFvwmRoot "Firefox%firefox.png%" Exec exec firefox
++ I PipeRead "xlsclients -a | grep ' gmpc$' >/dev/null || echo\
+       AddToMenu MenuFvwmRoot 'GMPC%gmpc.png%' Exec exec gmpc"
++ I AddToMenu MenuFvwmRoot "" Nop
++ I AddToMenu MenuFvwmRoot "Network%network.svg:16x16%" Popup MenuNetwork
++ I AddToMenu MenuFvwmRoot "" Nop
++ I AddToMenu MenuFvwmRoot "Wallpaper%wallpaper.svg:16x16%" Popup MenuWallpaper
++ I AddToMenu MenuFvwmRoot "Music%music.svg:16x16%" Popup MenuMPD
++ I AddToMenu MenuFvwmRoot "" Nop
++ I AddToMenu MenuFvwmRoot "Restart FVWM%reload.svg:16x16%" Restart
++ I AddToMenu MenuFvwmRoot "Exit FVWM%logout.svg:16x16%"\
+       Module FvwmForm FvwmForm-QuitVerify
+
+DestroyMenu MenuNetwork
+AddToMenu   MenuNetwork
++ "Pan Newsreader%pan.png%" Exec exec env LC_ALL=en_CA.UTF-8 pan
+
+DestroyMenu MenuMPD
+AddToMenu   MenuMPD
++ DynamicPopUpAction   MakeMenuMPD
++ DynamicPopDownAction KillMenuMPD
+ChangeMenuStyle MenuMPD MenuMPD
+
+DestroyFunc MakeMenuMPD
+AddToFunc   MakeMenuMPD
++ I DestroyMenu recreate MenuMPD
++ I PipeRead "exec $[FVWM_USERDIR]/scripts/mpdmenu.pl --menu MenuMPD"
+
+Mouse 3 R A Menu MenuFvwmRoot

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