Merge PR #74 'UI prototypes'

Author: tarruda

.gitignore

@@ -1 +1,4 @@
 *.egg-info/
+__pycache__
+neovim/ui/screen.c
+neovim/ui/screen.so

neovim/__init__.py

@@ -85,7 +85,7 @@ def attach(session_type, address=None, port=None, path=None, argv=None):
     session = (tcp_session(address, port) if session_type == 'tcp' else
                socket_session(path) if session_type == 'socket' else
                stdio_session() if session_type == 'stdio' else
-               child_session(argv) if session_type == 'child'else
+               child_session(argv) if session_type == 'child' else
                None)
 
     if not session:

neovim/api/nvim.py

@@ -86,6 +86,25 @@ def session(self):
         """Return the Session or SessionFilter for a Nvim instance."""
         return self._session
 
+    def ui_attach(self, width, height, rgb):
+        """Register as a remote UI.
+
+        After this method is called, the client will receive redraw
+        notifications.
+        """
+        return self._session.request('ui_attach', width, height, rgb)
+
+    def ui_detach(self):
+        """Unregister as a remote UI."""
+        return self._session.request('ui_detach')
+
+    def ui_try_resize(self, width, height):
+        """Notify nvim that the client window has resized.
+
+        If possible, nvim will send a redraw request to resize.
+        """
+        return self._session.request('ui_try_resize', width, height)
+
     def subscribe(self, event):
         """Subscribe to a Nvim event."""
         return self._session.request('vim_subscribe', event)

neovim/msgpack_rpc/event_loop/base.py

@@ -1,6 +1,7 @@
 """Common code for event loop implementations."""
 import logging
 import signal
+import threading
 
 
 logger = logging.getLogger(__name__)
@@ -11,6 +12,7 @@
 # which exits the program. To be able to restore the python interpreter to it's
 # default state, we keep a reference to the default handler
 default_int_handler = signal.getsignal(signal.SIGINT)
+main_thread = threading.current_thread()
 
 
 class BaseEventLoop(object):
@@ -131,12 +133,14 @@ def run(self, data_cb):
                 self._error = None
             raise err
         self._on_data = data_cb
-        self._setup_signals([signal.SIGINT, signal.SIGTERM])
+        if threading.current_thread() == main_thread:
+            self._setup_signals([signal.SIGINT, signal.SIGTERM])
         debug('Entering event loop')
         self._run()
         debug('Exited event loop')
-        self._teardown_signals()
-        signal.signal(signal.SIGINT, default_int_handler)
+        if threading.current_thread() == main_thread:
+            self._teardown_signals()
+            signal.signal(signal.SIGINT, default_int_handler)
         self._on_data = None
 
     def stop(self):

neovim/ui/__init__.py

@@ -0,0 +1 @@
+"""Neovim remote UI prototypes."""

neovim/ui/cli.py

@@ -0,0 +1,73 @@
+"""CLI for accessing the gtk/tickit UIs implemented by this package."""
+import shlex
+
+import click
+
+from .ui_bridge import UIBridge
+from .. import attach
+
+
+@click.command(context_settings=dict(allow_extra_args=True))
+@click.option('--prog')
+@click.option('--notify', '-n', default=False, is_flag=True)
+@click.option('--gui', '-g', default=False, is_flag=True)
+@click.option('--listen', '-l')
+@click.option('--connect', '-c')
+@click.option('--profile',
+              default='disable',
+              type=click.Choice(['ncalls', 'tottime', 'percall', 'cumtime',
+                                 'name', 'disable']))
+@click.pass_context
+def main(ctx, prog, notify, gui, listen, connect, profile):
+    """Entry point."""
+    address = connect or listen
+
+    if address:
+        import re
+        p = re.compile(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?:\:\d{1,5})?$')
+
+        if p.match(address):
+            args = ('tcp',)
+            kwargs = {'address': address}
+        else:
+            args = ('socket',)
+            kwargs = {'path': address}
+
+    if connect:
+        # connect to existing instance listening on address
+        nvim = attach(*args, **kwargs)
+    elif listen:
+        # spawn detached instance listening on address and connect to it
+        import os
+        import time
+        from subprocess import Popen
+        os.environ['NVIM_LISTEN_ADDRESS'] = address
+        nvim_argv = shlex.split(prog or 'nvim -T abstract_ui') + ctx.args
+        # spawn the nvim with stdio redirected to /dev/null.
+        dnull = open(os.devnull)
+        p = Popen(nvim_argv, stdin=dnull, stdout=dnull, stderr=dnull)
+        dnull.close()
+        while p.poll() or p.returncode is None:
+            try:
+                nvim = attach(*args, **kwargs)
+                break
+            except IOError:
+                # socket not ready yet
+                time.sleep(0.050)
+    else:
+        # spawn embedded instance
+        nvim_argv = shlex.split(prog or 'nvim --embed') + ctx.args
+        nvim = attach('child', argv=nvim_argv)
+
+    if gui:
+        from .gtk_ui import GtkUI
+        ui = GtkUI()
+    else:
+        from .tickit_ui import TickitUI
+        ui = TickitUI()
+    bridge = UIBridge()
+    bridge.connect(nvim, ui, profile if profile != 'disable' else None, notify)
+
+
+if __name__ == '__main__':
+    main()