Use the cleaner connect_dict function for adding multiple events.

8 files changed, 29 insertions, 17 deletions

diff --git a/examples/data/uzbl/scripts/event_manager.py b/examples/data/uzbl/scripts/event_manager.py
index 18a6d54..2e84ded 100755
--- a/examples/data/uzbl/scripts/event_manager.py
+++ b/examples/data/uzbl/scripts/event_manager.py
@@ -439,6 +439,17 @@ class UzblInstance(object):
         return handler
 
 
+    def connect_dict(self, connect_dict):
+        '''Connect a dictionary comprising of {"EVENT_NAME": handler, ..} to
+        the event handler stack.
+
+        If you need to supply args or kargs to an event use the normal connect
+        function.'''
+
+        for (event, handler) in connect_dict.items():
+            self.connect(event, handler)
+
+
     def remove_by_id(self, hid):
         '''Remove connected event handler by unique handler id.'''
 
diff --git a/examples/data/uzbl/scripts/plugins/bind.py b/examples/data/uzbl/scripts/plugins/bind.py
index b7a6e9b..15f6f8e 100644
--- a/examples/data/uzbl/scripts/plugins/bind.py
+++ b/examples/data/uzbl/scripts/plugins/bind.py
@@ -371,5 +371,4 @@ def init(uzbl):
       'MODCMD_EXEC': modcmd_exec,
       'MODE_CHANGED': clear_stack}
 
-    for (event, handler) in connects.items():
-        uzbl.connect(event, handler)
+    uzbl.connect_dict(connects)
diff --git a/examples/data/uzbl/scripts/plugins/config.py b/examples/data/uzbl/scripts/plugins/config.py
index dc2070a..22803b4 100644
--- a/examples/data/uzbl/scripts/plugins/config.py
+++ b/examples/data/uzbl/scripts/plugins/config.py
@@ -84,5 +84,4 @@ def init(uzbl):
       'INSTANCE_START': add_instance,
       'INSTANCE_EXIT': del_instance}
 
-    for (event, handler) in connects.items():
-        uzbl.connect(event, handler)
+    uzbl.connect_dict(connects)
diff --git a/examples/data/uzbl/scripts/plugins/keycmd.py b/examples/data/uzbl/scripts/plugins/keycmd.py
index 4b243a7..fcf70c8 100644
--- a/examples/data/uzbl/scripts/plugins/keycmd.py
+++ b/examples/data/uzbl/scripts/plugins/keycmd.py
@@ -296,5 +296,4 @@ def init(uzbl):
       'KEY_PRESS': key_press,
       'KEY_RELEASE': key_release}
 
-    for (event, handler) in connects.items():
-        uzbl.connect(event, handler)
+    uzbl.connect_dict(connects)
diff --git a/examples/data/uzbl/scripts/plugins/mode.py b/examples/data/uzbl/scripts/plugins/mode.py
index f8464e7..ad0d9a8 100644
--- a/examples/data/uzbl/scripts/plugins/mode.py
+++ b/examples/data/uzbl/scripts/plugins/mode.py
@@ -156,5 +156,4 @@ def init(uzbl):
       'LOAD_START': load_reset,
       'TOGGLE_MODES': toggle_modes}
 
-    for (event, handler) in connects.items():
-        uzbl.connect(event, handler)
+    uzbl.connect_dict(connects)
diff --git a/examples/data/uzbl/scripts/plugins/on_event.py b/examples/data/uzbl/scripts/plugins/on_event.py
index fbbc75d..242f9b0 100644
--- a/examples/data/uzbl/scripts/plugins/on_event.py
+++ b/examples/data/uzbl/scripts/plugins/on_event.py
@@ -109,9 +109,9 @@ def parse_on_event(uzbl, args):
 
 
 def init(uzbl):
+
     connects = {'ON_EVENT': parse_on_event,
       'INSTANCE_START': add_instance,
       'INSTANCE_EXIT': del_instance}
 
-    for (event, handler) in connects.items():
-        uzbl.connect(event, handler)
+    uzbl.connect_dict(connects)
diff --git a/examples/data/uzbl/scripts/plugins/plugin_template.py b/examples/data/uzbl/scripts/plugins/plugin_template.py
index 55bb62a..03cb748 100644
--- a/examples/data/uzbl/scripts/plugins/plugin_template.py
+++ b/examples/data/uzbl/scripts/plugins/plugin_template.py
@@ -10,13 +10,13 @@ UZBLS = {}
 DEFAULTS = {}
 
 
-def add_instance(uzbl, pid):
+def add_instance(uzbl, *args):
     '''Add a new instance with default config options.'''
 
     UZBLS[uzbl] = dict(DEFAULTS)
 
 
-def del_instance(uzbl, pid):
+def del_instance(uzbl, *args):
     '''Delete data stored for an instance.'''
 
     if uzbl in UZBLS:
@@ -58,12 +58,18 @@ def init(uzbl):
     is called each time a UzblInstance() object is created in the event
     manager.'''
 
+    # Make a dictionary comprising of {"EVENT_NAME": handler, ..} to the event
+    # handler stack:
     connects = {
-      # EVENT_NAME       HANDLER_FUNCTION
       'INSTANCE_START':  add_instance,
       'INSTANCE_EXIT':   del_instance,
       'MYPLUGIN_EVENT':  myplugin_event_parser,
     }
 
-    for (event, handler) in connects.items():
-        uzbl.connect(event, handler)
+    # And connect the dicts event handlers to the handler stack.
+    uzbl.connect_dict(connects)
+
+    # Or connect a handler to an event manually and supply additional optional
+    # arguments:
+
+    #uzbl.connect("MYOTHER_EVENT", myother_event_parser, True, limit=20)
diff --git a/examples/data/uzbl/scripts/plugins/progress_bar.py b/examples/data/uzbl/scripts/plugins/progress_bar.py
index c9f8a36..b6fcb1b 100644
--- a/examples/data/uzbl/scripts/plugins/progress_bar.py
+++ b/examples/data/uzbl/scripts/plugins/progress_bar.py
@@ -155,5 +155,4 @@ def init(uzbl):
       'PROGRESS_CONFIG': progress_config,
       'LOAD_COMMIT': reset_progress}
 
-    for (event, handler) in connects.items():
-        uzbl.connect(event, handler)
+    uzbl.connect_dict(connects)