adding first vim code+

[pygdb.git] / DbgTerminal.py

diff --git a/DbgTerminal.py b/DbgTerminal.py
index 73f15164c34213cbcab24a3cba6e9c2c7f21bae7..89659d035628a9fe7a450bffc9e603ff905eceb7 100644 (file)
--- a/DbgTerminal.py
+++ b/DbgTerminal.py
@@ -5,6 +5,7 @@ __author__ = "shuber"
 
 
 import gtk
+import pango
 import pty
 import string
 import time
@@ -17,6 +18,7 @@ import ClientIOTerminal
 
 class DbgTerminal (vte.Terminal):
 
+       isactive = True
        lastrow = 0
        history = []
 
@@ -27,26 +29,48 @@ class DbgTerminal (vte.Terminal):
 
                #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("child-exited", lambda *w: gtk.main_quit())
 
+               #font description
+               fontdesc = pango.FontDescription("monospace 9")
+               self.set_font(fontdesc)
+
+
+       def initialize(self):
+               self.fork_command( self.getCommand(), self.getArgv())
+               self.setPty(self.client_ptyslave)
+               self.waitForActivation()
+
 
        def contents_changed(self, term):
                c,r = term.get_cursor_position()
 
-               if self.lastrow < r:
-                       text = self.get_text_range(self.lastrow,0,r-1,-1,lambda *w:True)
-                       self.history += string.split(text, "\n")
+               if self.lastrow <= r:
+                       text = self.get_text_range(self.lastrow,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]
+
+                       #Get the lines and remove empty lines
+                       lines = string.split(text, "\n")
+
+                       #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 waitForDbgNewline(self):
+
+       def waitForNewline(self):
                r = self.lastrow
                while not self.lastrow > r:
                        gtk.main_iteration()
@@ -54,7 +78,7 @@ class DbgTerminal (vte.Terminal):
        def getHistoryLen(self):
                return len(self.history)
 
-       def waitForDbgRx(self, rx, start=None): 
+       def waitForRx(self, rx, start=None):    
 
                if start == None:
                        start = self.getHistoryLen()
@@ -68,44 +92,53 @@ class DbgTerminal (vte.Terminal):
                                        return no, line
 
                        start = self.getHistoryLen()
-                       self.waitForDbgNewline()
+                       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
 
        
+       
 
 
 
@@ -145,17 +178,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()
-
-
-