changed some stuff of active/inactive detection

[pygdb.git] / DbgTerminal.py

diff --git a/DbgTerminal.py b/DbgTerminal.py
index b9eb0d6ea3efc4b8a04ca5b698a5128bafaf5546..ebe4e1a2f147ed16bb8c37474724d02f4811dded 100644 (file)
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -4,6 +4,7 @@
 __author__ = "shuber"
 
 
+import gobject
 import gtk
 import os
 import pango
@@ -26,8 +27,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 +42,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")
@@ -55,28 +61,74 @@ 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(max(self.getHistoryLen()-1,0),0,r,-1,lambda *w:True)
+               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
-               if self.getHistoryLen()>0 and self.history[-1]!='\n':
-                       del self.history[-1]
+               len = max(0,self.getHistoryLen())
+               self.history[-1] += lines[0]
+               self.history += lines[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]]
+               #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
+
 
-               assert(r == self.getHistoryLen()-1)
 
 
        def waitForNewline(self):
@@ -88,16 +140,16 @@ class DbgTerminal (vte.Terminal):
                return len(self.history)
 
        def waitForRx(self, rx, start): 
-
                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())
+                       #Do not forget the last line
+                       curr = max(start,self.getHistoryLen()-1)
                        gtk.main_iteration()
 
 
@@ -137,6 +189,12 @@ 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