Merge branch 'tab_powerline' of https://github.com/slfotg/kitty

Author: kovidgoyal

kitty/config_data.py

@@ -953,6 +953,11 @@ def tab_fade(x: str) -> Tuple[float, ...]:
 o('tab_separator', '"{}"'.format(default_tab_separator), option_type=tab_separator, long_text=_('''
 The separator between tabs in the tab bar when using :code:`separator` as the :opt:`tab_bar_style`.'''))
 
+o('tab_powerline_style', 'angled', option_type=choices('angled', 'slanted', 'round'), long_text=_('''
+The powerline separator style between tabs in the tab bar when using :code:`powerline`
+as the :opt:`tab_bar_style`, can be one of: :code:`angled`, :code:`slanted`, or :code:`round`.
+'''))
+
 
 def tab_activity_symbol(x: str) -> Optional[str]:
     if x == 'none':

kitty/tab_bar.py

@@ -42,6 +42,7 @@ class DrawData(NamedTuple):
     title_template: str
     active_title_template: Optional[str]
     tab_activity_symbol: Optional[str]
+    powerline_style: str
 
 
 def as_rgb(x: int) -> int:
@@ -186,21 +187,30 @@ def draw_tab_with_powerline(draw_data: DrawData, screen: Screen, tab: TabBarData
     inactive_bg = as_rgb(color_as_int(draw_data.inactive_bg))
     default_bg = as_rgb(color_as_int(draw_data.default_bg))
 
+    separator_symbol = ''
+    separator_alt_symbol = ''
+    if draw_data.powerline_style == 'slanted':
+        separator_symbol = ''
+        separator_alt_symbol = '╱'
+    elif draw_data.powerline_style == 'round':
+        separator_symbol = ''
+        separator_alt_symbol = ''
+
     min_title_length = 1 + 2
 
     if screen.cursor.x + min_title_length >= screen.columns:
         screen.cursor.x -= 2
         screen.cursor.bg = default_bg
         screen.cursor.fg = inactive_bg
-        screen.draw('   ')
+        screen.draw('{}   '.format(separator_symbol))
         return screen.cursor.x
 
     start_draw = 2
     if tab.is_active and screen.cursor.x >= 2:
         screen.cursor.x -= 2
         screen.cursor.fg = inactive_bg
         screen.cursor.bg = tab_bg
-        screen.draw(' ')
+        screen.draw('{} '.format(separator_symbol))
         screen.cursor.fg = tab_fg
     elif screen.cursor.x == 0:
         screen.cursor.bg = tab_bg
@@ -224,9 +234,9 @@ def draw_tab_with_powerline(draw_data: DrawData, screen: Screen, tab: TabBarData
             screen.cursor.bg = default_bg
         else:
             screen.cursor.bg = inactive_bg
-        screen.draw('')
+        screen.draw(separator_symbol)
     else:
-        screen.draw(' ')
+        screen.draw(' {}'.format(separator_alt_symbol))
 
     end = screen.cursor.x
     if end < screen.columns:
@@ -273,7 +283,8 @@ def __init__(self, os_window_id: int, opts: Options):
             self.opts.inactive_tab_foreground, self.opts.inactive_tab_background,
             self.opts.tab_bar_background or self.opts.background, self.opts.tab_title_template,
             self.opts.active_tab_title_template,
-            self.opts.tab_activity_symbol
+            self.opts.tab_activity_symbol,
+            self.opts.tab_powerline_style
         )
         if self.opts.tab_bar_style == 'separator':
             self.draw_func = draw_tab_with_separator