new exciting GTK Main Control Window

[pygdb.git] / GdbTerminal.py

diff --git a/GdbWindow.py b/GdbTerminal.py
similarity index 74%
rename from GdbWindow.py
rename to GdbTerminal.py
index a5baaa86267f4e38f95071860a3e9f46d26a3325..79daf702307a5ea72835a8bf81006fc8ff072c34 100755 (executable)
--- 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)