Added support for ANSI colors only.

- Added --ansicolor option.
- Check PROMPT_TOOLKIT_ANSI_COLORS_ONLY environment variable.

Author: jonathanslenders

pymux/client.py

@@ -59,17 +59,19 @@ def run_command(self, command, pane_id=None):
             'pane_id': pane_id
         })
 
-    def attach(self, detach_other_clients=False, true_color=False):
+    def attach(self, detach_other_clients=False, ansi_colors_only=False, true_color=False):
         """
         Attach client user interface.
         """
         assert isinstance(detach_other_clients, bool)
+        assert isinstance(ansi_colors_only, bool)
         assert isinstance(true_color, bool)
 
         self._send_size()
         self._send_packet({
             'cmd': 'start-gui',
             'detach-others': detach_other_clients,
+            'ansi-colors-only': ansi_colors_only,
             'true-color': true_color,
             'term': os.environ.get('TERM', ''),
             'data': ''

pymux/entry_points/run_pymux.py

@@ -3,7 +3,7 @@
 pymux: Pure Python terminal multiplexer.
 Usage:
     pymux [(standalone|start-server|attach)] [-d]
-          [--truecolor] [(-S <socket>)] [(-f <file>)]
+          [--truecolor] [--ansicolor] [(-S <socket>)] [(-f <file>)]
           [(--log <logfile>)]
           [--] [<command>]
     pymux list-sessions
@@ -48,6 +48,8 @@ def run():
     filename = a['<file>']
     command = a['<command>']
     true_color = a['--truecolor']
+    ansi_colors_only = a['--ansicolor'] or \
+        bool(os.environ.get('PROMPT_TOOLKIT_ANSI_COLORS_ONLY', False))
 
     # Parse pane_id from socket_name. It looks like "socket_name,pane_id".
     if socket_name and ',' in socket_name:
@@ -76,7 +78,7 @@ def run():
         logging.basicConfig(filename=a['<logfile>'], level=logging.DEBUG)
 
     if a['standalone']:
-        mux.run_standalone(true_color=true_color)
+        mux.run_standalone(true_color=true_color, ansi_colors_only=ansi_colors_only)
 
     elif a['list-sessions'] or a['<command>'] in ('ls', 'list-sessions'):
         for c in list_clients():
@@ -107,12 +109,14 @@ def run():
         if socket_name:
             Client(socket_name).attach(
                 detach_other_clients=detach_other_clients,
-                true_color=true_color)
+                true_color=true_color,
+                ansi_colors_only=ansi_colors_only)
         else:
             # Connect to the first server.
             for c in list_clients():
                 c.attach(detach_other_clients=detach_other_clients,
-                         true_color=true_color)
+                         true_color=true_color,
+                         ansi_colors_only=ansi_colors_only)
                 break
             else:  # Nobreak.
                 print('No pymux instance found.')
@@ -132,7 +136,8 @@ def run():
             # daemon. (Otherwise the `waitpid` call won't work.)
             mux.run_server()
         else:
-            Client(socket_name).attach(true_color=true_color)
+            Client(socket_name).attach(
+                true_color=true_color, ansi_colors_only=ansi_colors_only)
 
     else:
         if socket_name_from_env:

pymux/server.py

@@ -88,13 +88,14 @@ def _process(self, data):
         elif packet['cmd'] == 'start-gui':
             detach_other_clients = bool(packet['detach-others'])
             true_color = bool(packet['true-color'])
+            ansi_colors_only = bool(packet['ansi-colors-only'])
             term = packet['term']
 
             if detach_other_clients:
                 for c in self.pymux.connections:
                     c.detach_and_close()
 
-            self._create_cli(true_color=true_color, term=term)
+            self._create_cli(true_color=true_color, ansi_colors_only=ansi_colors_only, term=term)
 
     def _send_packet(self, data):
         """
@@ -126,14 +127,15 @@ def _run_command(self, packet):
         finally:
             self._close_cli()
 
-    def _create_cli(self, true_color=False, term='xterm'):
+    def _create_cli(self, true_color=False, ansi_colors_only=False, term='xterm'):
         """
         Create CommandLineInterface for this client.
         Called when the client wants to attach the UI to the server.
         """
         output = Vt100_Output(_SocketStdout(self._send_packet),
                               lambda: self.size,
                               true_color=true_color,
+                              ansi_colors_only=ansi_colors_only,
                               term=term,
                               write_binary=False)
         input = _ClientInput(self._send_packet)