textbringer 26 → 27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2675c1e38b9c3e24666f87ebf58f4cede5bca7dfec811eec58cee700a500f33
-  data.tar.gz: b1835247ba5c703983dea5b80a84fb26b0f43954ee1cb9b737ac82e23a843278
+  metadata.gz: be4c934800d0492229b1476d4541825533ff3e824490ad23ef331926ee8d6492
+  data.tar.gz: 9157e0ba963f1dd77eab7a50f929c91b1ae6a7689c1ad41cda22876c32d6c0fb
 SHA512:
-  metadata.gz: 7bb45438e1cf3912540446ceeed8dcbbbfc1ac4c796242a7d63783e0741223051d4edd200aaa2aa5a1f0c8d01c0b7a8c94f3a9f576b303e29f6303357ae3f2b8
-  data.tar.gz: 30ed7d5c79192c5bfdf81122d018ae9269e30087b24be951a7d795c5a0e92aaf84aa7a9f2d58d476ed241e57b44d39ff15284549249127ac3ab811e79ce096ac
+  metadata.gz: 3f70f40322ad8fed8ef2044839e3df7fee67922b1cfe975283516cf3a10fac6566248d0a5fbcc98ef319155302105c0c37d9f30fa602f6a3b3b2069dbf5a1314
+  data.tar.gz: 6348a9ecddb8423d4fb07b8291dcda1ce7945cf049e997770347deb309ad8c3a507bfb6815a5db2c7f277677680c4023793cf9fd221ea96bd4ed60e5863e68e6

data/README.md

@@ -31,6 +31,10 @@ Install ncursesw before installing curses.gem, on which textbringer depends.
     $ sudo apt-get install libncursesw5-dev
     $ gem install curses
 
+You need ffi to use clipboard commands on Windows.
+
+    $ gem install ffi
+
 ## Usage
 
     $ txtb

data/lib/textbringer/commands/clipboard.rb

@@ -2,12 +2,15 @@ module Clipboard
   @implementation = nil
 end
 
-require "clipboard"
-
 module Textbringer
   module Commands
-    CLIPBOARD_AVAILABLE =
-      Clipboard.implementation.name != "Clipboard::File"
+    begin
+      require "clipboard"
+      CLIPBOARD_AVAILABLE =
+        Clipboard.implementation.name != "Clipboard::File"
+    rescue LoadError
+      CLIPBOARD_AVAILABLE = false
+    end
 
     if CLIPBOARD_AVAILABLE
       GLOBAL_MAP.define_key("\M-w", :clipboard_copy_region)

data/lib/textbringer/commands/misc.rb

@@ -354,6 +354,36 @@ module Textbringer
       RubyVM::MJIT.resume
     end
 
+    define_command(:forward_page,
+                   doc: "Move forward to page boundary.") do
+      |n = number_prefix_arg|
+      buffer = Buffer.current
+      n.times do
+        unless buffer.re_search_forward(/^\f/, raise_error: false)
+          buffer.end_of_buffer
+          break
+        end
+      end
+    end
+
+    define_command(:backward_page,
+                   doc: "Move backward to page boundary.") do
+      |n = number_prefix_arg|
+      buffer = Buffer.current
+      n.times do
+        if buffer.point == 0
+          break
+        end
+        buffer.backward_char
+        if buffer.re_search_backward(/^\f/, raise_error: false)
+          buffer.forward_char
+        else
+          buffer.beginning_of_buffer
+          break
+        end
+      end
+    end
+
     define_command(:what_cursor_position,
                    doc: "Print info on cursor position.") do
       |arg = current_prefix_arg|

data/lib/textbringer/face.rb

@@ -7,6 +7,8 @@ module Textbringer
     @@face_table = {}
     @@next_color_pair = 1
     @@color_pair_cache = {}
+    @@default_foreground = -1
+    @@default_background = -1
 
     def self.[](name)
       @@face_table[name]
@@ -26,6 +28,20 @@ module Textbringer
       @@face_table.delete(name)
     end
 
+    # Set the concrete color numbers substituted for -1 (default color).
+    # PDCurses resolves -1 when init_pair is called and
+    # assume_default_colors only affects color pair 0, so faces must be
+    # re-resolved with concrete colors to get the new default colors.
+    def self.set_default_color_numbers(fg_num, bg_num)
+      return if fg_num == @@default_foreground &&
+        bg_num == @@default_background
+      @@default_foreground = fg_num
+      @@default_background = bg_num
+      @@face_table.each_value do |face|
+        face.send(:resolve_inheritance)
+      end
+    end
+
     def initialize(name, **opts)
       @name = name
       update(**opts)
