Fixing synchro problems and exit status problems

[pygdb.git] / DbgTerminal.py

diff --git a/DbgTerminal.py b/DbgTerminal.py
index 11eaf5c35ee2cdf4a7f2629716b69fe5f2394e85..f69d8036fc8e5c3785903acb21f081a823ce268d 100644 (file)
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -4,10 +4,12 @@
 __author__ = "shuber"
 
 
+import gobject
 import gtk
 import os
 import pango
 import pty
+import re
 import string
 import sys
 import time
@@ -26,8 +28,12 @@ class DbgTerminal (vte.Terminal):
 
                #Set members
                self.childpid = None
-               self.history = []
+               self.history = [""]
                self.isactive = True
+               self.lastc, self.lastr = 0,0
+               self.gotActiveCallback = []
+               self.gotInactiveCallback = []
+               self.activityChanged = None
 
                #Start debugger
                self.clientCmd = clientCmd
@@ -37,6 +43,7 @@ class DbgTerminal (vte.Terminal):
                #Set up terminal window and initialize debugger
                self.connect("cursor-moved", self.contents_changed)
                self.connect("child-exited", quitHandler)
+               gobject.timeout_add(50, self.checkActivityChanged)
 
                #font description
                fontdesc = pango.FontDescription("monospace 9")
@@ -45,7 +52,7 @@ class DbgTerminal (vte.Terminal):
 
        def initialize(self):
                self.childpid = self.fork_command( self.getCommand(), self.getArgv())
-               self.waitForActivation(0)
+               self.waitForPrompt(0)
                self.setPty(self.client_ptyslave)
 
        def stopDbg(self):
@@ -55,26 +62,75 @@ class DbgTerminal (vte.Terminal):
                        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.getHistoryLen()-1,0,r,-1,lambda *w:True)
+               text = self.get_text_range(self.lastr,0,r,c,lambda *w:True)
+               self.lastc, self.lastr = c,r
 
                #Remove annoying \n at the end
                assert(text[-1] == "\n")
                text = text[:-1]
 
-               #Remove the incomplete line
-               if self.getHistoryLen()>0 and self.history[-1]!='\n':
-                       del self.history[-1]
-
                #Get the lines and remove empty lines
                lines = string.split(text, "\n")
 
-               #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]]
+               #Remove the incomplete line
+               len = max(0,self.getHistoryLen())
+               self.history[-1] = lines[0]
+               self.history += lines[1:]
+
+
+               #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()
+
+                               self.setActive(False)
+                               self.activityChanged = res
+
+                       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
+
+
 
 
        def waitForNewline(self):
@@ -85,18 +141,23 @@ class DbgTerminal (vte.Terminal):
        def getHistoryLen(self):
                return len(self.history)
 
-       def waitForRx(self, rx, start): 
+       def waitForRx(self, pat, start):        
 
+               rx = re.compile(pat)
                curr = start
-
                while True:
-                       for no in range(max(curr-1,start), self.getHistoryLen()):
+                       assert( curr>=start )
+                       for no in range(curr, self.getHistoryLen()):
                                line = self.history[no]
                                if rx.search(line):
                                        return no, line
 
-                       curr = max(start,self.getHistoryLen())
-                       gtk.main_iteration()
+                       #Do not forget the last line
+                       curr = max(start,self.getHistoryLen()-1)
+                       lr, lc = self.lastr, self.lastc
+
+                       while (self.lastr, self.lastc) == (lr,lc):
+                               gtk.main_iteration()
 
 
        def getCommand(self):
@@ -132,7 +193,13 @@ class DbgTerminal (vte.Terminal):
        def getExpression(self, expr):
                raise NotImplementedError()
 
-       def waitForActivation(self, his):               
+       def waitForPrompt(self, his):           
+               raise NotImplementedError()
+
+       def testForActivity(self, his):
+               raise NotImplementedError()
+
+       def testForInactivity(self, his):
                raise NotImplementedError()
 
        def setActive(self, isactive):
@@ -148,7 +215,6 @@ def quitHandler(*w):
                gtk.main_quit()
        except:
                pass
-       sys.exit(0)