echoes 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d12ae8bf0fab5f169c0d380125005490662167338fb529d6c0a1c3daf725a415
-  data.tar.gz: dabea435d3121c0411048313744738e62f759de537f4afd4e4d28dc378188cea
+  metadata.gz: 5125e5e42d6d0a336df431a944a75f07ba2b90ba91a3996f0a9fe9e634878c62
+  data.tar.gz: 7f1b2ea05ad61fe36922eef9da79fa04db3446b0019b2a25d2b0a5d4ad555205
 SHA512:
-  metadata.gz: c6306b65e5234b7e35cdb5624ae04b6a0585c5a418bbab22ca8d517a9c8aa928c5e6fdcf0b826d333fa73870275046efd16c4519bccf8d35de7959fba8958d08
-  data.tar.gz: 8481081986ffd00775f18a9fd6a5b8a0f3691e0f030c9f6f601b898f1ffc875d8c266b191ca0489e85e39cf6d7117c19843c68dbf9f2a091ec5fa757addcb5f6
+  metadata.gz: d22756dcafcec61e3d73a87ce3788bd928edea5eb3a3eb137ec6481da5d1faeda999b86850c1ae34f826c8eb57d876f1cebfb560ceacd85c49a3716bea98a1a3
+  data.tar.gz: 219539e6e1b55c53ce7690740b3f891a41034dd1df3275d8a8db7bcc2b6739f637236e9484a415d5e82e12a89b1c54d82251148f6faad130d09bc91caadd94f2

data/README.md

@@ -96,6 +96,8 @@ bundle exec exe/echoes -t  # TTY mode
 | Cmd+Shift+D               | Split pane down                         |
 | Cmd+] / Cmd+[             | Next / previous pane                    |
 | Cmd+Shift+] / Cmd+Shift+[ | Next / previous tab                     |
+| Cmd+1 … Cmd+8             | Jump to tab 1 … 8                       |
+| Cmd+9                     | Jump to the last tab                    |
 | Cmd++ / Cmd+- / Cmd+0     | Bigger / smaller / reset font           |
 | Cmd+F                     | Find                                    |
 | Cmd+G / Cmd+Shift+G       | Find next / previous                    |
@@ -161,9 +163,10 @@ keybind "",            :toggle_pointer    # disable the default
 Available actions (one per menu item): `:new_window`, `:new_tab`,
 `:close_tab`, `:close_pane`, `:edit_file`, `:split_right`, `:split_down`,
 `:select_next_pane`, `:select_previous_pane`, `:show_next_tab`,
-`:show_previous_tab`, `:increase_font_size`, `:decrease_font_size`,
-`:reset_font_size`, `:toggle_find`, `:find_next`, `:find_previous`,
-`:toggle_pointer`, `:toggle_copy_mode`.
+`:show_previous_tab`, `:select_tab_1` … `:select_tab_9`
+(jump-to-tab; `:select_tab_9` is "last tab"), `:increase_font_size`,
+`:decrease_font_size`, `:reset_font_size`, `:toggle_find`,
+`:find_next`, `:find_previous`, `:toggle_pointer`, `:toggle_copy_mode`.
 
 Modifier names are case-insensitive and accept the obvious aliases:
 `Cmd`/`Command`/`Super`, `Ctrl`/`Control`, `Opt`/`Option`/`Alt`, `Shift`.

data/lib/echoes/gui.rb

@@ -143,6 +143,20 @@ module Echoes
       @tabs[@active_tab]
     end
 
+    # Switch to a tab by 1-based slot number (Cmd+N shortcuts).
+    # n=1..8 maps to that tab index; n=9 maps to the LAST tab
+    # regardless of count, matching Safari / Chrome / iTerm2 /
+    # Ghostty. Returns true when the active tab actually changed
+    # (the caller redraws on true), false when the request was a
+    # no-op — target out of range or already active.
+    def select_tab(n)
+      target = (n == 9) ? @tabs.size - 1 : n - 1
+      return false if target < 0 || target >= @tabs.size
+      return false if target == @active_tab
+      @active_tab = target
+      true
+    end
+
     # Phase 1 launch flag for the in-process Rubish embedding. Setting
     # ECHOES_EMBED=1 in the environment routes new Tab/Pane creation
     # through Echoes::EmbeddedShell instead of PTY.spawn.
@@ -323,6 +337,12 @@ module Echoes
       add_menu_item(window_menu, "Show Next Tab", 'showNextTab:', '}',
                     modifiers: ObjC::NSEventModifierFlagCommand | ObjC::NSEventModifierFlagShift,
                     bind: :show_next_tab)
+      # Cmd+1..8 jump to that tab index; Cmd+9 goes to the last tab.
+      (1..9).each do |n|
+        title = (n == 9) ? "Show Last Tab" : "Show Tab #{n}"
+        add_menu_item(window_menu, title, "selectTab#{n}:", n.to_s,
+                      bind: :"select_tab_#{n}")
+      end
       add_separator(window_menu)
       add_menu_item(window_menu, "Select Next Pane", 'selectNextPane:', ']', bind: :select_next_pane)
       add_menu_item(window_menu, "Select Previous Pane", 'selectPreviousPane:', '[', bind: :select_previous_pane)
@@ -435,10 +455,19 @@ module Echoes
     def create_fonts
       @font = ObjC.retain(create_nsfont(@font_size))
       @bold_font = ObjC.retain(create_bold_nsfont(@font))
+      @tab_font = ObjC.retain(create_nsfont(tab_font_size))
       @font_y_offset_cache = {}
       update_cell_metrics
     end
 
+    # Tab labels render in a smaller font than the cell grid so long
+    # titles read comfortably even when the bar's split across many
+    # narrow tabs. Scales with the user's font_size so the bar stays
+    # proportional at any zoom.
+    def tab_font_size
+      [(@font_size * 0.85).round(1), 9.0].max
+    end
+
     def create_view_class
       gui = self
 
@@ -770,6 +799,15 @@ module Echoes
         @active_tab = (@active_tab + 1) % @tabs.size
         ObjC::MSG_VOID_I.call(@view, ObjC.sel('setNeedsDisplay:'), 1)
       })