@@ -68,6 +84,8 @@ module Textbringer
       @reverse = @explicit_reverse.nil? ? (parent&.instance_variable_get(:@reverse) || false) : @explicit_reverse
       fg_num = Color[@foreground]
       bg_num = Color[@background]
+      fg_num = @@default_foreground if fg_num == -1
+      bg_num = @@default_background if bg_num == -1
       key = [fg_num, bg_num]
       unless @@color_pair_cache.key?(key)
         @@color_pair_cache[key] = @@next_color_pair

data/lib/textbringer/keymap.rb

@@ -167,6 +167,8 @@ module Textbringer
   GLOBAL_MAP.define_key(:npage, :scroll_up)
   GLOBAL_MAP.define_key("\M-v", :scroll_down)
   GLOBAL_MAP.define_key(:ppage, :scroll_down)
+  GLOBAL_MAP.define_key("\C-x]", :forward_page)
+  GLOBAL_MAP.define_key("\C-x[", :backward_page)
   GLOBAL_MAP.define_key("\C-x0", :delete_window)
   GLOBAL_MAP.define_key("\C-x1", :delete_other_windows)
   GLOBAL_MAP.define_key("\C-x2", :split_window)

data/lib/textbringer/modes/ruby_mode.rb

@@ -8,7 +8,7 @@ module Textbringer
   class RubyMode < ProgrammingMode
     self.file_name_pattern =
       /\A(?:.*\.(?:rb|ru|rake|thor|jbuilder|gemspec|podspec)|
-            (?:Gem|Rake|Cap|Thor|Vagrant|Guard|Pod)file)\z/ix
+            (?:Gem|Rake|Cap|Thor|Vagrant|Guard|Pod)file|.irbrc)\z/ix
     self.interpreter_name_pattern = /ruby/i
 
     def comment_start
@@ -512,13 +512,14 @@ module Textbringer
       elsif node.type == :alias_method_node
         add_alias_method_name_locs(node.new_name)
         add_alias_method_name_locs(node.old_name)
-      elsif (node.type == :call_node &&
-             !(node.call_operator_loc.nil? && OPERATORS.include?(node.name)) &&          # exclude operators
-             !((node.call_operator_loc.nil? || node.call_operator_loc.slice == "::") &&  # exclude constants
-               /\A\p{Upper}/.match?(node.name))) ||
-          node.type == :call_operator_write_node ||
-          node.type == :call_and_write_node ||
-          node.type == :call_or_write_node
+      elsif ((node.type == :call_node &&
+              !(node.call_operator_loc.nil? && OPERATORS.include?(node.name)) &&          # exclude operators
+              !((node.call_operator_loc.nil? || node.call_operator_loc.slice == "::") &&  # exclude constants
+                /\A\p{Upper}/.match?(node.name))) ||
+             node.type == :call_operator_write_node ||
+             node.type == :call_and_write_node ||
+             node.type == :call_or_write_node) &&
+          node.message_loc
         @prism_method_name_locs[node.message_loc.start_offset] = true
       end
       node.compact_child_nodes.each { |child| collect_method_name_locs(child) }

data/lib/textbringer/themes/iceberg.rb

