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

diff --git a/DbgTerminal.py b/DbgTerminal.py
index 0f0eb07..9d08866 100644
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -4,10 +4,12 @@
 __author__ = "shuber"
 
 
+import gobject
 import gtk
 import os
 import pango
 import pty
+import re
 import string
 import sys
 import time
@@ -29,6 +31,9 @@ class DbgTerminal (vte.Terminal):
 		self.history = [""]
 		self.isactive = True
 		self.lastc, self.lastr = 0,0
+		self.gotActiveCallback = []
+		self.gotInactiveCallback = []
+		self.activityChanged = None
 
 		#Start debugger
 		self.clientCmd = clientCmd
@@ -38,6 +43,7 @@ class DbgTerminal (vte.Terminal):
 		#Set up terminal window and initialize debugger
 		self.connect("cursor-moved", self.contents_changed)
 		self.connect("child-exited", quitHandler)
+		gobject.timeout_add(50, self.checkActivityChanged)
 
 		#font description
 		fontdesc = pango.FontDescription("monospace 9")
@@ -46,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):
@@ -56,13 +62,57 @@ 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:
+
+			#There was activity
+			if self.activityChanged != None:
+
+				res = self.activityChanged
+				self.activityChanged = None
+
+				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 Exception, e:
+			import traceback
+			traceback.print_exc()
+			print e
+
+		return True
+
 
 
 	def contents_changed(self, term):
 		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
@@ -72,14 +122,35 @@ class DbgTerminal (vte.Terminal):
 		#Get the lines and remove empty lines
 		lines = string.split(text, "\n")
 
-
 		#Remove the incomplete line
-		len = self.getHistoryLen()
-		self.history[-1] += lines[0]
+		len = max(0,self.getHistoryLen())
+		self.history[-1] = lines[0]
 		self.history += lines[1:]
 
-		for l in self.history[len:]:
-			pass
+
+		#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:
+				while self.activityChanged != None:
+					print "wait for pending activity"
+					gtk.main_iteration()
+
+				self.setActive(True)
+				self.activityChanged = res
+
+
 
 
 	def waitForNewline(self):
@@ -90,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 )
@@ -101,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):
@@ -125,6 +201,9 @@ class DbgTerminal (vte.Terminal):
 	def setStepin(self):
 		raise NotImplementedError()
 
+	def setStepout(self):
+		raise NotImplementedError()
+
 	def setQuit(self):
 		raise NotImplementedError()
 
@@ -137,7 +216,19 @@ 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):
+		raise NotImplementedError()
+
+	def testForInactivity(self, his):
 		raise NotImplementedError()
 
 	def setActive(self, isactive):
@@ -155,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):