better line following

flipcoder · flipcoder · commit 18149ab20f37 · 2018-06-28T13:27:37.000-07:00
diff --git a/README.md b/README.md
@@ -1,9 +1,10 @@
-# vim-decadence
+# ![Decadence](icon.png) vim-decadence
 
 Write music in vim using [decadence](https://github.com/flipcoder/decadence)
 
 This is only the plug-in repo. The backend code is in the repo above.
 
-![Decadence](https://imgur.com/N3yNWyJl.png)
+![Screenshot](https://i.imgur.com/HmzNhXf.png)
 
 WORK IN PROGRESS
+
diff --git a/plugin/dc.py b/plugin/dc.py
@@ -13,14 +13,15 @@ def set_dc_path(self,p):
     def check_paths(self):
         if not self.PYTHON or not self.DC_PATH:
             print("vim-decadence: in your .vimrc, set the locations:")
-            print("   let g:decadence_python = '/usr/bin/python2'")
+            print("   let g:decadence_python = '/usr/bin/python'")
             print("   let g:decadence_path = '~/bin/decadence/decadence.py'")
             print("In the future, this will be automatic.")
             return False
         return True
 
     def __init__(self):
         self.processes = []
+        self.process_buf = {}
         self.playing = False
         self.PYTHON = None
         self.DC_PATH = None
@@ -34,6 +35,7 @@ def stop(self):
                 except:
                     pass
                 term += 1
+        self.process_buf = {}
         self.processes = []
         return term
     def refresh(self):
@@ -45,7 +47,7 @@ def play(self):
         vim.command('call dc#starttimer()')
         vim.command('set cursorline')
         print('Playing')
-        self.processes.append(subprocess.Popen([\
+        p = subprocess.Popen([\
             self.PYTHON,\
             self.DC_PATH,\
             '--follow',
@@ -54,21 +56,26 @@ def play(self):
         ],
             stdout=subprocess.PIPE, stderr=subprocess.PIPE,
             bufsize=1, universal_newlines=True
-        ))
+        )
+        self.processes.append(p)
+        self.process_buf[p] = ''
     def playline(self):
         if not self.check_paths(): return
         self.stop()
-        self.processes.append(subprocess.Popen([\
+        p = subprocess.Popen([\
             self.PYTHON,\
             self.DC_PATH,\
             '-l',\
             vim.current.line\
-        ], stdout=self.DEVNULL, stderr=self.DEVNULL))
+        ], stdout=self.DEVNULL, stderr=self.DEVNULL)
+        self.processes.append(p)
+        self.process_buf[p] = ''
     def poll(self):
         running = 0
         done = False
         active = 0
         for p in self.processes:
+            # phash = hash(p)
             working = False
             if p.poll()==None:
                 active += 1
@@ -83,15 +90,21 @@ def poll(self):
                 buf = p.stdout.read(1)
                 if not buf:
                     break
+                pbuf = self.process_buf[p]
                 if buf=='\n':
-                    vim.command('normal! '+str(buf.count('\n'))+'j')
+                    # vim.command('normal! '+str(buf.count('\n'))+'j')
+                    vim.command('exe ' + str(int(pbuf)+1))
+                    self.process_buf[p] = ''
+                else:
+                    self.process_buf[p] += buf
                 working = True
             if working:
                 running += 1
         if not active:
             print('Stopped')
             vim.command('call dc#stoptimer()')
             vim.command('set cursorline&')
+        return running
     def reload(self):
         for i in xrange(2): # first 2 lines check for header
             try:
diff --git a/plugin/dc.vim b/plugin/dc.vim
@@ -7,6 +7,9 @@ execute 'pyfile '. escape(expand('<sfile>:p:h'),'\') . '/dc.py'
 function! dc#play()
     py VimDecadence.play()
 endfunc
+function! dc#stop()
+    py VimDecadence.play()
+endfunc
 function! dc#playline()
     py VimDecadence.playline()
 endfunc
@@ -20,7 +23,7 @@ function! dc#starttimer()
     if exists('s:dctimer')
         call timer_stop(s:dctimer)
     endif
-    let s:dctimer = timer_start(100, 'dc#poll', {'repeat':-1})
+    let s:dctimer = timer_start(10, 'dc#poll', {'repeat':-1})
 endfunc
 function! dc#stoptimer()
     call timer_stop(s:dctimer)
@@ -38,7 +41,9 @@ command! -nargs=0 DecadenceStopTimer call dc#stoptimer()
 au! BufRead,BufWritePost *.dc DecadenceReload
 
 if !exists("g:decadence_no_mappings") || !g:decadence_no_mappings
-    "nmap <silent> <buffer> <cr> :DecadencePlay<cr>
+    "nmap <silent><buffer> <cr><cr> :DecadencePlay<cr>
+    "nmap <silent><buffer> <cr><esc> :DecadenceStop<cr>
+    "nmap <silent><buffer> <cr><space> :DecadencePlayLine<cr>
 endif
 
 if exists("g:decadence_path")
