Merge branch 'master' into experimental

3 files changed, 11 insertions, 14 deletions

diff --git a/docs/INSTALL b/docs/INSTALL
index 711ea97..c795502 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -9,8 +9,8 @@ From source
 You can pull the code from git or get a tagged tarball.
 
 	$ git clone git://github.com/Dieterbe/uzbl.git
-	[ $ git checkout origin/experimental ] # optional. see below
 	$ cd uzbl
+	[ $ git checkout origin/experimental ] # optional. see below
 	$ make
 	$ sudo make install
 If you want to remove uzbl again, you can issue:
diff --git a/examples/config/config b/examples/config/config
index 91ef872..5dd0e72 100644
--- a/examples/config/config
+++ b/examples/config/config
@@ -35,7 +35,7 @@ set shell_cmd       = sh -c
 set scripts_dir     = $XDG_DATA_HOME/uzbl:@prefix/share/uzbl/examples/data:scripts
 
 # Javascipt helpers.
-set jsh = js var run=Uzbl.run; function get(k){return run("print \\\@"+k)}; function set(k, v) {run("set "+k+" = "+v)};
+#set jsh = js var run=Uzbl.run; function get(k){return run("print \\\@"+k)}; function set(k, v) {run("set "+k+" = "+v)};
 
 # === Handlers ===============================================================
 
@@ -72,7 +72,7 @@ set new_window          = sh 'uzbl-browser -u $8'
 
 # Generate a FORM_ACTIVE event if an editable
 # element on the loaded site has initial focus
-@on_event   LOAD_FINISH    js if(document.activeElement.type == 'text') {Uzbl.run("event FORM_ACTIVE");}
+#@on_event   LOAD_FINISH    js if(document.activeElement.type == 'text') {Uzbl.run("event FORM_ACTIVE");}
 
 # Switch to insert mode if a (editable) html form is clicked
 @on_event   FORM_ACTIVE    @set_mode insert
@@ -190,12 +190,8 @@ set ebind = @mode_bind global,-insert
 
 # === Mouse bindings =========================================================
 
-# Middle click
-# if clicked on a link open the link in a new uzbl window
-# otherwise open the selection in the current window
-set load_from_xclip = sh 'echo "uri $(xclip -o)" > $4'
-set open_new_window = sh 'uzbl-browser -u \@SELECTED_URI'
-@bind <Button2> = @jsh if(get("SELECTED_URI")) { run("\@open_new_window"); } else { run("\\\@load_from_xclip"); }
+# Middle click open in new window
+@bind  <Button2>  = sh 'uzbl-browser -u \@SELECTED_URI'
 
 
 # === Keyboard bindings ======================================================
@@ -277,7 +273,8 @@ set toggle_cmd_ins = @toggle_modes command insert
 @cbind  gh  = uri http://www.uzbl.org
 
 # --- Yanking & pasting binds ---
-@cbind  y<Yank (t)itle or (u)rl:>* = @jsh if('%s' == 'u') { run("sh 'echo -n $6 | xclip'"); } else if('%s' == 't') { run("sh 'echo -n $7 | xclip'"); }; run('event SET_KEYCMD');
+@cbind  yu  = sh 'echo -n $6 | xclip'
+@cbind  yy  = sh 'echo -n $7 | xclip'
 
 # Go the page from primary selection
 @cbind  p   = sh 'echo "uri `xclip -selection primary -o`" > $4'
diff --git a/examples/data/scripts/uzbl-event-manager b/examples/data/scripts/uzbl-event-manager
index 99b215a..a92485f 100755
--- a/examples/data/scripts/uzbl-event-manager
+++ b/examples/data/scripts/uzbl-event-manager
@@ -295,7 +295,7 @@ def parse_msg(uzbl, msg):
     cmd = FINDSPACES.split(msg, 3)
     if not cmd or cmd[0] != 'EVENT':
         # Not an event message.
-        print '---', msg
+        print '---', msg.encode('utf-8')
         return
 
     while len(cmd) < 4:
@@ -374,11 +374,11 @@ class UzblInstance(object):
 
         msg = msg.strip()
         if self.client_socket:
-            print '%s<-- %s' % ('  ' * self.depth, msg)
+            print (u'%s<-- %s' % ('  ' * self.depth, msg)).encode('utf-8')
             self.client_socket.send(("%s\n" % msg).encode('utf-8'))
 
         else:
-            print '%s!-- %s' % ('  ' * self.depth, msg)
+            print (u'%s!-- %s' % ('  ' * self.depth, msg)).encode('utf-8')
 
 
     def export(self, name, function):
@@ -466,7 +466,7 @@ class UzblInstance(object):
         elems = [event,]
         if args: elems.append(unicode(args))
         if kargs: elems.append(unicode(kargs))
-        print "%s--> %s" % ('  ' * self.depth, ' '.join(elems))
+        print (u'%s--> %s' % ('  ' * self.depth, ' '.join(elems))).encode('utf-8')
 
         if event == "INSTANCE_START" and args:
             self.pid = int(args[0])