@@ -0,0 +1,88 @@
+# Iceberg theme for Textbringer
+# Based on https://github.com/cocopon/iceberg.vim
+# A well-designed dark blue color scheme.
+#
+# GUI hex values from the source's guifg/guibg definitions.
+
+Textbringer::Theme.define "iceberg" do |t|
+  t.palette :dark do |p|
+    # Background / foreground
+    p.color :bg,       hex: "#161821", ansi: "black"        # Normal guibg
+    p.color :bg1,      hex: "#1e2132", ansi: "black"        # terminal color0
+    p.color :bg_vis,   hex: "#272c42", ansi: "brightblack"  # Visual guibg
+    p.color :bg_popup, hex: "#3d425b", ansi: "brightblack"  # Pmenu guibg
+    p.color :bg_sel,   hex: "#5b6389", ansi: "brightblack"  # PmenuSel guibg
+    p.color :fg,       hex: "#c6c8d1", ansi: "white"        # Normal guifg
+    p.color :fg_sel,   hex: "#eff0f4", ansi: "white"        # PmenuSel guifg
+    p.color :comment,  hex: "#6b7089", ansi: "brightblack"  # Comment guifg
+    p.color :status_bg, hex: "#818596", ansi: "white"       # StatusLine (reverse)
+    p.color :status_fg, hex: "#17171b", ansi: "black"       # StatusLine (reverse)
+
+    # Accent colors
+    p.color :blue,     hex: "#84a0c6", ansi: "blue"         # Statement/Keyword guifg
+    p.color :cyan,     hex: "#89b8c2", ansi: "cyan"         # String/Identifier guifg
+    p.color :green,    hex: "#b4be82", ansi: "green"        # PreProc/Special guifg
+    p.color :purple,   hex: "#a093c7", ansi: "magenta"      # Constant guifg
+    p.color :orange,   hex: "#e4aa80", ansi: "yellow"       # Search guibg
+    p.color :search_fg, hex: "#392313", ansi: "black"       # Search guifg
+    p.color :red,      hex: "#e27878", ansi: "red"          # terminal color1
+  end
+
+  t.palette :light do |p|
+    # Background / foreground
+    p.color :bg,       hex: "#e8e9ec", ansi: "white"        # Normal guibg
+    p.color :bg1,      hex: "#dcdfe7", ansi: "white"        # terminal color0
+    p.color :bg_vis,   hex: "#c9cdd7", ansi: "white"        # Visual guibg
+    p.color :bg_popup, hex: "#cad0de", ansi: "white"        # Pmenu guibg
+    p.color :bg_sel,   hex: "#a7b2cd", ansi: "white"        # PmenuSel guibg
+    p.color :fg,       hex: "#33374c", ansi: "black"        # Normal guifg
+    p.color :fg_sel,   hex: "#33374c", ansi: "black"        # PmenuSel guifg
+    p.color :comment,  hex: "#8389a3", ansi: "brightblack"  # Comment guifg
+    p.color :status_bg, hex: "#757ca3", ansi: "brightblack" # StatusLine (reverse)
+    p.color :status_fg, hex: "#e8e9ec", ansi: "white"       # StatusLine (reverse)
+
+    # Accent colors
+    p.color :blue,     hex: "#2d539e", ansi: "blue"         # Statement/Keyword guifg
+    p.color :cyan,     hex: "#3f83a6", ansi: "cyan"         # String/Identifier guifg
+    p.color :green,    hex: "#668e3d", ansi: "green"        # PreProc/Special guifg
+    p.color :purple,   hex: "#7759b4", ansi: "magenta"      # Constant guifg
+    p.color :orange,   hex: "#eac6ad", ansi: "yellow"       # Search guibg
+    p.color :search_fg, hex: "#85512c", ansi: "black"       # Search guifg
+    p.color :red,      hex: "#cc517a", ansi: "red"          # terminal color1
+  end
+
+  t.default_colors foreground: :fg, background: :bg
+
+  # Programming faces
+  t.face :comment,                  foreground: :comment
+  t.face :preprocessing_directive,  foreground: :green     # PreProc
+  t.face :keyword,                  foreground: :blue      # Statement
+  t.face :string,                   foreground: :cyan      # String
+  t.face :number,                   foreground: :purple    # Constant
+  t.face :constant,                 foreground: :purple    # Constant
+  t.face :function_name,            foreground: :blue      # Function
+  t.face :type,                     foreground: :blue      # Type
+  t.face :variable,                 foreground: :cyan      # Identifier
+  t.face :operator,                 foreground: :blue      # Operator
+  t.face :punctuation                                      # Delimiter = fg
+  t.face :builtin,                  foreground: :green     # Special
+  t.face :property,                 foreground: :cyan      # Identifier
+
+  # Basic faces
+  t.face :mode_line,                foreground: :status_fg, background: :status_bg
+  t.face :link,                     foreground: :cyan,     underline: true
+  t.face :control
+  t.face :region,                   background: :bg_vis
+  t.face :isearch,                  foreground: :search_fg, background: :orange
+  t.face :floating_window,          foreground: :fg,       background: :bg_popup
+
+  # Completion faces
+  t.face :completion_popup,          foreground: :fg,      background: :bg_popup
+  t.face :completion_popup_selected, foreground: :fg_sel,  background: :bg_sel
+
+  # Dired faces
+  t.face :dired_directory,           foreground: :cyan     # Directory
+  t.face :dired_symlink,             foreground: :green    # Tag → Special
+  t.face :dired_executable,          foreground: :green
+  t.face :dired_flagged,             foreground: :red
+end

data/lib/textbringer/themes/kanagawa.rb

