commit 6d21fb93376ad4ccb651a8e98b385cef8343fa7e
parent e3328775b1a2d820c39882c23a0c923f6e802c04
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Sat, 24 May 2008 21:12:46 -0700
Merge commit 'origin/more-vi-keys'
Diffstat:
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/lib/sup/keymap.rb b/lib/sup/keymap.rb
@@ -43,16 +43,10 @@ class Keymap
when :home: "<home>"
when :end: "<end>"
when :enter, :return: "<enter>"
- when :ctrl_l: "ctrl-l"
- when :ctrl_g: "ctrl-g"
when :tab: "tab"
when " ": "<space>"
else
- if k.is_a?(String) && k.length == 1
- k
- else
- raise ArgumentError, "unknown key name \"#{k}\""
- end
+ Curses::keyname(keysym_to_keycode(k))
end
end
diff --git a/lib/sup/modes/scroll-mode.rb b/lib/sup/modes/scroll-mode.rb
@@ -15,12 +15,14 @@ class ScrollMode < Mode
COL_JUMP = 2
register_keymap do |k|
- k.add :line_down, "Down one line", :down, 'j', 'J'
- k.add :line_up, "Up one line", :up, 'k', 'K'
+ k.add :line_down, "Down one line", :down, 'j', 'J', "\C-e"
+ k.add :line_up, "Up one line", :up, 'k', 'K', "\C-y"
k.add :col_left, "Left one column", :left, 'h'
k.add :col_right, "Right one column", :right, 'l'
- k.add :page_down, "Down one page", :page_down, ' '
- k.add :page_up, "Up one page", :page_up, 'p', :backspace
+ k.add :page_down, "Down one page", :page_down, ' ', "\C-f"
+ k.add :page_up, "Up one page", :page_up, 'p', :backspace, "\C-b"
+ k.add :half_page_down, "Down one half page", "\C-d"
+ k.add :half_page_up, "Up one half page", "\C-u"
k.add :jump_to_start, "Jump to top", :home, '^', '1'
k.add :jump_to_end, "Jump to bottom", :end, '$', '0'
k.add :jump_to_left, "Jump to the left", '['
@@ -130,6 +132,8 @@ class ScrollMode < Mode
def line_up; jump_to_line @topline - 1; end
def page_down; jump_to_line @topline + buffer.content_height - @slip_rows; end
def page_up; jump_to_line @topline - buffer.content_height + @slip_rows; end
+ def half_page_down; jump_to_line @topline + buffer.content_height / 2; end
+ def half_page_up; jump_to_line @topline - buffer.content_height / 2; end
def jump_to_start; jump_to_line 0; end
def jump_to_end; jump_to_line lines - buffer.content_height; end