shoko 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7637c59f48a8e0b58e7e5497a188c54dc523dd364ec25fffadacbd909b01542
-  data.tar.gz: 96e4d52bd193d140919ac2fba904b279803b32e15ce12f477c7c22523f562815
+  metadata.gz: 5060375164152dd31808e0548f1a525246af0d4708e037eb3590423730d4d6c6
+  data.tar.gz: a71558d1f38594e40ffe44d80f4d05dcdd1d1c43a23bb003ab42f74c9ffffeec
 SHA512:
-  metadata.gz: b288a0f6d5ae08ccd1d4c15a6b8d052468e2565008e3bfd6a548982c8144a95ff836118649b5337a3e8741ac88d9d5d6a483948b93e2be2f271a84331d3d7c83
-  data.tar.gz: dce4bdcf953cb80acd4a01b53dc5d7e6267f2fe896db869d4f7fe162f578d198268b31261e9ee843985cec8aa21d29618938074603f9690de1b874a882a82e69
+  metadata.gz: 89e5372ed7369bb5631b4c190311303bbe8285602d5d7520060dc91f3c176c903f269a491d8b436f2c1d280717ddffd8b3498560aab076d7f7b7598ff76be0e8
+  data.tar.gz: b6ca5f48134e099a7b112c517bfa7efeb683606e3d25e66cdc27c8e6c6711615f49a7d2d7c4c75b7ef801e2d4286b3be8f3911dd00d726598093ee583c562198

data/.bundle/config

@@ -1,4 +1,3 @@
 ---
-BUNDLE_BIN: "bin"
 BUNDLE_PATH: "vendor/bundle"
-BUNDLE_WITHOUT: "development:test"
+BUNDLE_WITHOUT: "development"

data/bin/shoko

@@ -1,15 +1,19 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+app_root = File.expand_path('..', __dir__)
+lib_dir = File.join(app_root, 'lib')
+$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
 begin
-  require "bundler/setup"
+  gemspec = Dir[File.join(app_root, '*.gemspec')].first
+  if gemspec && File.exist?(File.join(app_root, 'Gemfile'))
+    require 'bundler/setup'
+  end
 rescue LoadError
-  # Bundler isn't required when running from a packaged gem.
+  # Running without Bundler (e.g., installed gem).
 end
 
-$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
-require "shoko"
+require 'shoko'
 
-Shoko::CLI.run(ARGV)
+Shoko::CLI.run

data/bin/start

@@ -1,15 +1,19 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+app_root = File.expand_path('..', __dir__)
+lib_dir = File.join(app_root, 'lib')
+$LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
 begin
-  require "bundler/setup"
+  gemspec = Dir[File.join(app_root, '*.gemspec')].first
+  if gemspec && File.exist?(File.join(app_root, 'Gemfile'))
+    require 'bundler/setup'
+  end
 rescue LoadError
-  # Bundler isn't required when running from a packaged gem.
+  # Running without Bundler (e.g., installed gem).
 end
 
-$LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
-require "shoko"
+require 'shoko'
 
-Shoko::CLI.run(ARGV)
+Shoko::CLI.run

data/lib/shoko/adapters/input/annotations/mouse_handler.rb

@@ -4,22 +4,34 @@ module Shoko
   module Adapters::Input::Annotations
     # Handles mouse events for text selection in the reader
     class MouseHandler
