kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

[ruby/reline] Terminfo.tigetstr and tiparm should return String object

Browse source 
https://github.com/ruby/reline/commit/1e287d10cc
This commit is contained in:
aycabta 2021-05-19 17:53:17 +09:00
parent 46c813969b
commit 5e09da2f7a
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/reline/ansi.rb
View file

@ -41,18 +41,18 @@ class Reline::ANSI
def self.set_default_key_bindings_terminfo(config)
{
Reline::Terminfo.tigetstr('khome').to_s.bytes => :ed_move_to_beg,
Reline::Terminfo.tigetstr('kend').to_s.bytes => :ed_move_to_end,
Reline::Terminfo.tigetstr('kcuu1').to_s.bytes => :ed_prev_history,
Reline::Terminfo.tigetstr('kcud1').to_s.bytes => :ed_next_history,
Reline::Terminfo.tigetstr('kcuf1').to_s.bytes => :ed_next_char,
Reline::Terminfo.tigetstr('kcub1').to_s.bytes => :ed_prev_char,
Reline::Terminfo.tigetstr('khome').bytes => :ed_move_to_beg,
Reline::Terminfo.tigetstr('kend').bytes => :ed_move_to_end,
Reline::Terminfo.tigetstr('kcuu1').bytes => :ed_prev_history,
Reline::Terminfo.tigetstr('kcud1').bytes => :ed_next_history,
Reline::Terminfo.tigetstr('kcuf1').bytes => :ed_next_char,
Reline::Terminfo.tigetstr('kcub1').bytes => :ed_prev_char,
# Escape sequences that omit the move distance and are set to defaults
# value 1 may be sometimes sent by pressing the arrow-key.
Reline::Terminfo.tigetstr('cuu').to_s.sub(/%p1%d/, '').bytes => :ed_prev_history,
Reline::Terminfo.tigetstr('cud').to_s.sub(/%p1%d/, '').bytes => :ed_next_history,
Reline::Terminfo.tigetstr('cuf').to_s.sub(/%p1%d/, '').bytes => :ed_next_char,
Reline::Terminfo.tigetstr('cub').to_s.sub(/%p1%d/, '').bytes => :ed_prev_char,
Reline::Terminfo.tigetstr('cuu').sub(/%p1%d/, '').bytes => :ed_prev_history,
Reline::Terminfo.tigetstr('cud').sub(/%p1%d/, '').bytes => :ed_next_history,
Reline::Terminfo.tigetstr('cuf').sub(/%p1%d/, '').bytes => :ed_next_char,
Reline::Terminfo.tigetstr('cub').sub(/%p1%d/, '').bytes => :ed_prev_char,
}.each_pair do |key, func|
config.add_default_key_binding_by_keymap(:emacs, key, func)
config.add_default_key_binding_by_keymap(:vi_insert, key, func)

4
lib/reline/terminfo.rb
View file

@ -57,7 +57,7 @@ module Reline::Terminfo
end
def self.tigetstr(capname)
@tigetstr.(capname)
@tigetstr.(capname).to_s
end
def self.tiparm(str, *args)
@ -65,7 +65,7 @@ module Reline::Terminfo
args.each do |a|
new_args << Fiddle::TYPE_INT << a
end
@tiparm.(str, *new_args)
@tiparm.(str, *new_args).to_s
end
def self.enabled?