Overwrite breakpoints when launching pygdb from vim, updating vim also after quit

[pygdb.git] / StatusWindow.py

diff --git a/StatusWindow.py b/StatusWindow.py
index 4a08b54f068f771f801b9733fa2cdb50adaead6e..07abd4c616b7fa0a14fca888a56af4ad00d06c7c 100644 (file)
--- a/StatusWindow.py
+++ b/StatusWindow.py
@@ -5,43 +5,57 @@ __author__ = "shuber"
 
 
 import gtk
+import re
+import string
+import os
 import vte
 
+import Configuration
+import DbgTerminal
 import BreakpointsFrame
+import PositionFrame
 import WatchesFrame
 
 
 
 class StatusWindow (gtk.Window):
 
-       def __init__(self, mainctrlwnd, debugger):
-
+       def __init__(self, debugger):
                gtk.Window.__init__(self)
+
                self.debugger = debugger
+               self.debugger.gotActiveCallback += [self.updateValues]
                
                self.set_border_width(5)
                self.set_title("Status")
                self.set_default_size(400,600)
-               self.connect("destroy", lambda *w: gtk.main_quit())
+               self.connect("destroy", DbgTerminal.quitHandler)
+
 
+               #Vbox container of frames
                vbox = gtk.VBox(False, 5)
                self.add(vbox)
 
-               self.status = gtk.Label("Not Running")
-               vbox.pack_start(self.status, False, False)
-               self.paned1 = gtk.VPaned()
-               vbox.add(self.paned1)
-
+       
                #Adding the frames
                self.frames = []
-               self.frames += [WatchesFrame.WatchesFrame(debugger)]
-               self.frames += [BreakpointsFrame.BreakpointsFrame(debugger)]
-               self.paned1.add1(self.frames[0])
-               self.paned1.add2(self.frames[1])
+               self.frames += [PositionFrame.PositionFrame(debugger), \
+                               WatchesFrame.WatchesFrame(debugger), \
+                               BreakpointsFrame.BreakpointsFrame(debugger) ]
 
-               #Register callback function for new positions
-               #and update the values
-               mainctrlwnd.newPosCbs += [self.updateValues]
+               #Register callback after frames!
+               self.debugger.gotActiveCallback += [self.updateValues]
+
+               #First paned window
+               self.paned1 = gtk.VPaned()
+               vbox.add(self.paned1)
+               #Second one
+               self.paned2 = gtk.VPaned()
+               self.paned1.add2(self.paned2)
+
+               self.paned1.add1(self.frames[1])
+               self.paned2.add1(self.frames[2])
+               self.paned2.add2(self.frames[0])
 
                self.show_all()
 
@@ -51,12 +65,14 @@ class StatusWindow (gtk.Window):
                w = conf.findInt("statuswnd-width")
                h = conf.findInt("statuswnd-height")
                paned1 = conf.findInt("statuswnd-paned1")
+               paned2 = conf.findInt("statuswnd-paned2")
 
-               print w, h, paned1
                if w!=None and h!=None:
                        self.resize(w,h)
                if paned1!=None:
                        self.paned1.set_position(paned1)
+               if paned2!=None:
+                       self.paned2.set_position(paned2)
 
 
                while not self.debugger.isActive():
@@ -71,20 +87,19 @@ class StatusWindow (gtk.Window):
                conf.addInt("statuswnd-width", self.get_size()[0])
                conf.addInt("statuswnd-height", self.get_size()[1])
                conf.addInt("statuswnd-paned1", self.paned1.get_position())
+               conf.addInt("statuswnd-paned2", self.paned2.get_position())
 
                for f in self.frames:
                        f.fillConfiguration(conf)
 
 
-       def updateValues(self, pos):
+       def updateValues(self, status, param):
 
-               if pos == None:
-                       self.status.set_text("Exited")
-               else:
-                       file, lineno = pos
-                       self.status.set_text("%s:%s" % (file, lineno))
+               conf = Configuration.Configuration()
+               self.fillConfiguration(conf)
+               conf.store(".pygdb.conf")
+
+               DbgTerminal.updateVim()
 
-               for f in self.frames:
-                       f.updateValues(pos)