X-Git-Url: https://git.sthu.org/?p=pygdb.git;a=blobdiff_plain;f=DbgTerminal.py;h=ebe4e1a2f147ed16bb8c37474724d02f4811dded;hp=c8b079fe18491567865c0d86c4c2ca9e39902e6b;hb=162c3ac77fb35684824a2a8f975800dd9780bf10;hpb=e3403072dbc8f31817f6492dea70ebdf5128fcb2 diff --git a/DbgTerminal.py b/DbgTerminal.py index c8b079f..ebe4e1a 100644 --- a/DbgTerminal.py +++ b/DbgTerminal.py @@ -4,9 +4,13 @@ __author__ = "shuber" +import gobject import gtk +import os +import pango import pty import string +import sys import time import threading import vte @@ -17,73 +21,135 @@ import ClientIOTerminal class DbgTerminal (vte.Terminal): - isactive = True - lastrow = 0 - history = [] - - def __init__(self, clientCmd): vte.Terminal.__init__(self) + #Set members + self.childpid = None + self.history = [""] + self.isactive = True + self.lastc, self.lastr = 0,0 + self.gotActiveCallback = [] + self.gotInactiveCallback = [] + self.activityChanged = None + #Start debugger self.clientCmd = clientCmd - 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.setPty(self.client_ptyslave) #Set up terminal window and initialize debugger self.connect("cursor-moved", self.contents_changed) - self.connect("child-exited", lambda *w: gtk.main_quit()) + self.connect("child-exited", quitHandler) + gobject.timeout_add(50, self.checkActivityChanged) + + #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 checkActivityChanged(self): + + try: + + #There was activity + if self.activityChanged != None: + + res = self.activityChanged + self.activityChanged = None + + status, param = res + if self.isActive(): + print "got active: ", res + for cb in self.gotActiveCallback: + cb(status, param) + else: + print "got inactive: ", res + for cb in self.gotInactiveCallback: + cb(status, param) + except: + pass + + return True + def contents_changed(self, term): + assert( self.getHistoryLen()>0 ) + c,r = term.get_cursor_position() + text = self.get_text_range(self.lastr,self.lastc,r,c-1,lambda *w:True) + self.lastc, self.lastr = c,r + + #Remove annoying \n at the end + assert(text[-1] == "\n") + text = text[:-1] + #Get the lines and remove empty lines + lines = string.split(text, "\n") + + #Remove the incomplete line + len = max(0,self.getHistoryLen()) + self.history[-1] += lines[0] + self.history += lines[1:] + - if self.lastrow <= r: - text = self.get_text_range(self.lastrow,0,r,-1,lambda *w:True) + #Check if activity status has been changed + for i in range(len, self.getHistoryLen()): + line = self.history[i] + + res = self.testForInactivity(i) + if res != None: + while self.activityChanged != None: + print "wait for pending activity" + gtk.main_iteration() - #Remove the incomplete line - if self.getHistoryLen()>0 and (len(self.history[-1])==0 or self.history[-1]!='\n') : - del self.history[-1] + self.setActive(False) + self.activityChanged = res - #Get the lines and remove empty lines - lines = string.split(text, "\n") + res = self.testForActivity(i) + if res != None: + while self.activityChanged != None: + print "wait for pending activity" + gtk.main_iteration() + + self.setActive(True) + self.activityChanged = res - #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 waitForNewline(self): - r = self.lastrow - while not self.lastrow > r: + l = self.getHistoryLen() + while not self.getHistoryLen() > l: gtk.main_iteration() def getHistoryLen(self): return len(self.history) - def waitForRx(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() + #Do not forget the last line + curr = max(start,self.getHistoryLen()-1) gtk.main_iteration() @@ -111,7 +177,10 @@ class DbgTerminal (vte.Terminal): def setQuit(self): raise NotImplementedError() - def setBreakpoint(self, file, lineno): + def setBreakpoint(self, file, lineno, condition=False): + raise NotImplementedError() + + def delBreakpoint(self, breakpoint): raise NotImplementedError() def getExpression(self, expr): @@ -120,24 +189,26 @@ class DbgTerminal (vte.Terminal): def waitForActivation(self, his): raise NotImplementedError() + def testForActivity(self, his): + raise NotImplementedError() + + def testForInactivity(self, his): + raise NotImplementedError() + def setActive(self, isactive): self.isactive = isactive def isActive(self): return self.isactive - def getLastLine(self): - if len(self.history) == 0: - return None - - return self.history[-1] - - def feed_dbg(self, text): - self.feed_child(text) - - +def quitHandler(*w): + try: + gtk.main_quit() + except: + pass + class DbgWindow (gtk.Window): @@ -152,7 +223,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") @@ -176,17 +247,3 @@ class DbgWindow (gtk.Window): - -def launchDebugger(wnd, term): - - wnd.toggleClientIOWindow() - - term.setBreakpoint("main.cpp", 15) - term.setRun() - res = term.getExpression("a") - print "Result = ", res - - term.setQuit() - - -