+      SGR_REGEX = /\e\[<(\d+);(\d+);(\d+)([Mm])/
+
       attr_reader :selection_start, :selection_end, :selecting
 
       def initialize
         reset
       end
 
+      def mouse_sequence?(input)
+        !parse_mouse_event(input).nil?
+      end
+
+      def mouse_prefix?(input)
+        bytes = input.to_s.b
+        return false if bytes.bytesize < 2
+        return false unless bytes.getbyte(0) == 0x1B && bytes.getbyte(1) == 0x5B
+
+        return true if bytes.bytesize == 2
+
+        [0x3C, 0x4D].include?(bytes.getbyte(2))
+      end
+
       # Parse ANSI mouse event
       def parse_mouse_event(input)
-        return nil unless input =~ /\e\[<(\d+);(\d+);(\d+)([Mm])/
+        return parse_sgr_mouse_event(input) if sgr_mouse_sequence?(input)
+        return parse_x10_mouse_event(input) if x10_mouse_sequence?(input)
 
-        {
-          button: ::Regexp.last_match(1).to_i,
-          x: ::Regexp.last_match(2).to_i - 1, # Convert to 0-based
-          y: ::Regexp.last_match(3).to_i - 1,
-          released: ::Regexp.last_match(4) == 'm',
-        }
+        nil
       end
 
       # Handle mouse event and update selection state
@@ -63,6 +75,44 @@ module Shoko
 
       private
 
+      def sgr_mouse_sequence?(input)
+        bytes = input.to_s.b
+        bytes.bytesize >= 4 && bytes.getbyte(0) == 0x1B && bytes.getbyte(1) == 0x5B && bytes.getbyte(2) == 0x3C
+      end
+
+      def x10_mouse_sequence?(input)
+        bytes = input.to_s.b
+        bytes.bytesize >= 6 && bytes.getbyte(0) == 0x1B && bytes.getbyte(1) == 0x5B && bytes.getbyte(2) == 0x4D
+      end
+
+      def parse_sgr_mouse_event(input)
+        match = SGR_REGEX.match(input)
+        return nil unless match
+
+        {
+          button: match[1].to_i,
+          x: match[2].to_i - 1, # Convert to 0-based
+          y: match[3].to_i - 1,
+          released: match[4] == 'm',
+        }
+      end
+
+      def parse_x10_mouse_event(input)
+        bytes = input.to_s.b
+        cb = bytes.getbyte(3) - 32
+        cx = bytes.getbyte(4) - 33
+        cy = bytes.getbyte(5) - 33
+
+        return nil if cb.negative? || cx.negative? || cy.negative?
+
+        {
+          button: cb,
+          x: cx,
+          y: cy,
+          released: (cb & 3) == 3,
+        }
+      end
+
       def start_selection(col, row)
         @selecting = true
         @selection_start = { x: col, y: row }

data/lib/shoko/adapters/output/terminal/input/decoder.rb

@@ -302,6 +302,13 @@ module Shoko
       end
 
       def parse_csi_sequence(prefix_bytes:, output_prefix:)
+        if x10_mouse_prefix?(prefix_bytes)
+          min_length = prefix_bytes == 1 ? 5 : 6
+          return nil if @buffer.bytesize < min_length
+
+          return parse_x10_mouse_sequence(prefix_bytes)
+        end
+
         return nil unless (final_index = DecoderScanner.new(@buffer).csi_final_index(prefix_bytes))
 
         end_index = final_index + 1
@@ -326,6 +333,33 @@ module Shoko
         prefix ? "#{prefix}#{char}" : char
       end
 
+      def x10_mouse_prefix?(prefix_bytes)
+        case prefix_bytes
+        when 2
+          return false unless @buffer.bytesize >= 3
+
+          @buffer.getbyte(0) == ESC && @buffer.getbyte(1) == 0x5B && @buffer.getbyte(2) == 0x4D
+        when 1
+          return false unless @buffer.bytesize >= 2
+
+          @buffer.getbyte(0) == CSI_8BIT && @buffer.getbyte(1) == 0x4D
+        else
+          false
+        end
+      end
+
+      def parse_x10_mouse_sequence(prefix_bytes)
+        length = prefix_bytes + 1 + 3
+        raw = @buffer.byteslice(0, length)
+        consume_and_clear(length)
+        if prefix_bytes == 1
+          coords = raw.byteslice(2, 3) || ''.b
+          return "\e[M".b + coords
+        end
+
+        raw.force_encoding(Encoding::BINARY)
+      end
+
       def degrade_pending_token
         lead_byte = @buffer.getbyte(0)
         consume_and_clear(1)

data/lib/shoko/application/controllers/mouseable_reader.rb

@@ -23,6 +23,7 @@ module Shoko
       @coordinate_service = dependencies.resolve(:coordinate_service)
 
       @mouse_handler = Shoko::Adapters::Input::Annotations::MouseHandler.new
+      @mouse_input_buffer = nil
       @sidebar_scroll_drag_active = false
       state.dispatch(Application::Actions::ClearPopupMenuAction.new)
       @selected_text = nil
@@ -42,17 +43,60 @@ module Shoko
       key = terminal_service.read_input_with_mouse(timeout: timeout)
       return [] unless key
 
-      if key.start_with?("\e[<")
-        handle_mouse_input(key)
-        return []
-      end
-
       keys = [key]
       while (extra = terminal_service.read_key)
         keys << extra
         break if keys.size > 10
       end
-      keys
+
+      filter_mouse_sequences(keys)
+    end
+
+    def filter_mouse_sequences(keys)
+      remaining = []
+      saw_mouse = false
+      saw_mouse_prefix = false
+
+      keys.each do |token|
+        if @mouse_input_buffer
+          @mouse_input_buffer << token
+          if @mouse_handler.mouse_sequence?(@mouse_input_buffer)
+            handle_mouse_input(@mouse_input_buffer)
+            @mouse_input_buffer = nil
+            saw_mouse = true
+            next
+          end
+
+          if @mouse_handler.mouse_prefix?(@mouse_input_buffer)
+            saw_mouse_prefix = true
+            next
+          end
+
+          remaining << @mouse_input_buffer
+          @mouse_input_buffer = nil
+          next
+        end
+
+        if @mouse_handler.mouse_sequence?(token)
+          handle_mouse_input(token)
+          saw_mouse = true
+          next
+        end
+
+        if @mouse_handler.mouse_prefix?(token)
+          @mouse_input_buffer = String(token)
+          saw_mouse_prefix = true
+          next
+        end
+
+        if saw_mouse || saw_mouse_prefix
+          next if token == 'q' || token == "\e"
+        end
+
+        remaining << token
+      end
+
+      remaining
     end
 
     def handle_mouse_input(input)

data/lib/shoko/application/selectors/reader_selectors.rb

@@ -122,10 +122,14 @@ module Shoko
           rescue StandardError
             nil
           end
+
           lines = registry&.lines
-          return lines if lines && !lines.empty?
+          return lines if lines.is_a?(Hash)
+
+          fallback = state.get(%i[reader rendered_lines])
+          return {} if fallback == :render_registry
 
-          state.get(%i[reader rendered_lines]) || {}
+          fallback.is_a?(Hash) ? fallback : {}
         end
 
         def self.popup_menu(state)

data/lib/shoko/core/services/coordinate_service.rb

@@ -238,7 +238,7 @@ module Shoko
         end
 
         def geometry_index_by_row(rendered_lines)
-          return {} unless rendered_lines
+          return {} unless rendered_lines.respond_to?(:each_value)
 
           key = rendered_lines.object_id
           if @geometry_index_key != key

data/lib/shoko/shared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shoko
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoko
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Shoko
@@ -9,6 +9,20 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -344,7 +358,6 @@ files:
 - lib/shoko/test_support/terminal_double.rb
 - lib/shoko/test_support/test_mode.rb
 - lib/zip.rb
-- shoko-0.1.0.gem
 - zip.rb
 homepage: https://sr.ht/~shayan/Shoko/
 licenses: