Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into dieter/experimental

Conflicts:
	uzbl.c

6 files changed, 37 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 97f5761..a70ca9a 100644
--- a/Makefile
+++ b/Makefile
@@ -20,4 +20,5 @@ install:
 	install -d $(DESTDIR)/usr/share/uzbl/examples
 	install -D -m755 uzbl $(DESTDIR)/usr/bin/uzbl
 	cp -ax examples $(DESTDIR)/usr/share/uzbl/
+	install -D -m644 CHECKLIST $(DESTDIR)/usr/share/uzbl/docs
 	install -D -m644 README $(DESTDIR)/usr/share/uzbl/docs
diff --git a/README b/README
index ed8471a..02062f1 100644
--- a/README
+++ b/README
@@ -1,3 +1,23 @@
+THIS PROJECT IS NOT FOR:
+- people want a browser that does everything
+- people who want a browser with things like a built-in bookmark manager, address bar, forward/back buttons, ...
+
+
+
+TO NEW PEOPLE:
+ - please read the README in /usr/share/uzbl/docs
+ - invoke uzbl --help
+ - to get you started: uzbl --uri 'http://www.archlinux.org' --config /usr/share/uzbl/examples/configs/sampleconfig
+ - study the sample config, have a look at all the bindings, and note how you can call the scripts to load new url from history and the bookmarks file
+ - inserting new bookmarks is not working yet. it will be soon.
+ - note that there is no url bar. all url editing is supposed to happen _outside_ of uzbl.
+   for now, you can use the load_from_* dmenu based scripts to pick a url or type a new one (we should have a dmenu-like that functions as a better editor) or write commands into the fifo (see /usr/share/uzbl/docs/CHECKLIST)
+
+
+CURRENT STATE:
+ alpha / prototype
+
+
 - Uzbl.
   In my opinion, any program can only be really useful if it complies to the unix philosophy.
   Web browsers are frequent violators of this principle.  Time to change that!
diff --git a/TODO b/TODO
index 8a0cb91..5b300e3 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
 ASAP
+* do a clean implementation of bindings that need arguments (eg insert_bookmark needs the uri.)
 
 * implement all the ideas from README
 * get a logo
diff --git a/examples/scripts/insert_bookmark.sh b/examples/scripts/insert_bookmark.sh
index af6ca8a..be17c05 100755
--- a/examples/scripts/insert_bookmark.sh
+++ b/examples/scripts/insert_bookmark.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 # you probably want your bookmarks file in your $XDG_DATA_HOME ( eg $HOME/.local/share/uzbl/bookmarks)
+
 if [ -f /usr/share/uzbl/examples/bookmarks ]
 then
-	file=/usr/share/uzbl/examples/bookmarks
+	file=/usr/share/uzbl/examples/bookmarks # you will probably get permission denied errors here. pick a file in your ~
 else
 	file=./examples/bookmarks #useful when developing
 fi
diff --git a/examples/scripts/load_url_from_bookmarks.sh b/examples/scripts/load_url_from_bookmarks.sh
index fd9179e..ca512eb 100755
--- a/examples/scripts/load_url_from_bookmarks.sh
+++ b/examples/scripts/load_url_from_bookmarks.sh
@@ -8,5 +8,5 @@ else
         file=./examples/bookmarks #useful when developing
 fi
 
-goto=`awk '{print $1}' $history_file | dmenu` #NOTE: it's the job of the script that inserts bookmarks to make sure there are no dupes.
+goto=`awk '{print $1}' $file | dmenu` #NOTE: it's the job of the script that inserts bookmarks to make sure there are no dupes.
 [ -n "$goto" ] && echo "uri $goto" > $4
diff --git a/uzbl.c b/uzbl.c
index da73bfe..1b4cd8b 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -107,6 +107,9 @@ char *XDG_CONFIG_DIRS_default = "/etc/xdg";
 static void
 update_title (GtkWindow* window);
 
+static void
+load_uri ( WebKitWebView * web_view, gchar * uri);
+
 static gboolean
 run_command(const char *command, const char *args);
 
@@ -207,7 +210,7 @@ static Command commands[] =
     { "stop",          &webkit_web_view_stop_loading,  NULL },
     { "zoom_in",       &webkit_web_view_zoom_in,       NULL }, //Can crash (when max zoom reached?).
     { "zoom_out",      &webkit_web_view_zoom_out,      NULL },
-    { "uri",           NULL, &webkit_web_view_load_uri      },
+    { "uri",           NULL, &load_uri                      },
     { "toggle_status", &toggle_status_cb,              NULL }
 //{ "get uri",  &webkit_web_view_get_uri},
 };
@@ -236,6 +239,12 @@ file_exists (const char * filename) {
     return false;
 }
 
+static void
+load_uri ( WebKitWebView * web_view, gchar * uri) {
+    webkit_web_view_load_uri (web_view, uricheck(uri));
+}
+
+
 // make sure to put '' around args, so that if there is whitespace we can still keep arguments together.
 static gboolean
 run_command(const char *command, const char *args) {
@@ -468,7 +477,7 @@ settings_init () {
         printf("XDG_CONFIG_HOME: %s\n", XDG_CONFIG_HOME);
     
         strcpy (conf, XDG_CONFIG_HOME);
-        strcat (conf, "/uzbl");
+        strcat (conf, "/uzbl/config");
         if (file_exists (conf)) {
           printf ("Config file %s found.\n", conf);
           config_file = &conf[0];
@@ -484,7 +493,7 @@ settings_init () {
             char *dir = (char *)strtok (dirs, ":");
             while (dir && ! file_exists (conf)) {
                 strcpy (conf, dir);
-                strcat (conf, "/uzbl");
+                strcat (conf, "/uzbl/config");
                 if (file_exists (conf)) {
                     printf ("Config file %s found.\n", conf);
                     config_file = &conf[0];