merge in changes from master

9 files changed, 153 insertions, 101 deletions

diff --git a/examples/data/uzbl/plugins/bind.py b/examples/data/uzbl/plugins/bind.py
index 9614df6..9e09337 100644
--- a/examples/data/uzbl/plugins/bind.py
+++ b/examples/data/uzbl/plugins/bind.py
@@ -13,9 +13,6 @@ import sys
 import re
 import pprint
 
-# Export these functions to uzbl.<name>
-__export__ = ['bind', 'mode_bind', 'get_bindlet']
-
 # Hold the bind dicts for each uzbl instance.
 UZBLS = {}
 
@@ -504,12 +501,21 @@ def modcmd_exec(uzbl, keylet):
 
 
 def init(uzbl):
-    connects = {'BIND': parse_bind,
-      'MODE_BIND': parse_mode_bind,
-      'KEYCMD_UPDATE': keycmd_update,
-      'MODCMD_UPDATE': modcmd_update,
-      'KEYCMD_EXEC': keycmd_exec,
-      'MODCMD_EXEC': modcmd_exec,
-      'MODE_CHANGED': mode_changed}
-
-    uzbl.connect_dict(connects)
+    # Event handling hooks.
+    uzbl.connect_dict({
+        'BIND':             parse_bind,
+        'KEYCMD_EXEC':      keycmd_exec,
+        'KEYCMD_UPDATE':    keycmd_update,
+        'MODCMD_EXEC':      modcmd_exec,
+        'MODCMD_UPDATE':    modcmd_update,
+        'MODE_BIND':        parse_mode_bind,
+        'MODE_CHANGED':     mode_changed,
+    })
+
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.export_dict({
+        'bind':         bind,
+        'mode_bind':    mode_bind,
+        'get_bindlet':  get_bindlet,
+    })
diff --git a/examples/data/uzbl/plugins/cmd_expand.py b/examples/data/uzbl/plugins/cmd_expand.py
index a5c279d..3f6ae2b 100644
--- a/examples/data/uzbl/plugins/cmd_expand.py
+++ b/examples/data/uzbl/plugins/cmd_expand.py
@@ -1,6 +1,3 @@
-__export__ = ['cmd_expand',]
-
-
 def escape(str):
     for (level, char) in [(3, '\\'), (2, "'"), (2, '"'), (1, '@')]:
         str = str.replace(char, (level * '\\') + char)
@@ -39,5 +36,7 @@ def cmd_expand(uzbl, cmd, args):
     return cmd
 
 
-def init(*args):
-    pass
+def init(uzbl):
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.export('cmd_expand', cmd_expand)
diff --git a/examples/data/uzbl/plugins/completion.py b/examples/data/uzbl/plugins/completion.py
index 8e055e1..8cea203 100644
--- a/examples/data/uzbl/plugins/completion.py
+++ b/examples/data/uzbl/plugins/completion.py
@@ -185,17 +185,22 @@ def add_config_key(uzbl, key, value):
 
 
 def init(uzbl):
-    connects = {
-      'INSTANCE_START':    add_instance,
-      'INSTANCE_EXIT':     del_instance,
+    # Event handling hooks.
+    uzbl.connect_dict({
       'BUILTINS':          add_builtins,
       'CONFIG_CHANGED':    add_config_key,
+      'INSTANCE_EXIT':     del_instance,
+      'INSTANCE_START':    add_instance,
+      'KEYCMD_CLEARED':    stop_completion,
+      'KEYCMD_EXEC':       stop_completion,
       'KEYCMD_UPDATE':     update_completion_list,
       'START_COMPLETION':  start_completion,
-    }
-
-    # And connect the dicts event handlers to the handler stack.
-    uzbl.connect_dict(connects)
-
-    for event in ['STOP_COMPLETION', 'KEYCMD_EXEC', 'KEYCMD_CLEARED']:
-        uzbl.connect(event, stop_completion)
+      'STOP_COMPLETION':   stop_completion,
+    })
+
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.export_dict({
+        'get_completion_dict':  get_completion_dict,
+        'start_completion':     start_completion,
+    })
diff --git a/examples/data/uzbl/plugins/config.py b/examples/data/uzbl/plugins/config.py
index b43161b..4a848a3 100644
--- a/examples/data/uzbl/plugins/config.py
+++ b/examples/data/uzbl/plugins/config.py
@@ -82,9 +82,16 @@ def variable_set(uzbl, args):
 
 
 def init(uzbl):