@@ -0,0 +1,94 @@
+# Kanagawa theme for Textbringer
+# Based on https://github.com/rebelot/kanagawa.nvim
+# Wave (dark) and Lotus (light) variants.
+#
+# GUI hex values from the source palette and theme definitions.
+
+Textbringer::Theme.define "kanagawa" do |t|
+  t.palette :dark do |p|
+    # Background / foreground (wave variant)
+    p.color :bg,          hex: "#1f1f28", ansi: "black"        # sumiInk3 – Normal bg
+    p.color :bg_dark,     hex: "#181820", ansi: "black"        # sumiInk1 – StatusLine bg
+    p.color :bg_popup,    hex: "#223249", ansi: "brightblack"  # waveBlue1 – Pmenu bg
+    p.color :bg_vis,      hex: "#223249", ansi: "brightblack"  # waveBlue1 – Visual bg
+    p.color :bg_sel,      hex: "#2d4f67", ansi: "brightblack"  # waveBlue2 – PmenuSel bg, Search bg
+    p.color :bg_float,    hex: "#16161d", ansi: "black"        # sumiInk0 – float bg
+    p.color :fg,          hex: "#dcd7ba", ansi: "white"        # fujiWhite – Normal fg
+    p.color :fg_dim,      hex: "#c8c093", ansi: "white"        # oldWhite – StatusLine fg, float fg
+
+    # Syntax colors
+    p.color :comment,     hex: "#727169", ansi: "brightblack"  # fujiGray – Comment
+    p.color :string,      hex: "#98bb6c", ansi: "green"        # springGreen – String
+    p.color :pink,        hex: "#d27e99", ansi: "magenta"      # sakuraPink – Number
+    p.color :orange,      hex: "#ffa066", ansi: "yellow"       # surimiOrange – Constant
+    p.color :yellow,      hex: "#e6c384", ansi: "yellow"       # carpYellow – Identifier
+    p.color :blue,        hex: "#7e9cd8", ansi: "blue"         # crystalBlue – Function
+    p.color :violet,      hex: "#957fb8", ansi: "magenta"      # oniViolet – Keyword/Statement
+    p.color :gold,        hex: "#c0a36e", ansi: "yellow"       # boatYellow2 – Operator
+    p.color :red,         hex: "#e46876", ansi: "red"          # waveRed – PreProc
+    p.color :aqua,        hex: "#7aa89f", ansi: "cyan"         # waveAqua2 – Type
+    p.color :light_blue,  hex: "#9cabca", ansi: "cyan"         # springViolet2 – Punctuation
+    p.color :spring_blue, hex: "#7fb4ca", ansi: "cyan"         # springBlue – Special/Builtin
+  end
+
+  t.palette :light do |p|
+    # Background / foreground (lotus variant)
+    p.color :bg,          hex: "#f2ecbc", ansi: "white"        # lotusWhite3 – Normal bg
+    p.color :bg_dark,     hex: "#dcd7ba", ansi: "white"        # lotusGray – StatusLine bg
+    p.color :bg_popup,    hex: "#c7d7e0", ansi: "white"        # lotusBlue1 – Pmenu bg
+    p.color :bg_sel,      hex: "#9fb5c9", ansi: "white"        # lotusBlue3 – PmenuSel bg, Search bg
+    p.color :bg_float,    hex: "#d5cea3", ansi: "white"        # lotusWhite0 – float bg
+    p.color :bg_vis,      hex: "#c9cbd1", ansi: "white"        # lotusViolet3 – Visual bg
+    p.color :fg,          hex: "#545464", ansi: "black"        # lotusInk1 – Normal fg
+    p.color :fg_dim,      hex: "#43436c", ansi: "black"        # lotusInk2 – StatusLine fg
+
+    # Syntax colors
+    p.color :comment,     hex: "#8a8980", ansi: "brightblack"  # lotusGray3 – Comment
+    p.color :string,      hex: "#6f894e", ansi: "green"        # lotusGreen – String
+    p.color :pink,        hex: "#b35b79", ansi: "magenta"      # lotusPink – Number
+    p.color :orange,      hex: "#cc6d00", ansi: "yellow"       # lotusOrange – Constant
+    p.color :yellow,      hex: "#77713f", ansi: "yellow"       # lotusYellow – Identifier
+    p.color :blue,        hex: "#4d699b", ansi: "blue"         # lotusBlue4 – Function
+    p.color :violet,      hex: "#624c83", ansi: "magenta"      # lotusViolet4 – Keyword/Statement
+    p.color :gold,        hex: "#836f4a", ansi: "yellow"       # lotusYellow2 – Operator
+    p.color :red,         hex: "#c84053", ansi: "red"          # lotusRed – PreProc
+    p.color :aqua,        hex: "#597b75", ansi: "cyan"         # lotusAqua – Type
+    p.color :light_blue,  hex: "#4e8ca2", ansi: "cyan"         # lotusTeal1 – Punctuation
+    p.color :spring_blue, hex: "#6693bf", ansi: "cyan"         # lotusTeal2 – Special/Builtin
+  end
+
+  t.default_colors foreground: :fg, background: :bg
+
+  # Programming faces
+  t.face :comment,                  foreground: :comment
+  t.face :string,                   foreground: :string       # syn.string
+  t.face :number,                   foreground: :pink         # syn.number
+  t.face :constant,                 foreground: :orange       # syn.constant
+  t.face :keyword,                  foreground: :violet, bold: true  # syn.keyword + statementStyle
+  t.face :preprocessing_directive,  foreground: :red          # syn.preproc
+  t.face :function_name,            foreground: :blue         # syn.fun
+  t.face :type,                     foreground: :aqua         # syn.type
+  t.face :variable,                 foreground: :yellow       # syn.identifier
+  t.face :operator,                 foreground: :gold         # syn.operator
+  t.face :punctuation,              foreground: :light_blue   # syn.punct
+  t.face :builtin,                  foreground: :spring_blue  # syn.special1
+  t.face :property,                 foreground: :yellow       # syn.identifier (carpYellow)
+
+  # Basic faces
+  t.face :mode_line,                foreground: :fg_dim, background: :bg_dark
+  t.face :link,                     foreground: :blue, underline: true
+  t.face :control
+  t.face :region,                   background: :bg_vis       # Visual = waveBlue1 / lotusViolet3
+  t.face :isearch,                  foreground: :fg, background: :bg_sel  # bg_search
+  t.face :floating_window,          foreground: :fg_dim, background: :bg_float
+
+  # Completion faces
+  t.face :completion_popup,          foreground: :fg,     background: :bg_popup
+  t.face :completion_popup_selected, foreground: :fg,     background: :bg_sel
+
+  # Dired faces
+  t.face :dired_directory,           foreground: :blue,   bold: true  # Directory
+  t.face :dired_symlink,             foreground: :spring_blue         # special1
+  t.face :dired_executable,          foreground: :string              # springGreen / lotusGreen
+  t.face :dired_flagged,             foreground: :red
+end

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "26"
+  VERSION = "27"
 end

