#Set members
self.childpid = None
- self.history = []
+ self.history = [""]
self.isactive = True
+ self.lastc, self.lastr = 0,0
#Start debugger
self.clientCmd = clientCmd
def contents_changed(self, term):
+ assert( self.getHistoryLen()>0 )
+
c,r = term.get_cursor_position()
- text = self.get_text_range(max(self.getHistoryLen()-1,0),0,r,-1,lambda *w:True)
+ text = self.get_text_range(self.lastr,self.lastc,r,c-1,lambda *w:True)
+ self.lastc, self.lastr = c,r
#Remove annoying \n at the end
assert(text[-1] == "\n")
text = text[:-1]
- #Remove the incomplete line
- if self.getHistoryLen()>0 and self.history[-1]!='\n':
- del self.history[-1]
-
#Get the lines and remove empty lines
lines = string.split(text, "\n")
- #Add lines to history. The last line contains no "\n" at the end!
- self.history += [l+"\n" for l in lines[:-1]]
- self.history += [lines[-1]]
- assert(r == self.getHistoryLen()-1)
+ #Remove the incomplete line
+ len = self.getHistoryLen()
+ self.history[-1] += lines[0]
+ self.history += lines[1:]
+
+ for l in self.history[len:]:
+ pass
def waitForNewline(self):
return len(self.history)
def waitForRx(self, rx, start):
-
curr = start
-
while True:
- for no in range(max(curr-1,start), self.getHistoryLen()):
+ assert( curr>=start )
+ for no in range(curr, self.getHistoryLen()):
line = self.history[no]
if rx.search(line):
return no, line
- curr = max(start,self.getHistoryLen())
+ #Do not forget the last line
+ curr = max(start,self.getHistoryLen()-1)
gtk.main_iteration()
gtk.main_quit()
except:
pass
- sys.exit(0)