From 1d1021992fab93a444e98935154f3aaf77d2b87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20Silkeb=C3=A6kken?= Date: Fri, 16 Nov 2012 17:05:55 +0100 Subject: [PATCH] Update vim and terminal examples The examples have been moved into their own directory. The vim example now uses pyeval() and vim.bindeval() and loads the Python file through an import (so it gets compiled) for speed improvements. --- examples/__init__.py | 0 .../terminal/powerline.py | 4 + examples/vim/__init__.py | 0 examples/vim/powerline.py | 113 ++++++++++++++++++ examples/vim/powerline.vim | 21 ++++ powerline-vim-example.vim | 89 -------------- 6 files changed, 138 insertions(+), 89 deletions(-) create mode 100644 examples/__init__.py rename powerline-terminal-example.py => examples/terminal/powerline.py (83%) create mode 100644 examples/vim/__init__.py create mode 100644 examples/vim/powerline.py create mode 100644 examples/vim/powerline.vim delete mode 100644 powerline-vim-example.vim diff --git a/examples/__init__.py b/examples/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/powerline-terminal-example.py b/examples/terminal/powerline.py similarity index 83% rename from powerline-terminal-example.py rename to examples/terminal/powerline.py index 8ae52cfc..66cd497b 100755 --- a/powerline-terminal-example.py +++ b/examples/terminal/powerline.py @@ -2,6 +2,10 @@ '''Powerline terminal prompt example. ''' +import os +import sys +sys.path.append(os.path.join(os.path.dirname(__file__), '../..')) + from lib.core import Powerline, Segment from lib.renderers import TerminalSegmentRenderer diff --git a/examples/vim/__init__.py b/examples/vim/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/examples/vim/powerline.py b/examples/vim/powerline.py new file mode 100644 index 00000000..11066d86 --- /dev/null +++ b/examples/vim/powerline.py @@ -0,0 +1,113 @@ +# -*- coding: utf-8 -*- + +import vim +import os +import re + +from lib.core import Powerline, Segment +from lib.renderers import VimSegmentRenderer + +modes = { + 'n': 'NORMAL', + 'no': 'N·OPER', + 'v': 'VISUAL', + 'V': 'V·LINE', + '': 'V·BLCK', + 's': 'SELECT', + 'S': 'S·LINE', + '': 'S·BLCK', + 'i': 'INSERT', + 'R': 'REPLACE', + 'Rv': 'V·RPLCE', + 'c': 'COMMND', + 'cv': 'VIM EX', + 'ce': 'EX', + 'r': 'PROMPT', + 'rm': 'MORE', + 'r?': 'CONFIRM', + '!': 'SHELL', +} + + +def statusline(): + winwidth = int(vim.bindeval('winwidth(0)')) + + # Prepare segment contents + mode = modes[vim.bindeval('mode()')] + + branch = vim.bindeval('fugitive#head(5)') + if branch: + branch = '⭠ ' + branch + + line_current = int(vim.bindeval('line(".")')) + line_end = int(vim.bindeval('line("$")')) + line_percent = int(float(line_current) / float(line_end) * 100) + + # Fun gradient colored percent segment + line_percent_gradient = [160, 166, 172, 178, 184, 190] + line_percent_color = line_percent_gradient[int((len(line_percent_gradient) - 1) * line_percent / 100)] + + col_current = vim.bindeval('col(".")') + + filepath = os.path.split(vim.bindeval('expand("%:~:.")')) + filename_color = 231 + if filepath[0]: + filepath[0] += os.sep + + if not filepath[1]: + filepath = ('', '[No Name]') + filename_color = 250 + + readonly = vim.bindeval('&ro ? "⭤ " : ""') + modified = vim.bindeval('&mod ? " +" : ""') + + currenttag = vim.bindeval('tagbar#currenttag("%s", "")') + + # The Syntastic segment is center aligned (filler segment on each side) to show off how the filler segments work + # Not necessarily how it's going to look in the final theme + vim.command('let g:syntastic_stl_format = "⮃ %E{ ERRORS (%e) ⭡ %fe }%W{ WARNINGS (%w) ⭡ %fw } ⮁"') + syntastic = vim.bindeval('SyntasticStatuslineFlag()') + + powerline = Powerline([ + Segment(mode, 22, 148, attr=Segment.ATTR_BOLD), + Segment(vim.bindeval('&paste ? "PASTE" : ""'), 231, 166, attr=Segment.ATTR_BOLD), + Segment(branch, 250, 240, priority=10), + Segment(readonly, 196, 240, draw_divider=False), + Segment(filepath[0], 250, 240, draw_divider=False, priority=5), + Segment(filepath[1], filename_color, 240, attr=Segment.ATTR_BOLD, draw_divider=not len(modified)), + Segment(modified, 220, 240, attr=Segment.ATTR_BOLD), + Segment(currenttag, 246, 236, draw_divider=False, priority=100), + Segment(filler=True, fg=236, bg=236), + Segment(syntastic, 214, 236, attr=Segment.ATTR_BOLD, draw_divider=False, priority=100), + Segment(filler=True, fg=236, bg=236), + Segment(vim.bindeval('&ff'), 247, 236, side='r', priority=50), + Segment(vim.bindeval('&fenc'), 247, 236, side='r', priority=50), + Segment(vim.bindeval('&ft'), 247, 236, side='r', priority=50), + Segment(str(line_percent).rjust(3) + '%', line_percent_color, 240, side='r', priority=30), + Segment('⭡ ', 239, 252, side='r'), + Segment(str(line_current).rjust(3), 235, 252, attr=Segment.ATTR_BOLD, side='r', draw_divider=False), + Segment(':' + str(col_current).ljust(2), 244, 252, side='r', priority=30, draw_divider=False), + ]) + + renderer = VimSegmentRenderer() + stl = powerline.render(renderer, winwidth) + + # Escape percent chars in the statusline, but only if they aren't part of any stl escape sequence + stl = re.sub('(\w+)\%(?![-{()<=#*%])', '\\1%%', stl) + + # Create highlighting groups + for group, hl in renderer.hl_groups.items(): + if int(vim.bindeval('hlexists("{0}")'.format(group))): + # Only create hl group if it doesn't already exist + continue + + vim.command('hi {group} ctermfg={ctermfg} guifg={guifg} guibg={guibg} ctermbg={ctermbg} cterm={attr} gui={attr}'.format( + group=group, + ctermfg=hl['ctermfg'], + guifg='#{0:06x}'.format(hl['guifg']) if hl['guifg'] != 'NONE' else 'NONE', + ctermbg=hl['ctermbg'], + guibg='#{0:06x}'.format(hl['guibg']) if hl['guibg'] != 'NONE' else 'NONE', + attr=','.join(hl['attr']), + )) + + return stl diff --git a/examples/vim/powerline.vim b/examples/vim/powerline.vim new file mode 100644 index 00000000..469c3b32 --- /dev/null +++ b/examples/vim/powerline.vim @@ -0,0 +1,21 @@ +" Powerline vim example +" Run with :source % + +python import sys, vim, os +python sys.path.append(vim.eval('expand(":h:h:h")')) +python from examples.vim.powerline import statusline + +if exists('*pyeval') + let s:pyeval=function('pyeval') +else + python import json + function s:pyeval(e) + python vim.command('return ' + json.dumps(eval(vim.eval('a:e')))) + endfunction +endif + +function! DynStl() + return s:pyeval('statusline()') +endfunction + +set stl=%!DynStl() diff --git a/powerline-vim-example.vim b/powerline-vim-example.vim deleted file mode 100644 index 7f2da064..00000000 --- a/powerline-vim-example.vim +++ /dev/null @@ -1,89 +0,0 @@ -" Powerline vim example -" Run with :source % - -set stl=%!DynStl() - -function! DynStl() -python <