X-Git-Url: https://git.sthu.org/?p=pygdb.git;a=blobdiff_plain;f=DbgTerminal.py;h=11eaf5c35ee2cdf4a7f2629716b69fe5f2394e85;hp=8beec4652f97750b6a553710185b6c92b5295e37;hb=973cf63f2347aa83edb9654d3566eaf66526d6b9;hpb=74af4d713d7a7456beabc86693e2cc53819e7935

diff --git a/DbgTerminal.py b/DbgTerminal.py
index 8beec46..11eaf5c 100644
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -9,6 +9,7 @@ import os
 import pango
 import pty
 import string
+import sys
 import time
 import threading
 import vte
@@ -26,7 +27,6 @@ class DbgTerminal (vte.Terminal):
 		#Set members
 		self.childpid = None
 		self.history = []
-		self.lastrow = 0
 		self.isactive = True
 
 		#Start debugger
@@ -36,7 +36,7 @@ class DbgTerminal (vte.Terminal):
 
 		#Set up terminal window and initialize debugger
 		self.connect("cursor-moved", self.contents_changed)
-		self.connect("child-exited", lambda *w: gtk.main_quit())
+		self.connect("child-exited", quitHandler)
 
 		#font description
 		fontdesc = pango.FontDescription("monospace 9")
@@ -45,8 +45,8 @@ class DbgTerminal (vte.Terminal):
 
 	def initialize(self):
 		self.childpid = self.fork_command( self.getCommand(), self.getArgv())
+		self.waitForActivation(0)
 		self.setPty(self.client_ptyslave)
-		self.waitForActivation()
 
 	def stopDbg(self):
 
@@ -59,49 +59,43 @@ class DbgTerminal (vte.Terminal):
 
 	def contents_changed(self, term):
 		c,r = term.get_cursor_position()
+		text = self.get_text_range(self.getHistoryLen()-1,0,r,-1,lambda *w:True)
 
-		if self.lastrow <= r:
-			text = self.get_text_range(self.lastrow,0,r,-1,lambda *w:True)
+		#Remove annoying \n at the end
+		assert(text[-1] == "\n")
+		text = text[:-1]
 
-			#Remove the incomplete line
-			if self.getHistoryLen()>0 and (len(self.history[-1])==0 or self.history[-1]!='\n') :
-				del self.history[-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")
 
-			#Remove last empty line...
-			if lines[-1] == "":
-				del lines[-1]
-
-			#Add lines to history
-			self.history += [l+"\n" for l in lines[:-1]]
-			self.history += [lines[-1]]
-			self.lastrow = r
+		#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]]
 
 
 	def waitForNewline(self):
-		r = self.lastrow
-		while not self.lastrow > r:
+		l = self.getHistoryLen()
+		while not self.getHistoryLen() > l:
 			gtk.main_iteration()
 
 	def getHistoryLen(self):
 		return len(self.history)
 
-	def waitForRx(self, rx, start=None):	
+	def waitForRx(self, rx, start):	
 
-		if start == None:
-			start = self.getHistoryLen()
-		if start < 0:
-			start = 0
+		curr = start
 
 		while True:
-			for no in range(start, self.getHistoryLen()):
+			for no in range(max(curr-1,start), self.getHistoryLen()):
 				line = self.history[no]
 				if rx.search(line):
 					return no, line
 
-			start = self.getHistoryLen()
+			curr = max(start,self.getHistoryLen())
 			gtk.main_iteration()
 
 
@@ -148,7 +142,13 @@ class DbgTerminal (vte.Terminal):
 		return self.isactive
 
 	
-	
+
+def quitHandler(*w):
+	try:
+		gtk.main_quit()
+	except:
+		pass
+	sys.exit(0)
 
 
 
@@ -164,7 +164,7 @@ class DbgWindow (gtk.Window):
 
 		#Set up GTK stuff
 		gtk.Window.__init__(self)
-		self.connect("destroy", lambda *w: gtk.main_quit())
+		self.connect("destroy", quitHandler)
 
 		#Set title and add terminal
 		self.set_title("Debugger I/O")