X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=DbgTerminal.py;h=543cadc893144bc0c378bb2cd4e09be082f9b76a;hb=54db320b17dd5362b86ce4bb3ec4c2cfe2f2e289;hp=21aa1c42d790f4b1bc230be0e51c54715b627466;hpb=054679cd2c3372717bf7982407e2453428193581;p=pygdb.git

diff --git a/DbgTerminal.py b/DbgTerminal.py
index 21aa1c4..543cadc 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
@@ -19,20 +20,14 @@ import ClientIOTerminal
 
 class DbgTerminal (vte.Terminal):
 
-	isactive = True
-	lastrow = 0
-	history = []
-	childpid = None
-
-
-	def __init__(self, clientCmd, exitcb=None):
+	def __init__(self, clientCmd):
 
 		vte.Terminal.__init__(self)
 
-		def onChildExited():
-			self.childpid = None
-			if exitcb != None:
-				exitcb()
+		#Set members
+		self.childpid = None
+		self.history = [""]
+		self.isactive = True
 
 		#Start debugger
 		self.clientCmd = clientCmd
@@ -41,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: onChildExited())
+		self.connect("child-exited", quitHandler)
 
 		#font description
 		fontdesc = pango.FontDescription("monospace 9")
@@ -50,62 +45,59 @@ 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):
 
 		if self.childpid != None:
+			#9=KILL, 15=TERM
 			os.kill(self.childpid, 15);
 			self.childpid = None
 
 
 
 	def contents_changed(self, term):
-		c,r = term.get_cursor_position()
+		assert( self.getHistoryLen()>0 )
 
-		if self.lastrow <= r:
-			text = self.get_text_range(self.lastrow,0,r,-1,lambda *w:True)
+		c,r = term.get_cursor_position()
+		text = self.get_text_range(self.getHistoryLen()-1,0,r,-1,lambda *w:True)
 
-			#Remove the incomplete line
-			if self.getHistoryLen()>0 and (len(self.history[-1])==0 or self.history[-1]!='\n') :
-				del self.history[-1]
+		#Remove annoying \n at the end
+		assert(text[-1] == "\n")
+		text = text[:-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]
+		#Remove the incomplete line
+		del self.history[-1]
+		#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]]
 
-			#Add lines to history
-			self.history += [l+"\n" for l in lines[:-1]]
-			self.history += [lines[-1]]
-			self.lastrow = r
+		assert(r == self.getHistoryLen()-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()
 
 
@@ -152,7 +144,12 @@ class DbgTerminal (vte.Terminal):
 		return self.isactive
 
 	
-	
+
+def quitHandler(*w):
+	try:
+		gtk.main_quit()
+	except:
+		pass
 
 
 
@@ -168,7 +165,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")