diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/reline.rb | 20 | ||||
| -rw-r--r-- | lib/reline/config.rb | 32 |
2 files changed, 26 insertions, 26 deletions
diff --git a/lib/reline.rb b/lib/reline.rb index 9de04a95b3..0487232a0d 100644 --- a/lib/reline.rb +++ b/lib/reline.rb @@ -53,12 +53,12 @@ module Reline :dialog_default_fg_color, :dialog_default_fg_color_sequence, :dialog_default_fg_color=, - :dialog_pointer_bg_color, - :dialog_pointer_bg_color_sequence, - :dialog_pointer_bg_color=, - :dialog_pointer_fg_color, - :dialog_pointer_fg_color_sequence, - :dialog_pointer_fg_color= + :dialog_highlight_bg_color, + :dialog_highlight_bg_color_sequence, + :dialog_highlight_bg_color=, + :dialog_highlight_fg_color, + :dialog_highlight_fg_color_sequence, + :dialog_highlight_fg_color= ] class Core @@ -273,9 +273,9 @@ module Reline scrollbar: true, height: 15, bg_color: config.dialog_default_bg_color_sequence, - pointer_bg_color: config.dialog_pointer_bg_color_sequence, + pointer_bg_color: config.dialog_highlight_bg_color_sequence, fg_color: config.dialog_default_fg_color_sequence, - pointer_fg_color: config.dialog_pointer_fg_color_sequence + pointer_fg_color: config.dialog_highlight_fg_color_sequence ) } Reline::DEFAULT_DIALOG_CONTEXT = Array.new @@ -586,8 +586,8 @@ module Reline core.add_dialog_proc(:autocomplete, Reline::DEFAULT_DIALOG_PROC_AUTOCOMPLETE, Reline::DEFAULT_DIALOG_CONTEXT) core.dialog_default_bg_color = :cyan core.dialog_default_fg_color = :white - core.dialog_pointer_bg_color = :magenta - core.dialog_pointer_fg_color = :white + core.dialog_highlight_bg_color = :magenta + core.dialog_highlight_fg_color = :white } end diff --git a/lib/reline/config.rb b/lib/reline/config.rb index cef7735bdb..ffd1765e4f 100644 --- a/lib/reline/config.rb +++ b/lib/reline/config.rb @@ -48,8 +48,8 @@ class Reline::Config attr_accessor :autocompletion attr_reader :dialog_default_bg_color_sequence, :dialog_default_fg_color_sequence, - :dialog_pointer_bg_color_sequence, - :dialog_pointer_fg_color_sequence + :dialog_highlight_bg_color_sequence, + :dialog_highlight_fg_color_sequence def initialize @additional_key_bindings = {} # from inputrc @@ -76,9 +76,9 @@ class Reline::Config @autocompletion = false @convert_meta = true if seven_bit_encoding?(Reline::IOGate.encoding) @dialog_default_bg_color_sequence = nil - @dialog_pointer_bg_color_sequence = nil + @dialog_highlight_bg_color_sequence = nil @dialog_default_fg_color_sequence = nil - @dialog_pointer_fg_color_sequence = nil + @dialog_highlight_fg_color_sequence = nil end def reset @@ -112,12 +112,12 @@ class Reline::Config @dialog_default_fg_color_sequence = dialog_color_to_code(:fg, color) end - def dialog_pointer_bg_color=(color) - @dialog_pointer_bg_color_sequence = dialog_color_to_code(:bg, color) + def dialog_highlight_bg_color=(color) + @dialog_highlight_bg_color_sequence = dialog_color_to_code(:bg, color) end - def dialog_pointer_fg_color=(color) - @dialog_pointer_fg_color_sequence = dialog_color_to_code(:fg, color) + def dialog_highlight_fg_color=(color) + @dialog_highlight_fg_color_sequence = dialog_color_to_code(:fg, color) end def dialog_default_bg_color @@ -128,12 +128,12 @@ class Reline::Config dialog_code_to_color(:fg, @dialog_default_fg_color_sequence) end - def dialog_pointer_bg_color - dialog_code_to_color(:bg, @dialog_pointer_bg_color_sequence) + def dialog_highlight_bg_color + dialog_code_to_color(:bg, @dialog_highlight_bg_color_sequence) end - def dialog_pointer_fg_color - dialog_code_to_color(:fg, @dialog_pointer_fg_color_sequence) + def dialog_highlight_fg_color + dialog_code_to_color(:fg, @dialog_highlight_fg_color_sequence) end COLORS = [ @@ -399,10 +399,10 @@ class Reline::Config self.dialog_default_bg_color = value when 'dialog-default-fg-color' self.dialog_default_fg_color = value - when 'dialog-pointer-bg-color' - self.dialog_pointer_bg_color = value - when 'dialog-pointer-fg-color' - self.dialog_pointer_fg_color = value + when 'dialog-highlight-bg-color' + self.dialog_highlight_bg_color = value + when 'dialog-highlight-fg-color' + self.dialog_highlight_fg_color = value when *VARIABLE_NAMES then variable_name = :"@#{name.tr(?-, ?_)}" instance_variable_set(variable_name, value.nil? || value == '1' || value == 'on') |