From 382465d6c2f07b99c0263314405d1d8411072d23 Mon Sep 17 00:00:00 2001
From: Stefan Huber <shuber2@gmail.com>
Date: Fri, 13 Jun 2008 16:37:49 +0200
Subject: [PATCH] show backtrace in source view

---
 DbgTerminal.py     |  3 +++
 GdbTerminal.py     | 41 +++++++++++++++++++----------------------
 PositionFrame.py   |  2 +-
 featurerequest.txt |  1 -
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/DbgTerminal.py b/DbgTerminal.py
index aa04b3d..5c5cbd2 100644
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -214,6 +214,9 @@ class DbgTerminal (vte.Terminal):
 	def listCodeSnippet(self):
 		raise NotImplementedError()
 
+	def getBacktrace(self):
+		raise NotImplementedError()
+
 	def waitForPrompt(self, his):		
 		raise NotImplementedError()
 
diff --git a/GdbTerminal.py b/GdbTerminal.py
index ff6dc6b..5be9c05 100644
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -43,9 +43,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 	def setPty(self, pty):
 		ttyname = os.ttyname(pty)
-		len = self.getHistoryLen()
-		self.feed_child("set inferior-tty %s\n" % (ttyname,))
-		self.waitForPrompt(len)
+		self.__getAnswerFromCmd("set inferior-tty %s\n" % (ttyname,))
 
 	def setBreakpoint(self, file, lineno, condition=None):
 		his = self.getHistoryLen()
@@ -74,22 +72,18 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
 	def delBreakpoint(self, breakpoint):
-		his = self.getHistoryLen()
-		self.feed_child("del breakpoint %s\n" % (breakpoint,))
-		self.waitForPrompt(his)
+		self.__getAnswerFromCmd("del breakpoint %s\n" % (breakpoint,))
+
 
 	def getBreakpoints(self):
-		starthis = self.getHistoryLen()
-		self.feed_child("info breakpoints\n")
-		endhis, response = self.waitForPrompt(starthis)
+		bplines = self.__getAnswerFromCmd("info breakpoints\n")
 
 		rxbp = re.compile("^\d+\s+breakpoint")
 		rxpos = re.compile("^.* at \S+:\d+$")
 		rxcond = re.compile("^\tstop only if")
 
 		bpnts = []
-		bplines = self.history[starthis+1:endhis]
-		i = 0
+		i = 1
 
 		#Parse the resulting lines
 		while i<len(bplines):
@@ -124,11 +118,8 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
 	def getExpression(self, expr):
-
-		his = self.getHistoryLen()
-		self.feed_child("print " + expr + "\n")
-		his, response = self.waitForPrompt(his)
-		answer = self.history[his-1]
+		answer = self.__getAnswerFromCmd("print " + expr + "\n")
+		answer = answer[-1]
 
 		if len(string.split(answer, "=")) == 1:
 			return answer.strip()
@@ -138,18 +129,24 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 	
 	def listCodeSnippet(self):
-		starthis = self.getHistoryLen()
-		self.feed_child("list\n")
-		endhis, response = self.waitForPrompt(starthis)
-
-		text = string.join(self.history[starthis:endhis], "\n")
-		return text
+		answ = self.__getAnswerFromCmd("list\n")
+		return string.join(answ, "\n")
 
+	def getBacktrace(self):
+		answ = self.__getAnswerFromCmd("bt\n")
+		return string.join(answ, "\n")
 
 	def waitForPrompt(self, his):
 		rx = "^\(gdb\)"
 		return self.waitForRx(rx,his)
 
+	def __getAnswerFromCmd(self, cmd):
+		starthis = self.getHistoryLen()
+		self.feed_child(cmd)
+		endhis, response = self.waitForPrompt(starthis)
+
+		return self.history[starthis:endhis]
+
 
 	def testForActivity(self, his):
 		"""Test whether debugger got active again"""
diff --git a/PositionFrame.py b/PositionFrame.py
index d3fc3cf..985dccf 100644
--- a/PositionFrame.py
+++ b/PositionFrame.py
@@ -78,7 +78,7 @@ class PositionFrame (StatusFrame.StatusFrame):
 			self.positionLabel.set_label("%s:%d" % (self.file, self.lineno))
 
 			#Get some code
-			code = self.debugger.listCodeSnippet()
+			code = self.debugger.getBacktrace()
 			buf.set_text(code)
 
 
diff --git a/featurerequest.txt b/featurerequest.txt
index 52e8010..f511ca7 100644
--- a/featurerequest.txt
+++ b/featurerequest.txt
@@ -13,7 +13,6 @@ Smaller requests
 Medium requestes:
   - Deactivate breakpoints
   - Hightlight current line in little source field
-  - Backtrace frame
   - Button for step out of function ('bt', followed by 'advance')
 
 Bigger requests:
-- 
2.30.2