X-Git-Url: https://git.sthu.org/?p=pygdb.git;a=blobdiff_plain;f=GdbTerminal.py;fp=GdbWindow.py;h=79daf702307a5ea72835a8bf81006fc8ff072c34;hp=a5baaa86267f4e38f95071860a3e9f46d26a3325;hb=5c48ca6a99597f2a2bfa1f9718eabb6e3f8678fa;hpb=7108ee075bddb8425305ed93bc1992ca8fe0c6cb

diff --git a/GdbWindow.py b/GdbTerminal.py
similarity index 74%
rename from GdbWindow.py
rename to GdbTerminal.py
index a5baaa8..79daf70 100755
--- a/GdbWindow.py
+++ b/GdbTerminal.py
@@ -11,14 +11,14 @@ import string
 import sys
 import time
 
-import DbgWindow
+import DbgTerminal
 
 
-class GdbWindow (DbgWindow.DbgWindow):
+class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
 	def __init__(self, clientCmd):
-		DbgWindow.DbgWindow.__init__(self, clientCmd)
+		DbgTerminal.DbgTerminal.__init__(self, clientCmd)
 
 	def getDbgArgv(self):
 		return ["gdb", "--fullname", string.split(self.clientCmd)[0]]
@@ -44,11 +44,11 @@ class GdbWindow (DbgWindow.DbgWindow):
 
 	def getDbgExpression(self, expr):
 
-		self.waitForDbgNewline()
+		his = self.getHistoryLen()
 		self.feed_dbg("print " + expr + "\n")
 
 		rx = re.compile("^\$[1-9][0-9]* = .*$")
-		response = self.waitForDbgRx(rx)
+		his, response = self.waitForDbgRx(rx, his)
 
 		split = string.split(response, "=")
 		return string.join(split[1:], "=").strip()
@@ -58,8 +58,10 @@ class GdbWindow (DbgWindow.DbgWindow):
 if __name__ == "__main__":
 
 
-	gdbwnd = GdbWindow(string.join(sys.argv[1:]))
-	DbgWindow.launchDebugger(gdbwnd)
+	dbgterm = GdbTerminal(string.join(sys.argv[1:]))
+	dbgwnd = DbgTerminal.DbgWindow(dbgterm)
+
+	DbgTerminal.launchDebugger(dbgwnd, dbgterm)