some code beautifying incl. waitForRx
[pygdb.git] / DbgTerminal.py
index 51d6ce1d7026773737b639e242642d77e46bba16..6fec9f3e789f40cff60e62de2561d271ca81164e 100644 (file)
@@ -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,137 @@ 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):
+               assert( self.getHistoryLen()>0 )
+
                c,r = term.get_cursor_position()
+               text = self.get_text_range(self.getHistoryLen()-1,0,r,-1,lambda *w:True)
+
+               #Remove annoying \n at the end
+               assert(text[-1] == "\n")
+               text = text[:-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
+               #Get the lines and remove empty lines
+               lines = string.split(text, "\n")
 
-       def waitForDbgNewline(self):
-               r = self.lastrow
-               while not self.lastrow > r:
+               #Remove the incomplete line
+               del self.history[-1]
+               #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)
+
+
+       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): 
-
-               if start == None:
-                       start = self.getHistoryLen()
-               if start < 0:
-                       start = 0
-
+       def waitForRx(self, rx, start): 
+               curr = start
                while True:
-                       for no in range(start, self.getHistoryLen()):
+                       assert( curr>=start )
+                       for no in range(curr, self.getHistoryLen()):
                                line = self.history[no]
                                if rx.search(line):
                                        return no, line
 
-                       start = self.getHistoryLen()
-                       self.waitForDbgNewline()
+                       #Do not forget the last line
+                       curr = max(start,self.getHistoryLen()-1)
+                       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
+
 
 
 class DbgWindow (gtk.Window):
@@ -121,7 +165,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 +178,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 +189,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()
-
-
-