Merge branch 'master' of http://git.hands.com/zavai

Conflicts:
	debian/zavai.install

diff --git a/debian/changelog b/debian/changelog
index 35db29f8aef4971beb3770b646cd7c793cd4b10f..d862eb9d992f013bb39f3089757a03c0a563409d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zavai (0.0-5) unstable; urgency=low
+
+  * move examples to zavai.examples
+
+ -- unknown <phil@hands.com>  Tue, 13 Oct 2009 12:09:14 +0100
+
 zavai (0.0-4) unstable; urgency=low
 
   * call xvkbd via a script to allow transparency to be added once it's up

diff --git a/debian/zavai.examples b/debian/zavai.examples
new file mode 100644 (file)
index 0000000..1000c89
--- /dev/null
+++ b/debian/zavai.examples
@@ -0,0 +1 @@
+hooks/*

diff --git a/hooks/README b/hooks/README
index 6ec5e302af48393419263690b18741c3f28c293b..613ba88f7c9f850fd490b93b2d2896537c2837f0 100644 (file)
--- a/hooks/README
+++ b/hooks/README
@@ -2,3 +2,11 @@ These scripts go into ~/.zavai.
 
 Zavai will call them to perform various actions; you can customise them to suit
 your needs.
+
+*.fil
+=====
+The files with a .fil suffix are components of Philip Hands's configuration, that
+uses the openmoko in landscape, and a transparent overlayed keyboard.
+It requires xmonad to be installed, although any window manager that
+allows a floating window over the top of the currently focused window.
+Each file contains a comment describing where it should be installed.

diff --git a/hooks/Xdefaults.fil b/hooks/Xdefaults.fil
new file mode 100644 (file)
index 0000000..3bea2db
--- /dev/null
+++ b/hooks/Xdefaults.fil
@@ -0,0 +1,6 @@
+! to use this file, link/copy this to ~/.Xdefaults
+
+xvkbd.modalKeytop: false
+xvkbd*Font: -*-helvetica-medium-r-*-*-24-*-*-*-*-*-iso8859-1
+xvkbd.windowGeometry: 610x400+15+60
+xvkbd.keypad: false

diff --git a/hooks/keyboard.fil b/hooks/keyboard.fil
index 8a96dc31fa89c0e97b779e594a698989c78b0169..7b755a212631ec1980a5cbbe56ae1f4df704095c 100755 (executable)
--- a/hooks/keyboard.fil
+++ b/hooks/keyboard.fil
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# to use this, copy/sym-link it to ~/.zavai/keyboard
+
 # I'm sure there is some clever way to make the WM inflict transparency on the keyboard,
 # but I don't know what it is, so for now a dodgy hack
 

diff --git a/hooks/xmonad.hs.fil b/hooks/xmonad.hs.fil
new file mode 100644 (file)
index 0000000..1e24dc5
--- /dev/null
+++ b/hooks/xmonad.hs.fil
@@ -0,0 +1,20 @@
+-- to use this, copy/sym-link it to ~/.xmonad/xmonad.hs
+
+import XMonad
+import XMonad.Hooks.ManageDocks
+import XMonad.Util.EZConfig(additionalKeys)
+
+myManageHook = composeAll
+    [ className =? "XVkbd"     --> doIgnore
+    , className =? "stalonetray" --> doIgnore
+    , className =? "trayer" --> doIgnore
+    ]
+
+main = do
+    xmonad $ defaultConfig
+        { manageHook = manageDocks <+> myManageHook -- make sure to include myManageHook definition from above
+                        <+> manageHook defaultConfig
+        , layoutHook = avoidStruts $ Full
+        } `additionalKeys`
+        [ ((mod1Mask .|. shiftMask, xK_t), spawn "transset-df -n xvkbd .4") -- AltShift-t make keyboard transparent
+        ]

diff --git a/hooks/xsession.fil b/hooks/xsession.fil
new file mode 100644 (file)
index 0000000..7d81d05
--- /dev/null
+++ b/hooks/xsession.fil
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# to use this, copy/sym-link it to ~/.xsession
+
+# lindi's answering machine script
+/usr/local/bin/answering-machine-loop &
+
+# set the keyboard defaults
+xrdb -merge .Xdefaults
+
+# set X to landscape
+xrandr -o 3
+
+# required to allow transparency for the keyboard
+xcompmgr -n &
+
+zavai_forever &
+
+trayer --edge top --align right --SetDockType true --SetPartialStrut true \
+  --expand true --width 40 --transparent true --height 48 &
+
+# I have xmonad installed as my default window manager, configured thus:
+#      update-alternatives --config x-window-manager
+exec x-window-manager

diff --git a/hooks/xvkbd.fil b/hooks/xvkbd.fil
new file mode 100644 (file)
index 0000000..8fe9a1e
--- /dev/null
+++ b/hooks/xvkbd.fil
@@ -0,0 +1,3 @@
+# to use this, copy it to ~/.xvkbd -- it's over-written when changing options, so sym-linking would be a mistake
+autoclick 0
+always_on_top 1