-
-    connects = {'VARIABLE_SET': variable_set,
-      'INSTANCE_START': add_instance,
-      'INSTANCE_EXIT': del_instance}
-
-    uzbl.connect_dict(connects)
+    # Event handling hooks.
+    uzbl.connect_dict({
+        'INSTANCE_EXIT':    del_instance,
+        'INSTANCE_START':   add_instance,
+        'VARIABLE_SET':     variable_set,
+    })
+
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.export_dict({
+        'get_config':   get_config,
+        'set':          set,
+    })
diff --git a/examples/data/uzbl/plugins/keycmd.py b/examples/data/uzbl/plugins/keycmd.py
index af6beff..c119077 100644
--- a/examples/data/uzbl/plugins/keycmd.py
+++ b/examples/data/uzbl/plugins/keycmd.py
@@ -1,29 +1,22 @@
 import re
 
-# Map these functions/variables in the plugins namespace to the uzbl object.
-__export__ = ['clear_keycmd', 'set_keycmd', 'set_cursor_pos', 'get_keylet',
-    'clear_current', 'clear_modcmd', 'add_modmap', 'add_key_ignore',
-    'append_keycmd', 'inject_keycmd', 'add_modkey_addition']
-
 # Hold the keylets.
 UZBLS = {}
 
 # Keycmd format which includes the markup for the cursor.
 KEYCMD_FORMAT = "%s<span @cursor_style>%s</span>%s"
+MODCMD_FORMAT = "<span> %s </span>"
 
 
-def uzbl_escape(str):
-    '''Prevent outgoing keycmd values from expanding inside the
-    status_format.'''
+def escape(str):
+    for char in ['\\', '@']:
+        str = str.replace(char, '\\'+char)
 
-    if not str:
-        return ''
+    return str
 
-    for char in ['\\', '@']:
-        if char in str:
-            str = str.replace(char, '\\'+char)
 
-    return "@[%s]@" % str
+def uzbl_escape(str):
+    return "@[%s]@" % escape(str) if str else ''
 
 
 class Keylet(object):
@@ -261,6 +254,7 @@ def clear_keycmd(uzbl):
     k.cursor = 0
     k._repr_cache = False
     uzbl.set('keycmd')
+    uzbl.set('raw_keycmd')
     uzbl.event('KEYCMD_CLEARED')
 
 
@@ -276,6 +270,7 @@ def clear_modcmd(uzbl, clear_held=False):
         k.held = set()
 
     uzbl.set('modcmd')
+    uzbl.set('raw_modcmd')
     uzbl.event('MODCMD_CLEARED')
 
 
@@ -314,9 +309,11 @@ def update_event(uzbl, k, execute=True):
         new_modcmd = k.get_modcmd()
         if not new_modcmd:
             uzbl.set('modcmd', config=config)
+            uzbl.set('raw_modcmd', config=config)
 
         elif new_modcmd == modcmd:
