X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=DbgTerminal.py;h=e9a706fffcdb793ba81e7d3d027ef48d010d1c39;hb=66662457f7e6cfc95de535503aa1f4b088822d2f;hp=51d6ce1d7026773737b639e242642d77e46bba16;hpb=5c48ca6a99597f2a2bfa1f9718eabb6e3f8678fa;p=pygdb.git

diff --git a/DbgTerminal.py b/DbgTerminal.py
old mode 100755
new mode 100644
index 51d6ce1..e9a706f
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -5,8 +5,11 @@ __author__ = "shuber"
 
 
 import gtk
+import os
+import pango
 import pty
 import string
+import sys
 import time
 import threading
 import vte
@@ -17,96 +20,138 @@ import ClientIOTerminal
 
 class DbgTerminal (vte.Terminal):
 
-	lastrow = 0
-	history = []
-
-
 	def __init__(self, clientCmd):
 
 		vte.Terminal.__init__(self)
 
+		#Set members
+		self.childpid = None
+		self.history = []
+		self.isactive = True
+
 		#Start debugger
 		self.clientCmd = clientCmd
-		self.fork_command( self.getDbgCommand(), self.getDbgArgv())
-
 		#Open pseudo-terminal where to-be-debugged process reads/writes to
 		self.client_ptymaster, self.client_ptyslave = pty.openpty()
-		self.setDbgPty(self.client_ptyslave)
 
 		#Set up terminal window and initialize debugger
 		self.connect("cursor-moved", self.contents_changed)
-		self.connect("eof", lambda *w: gtk.main_quit())
+		self.connect("child-exited", quitHandler)
+
+		#font description
+		fontdesc = pango.FontDescription("monospace 9")
+		self.set_font(fontdesc)
+
+
+	def initialize(self):
+		self.childpid = self.fork_command( self.getCommand(), self.getArgv())
+		self.waitForActivation(0)
+		self.setPty(self.client_ptyslave)
+
+	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()
+		text = self.get_text_range(max(self.getHistoryLen()-1,0),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 self.history[-1]!='\n':
+			del self.history[-1]
+
+		#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]]
+
+		assert(r == self.getHistoryLen()-1)
 
-		if self.lastrow < r:
-			text = self.get_text_range(self.lastrow,0,r-1,-1,lambda *w:True)
-			self.history += string.split(text, "\n")
-			self.lastrow = r
 
-	def waitForDbgNewline(self):
-		r = self.lastrow
-		while not self.lastrow > r:
+	def waitForNewline(self):
+		l = self.getHistoryLen()
+		while not self.getHistoryLen() > l:
 			gtk.main_iteration()
 
 	def getHistoryLen(self):
 		return len(self.history)
 
-	def waitForDbgRx(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()
-			self.waitForDbgNewline()
+			curr = max(start,self.getHistoryLen())
+			gtk.main_iteration()
+
 
+	def getCommand(self):
+		return self.getArgv()[0];
+
+	def getArgv(self):
+		raise NotImplementedError()
 
-	def getDbgCommand(self):
-		return self.getDbgArgv()[0];
+	def setPty(self, pty):
+		raise NotImplementedError()
 
-	def getDbgArgv(self):
+	def setRun(self):
 		raise NotImplementedError()
 
-	def setDbgPty(self, pty):
+	def setContinue(self):
 		raise NotImplementedError()
 
-	def setDbgRun(self):
+	def setStepover(self):
 		raise NotImplementedError()
 
-	def setDbgQuit(self):
+	def setStepin(self):
 		raise NotImplementedError()
 
-	def setDbgContinue(self):
+	def setQuit(self):
 		raise NotImplementedError()
 
-	def setDbgBreakpoint(self, file, lineno):
+	def setBreakpoint(self, file, lineno, condition=False):
 		raise NotImplementedError()
 
-	def getDbgExpression(self, expr):
+	def delBreakpoint(self, breakpoint):
 		raise NotImplementedError()
 
-	def getDbgLastLine(self):
-		if len(self.history) == 0:
-			return None
+	def getExpression(self, expr):
+		raise NotImplementedError()
 
-		return self.history[-1]
+	def waitForActivation(self, his):		
+		raise NotImplementedError()
 
-	def feed_dbg(self, text):
-		self.feed_child(text)
+	def setActive(self, isactive):
+		self.isactive = isactive
 
+	def isActive(self):
+		return self.isactive
 
 	
 
+def quitHandler(*w):
+	try:
+		gtk.main_quit()
+	except:
+		pass
+	sys.exit(0)
+
 
 
 class DbgWindow (gtk.Window):
@@ -121,7 +166,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")
@@ -134,7 +179,8 @@ class DbgWindow (gtk.Window):
 
 	def toggleClientIOWindow(self):
 		if not self.clientIOWnd:
-			self.clientIOWnd = ClientIOTerminal.ClientIOWindow(self, self.terminal.client_ptymaster)
+			self.clientIOWnd = ClientIOTerminal.ClientIOWindow(self, \
+					self.terminal.client_ptymaster)
 		else:
 			self.clientIOWnd.destroy()
 			self.clientIOWnd = None
@@ -144,17 +190,3 @@ class DbgWindow (gtk.Window):
 
 
 
-
-def launchDebugger(wnd, term):
-
-	wnd.toggleClientIOWindow()
-
-	term.setDbgBreakpoint("main.cpp", 15)
-	term.setDbgRun()
-	res = term.getDbgExpression("a")
-	print "Result = ", res
-
-	term.setDbgQuit()
-
-
-