X-Git-Url: https://git.sthu.org/?p=pygdb.git;a=blobdiff_plain;f=DbgTerminal.py;h=9d08866820acc3083048b589c78f4b54eacc30f2;hp=005661ce3e4aeff79f2bcea9461a8389555e7929;hb=HEAD;hpb=0296b6d5afe20a15764842873917bf1d6aa34b77

diff --git a/DbgTerminal.py b/DbgTerminal.py
index 005661c..9d08866 100644
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -9,6 +9,7 @@ import gtk
 import os
 import pango
 import pty
+import re
 import string
 import sys
 import time
@@ -51,7 +52,7 @@ class DbgTerminal (vte.Terminal):
 
 	def initialize(self):
 		self.childpid = self.fork_command( self.getCommand(), self.getArgv())
-		self.waitForActivation(0)
+		self.waitForPrompt(0)
 		self.setPty(self.client_ptyslave)
 
 	def stopDbg(self):
@@ -61,6 +62,24 @@ class DbgTerminal (vte.Terminal):
 			os.kill(self.childpid, 15);
 			self.childpid = None
 
+	def getClientExecuteable(self):
+		return string.split(self.clientCmd)[0]
+
+
+	def toAbsPath(self, path):
+		"""convert path to an absolute path relative to the client
+		executable we debug."""
+		
+		#Current working dir
+		pwd = os.getcwd() + "/"
+
+		#executeable path
+		client = self.getClientExecuteable()
+		client = relToAbsPath(pwd, client)		
+
+		return relToAbsPath(client, path)
+
+
 	def checkActivityChanged(self):
 
 		try:
@@ -73,13 +92,17 @@ class DbgTerminal (vte.Terminal):
 
 				status, param = res
 				if self.isActive():
+					print "got active: ", res
 					for cb in self.gotActiveCallback:
 						cb(status, param)
 				else:
+					print "got inactive: ", res
 					for cb in self.gotInactiveCallback:
 						cb(status, param)
-		except:
-			pass
+		except Exception, e:
+			import traceback
+			traceback.print_exc()
+			print e
 
 		return True
 
@@ -89,34 +112,44 @@ class DbgTerminal (vte.Terminal):
 		assert( self.getHistoryLen()>0 )
 
 		c,r = term.get_cursor_position()
-		text = self.get_text_range(self.lastr,self.lastc,r,c-1,lambda *w:True)
+		text = self.get_text_range(self.lastr,0,r,c,lambda *w:True)
 		self.lastc, self.lastr = c,r
 
 		#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")
 
 		#Remove the incomplete line
-		len = max(0,self.getHistoryLen()-1)
-		self.history[-1] += lines[0]
+		len = max(0,self.getHistoryLen())
+		self.history[-1] = lines[0]
 		self.history += lines[1:]
 
 
 		#Check if activity status has been changed
 		for i in range(len, self.getHistoryLen()):
 			line = self.history[i]
+					
+			res = self.testForInactivity(i)
+			if res != None:
+				while self.activityChanged != None:
+					print "wait for pending activity"
+					gtk.main_iteration()
+
+				self.setActive(False)
+				self.activityChanged = res
 
 			res = self.testForActivity(i)
-			if res != None and not self.isActive():
+			if res != None:
+				while self.activityChanged != None:
+					print "wait for pending activity"
+					gtk.main_iteration()
+
 				self.setActive(True)
 				self.activityChanged = res
-				
-			res = self.testForInactivity(i)
-			if res != None and self.isActive():
-				self.setActive(False)
-				self.activityChanged = res
+
 
 
 
@@ -128,7 +161,9 @@ class DbgTerminal (vte.Terminal):
 	def getHistoryLen(self):
 		return len(self.history)
 
-	def waitForRx(self, rx, start):	
+	def waitForRx(self, pat, start):	
+
+		rx = re.compile(pat)
 		curr = start
 		while True:
 			assert( curr>=start )
@@ -139,7 +174,10 @@ class DbgTerminal (vte.Terminal):
 
 			#Do not forget the last line
 			curr = max(start,self.getHistoryLen()-1)
-			gtk.main_iteration()
+			lr, lc = self.lastr, self.lastc
+
+			while (self.lastr, self.lastc) == (lr,lc):
+				gtk.main_iteration()
 
 
 	def getCommand(self):
@@ -163,6 +201,9 @@ class DbgTerminal (vte.Terminal):
 	def setStepin(self):
 		raise NotImplementedError()
 
+	def setStepout(self):
+		raise NotImplementedError()
+
 	def setQuit(self):
 		raise NotImplementedError()
 
@@ -175,7 +216,13 @@ class DbgTerminal (vte.Terminal):
 	def getExpression(self, expr):
 		raise NotImplementedError()
 
-	def waitForActivation(self, his):		
+	def listCodeSnippet(self):
+		raise NotImplementedError()
+
+	def getBacktrace(self):
+		raise NotImplementedError()
+
+	def waitForPrompt(self, his):		
 		raise NotImplementedError()
 
 	def testForActivity(self, his):
@@ -199,6 +246,25 @@ def quitHandler(*w):
 		pass
 
 
+def relToAbsPath(absfile, relfile):
+	"""When an absfile is given and a relfile is given by
+	relative paths relative to absfile, determine the abs
+	path of relfile"""
+
+	#Get directories except for "." parts
+	relsplit = filter(lambda x: x!=".", string.split(relfile, os.sep))
+	#Get the directories of absfile withouth the trailing filename 
+	abssplit = string.split(absfile, os.sep)[:-1]
+
+	#Determine number of ".." and remove them
+	up=0
+	while relsplit[0] == "..":
+		up += 1
+		del relsplit[0]
+		del abssplit[-1]
+
+	return string.join(abssplit + relsplit, os.sep)
+
 
 class DbgWindow (gtk.Window):