pygdb now saves absolute breakpoint paths

[pygdb.git] / pygdb.vim

diff --git a/pygdb.vim b/pygdb.vim
index 25b7fe1cada7436637d21f33aa987bfcf2931581..ea552d307a0b130646770c4b4607a0de7527de64 100644 (file)
--- a/pygdb.vim
+++ b/pygdb.vim
@@ -16,6 +16,7 @@ import threading
 import vim
 
 import Configuration
+import DbgTerminal
 
 
 
@@ -24,6 +25,7 @@ import Configuration
 gdbBps = []
 signnum = 0
 clientcmd = ""
+execsign = None
 
 def gdbLaunch():
        global gdbterm, mainctrlwnd, statuswnd, gdbBps, clientcmd, gdbthread
@@ -62,8 +64,53 @@ def gdbToggleBreakpoint(lineno=None, file=None):
                addBreakpoint(file, lineno)
 
 
+def setExecutionLine(file, lineno):
+       global execsign
+
+
+       #Open that file!
+       if file != getCurrentFile():
+               try:
+                       os.stat(file)
+                       vim.command(":e %s" % file)
+               except OSError:
+                       print "Warning: file '%s' does not exist! (Wrong client command?)" % file
+                       return
+
+       #Jump to line
+       vim.command(":%d" % lineno)
+
+       #Remove old execsign
+       if execsign != None:
+               delExecutionLine()
+
+       #Set the sign
+       execsign = gdbNewSignnum()
+       vim.command("sign place %d line=%s name=ExecutionLine file=%s"%(execsign, lineno, file))
+
+
+def delExecutionLine():
+       global execsign
+
+       #Remove old execsign
+       if execsign != None:
+               vim.command("sign unplace %d" % execsign)
+               execsign = None
+
+
 def addBreakpoint(file, lineno, cond=None):
-       global gdbBps
+       global gdbBps, cmdset
+
+       #If file is not open, open it
+       if not file in [b.name for b in vim.buffers]:
+               try:
+                       os.stat(file)
+                       vim.command(":e %s" % file)
+               except OSError:
+                       print "Warning: file '%s' does not exist! (Wrong client command?)" % file
+                       cmdset = False
+                       return
+
 
        #Determine a sign number
        signnum = gdbNewSignnum()
@@ -141,29 +188,32 @@ def gdbShowBreakpoints():
                        print "%(file)s:%(lineno)d" % bp
 
 
-def getAbsPath(absfile, relfile):
-       """When an absfile is given and a relfile is given by
-       relative paths relative to absfile, determine the abs
-       path of relfile"""
 
-       #Get directories except for "." parts
-       relsplit = filter(lambda x: x!=".", string.split(relfile, os.sep))
-       #Get the directories of absfile withouth the trailing filename 
-       abssplit = string.split(absfile, os.sep)[:-1]
+def toAbsPath(path):
+       global clientcmd, cmdset
+
+       #Not a absolute path --> make one
+       if path[0] != os.sep:
 
-       #Determine number of ".." and remove them
-       up=0
-       while relsplit[0] == "..":
-               up += 1
-               del relsplit[0]
-               del abssplit[-1]
+               #We need the client command to expand the paths...
+               while clientcmd == "" or not cmdset:
+                       clientcmd = vim.eval("input('Client commando: ', '%s')" % clientcmd).strip()
+                       cmdset = True
 
-       return string.join(abssplit + relsplit, os.sep)
+               #Get the dirs where executeable is in
+               relcmd = string.split(clientcmd)[0]
+               abscmd = DbgTerminal.relToAbsPath(getCurrentFile(), relcmd)
+               path = DbgTerminal.relToAbsPath(abscmd, path)
 
+               assert(path[0] == "/")
+
+       return path
 
 
 def gdbLoadConfig():
-       global clientcmd, gdbBps
+       global clientcmd, gdbBps, cmdset
+
+
 
 
        #Load configuration
@@ -176,35 +226,25 @@ def gdbLoadConfig():
 
        #Add breakpoints from configuration
        for bp in conf.breakpoints:
-
-               file = bp["file"]
-
-               #Not a absolute path --> make one
-               if file[0] != os.sep:
-
-                       #We need the client command to expand the paths...
-                       while clientcmd == "":
-                               clientcmd = vim.eval("input('Client commando: ', '%s')" % clientcmd).strip()
-
-                       #Get the dirs where executeable is in
-                       relcmd = string.split(clientcmd)[0]
-                       abscmd = getAbsPath(getCurrentFile(), relcmd)
-                       bp["file"] = file = getAbsPath(abscmd, file)
-
-                       assert(file[0] == "/")
-
+               bp["file"] = toAbsPath( bp["file"] )
                addBreakpoint(bp["file"], bp["lineno"], bp["cond"])
-
+       
+       #Set current execution line
+       if conf.isCurrposSet():
+               file = toAbsPath(conf.currfile)
+               setExecutionLine(file, conf.currlineno)
+       else:
+               delExecutionLine()
 >>
 
+highlight ExecutionLine term=bold ctermbg=DarkGreen ctermfg=Black guibg=LightGreen guifg=Black
+highlight BreakPoint term=inverse ctermbg=DarkRed ctermfg=Black guibg=LightRed guifg=Black
 
-highlight BreakPoint term=inverse ctermbg=DarkCyan ctermfg=Black
-
+sign define ExecutionLine text==> texthl=ExecutionLine linehl=ExecutionLine
 sign define BreakPoint text=! texthl=BreakPoint linehl=BreakPoint
 sign define CondBreakPoint text=? texthl=BreakPoint linehl=BreakPoint
 
 
-
 command! GDBLaunch :python gdbLaunch()
 command! GDBToggleBreakpoint :python gdbToggleBreakpoint()
 command! GDBBreakpointCond :python gdbBreakpointCond()