Merge branch 'dieter/experimental' into experimental

4 files changed, 30 insertions, 6 deletions

diff --git a/AUTHORS b/AUTHORS
index 0849060..57f2bc2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,8 @@
 Original code taken from webkit example application whis is copyrighted 2006, 2007 Apple Inc and 2007 Alp Toker <alp@atoker.com>
 enhancements to form uzbl made by Dieter Plaetinck.
+
+Michael Walker (Barrucadu) <mike@barrucadu.co.uk> - Original threaded FIFO interface. Command adding methods.
+
+Zane Ashby (HashBox) <http://demonastery.org> - Rewrote FIFO interface. Fixed various bugs.
+
+(sentientswitch) - Cleaned up code. Added some commands.
diff --git a/README b/README
index 89098ea..e58962d 100644
--- a/README
+++ b/README
@@ -57,9 +57,27 @@ So, assume each entry is about 80 chars, you visit 100 pages per day (?), and yo
 (50 * 1000 * 1000 ) / ( 80 * 100 ) = 6250 days or 17 years.
 There is code to run a benchmark in the 'extra' dir.  For results & interpretation, see http://dieter.plaetinck.be/poor_mans_dmenu_benchmark
 
+CONTROL:
+- FIFO opened in /tmp/uzbl_pid
+- See config file for commands
+- Press ESC to toggle the command entry.
+- Press enter after typing a command to use it.
 
-
-
-NOTE:
+NOTES:
 - My c skills are very rusty, it will take me a while to get back up to speed
 - For more thoughts & ideas see http://bbs.archlinux.org/viewtopic.php?id=67463
+
+REPO's:
+- http://github.com/Dieterbe/uzbl
+  master -> uzbl stable branch
+  experimental -> bleeding edge stuff that may break. after QA codes gets merged into master
+- various contributors also have their clones on github (http://github.com/dusanx, http://github.com/Barrucadu/uzbl, ...).
+  They may be developing specific features, which get merged into Dieters experimental branch
+
+
+KNOWN BUGS
+- Segfault occurs on shutdown, almost definitely FIFO related (I'm not seeing this bug now, but the warning was here when I forked the code and I haven't touched the FIFO bit)
+- Segfaults when using zoom commands (happens when max zoom already reached?).
+- Something in the FIFO code causes CPU usage to jump.
+- Segfaults when loading aliases from config file (currently aliases are defined in the code as a 'work-around').
+- Segfaults when setting the xwin variable
\ No newline at end of file
diff --git a/TODO b/TODO
index 52df75c..2f5bef8 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
 * implement all the ideas from README
+* Support for binding keyboard shortcuts in config file.
 * where to put proxy config? webkit support?
 * do not store the 'http://' part in the history file
 * improve commandline arguments
@@ -6,5 +7,5 @@
 * history logging broken. logs always starting url because i made uri const
 
 SOMEDAY:
-figure out caching with webkit and in general how we can speed everything
+figure out caching with webkit and in general how we can speed up everything
 figure out how webkit intercepts key input
diff --git a/sampleconfig b/sampleconfig
index e318e49..3a4bae1 100644
--- a/sampleconfig
+++ b/sampleconfig
@@ -18,7 +18,7 @@ always_insert_mode = 0
 modkey = Mod4
 
 [bindings_internal]
-next = n
+back = b
 forward = m
 stop = s
 refresh = r
@@ -36,5 +36,4 @@ zoom_out = -
 ./extra/load_url_from_history.sh = u
 ./extra/load_url_from_bookmarks.sh = U
 
-
 [network]