diff --git a/autoload/lightline.vim b/autoload/lightline.vim index 29d9e92..b91e76f 100644 --- a/autoload/lightline.vim +++ b/autoload/lightline.vim @@ -3,7 +3,7 @@ " Version: 0.0 " Author: itchyny " License: MIT License -" Last Change: 2013/08/22 05:34:46. +" Last Change: 2013/08/22 06:03:02. " ============================================================================= let s:save_cpo = &cpo @@ -97,6 +97,9 @@ function! lightline#mode() return get(g:lightline.mode_map, mode(), g:lightline.mode_map['?']) endfunction +function! s:term(l) + return len(a:l) == 5 && type(a:l[4]) == 1 ? 'term='.a:l[4] : '' +endfunction function! lightline#highlight(mode) let d = has_key(g:lightline.palette, a:mode) ? a:mode : 'normal' let c = g:lightline.palette @@ -106,15 +109,15 @@ function! lightline#highlight(mode) let r = has_key(c, d) && has_key(c[d], 'right') ? c[d].right : c.normal.right let m = has_key(c, d) && has_key(c[d], 'middle') ? c[d].middle[0] : c.normal.middle[0] for i in range(len(left)) - exec printf('hi LightLineLeft_%s_%d guifg=%s guibg=%s ctermfg=%d ctermbg=%d', a:mode, i, l[i][0], l[i][1], l[i][2], l[i][3]) + exec printf('hi LightLineLeft_%s_%d guifg=%s guibg=%s ctermfg=%d ctermbg=%d %s', a:mode, i, l[i][0], l[i][1], l[i][2], l[i][3], s:term(l[i])) exec printf('hi LightLineLeft_%s_%d_%d guifg=%s guibg=%s ctermfg=%d ctermbg=%d', a:mode, \ i, i + 1, l[i][1], i == len(left) - 1 ? m[1] : l[i + 1][1], l[i][3], i == len(left) - 1 ? m[3] : l[i + 1][3]) endfor - exec printf('hi LightLineMiddle_%s guifg=%s guibg=%s ctermfg=%d ctermbg=%d', a:mode, m[0], m[1], m[2], m[3]) + exec printf('hi LightLineMiddle_%s guifg=%s guibg=%s ctermfg=%d ctermbg=%d %s', a:mode, m[0], m[1], m[2], m[3], s:term(m)) for i in reverse(range(len(right))) exec printf('hi LightLineRight_%s_%d_%d guifg=%s guibg=%s ctermfg=%d ctermbg=%d', a:mode, \ i, i + 1, r[i][1], i == len(right) - 1 ? m[1] : r[i + 1][1], r[i][3], i == len(right) - 1 ? m[3] : r[i + 1][3]) - exec printf('hi LightLineRight_%s_%d guifg=%s guibg=%s ctermfg=%d ctermbg=%d', a:mode, i, r[i][0], r[i][1], r[i][2], r[i][3]) + exec printf('hi LightLineRight_%s_%d guifg=%s guibg=%s ctermfg=%d ctermbg=%d %s', a:mode, i, r[i][0], r[i][1], r[i][2], r[i][3], s:term(r[i])) endfor endfunction diff --git a/autoload/lightline/colorscheme/default.vim b/autoload/lightline/colorscheme/default.vim index bbbb500..67aa4f1 100644 --- a/autoload/lightline/colorscheme/default.vim +++ b/autoload/lightline/colorscheme/default.vim @@ -3,18 +3,7 @@ " Version: 0.0 " Author: itchyny " License: MIT License -" Last Change: 2013/08/22 05:31:04. +" Last Change: 2013/08/22 06:05:52. " ============================================================================= -let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}} -let s:p.normal.left = [ ['#0000ff', '#ffffff', 21, 231 ], [ '#ffffff', '#0000ff', 231, 21 ], [ '#ffffff', '#0000ff', 231, 21 ] ] -let s:p.normal.right = [ [ '#303030', '#d0d0d0', 236, 252 ], [ '#303030', '#8a8a8a', 236, 245 ], [ '#bcbcbc', '#585858', 250, 240 ] ] -let s:p.inactive.right = [ [ '#121212', '#606060', 233, 241 ], [ '#121212', '#3a3a3a', 233, 237 ], [ '#121212', '#262626', 233, 235 ], [ '#121212', '#262626', 233, 235 ] ] -let s:p.inactive.left = s:p.inactive.right[1:] -let s:p.insert.left = [ ['#005f00', '#ffffff', 22, 231 ], [ '#ffffff', '#005f00', 231, 22 ], [ '#ffffff', '#005f00', 231, 22 ] ] -let s:p.replace.left = [ [ '#af0000', '#ffffff', 124, 231 ], [ '#ffffff', '#af0000', 231, 124 ], [ '#ffffff', '#af0000', 231, 124 ] ] -let s:p.visual.left = [ [ '#5f00ff', '#ffffff', 57, 231 ], [ '#ffffff', '#5f00ff', 231, 57 ], [ '#ffffff', '#5f00ff', 231, 57 ] ] -let s:p.normal.middle = [ [ '#ffffff', '#303030', 231, 236 ] ] -let s:p.inactive.middle = [ [ '#303030', '#121212', 236, 233 ] ] - -let g:lightline#colorscheme#default#palette = s:p +let g:lightline#colorscheme#default#palette = g:lightline#colorscheme#powerline#palette diff --git a/autoload/lightline/colorscheme/powerline.vim b/autoload/lightline/colorscheme/powerline.vim index 109c846..1fb667c 100644 --- a/autoload/lightline/colorscheme/powerline.vim +++ b/autoload/lightline/colorscheme/powerline.vim @@ -3,18 +3,18 @@ " Version: 0.0 " Author: itchyny " License: MIT License -" Last Change: 2013/08/22 05:44:50. +" Last Change: 2013/08/22 05:59:58. " ============================================================================= let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}} -let s:p.normal.left = [ ['darkestgreen', 'brightgreen'], ['white', 'gray4'] ] +let s:p.normal.left = [ ['darkestgreen', 'brightgreen', 'bold'], ['white', 'gray4'] ] let s:p.normal.right = [ ['gray6', 'gray10'], ['gray9', 'gray4'], ['gray8', 'gray2'] ] let s:p.inactive.right = [ ['gray1', 'gray5'], ['gray4', 'gray1'], ['gray4', 'gray0'] ] let s:p.inactive.left = s:p.inactive.right[1:] -let s:p.insert.left = [ ['darkestcyan', 'white'], ['white', 'darkblue'] ] +let s:p.insert.left = [ ['darkestcyan', 'white', 'bold'], ['white', 'darkblue'] ] let s:p.insert.right = [ [ 'darkestcyan', 'gray10' ], [ 'mediumcyan', 'darkblue' ], [ 'mediumcyan', 'darkestblue' ] ] -let s:p.replace.left = [ ['white', 'brightred'], ['white', 'gray4'] ] -let s:p.visual.left = [ ['darkred', 'brightorange'], ['white', 'gray4'] ] +let s:p.replace.left = [ ['white', 'brightred', 'bold'], ['white', 'gray4'] ] +let s:p.visual.left = [ ['darkred', 'brightorange', 'bold'], ['white', 'gray4'] ] let s:p.normal.middle = [ [ 'gray6', 'gray2' ] ] let s:p.insert.middle = [ [ 'darkcyan', 'darkestblue' ] ]