make working again with the new ui events "contract" (#35)

i e ignore new parameters and events
also fix button press issue

Author: bfredl

neovim_gui/cli.py

@@ -5,7 +5,6 @@
 
 from .ui_bridge import UIBridge
 from neovim import attach
-from neovim.compat import IS_PYTHON3
 
 
 @click.command(context_settings=dict(allow_extra_args=True))

neovim_gui/gtk_ui.py

@@ -95,7 +95,7 @@ def __init__(self, font):
 
     def start(self, bridge):
         """Start the UI event loop."""
-        bridge.attach(80, 24, True)
+        bridge.attach(80, 24, rgb=True)
         drawing_area = Gtk.DrawingArea()
         drawing_area.connect('draw', self._gtk_draw)
         window = Gtk.Window()
@@ -378,6 +378,7 @@ def _gtk_button_press(self, widget, event, *args):
         input_str += '<{0},{1}>'.format(col, row)
         self._bridge.input(input_str)
         self._pressed = button
+        return True
 
     def _gtk_button_release(self, widget, event, *args):
         self._pressed = None

neovim_gui/ui_bridge.py

@@ -1,7 +1,9 @@
 """Bridge for connecting a UI instance to nvim."""
 import sys
+import os
 from threading import Semaphore, Thread
 from traceback import format_exc
+from inspect import signature
 
 
 class UIBridge(object):
@@ -20,6 +22,7 @@ def connect(self, nvim, ui, profile=None, notify=False):
         self._ui = ui
         self._profile = profile
         self._sem = Semaphore(0)
+        self.debug_events = len(os.environ.get("NVIM_PYTHON_UI_DEBUG", "")) > 0
         t = Thread(target=self._nvim_event_loop)
         t.daemon = True
         t.start()
@@ -42,9 +45,9 @@ def resize(self, columns, rows):
         """Send a resize request to nvim."""
         self._call(self._nvim.ui_try_resize, columns, rows)
 
-    def attach(self, columns, rows, rgb):
+    def attach(self, columns, rows, **options):
         """Attach the UI to nvim."""
-        self._call(self._nvim.ui_attach, columns, rows, rgb)
+        self._call(self._nvim.api.ui_attach, columns, rows, options)
 
     def detach(self):
         """Detach the UI from nvim."""
@@ -90,12 +93,17 @@ def apply_updates():
                         # print >> sys.stderr, update[0], ' '.join(l)
                         try:
                             handler = getattr(self._ui, '_nvim_' + update[0])
+                            nparam = len(signature(handler).parameters)
+
                         except AttributeError:
-                            pass
+                            if self.debug_events:
+                                print(repr(update), file=sys.stderr)
                         else:
+                            if self.debug_events and len(update[1]) > nparam:
+                                print(repr(update), file=sys.stderr)
                             for args in update[1:]:
-                                handler(*args)
-                except:
+                                handler(*args[:nparam])
+                except Exception:
                     self._error = format_exc()
                     self._call(self._nvim.quit)
             if method == 'redraw':