some code beautifying incl. waitForRx

[pygdb.git] / DbgTerminal.py

diff --git a/DbgTerminal.py b/DbgTerminal.py
index 8cdc932abfbeda71402a10a1d0ddd985582e9e75..6fec9f3e789f40cff60e62de2561d271ca81164e 100644 (file)
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -5,9 +5,11 @@ __author__ = "shuber"
 
 
 import gtk
+import os
 import pango
 import pty
 import string
+import sys
 import time
 import threading
 import vte
@@ -18,15 +20,15 @@ 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
+
                #Start debugger
                self.clientCmd = clientCmd
                #Open pseudo-terminal where to-be-debugged process reads/writes to
@@ -34,7 +36,7 @@ class DbgTerminal (vte.Terminal):
 
                #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)
 
                #font description
                fontdesc = pango.FontDescription("monospace 9")
@@ -42,56 +44,60 @@ class DbgTerminal (vte.Terminal):
 
 
        def initialize(self):
-               #Launch debugger
-               self.fork_command( self.getCommand(), self.getArgv())
+               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):
-               c,r = term.get_cursor_position()
+               assert( self.getHistoryLen()>0 )
 
-               if self.lastrow <= r:
-                       text = self.get_text_range(self.lastrow,0,r,-1,lambda *w:True)
+               c,r = term.get_cursor_position()
+               text = self.get_text_range(self.getHistoryLen()-1,0,r,-1,lambda *w:True)
 
-                       #Remove the incomplete line
-                       if self.getHistoryLen()>0 and (len(self.history[-1])==0 or self.history[-1]!='\n') :
-                               del self.history[-1]
+               #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")
+               #Get the lines and remove empty lines
+               lines = string.split(text, "\n")
 
-                       #Remove last empty line...
-                       if lines[-1] == "":
-                               del lines[-1]
+               #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]]
 
-                       #Add lines to history
-                       self.history += [l+"\n" for l in lines[:-1]]
-                       self.history += [lines[-1]]
-                       self.lastrow = r
+               assert(r == self.getHistoryLen()-1)
 
 
        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()
 
 
@@ -138,7 +144,12 @@ class DbgTerminal (vte.Terminal):
                return self.isactive
 
        
-       
+
+def quitHandler(*w):
+       try:
+               gtk.main_quit()
+       except:
+               pass
 
 
 
@@ -154,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")