projects
/
pygdb.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rewriting DbgTerminal.contents_changed. Much better now
[pygdb.git]
/
DbgTerminal.py
diff --git
a/DbgTerminal.py
b/DbgTerminal.py
index 11eaf5c35ee2cdf4a7f2629716b69fe5f2394e85..6b09426a0698313742ed85402b441cdf4b715c67 100644
(file)
--- a/
DbgTerminal.py
+++ b/
DbgTerminal.py
@@
-26,8
+26,9
@@
class DbgTerminal (vte.Terminal):
#Set members
self.childpid = None
#Set members
self.childpid = None
- self.history = []
+ self.history = [
""
]
self.isactive = True
self.isactive = True
+ self.lastc, self.lastr = 0,0
#Start debugger
self.clientCmd = clientCmd
#Start debugger
self.clientCmd = clientCmd
@@
-58,23
+59,22
@@
class DbgTerminal (vte.Terminal):
def contents_changed(self, term):
def contents_changed(self, term):
+ assert( self.getHistoryLen()>0 )
+
c,r = term.get_cursor_position()
c,r = term.get_cursor_position()
- text = self.get_text_range(self.getHistoryLen()-1,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 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")
#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]
]
+ #
Remove the incomplete line
+ self.history
[-1] += lines[0
]
+ self.history +=
lines[1:
]
def waitForNewline(self):
def waitForNewline(self):
@@
-86,16
+86,16
@@
class DbgTerminal (vte.Terminal):
return len(self.history)
def waitForRx(self, rx, start):
return len(self.history)
def waitForRx(self, rx, start):
-
curr = start
curr = start
-
while True:
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
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_iteration()
@@
-148,7
+148,6
@@
def quitHandler(*w):
gtk.main_quit()
except:
pass
gtk.main_quit()
except:
pass
- sys.exit(0)