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

diff --git a/DbgTerminal.py b/DbgTerminal.py
old mode 100755
new mode 100644
index 51d6ce1..c8b079f
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -17,6 +17,7 @@ import ClientIOTerminal
 
 class DbgTerminal (vte.Terminal):
 
+	isactive = True
 	lastrow = 0
 	history = []
 
@@ -27,26 +28,41 @@ class DbgTerminal (vte.Terminal):
 
 		#Start debugger
 		self.clientCmd = clientCmd
-		self.fork_command( self.getDbgCommand(), self.getDbgArgv())
+		self.fork_command( self.getCommand(), self.getArgv())
 
 		#Open pseudo-terminal where to-be-debugged process reads/writes to
 		self.client_ptymaster, self.client_ptyslave = pty.openpty()
-		self.setDbgPty(self.client_ptyslave)
+		self.setPty(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", lambda *w: gtk.main_quit())
 
 
 	def contents_changed(self, term):
 		c,r = term.get_cursor_position()
 
-		if self.lastrow < r:
-			text = self.get_text_range(self.lastrow,0,r-1,-1,lambda *w:True)
-			self.history += string.split(text, "\n")
+		if self.lastrow <= r:
+			text = self.get_text_range(self.lastrow,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]
+
+			#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
 
-	def waitForDbgNewline(self):
+
+	def waitForNewline(self):
 		r = self.lastrow
 		while not self.lastrow > r:
 			gtk.main_iteration()
@@ -54,7 +70,7 @@ class DbgTerminal (vte.Terminal):
 	def getHistoryLen(self):
 		return len(self.history)
 
-	def waitForDbgRx(self, rx, start=None):	
+	def waitForRx(self, rx, start=None):	
 
 		if start == None:
 			start = self.getHistoryLen()
@@ -68,34 +84,49 @@ class DbgTerminal (vte.Terminal):
 					return no, line
 
 			start = self.getHistoryLen()
-			self.waitForDbgNewline()
+			gtk.main_iteration()
+
+
+	def getCommand(self):
+		return self.getArgv()[0];
 
+	def getArgv(self):
+		raise NotImplementedError()
+
+	def setPty(self, pty):
+		raise NotImplementedError()
 
-	def getDbgCommand(self):
-		return self.getDbgArgv()[0];
+	def setRun(self):
+		raise NotImplementedError()
 
-	def getDbgArgv(self):
+	def setContinue(self):
 		raise NotImplementedError()
 
-	def setDbgPty(self, pty):
+	def setStepover(self):
 		raise NotImplementedError()
 
-	def setDbgRun(self):
+	def setStepin(self):
 		raise NotImplementedError()
 
-	def setDbgQuit(self):
+	def setQuit(self):
 		raise NotImplementedError()
 
-	def setDbgContinue(self):
+	def setBreakpoint(self, file, lineno):
 		raise NotImplementedError()
 
-	def setDbgBreakpoint(self, file, lineno):
+	def getExpression(self, expr):
 		raise NotImplementedError()
 
-	def getDbgExpression(self, expr):
+	def waitForActivation(self, his):		
 		raise NotImplementedError()
 
-	def getDbgLastLine(self):
+	def setActive(self, isactive):
+		self.isactive = isactive
+
+	def isActive(self):
+		return self.isactive
+
+	def getLastLine(self):
 		if len(self.history) == 0:
 			return None
 
@@ -104,7 +135,7 @@ class DbgTerminal (vte.Terminal):
 	def feed_dbg(self, text):
 		self.feed_child(text)
 
-
+	
 	
 
 
@@ -134,7 +165,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
@@ -149,12 +181,12 @@ def launchDebugger(wnd, term):
 
 	wnd.toggleClientIOWindow()
 
-	term.setDbgBreakpoint("main.cpp", 15)
-	term.setDbgRun()
-	res = term.getDbgExpression("a")
+	term.setBreakpoint("main.cpp", 15)
+	term.setRun()
+	res = term.getExpression("a")
 	print "Result = ", res
 
-	term.setDbgQuit()
+	term.setQuit()