mirror of
https://github.com/wassname/pyreadline.git
synced 2026-07-28 11:24:31 +08:00
Removed the last dependency on console from vi-mode.
The cursor_size property of the BaseMode class should be used to determine the wanted cursorsize. Fixed some whitespace in emacsmode.
This commit is contained in:
@@ -38,6 +38,7 @@ class BaseMode(object):
|
||||
self.startup_hook = None
|
||||
self.pre_input_hook = None
|
||||
self.first_prompt = True
|
||||
self.cursor_size=25
|
||||
|
||||
self.prompt = ">>>"
|
||||
|
||||
|
||||
@@ -88,10 +88,6 @@ class IncrementalSearchPromptMode(object):
|
||||
else:
|
||||
self.line=""
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class SearchPromptMode(object):
|
||||
def __init__(self, rlobj):
|
||||
pass
|
||||
@@ -188,10 +184,6 @@ class DigitArgumentMode(object):
|
||||
log("arg-init %s %s"%(self.argument,keyinfo.char))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class EmacsMode(DigitArgumentMode, IncrementalSearchPromptMode, SearchPromptMode, basemode.BaseMode):
|
||||
mode="emacs"
|
||||
def __init__(self, rlobj):
|
||||
|
||||
@@ -158,9 +158,9 @@ class ViMode(basemode.BaseMode):
|
||||
self.__vi_insert_mode = value
|
||||
if value:
|
||||
self.vi_save_line ()
|
||||
self.console.cursor (size=25)
|
||||
self.cursor_size=25
|
||||
else:
|
||||
self.console.cursor (size=100)
|
||||
self.cursor_size=100
|
||||
|
||||
def vi_undo_restart (self):
|
||||
tpl_undo = (self.l_buffer.point, self.l_buffer.line_buffer[:], )
|
||||
|
||||
@@ -468,7 +468,9 @@ class Readline(BaseReadline):
|
||||
c.clear_to_end_of_window() #to System.Console's lack of FillFunction
|
||||
else:
|
||||
self._clear_after()
|
||||
c.cursor(1) #Show cursor
|
||||
|
||||
#Show cursor, set size vi mode changes size in insert/overwrite mode
|
||||
c.cursor(1, size=self.mode.cursor_size)
|
||||
self._set_cursor()
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user