data/lib/textbringer/window.rb

@@ -137,9 +137,12 @@ module Textbringer
     def self.set_default_colors(fg, bg)
       new_fg = fg || @@default_fg
       new_bg = bg || @@default_bg
-      Curses.assume_default_colors(Color[new_fg], Color[new_bg])
+      fg_num = Color[new_fg]
+      bg_num = Color[new_bg]
+      Curses.assume_default_colors(fg_num, bg_num)
       @@default_fg = new_fg
       @@default_bg = new_bg
+      Face.set_default_color_numbers(fg_num, bg_num)
       Face.define(:default, foreground: new_fg, background: new_bg)
       Window.redraw if @@started
     end

data/textbringer.gemspec

@@ -27,11 +27,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "irb"
   spec.add_runtime_dependency "nkf"
   spec.add_runtime_dependency "drb"
+  spec.add_runtime_dependency "fiddle" # for reline on Windows
   spec.add_runtime_dependency "curses", ">= 1.2.7"
   spec.add_runtime_dependency "unicode-display_width", ">= 1.1"
   spec.add_runtime_dependency "clipboard", ">= 1.1"
-  spec.add_runtime_dependency "fiddle"
-  spec.add_runtime_dependency "fiddley", ">= 0.0.5"
   spec.add_runtime_dependency "editorconfig"
   spec.add_runtime_dependency "warning"
   spec.add_runtime_dependency "unicode-name"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '26'
+  version: '27'
 platform: ruby
 authors:
 - Shugo Maeda
@@ -94,35 +94,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curses
+  name: fiddle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: unicode-display_width
+  name: curses
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.2.7
 - !ruby/object:Gem::Dependency
-  name: clipboard
+  name: unicode-display_width
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,33 +136,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: fiddle
-  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: fiddley
+  name: clipboard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: editorconfig
   requirement: !ruby/object:Gem::Requirement
@@ -436,6 +422,8 @@ files:
 - lib/textbringer/themes/catppuccin.rb
 - lib/textbringer/themes/github.rb
 - lib/textbringer/themes/gruvbox.rb
+- lib/textbringer/themes/iceberg.rb
+- lib/textbringer/themes/kanagawa.rb
 - lib/textbringer/themes/molokai.rb
 - lib/textbringer/themes/sonokai.rb
 - lib/textbringer/themes/tokyonight.rb
@@ -515,7 +503,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.16
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []