lib/sup/modes/scroll-mode.rb in sup-0.5 vs lib/sup/modes/scroll-mode.rb in sup-0.6

- old
+ new

@@ -13,16 +13,18 @@ attr_reader :status, :topline, :botline, :leftcol 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", '[' k.add :search_in_buffer, "Search in current buffer", '/' k.add :continue_search_in_buffer, "Jump to next search occurrence in buffer", BufferManager::CONTINUE_IN_BUFFER_SEARCH_KEY @@ -83,19 +85,20 @@ return if query.nil? || query.empty? @search_query = Regexp.escape query continue_search_in_buffer end - ## subclasses can override these two! + ## subclasses can override these three! def search_goto_pos line, leftcol, rightcol - jump_to_line line + search_goto_line line if rightcol > self.rightcol # if it's occluded... jump_to_col [rightcol - buffer.content_width + 1, 0].max # move right end end def search_start_line; @topline end + def search_goto_line line; jump_to_line line end def col_left return unless @leftcol > 0 @leftcol -= COL_JUMP buffer.mark_dirty @@ -128,9 +131,11 @@ def line_down; jump_to_line @topline + 1; end 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 def ensure_mode_validity @topline = @topline.clamp 0, [lines - 1, 0].max