+      # Cmd+1..8 → tabs 1..8; Cmd+9 → last tab (whichever it is) —
+      # matches Safari, Chrome, iTerm2, Ghostty. The indexing /
+      # bounds / no-op logic lives in select_tab so it's testable
+      # without standing up the closure + menu machinery.
+      @select_tab_closures = (1..9).map do |n|
+        menu_action.call(-> {
+          ObjC::MSG_VOID_I.call(@view, ObjC.sel('setNeedsDisplay:'), 1) if select_tab(n)
+        })
+      end
       @split_right_closure = menu_action.call(-> {
         tab = current_tab
         new_pane = tab.split_vertical
@@ -902,6 +940,9 @@ module Echoes
         'findPrevious:'         => ['v@:@', @find_prev_closure],
         'showPreviousTab:'      => ['v@:@', @prev_tab_closure],
         'showNextTab:'          => ['v@:@', @next_tab_closure],
+        **(1..9).each_with_object({}) { |n, h|
+          h["selectTab#{n}:"] = ['v@:@', @select_tab_closures[n - 1]]
+        },
         'splitRight:'           => ['v@:@', @split_right_closure],
         'splitDown:'            => ['v@:@', @split_down_closure],
         'closePane:'            => ['v@:@', @close_pane_closure],
@@ -2084,10 +2125,13 @@ module Echoes
       Preferences.set_double(:font_size, new_size) if persist
       old_font = @font
       old_bold = @bold_font
+      old_tab  = @tab_font
       @font = ObjC.retain(create_nsfont(@font_size))
       @bold_font = ObjC.retain(create_bold_nsfont(@font))
+      @tab_font  = ObjC.retain(create_nsfont(tab_font_size))
       ObjC.release(old_font) if old_font
       ObjC.release(old_bold) if old_bold
+      ObjC.release(old_tab)  if old_tab
       @font_cache.each_value { |f| ObjC.release(f) unless f.to_i == old_font&.to_i }
       @font_cache = {}
       @font_y_offset_cache = {}
@@ -2522,6 +2566,20 @@ module Echoes
       ObjC::CGContextRestoreGState.call(cg_ctx)
     end
 
+    NSLineBreakByTruncatingTail = 4
+    # macOS empirically uses { Left=0, Center=1, Right=2 } at runtime
+    # (despite Apple's header comments and several years of doc pages
+    # claiming Center=2 / Right=1 for macOS) — verified by setting and
+    # rendering with each value against an offscreen bitmap context.
+    # Get this wrong and the truncated tab title pins to the right edge.
+    NSTextAlignmentCenter       = 1
+    # Engage the modern Cocoa typesetter so the paragraph-style
+    # alignment + line-break-mode actually take effect; the simple
+    # NSString-based draw APIs honor font/color but silently ignore
+    # paragraph styles.
+    NSStringDrawingUsesLineFragmentOrigin = 1
+    NSStringDrawingTruncatesLastVisibleLine = 1 << 5  # 32
+
     def draw_tab_bar(tbh, ty)
       total_w = @cell_width * @cols
       tab_w = total_w / @tabs.size
@@ -2531,24 +2589,51 @@ module Echoes
       ObjC::NSRectFill.call(0.0, ty, total_w + @cell_width, tbh)
 
       # Vertically center titles in the bar.
-      title_y = ty + (tbh - @font_default_line_height) / 2.0
+      title_y = ty + (tbh - @tab_font_line_height) / 2.0
 
       accent_color = make_color(*@active_profile.cursor_color)
       accent_h     = 2.0
       accent_inset = @cell_width * 0.5
 
+      # Truncating-tail paragraph style so titles wider than the tab
+      # render with a trailing "…" instead of overlapping their
+      # neighbors. Built once per draw (paragraph style is mutable
+      # and shared across the loop's attrs dicts).
+      ns_para = ObjC::MSG_PTR.call(ObjC.cls('NSMutableParagraphStyle'), ObjC.sel('alloc'))
+      ns_para = ObjC::MSG_PTR.call(ns_para, ObjC.sel('init'))
+      ObjC::MSG_VOID_L.call(ns_para, ObjC.sel('setLineBreakMode:'), NSLineBreakByTruncatingTail)
+      ObjC::MSG_VOID_L.call(ns_para, ObjC.sel('setAlignment:'),     NSTextAlignmentCenter)
+
+      pad    = @cell_width * 0.5
+      rect_w = tab_w - 2 * pad
+      rect_w = 0.0 if rect_w < 0
+
       @tabs.each_with_index do |tab, i|
         x         = i * tab_w
         is_active = (i == @active_tab)
 
-        label = tab.title
-        ns_label = ObjC.nsstring(label)
+        ns_label = ObjC.nsstring(tab.title)
         ns_attrs = ObjC.nsdict({
-          ObjC::NSFontAttributeName => @font,
+          ObjC::NSFontAttributeName => @tab_font,
           ObjC::NSForegroundColorAttributeName => is_active ? @tab_fg_active : @tab_fg_inactive,
+          ObjC::NSParagraphStyleAttributeName  => ns_para,
         })
-        text_x = x + @cell_width * 0.5
-        ObjC::MSG_VOID_PT_1.call(ns_label, ObjC.sel('drawAtPoint:withAttributes:'), text_x, title_y, ns_attrs)
+        # Build an NSAttributedString rather than passing the dict to
+        # NSString's draw methods — the NSString-based draw APIs honor
+        # font + color but silently ignore paragraph-style alignment,
+        # which is why earlier attempts left the truncated text
+        # drifted toward one edge instead of centered. NSAttributedString
+        # drawWithRect:options:context: routes through the canonical
+        # typesetter and respects the alignment + truncating-tail mode.
+        attr_str = ObjC::MSG_PTR.call(ObjC.cls('NSAttributedString'), ObjC.sel('alloc'))
+        attr_str = ObjC::MSG_PTR_2.call(attr_str,
+          ObjC.sel('initWithString:attributes:'), ns_label, ns_attrs)
+        ObjC::MSG_VOID_RECT_L_1.call(attr_str,
+          ObjC.sel('drawWithRect:options:context:'),
+          x + pad, title_y, rect_w, @tab_font_line_height,
+          NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine,
+          Fiddle::Pointer.new(0))
+        ObjC.release(attr_str)
 
         # Thin accent strip flush to the bottom of the bar marks
         # the active tab — replaces the previous heavier full-cell
@@ -2560,6 +2645,8 @@ module Echoes
                                  tab_w - 2 * accent_inset, accent_h)
         end
       end
+
+      ObjC.release(ns_para)
     end
 
     def grid_position(event_ptr)
@@ -3353,6 +3440,9 @@ module Echoes
       @font_default_line_height = ObjC::MSG_RET_D.call(@font, ObjC.sel('defaultLineHeightForFont'))
       @font_default_ascender = ascender
       @font_default_family = ObjC.to_ruby_string(ObjC::MSG_PTR.call(@font, ObjC.sel('familyName')))
+      @tab_font_line_height = @tab_font ?
+        ObjC::MSG_RET_D.call(@tab_font, ObjC.sel('defaultLineHeightForFont')) :
+        @font_default_line_height
       @font_y_offset_cache = {}
 
       # Propagate cell metrics to all pane screens (sixel sizing,

data/lib/echoes/objc.rb

@@ -53,6 +53,8 @@ module Echoes
     MSG_PTR_RECT  = new_msg([P, P, D, D, D, D], P)  # initWithFrame:
     MSG_VOID_RECT = new_msg([P, P, D, D, D, D], V)  # NSRectFill equivalent
     MSG_VOID_RECT_1 = new_msg([P, P, D, D, D, D, P], V)  # addCursorRect:cursor:
+    # drawWithRect:options:attributes: (NSRect + NSStringDrawingOptions + NSDictionary)
+    MSG_VOID_RECT_L_1 = new_msg([P, P, D, D, D, D, L, P], V)
     # NSGradient drawInRect:angle: (4 doubles for rect + 1 double for angle)
     MSG_VOID_RECT_D = new_msg([P, P, D, D, D, D, D], V)
 
@@ -159,6 +161,7 @@ module Echoes
     NSUnderlineStyleAttributeName      = appkit_const('NSUnderlineStyleAttributeName')
     NSStrikethroughStyleAttributeName  = appkit_const('NSStrikethroughStyleAttributeName')
     NSLigatureAttributeName            = appkit_const('NSLigatureAttributeName')
+    NSParagraphStyleAttributeName      = appkit_const('NSParagraphStyleAttributeName')
     NSPasteboardTypeString         = appkit_const('NSPasteboardTypeString')
     NSPasteboardTypeFileURL        = appkit_const('NSPasteboardTypeFileURL')
 

data/lib/echoes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Echoes
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: echoes
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
   - Akira Matsuda