-            uzbl.set('modcmd', '<span> %s </span>' % uzbl_escape(new_modcmd),
+            uzbl.set('raw_modcmd', escape(modcmd), config=config)
+            uzbl.set('modcmd', MODCMD_FORMAT % uzbl_escape(modcmd),
                 config=config)
 
     if 'keycmd_events' in config and config['keycmd_events'] != '1':
@@ -325,6 +322,7 @@ def update_event(uzbl, k, execute=True):
     new_keycmd = k.get_keycmd()
     if not new_keycmd:
         uzbl.set('keycmd', config=config)
+        uzbl.set('raw_keycmd', config=config)
 
     elif new_keycmd == keycmd:
         # Generate the pango markup for the cursor in the keycmd.
@@ -332,6 +330,7 @@ def update_event(uzbl, k, execute=True):
         chunks = [keycmd[:k.cursor], curchar, keycmd[k.cursor+1:]]
         value = KEYCMD_FORMAT % tuple(map(uzbl_escape, chunks))
         uzbl.set('keycmd', value, config=config)
+        uzbl.set('raw_keycmd', escape(keycmd), config=config)
 
 
 def inject_str(str, index, inj):
@@ -391,6 +390,7 @@ def key_press(uzbl, key):
             k.keycmd = ''
             k.cursor = 0
             uzbl.set('keycmd', config=config)
+            uzbl.set('raw_keycmd', config=config)
             return
 
         k.keycmd = inject_str(k.keycmd, k.cursor, key)
@@ -533,22 +533,39 @@ def set_cursor_pos(uzbl, index):
 def init(uzbl):
     '''Connect handlers to uzbl events.'''
 
-    connects = {'INSTANCE_START': add_instance,
-      'INSTANCE_EXIT': del_instance,
-      'KEY_PRESS': key_press,
-      'KEY_RELEASE': key_release,
-      'SET_KEYCMD': set_keycmd,
-      'KEYCMD_STRIP_WORD': keycmd_strip_word,
-      'KEYCMD_BACKSPACE': keycmd_backspace,
-      'KEYCMD_DELETE': keycmd_delete,
-      'KEYCMD_EXEC_CURRENT': keycmd_exec_current,
-      'SET_CURSOR_POS': set_cursor_pos,
-      'FOCUS_LOST': focus_changed,
-      'FOCUS_GAINED': focus_changed,
-      'MODMAP': modmap_parse,
-      'APPEND_KEYCMD': append_keycmd,
-      'INJECT_KEYCMD': inject_keycmd,
-      'IGNORE_KEY': add_key_ignore,
-      'MODKEY_ADDITION': modkey_addition_parse}
-
-    uzbl.connect_dict(connects)
+    # Event handling hooks.
+    uzbl.connect_dict({
+        'APPEND_KEYCMD':        append_keycmd,
+        'FOCUS_GAINED':         focus_changed,
+        'FOCUS_LOST':           focus_changed,
+        'IGNORE_KEY':           add_key_ignore,
+        'INJECT_KEYCMD':        inject_keycmd,
+        'INSTANCE_EXIT':        del_instance,
+        'INSTANCE_START':       add_instance,
+        'KEYCMD_BACKSPACE':     keycmd_backspace,
+        'KEYCMD_DELETE':        keycmd_delete,
+        'KEYCMD_EXEC_CURRENT':  keycmd_exec_current,
+        'KEYCMD_STRIP_WORD':    keycmd_strip_word,
+        'KEY_PRESS':            key_press,
+        'KEY_RELEASE':          key_release,
+        'MODKEY_ADDITION':      modkey_addition_parse,
+        'MODMAP':               modmap_parse,
+        'SET_CURSOR_POS':       set_cursor_pos,
+        'SET_KEYCMD':           set_keycmd,
+    })
+
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.export_dict({
+        'add_key_ignore':       add_key_ignore,
+        'add_modkey_addition':  add_modkey_addition,
+        'add_modmap':           add_modmap,
+        'append_keycmd':        append_keycmd,
+        'clear_current':        clear_current,
+        'clear_keycmd':         clear_keycmd,
+        'clear_modcmd':         clear_modcmd,
+        'get_keylet':           get_keylet,
+        'inject_keycmd':        inject_keycmd,
+        'set_cursor_pos':       set_cursor_pos,
+        'set_keycmd':           set_keycmd,
+    })
diff --git a/examples/data/uzbl/plugins/mode.py b/examples/data/uzbl/plugins/mode.py
index f85d999..54d865a 100644
--- a/examples/data/uzbl/plugins/mode.py
+++ b/examples/data/uzbl/plugins/mode.py
@@ -156,12 +156,21 @@ def toggle_modes(uzbl, modes):
 
 
 def init(uzbl):
-
-    connects = {'CONFIG_CHANGED': config_changed,
-      'INSTANCE_EXIT': del_instance,
-      'INSTANCE_START': add_instance,
-      'MODE_CONFIG': mode_config,
-      'TOGGLE_MODES': toggle_modes,
-      'MODE_CHANGED': mode_changed}
-
-    uzbl.connect_dict(connects)
+    # Event handling hooks.
+    uzbl.connect_dict({
+        'CONFIG_CHANGED':   config_changed,
+        'INSTANCE_EXIT':    del_instance,
+        'INSTANCE_START':   add_instance,
+        'MODE_CHANGED':     mode_changed,
+        'MODE_CONFIG':      mode_config,
+        'TOGGLE_MODES':     toggle_modes,
+    })
+
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.export_dict({
+        'get_mode': get_mode,
+        'get_mode_config': get_mode_config,
+        'set_mode': set_mode,
+        'set_mode_config': set_mode_config,
+    })
diff --git a/examples/data/uzbl/plugins/on_event.py b/examples/data/uzbl/plugins/on_event.py
index f1ad0c9..b9c504a 100644
--- a/examples/data/uzbl/plugins/on_event.py
+++ b/examples/data/uzbl/plugins/on_event.py
@@ -92,9 +92,16 @@ def parse_on_event(uzbl, args):
 
 
 def init(uzbl):
-
-    connects = {'ON_EVENT': parse_on_event,
-      'INSTANCE_START': add_instance,
-      'INSTANCE_EXIT': del_instance}
-
-    uzbl.connect_dict(connects)
+    # Event handling hooks.
+    uzbl.connect_dict({
+        'INSTANCE_EXIT':    del_instance,
+        'INSTANCE_START':   add_instance,
+        'ON_EVENT':         parse_on_event,
+    })
+
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.export_dict({
+        'get_on_events':    get_on_events,
+        'on_event':         on_event,
+    })
diff --git a/examples/data/uzbl/plugins/plugin_template.py b/examples/data/uzbl/plugins/plugin_template.py
index 03cb748..565a999 100644
--- a/examples/data/uzbl/plugins/plugin_template.py
+++ b/examples/data/uzbl/plugins/plugin_template.py
@@ -1,8 +1,5 @@
 '''Plugin template.'''
 
-# A list of functions this plugin exports to be used via uzbl object.
-__export__ = ['myplugin_function',]
-
 # Holds the per-instance data dict.
 UZBLS = {}
 
@@ -60,16 +57,20 @@ def init(uzbl):
 
     # Make a dictionary comprising of {"EVENT_NAME": handler, ..} to the event
     # handler stack:
-    connects = {
-      'INSTANCE_START':  add_instance,
-      'INSTANCE_EXIT':   del_instance,
-      'MYPLUGIN_EVENT':  myplugin_event_parser,
-    }
-
-    # And connect the dicts event handlers to the handler stack.
-    uzbl.connect_dict(connects)
+    uzbl.connect_dict({
+        # event name       function
+        'INSTANCE_START':  add_instance,
+        'INSTANCE_EXIT':   del_instance,
+        'MYPLUGIN_EVENT':  myplugin_event_parser,
+    })
 
     # Or connect a handler to an event manually and supply additional optional
     # arguments:
-
     #uzbl.connect("MYOTHER_EVENT", myother_event_parser, True, limit=20)
+
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.connect_dict({
+        # external name      function
+        'myplugin_function': myplugin_function,
+    })
diff --git a/examples/data/uzbl/plugins/progress_bar.py b/examples/data/uzbl/plugins/progress_bar.py
index b6fcb1b..89ba175 100644
--- a/examples/data/uzbl/plugins/progress_bar.py
+++ b/examples/data/uzbl/plugins/progress_bar.py
@@ -149,10 +149,11 @@ def reset_progress(uzbl, args):
 
 
 def init(uzbl):
-    connects = {'LOAD_PROGRESS': update_progress,
-      'INSTANCE_START': add_instance,
-      'INSTANCE_EXIT': del_instance,
-      'PROGRESS_CONFIG': progress_config,
-      'LOAD_COMMIT': reset_progress}
-
-    uzbl.connect_dict(connects)
+    # Event handling hooks.
+    uzbl.connect_dict({
+        'INSTANCE_EXIT':    del_instance,
+        'INSTANCE_START':   add_instance,
+        'LOAD_COMMIT':      reset_progress,
+        'LOAD_PROGRESS':    update_progress,
+        'PROGRESS_CONFIG':  progress_config,
+    })