pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix input history, and avoid consecutive duplicates. fixed #1851

Browse source
This commit is contained in:
louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 2011-01-06 19:57:31 +00:00
parent 850bde1655
commit c2344d0d33
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/windows.py
View file

@ -1014,7 +1014,7 @@ class MessageInput(Input):
def __init__(self): def __init__(self):
Input.__init__(self) Input.__init__(self)
self.last_completion = None self.last_completion = None
self.histo_pos = 0 self.histo_pos = -1
self.key_func["KEY_UP"] = self.key_up self.key_func["KEY_UP"] = self.key_up
self.key_func["M-A"] = self.key_up self.key_func["M-A"] = self.key_up
self.key_func["KEY_DOWN"] = self.key_down self.key_func["KEY_DOWN"] = self.key_down
@ -1027,10 +1027,9 @@ class MessageInput(Input):
if not len(MessageInput.history): if not len(MessageInput.history):
return return
self.reset_completion() self.reset_completion()
self._win.erase() if self.histo_pos < len(MessageInput.history) - 1:
if self.histo_pos >= 0: self.histo_pos += 1
self.histo_pos -= 1 self.text = MessageInput.history[self.histo_pos]
self.text = MessageInput.history[self.histo_pos+1]
self.key_end() self.key_end()
def key_down(self): def key_down(self):
@ -1040,22 +1039,18 @@ class MessageInput(Input):
if not len(MessageInput.history): if not len(MessageInput.history):
return return
self.reset_completion() self.reset_completion()
if self.histo_pos < len(MessageInput.history)-1: if self.histo_pos > 0:
self.histo_pos += 1 self.histo_pos -= 1
self.text = self.history[self.histo_pos] self.text = MessageInput.history[self.histo_pos]
self.key_end() self.key_end()
else:
self.histo_pos = len(MessageInput.history)-1
self.text = ''
self.pos = 0
self.line_pos = 0
self.rewrite_text()
def key_enter(self): def key_enter(self):
txt = self.get_text() txt = self.get_text()
if len(txt) != 0: if len(txt) != 0:
self.history.append(txt) if not MessageInput.history or MessageInput.history[0] != txt:
self.histo_pos = len(self.history)-1 # add the message to history, but avoid duplicates
MessageInput.history.insert(0, txt)
self.histo_pos = -1
self.clear_text() self.clear_text()
return txt return txt