X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=21de57f8fe1a1938f628f4ec919490d2ee459ad0;hp=b63d1ba0e7e3226506854ca4afe6924b863dfd2d;hb=3355282d8c651fa4e8cf4c819095e47b9fb4bfeb;hpb=c204dd8c0a7d9d0c767e01f98f623af5f103c4d9 diff --git a/.vimrc b/.vimrc index b63d1ba..21de57f 100644 --- a/.vimrc +++ b/.vimrc @@ -167,13 +167,14 @@ endfun "}}}2 " Set up our variables. fun! Iain_Vars() "{{{2 - call Prep_Var("b:iainlist", 0) + call Prep_Var("w:iainlist", 0) call Prep_Var("b:iainhex", 0) call Prep_Var("b:iainverbose", 0) " Window Flags: (F)ocused, (I)nsert mode, Cursor (H)old. call Prep_Var("b:iainstatus", "'Fih'") - call Prep_Var("g:iainextracolumnsnumber", 0) - call Prep_Var("g:iainextracolumnslist", 0) + call Prep_Var("g:iainextracolumnsnumber", "''") + call Prep_Var("g:iainextracolumnslist", "''") + call Prep_Var("b:iaincul", 0) if has("signs") call Prep_Var("g:marksigns", 0) call Prep_Var("g:firstsign", 100) @@ -184,11 +185,11 @@ endfun "}}}2 " Show space, underscore or dollar sign depending on list mode. fun! Show_List() "{{{2 call Iain_Vars() - if b:iainlist == 0 + if w:iainlist == 0 " No list. return " " elseif Has_Unicode() - if b:iainlist == 1 + if w:iainlist == 1 " Just tabs. return "»" else @@ -196,7 +197,7 @@ fun! Show_List() "{{{2 return "¶" endif else - if b:iainlist == 1 + if w:iainlist == 1 return "_" else return "\$" @@ -252,8 +253,8 @@ endfun "}}}2 " Show the status line. fun! Show_StatusLine() "{{{2 call Iain_Vars() - let l:sl1='%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ ' - let l:sl3='L:%4.6l/%-4.6L\ C:%3.6c\ \|\ %P' + let l:sl1='%2n\:\ %<%1*%f%0*\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ ' + let l:sl3='L:%1*%4.6l%0*/%-4.6L\ C:%1*%3.6c%0*\ \|\ %P' let l:hexformat='%b' if b:iainhex let l:hexformat='0\x%02B' @@ -309,10 +310,20 @@ endfun "}}}2 " Set extra columns depending on window status. fun! Extra_Columns(extra, var, ...) "{{{2 - if v:version < "700" + " Vim 6 doesn't have winnr("$"). Determine which windows are open + " ourselves by using :windo to incremement a counter. As Vim 5 + " doesn't have :windo we require Vim 6 for this. + if v:version < "600" return "" endif + " Remember which window we're in. + let l:winnr = winnr() + let l:num_windows = 0 + windo let l:num_windows = l:num_windows + 1 + " Switch back to the window we were in. + exe l:winnr . "wincmd w" + call Iain_Vars() if a:0 == 0 @@ -321,28 +332,34 @@ fun! Extra_Columns(extra, var, ...) "{{{2 let l:condition = a:1 endif + let l:n = 0 let l:i = 1 - let l:num_windows = 0 - while l:i <= winnr("$") + let l:windows = "" + while l:n < l:num_windows + " If window w exists then getwinvar(w, "&modified") will be 0 or 1. + if getwinvar(l:i, "&modified") =~ '^\d' + let l:n = l:n + 1 + let l:val = 0 exe "if getwinvar(" . l:i . ", '" . a:var . "') " . l:condition . " | let l:val = 1 | endif" if l:val - let l:num_windows = l:num_windows + 1 + exe "let l:windows = '" . l:windows . ":" . l:i . "'" + endif endif let l:i = l:i + 1 endwhile let l:extra = "g:iainextracolumns" . a:extra exe "let l:val = " . l:extra + exe "let " . l:extra . " = '" . l:windows . "'" - if l:num_windows == l:val + if l:windows == l:val return "" endif - exe "let " . l:extra . " = " . l:num_windows - if l:num_windows == 0 + if l:windows == "" return "-" - elseif l:val == 0 + elseif l:val == "" return "+" endif endfun "}}}2 @@ -371,7 +388,7 @@ au Mode BufLeave * if &ft == "make" | call MakeMode_unmap() | endif " Entering Make mode. fun! MakeMode_map() "{{{2 call Iain_Vars() - let b:iainlist=1 + let w:iainlist=1 call Cycle_List() set ts=8 set noexpandtab @@ -482,6 +499,85 @@ fun! Startup_Resize() "{{{2 endif endfun "}}}2 +" Change status bar colour when various things happen. +" Flags: H/h: Cursor held/moved. +" F/f: Focus gained/lost. +" I/i: Insert mode entered/left. +fun! Highlight_StatusLine(flag) "{{{2 + " Get current status. + call Iain_Vars() + + " Change the status based on the flag. XXX: Does Vim let us to do flags? + let l:ic = &ic + set ic + let b:iainstatus = substitute(b:iainstatus, a:flag, a:flag, "") + let &ic = l:ic + + let l:normalcolour = "darkblue" + let l:editingcolour = "darkmagenta" + let l:warningcolour = "darkred" + let l:readonlycolour = "red" + + " Default colour. + let l:colour = l:normalcolour + " Maybe override depending on status. + if b:iainstatus =~# "H" + if b:iainstatus =~# "I" + " Held in insert mode. Add extra highlight if we don't have focus. + if b:iainstatus =~# "f" + let l:colour = l:warningcolour + else + let l:colour = l:editingcolour + endif + endif + else + if b:iainstatus =~# "I" + " Regular insert mode. + let l:colour = l:editingcolour + endif + endif + + " Override again if readonly. + if l:colour != l:normalcolour + if getbufvar("", "&ro") + let l:colour = l:readonlycolour + endif + endif + + let l:termcolour = Iain_Colour(l:colour) + + exec "highlight StatusLine gui=none term=none cterm=none guifg=white guibg=" . l:colour . " ctermfg=white ctermbg=" . l:termcolour + exec "highlight User1 gui=bold term=bold cterm=bold guifg=white guibg=" . l:colour . " ctermfg=white ctermbg=" . l:termcolour +endfun "}}}2 + +fun! Iain_Colour(colour) "{{{2 + if &t_Co == 88 + if a:colour == "darkblue" + return 17 + elseif a:colour == "darkmagenta" + return 33 + elseif a:colour == "darkred" + return 32 + elseif a:colour == "red" + return 64 + endif + elseif &t_Co == 256 + if a:colour == "darkblue" + return 17 + elseif a:colour == "darkmagenta" + return 90 + elseif a:colour == "darkred" + return 88 + elseif a:colour == "red" + return 196 + endif + else + return a:colour + endif +endfun "}}}2 + +au StatusLine VimEnter * call Highlight_StatusLine("") + " Show numbers by default. au Display VimEnter * if ! Uncluttered_Buffer() | call Number(0) | endif @@ -510,20 +606,14 @@ syn enable " Set colours. if has("gui_running") - try - if has("win32") - se guifont=DejaVu_Sans_Mono:h10:cANSI - else - se guifont=DejaVu\ Sans\ Mono\ 10 - endif - catch - endtry + if has("win32") + exe "silent se guifont=DejaVu_Sans_Mono:h10:cANSI" + else + exe "silent se guifont=DejaVu\\ Sans\\ Mono\\ 10" + endif endif if has("gui_running") || &t_Co > 16 - try - colo iain - catch - endtry + exe "silent colo iain" endif " Ignore whitespace when diffing. @@ -560,33 +650,6 @@ fun! Prep_Sign(sign) "{{{2 endif endfun "}}}2 -fun! Prep_Signs() "{{{2 - call Prep_Sign("dot") - call Prep_Sign("dash") - call Prep_Sign("quote") - call Prep_Sign("caret") - call Prep_Sign("less") - call Prep_Sign("greater") - call Prep_Sign("left") - call Prep_Sign("right") - call Prep_Sign("squareleft") - call Prep_Sign("squareright") - call Prep_Sign("braceleft") - call Prep_Sign("braceright") - call Prep_Sign("a") - call Prep_Sign("b") - call Prep_Sign("c") - call Prep_Sign("d") - call Prep_Sign("e") - call Prep_Sign("f") - call Prep_Sign("A") - call Prep_Sign("B") - call Prep_Sign("C") - call Prep_Sign("D") - call Prep_Sign("E") - call Prep_Sign("F") -endfun! "}}}2 - fun! Place_Sign(number, line, old, name) "{{{2 if a:line == a:old return a:old @@ -603,33 +666,30 @@ fun! Highlight_Signs(...) "{{{2 return endif - call Prep_Signs() - - let b:signdot = Place_Sign(0, line("'."), b:signdot, "MarkDot") - let b:signdash = Place_Sign(1, line("''"), b:signdash, "MarkDash") - let b:signquote = Place_Sign(2, line("'\""), b:signquote, "MarkQuote") - let b:signcaret = Place_Sign(3, line("'^"), b:signcaret, "MarkCaret") - let b:signless = Place_Sign(4, line("'<"), b:signless, "MarkLess") - let b:signgreater = Place_Sign(5, line("'>"), b:signgreater, "MarkGreater") - let b:signleft = Place_Sign(6, line("'("), b:signleft, "MarkLeft") - let b:signright = Place_Sign(7, line("')"), b:signright, "MarkRight") - let b:signsquareleft = Place_Sign(8, line("'["), b:signsquareleft, "MarkSquareLeft") - let b:signsquareright = Place_Sign(9, line("']"), b:signsquareright, "MarkSquareRight") - let b:signbraceleft = Place_Sign(10, line("'{"), b:signbraceleft, "MarkBraceLeft") - let b:signbraceright = Place_Sign(11, line("'}"), b:signbraceright, "MarkBraceRight") - - let b:signa = Place_Sign(12, line("'a"), b:signa, "Marka") - let b:signb = Place_Sign(13, line("'b"), b:signb, "Markb") - let b:signc = Place_Sign(15, line("'c"), b:signc, "Markc") - let b:signd = Place_Sign(16, line("'d"), b:signd, "Markd") - let b:signe = Place_Sign(17, line("'e"), b:signe, "Marke") - let b:signf = Place_Sign(18, line("'f"), b:signf, "Markf") - let b:signA = Place_Sign(19, line("'A"), b:signA, "MarkA") - let b:signB = Place_Sign(20, line("'B"), b:signB, "MarkB") - let b:signC = Place_Sign(21, line("'C"), b:signC, "MarkC") - let b:signD = Place_Sign(22, line("'D"), b:signD, "MarkD") - let b:signE = Place_Sign(23, line("'E"), b:signE, "MarkE") - let b:signF = Place_Sign(24, line("'F"), b:signF, "MarkF") + let l:signs = g:iainsigns + let l:sign = "" + let l:i = 0 + while strlen(l:signs) + let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=-][^ ]\+') + + let l:name = substitute(l:sign, '[:.=-].*', "", "") + let l:var = tolower(l:name) + let l:sign = substitute(l:sign, '^[A-Za-z]\+', "", "") + let l:ascii = matchstr(l:sign, '^:.') + let l:mark = substitute(l:sign, '^\(:.\)*[.-=]', "", "") + if strlen(l:ascii) + let l:ascii = substitute(l:ascii, '^:', "", "") + else + let l:ascii = l:mark + endif + let l:ascii = substitute(l:ascii, '"', '\\"', "") + + call Prep_Sign(l:var) + exe "let " . l:var . " = Place_Sign(" . l:i . ", line(\"'" . l:ascii . "\"), b:sign" . l:var . ", \"Mark" . l:name . "\")" + let l:i = l:i + 1 + + let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "") + endwhile endfun "}}}2 " Toggle signs. @@ -640,97 +700,64 @@ fun! Cycle_Signs(resize) "{{{2 call Iain_Vars() let g:marksigns = ! g:marksigns - if g:marksigns - " Signs to highlight marks. - " Syntax won't work properly in Vim 6. + " Retrofit arrays on to Vim 6. + if ! exists("g:iainsigns") + " Signs are defined in g:iainsigns. The syntax is as follows: + " + " Sign ::= Name (':' Mark)* Type Symbol + " Type ::= '=' | '-' | '.' + " + " Signs with Type '=' will be highlighted with the MarkSign group. + " Signs with Type '-' will be highlighted with the MarkLine group. + " Signs with Type '.' will be highlighted with the MarkDot group. + " Define the Mark where Symbol is not also the mark name, eg "']". if Has_Unicode() - sign define MarkDash text=’ texthl=MarkSign - sign define MarkDot text=• texthl=MarkDot - sign define MarkQuote text=” texthl=MarkSign + let g:iainsigns = "Dash:'=’ Dot:..• Quote:\"=” Caret:^.ʌ" else - sign define MarkDash text=' texthl=MarkSign - sign define MarkDot text=* texthl=MarkDot - sign define MarkQuote text=" texthl=MarkSign + let g:iainsigns = "Dash=' Dot:..* Quote=\" Caret.^" endif - sign define MarkCaret text=^ texthl=MarkDot - sign define MarkLess text=< texthl=MarkSign - sign define MarkGreater text=> texthl=MarkSign - sign define MarkLeft text=( texthl=MarkSign - sign define MarkRight text=) texthl=MarkSign - sign define MarkSquareLeft text=[ texthl=MarkSign - sign define MarkSquareRight text=] texthl=MarkSign - sign define MarkBraceLeft text={ texthl=MarkSign - sign define MarkBraceRight text=} texthl=MarkSign - sign define Marka text=a texthl=MarkSign linehl=MarkLine - sign define Markb text=b texthl=MarkSign linehl=MarkLine - sign define Markc text=c texthl=MarkSign linehl=MarkLine - sign define Markd text=d texthl=MarkSign linehl=MarkLine - sign define Marke text=e texthl=MarkSign linehl=MarkLine - sign define Markf text=f texthl=MarkSign linehl=MarkLine - sign define MarkA text=A texthl=MarkSign linehl=MarkLine - sign define MarkB text=B texthl=MarkSign linehl=MarkLine - sign define MarkC text=C texthl=MarkSign linehl=MarkLine - sign define MarkD text=D texthl=MarkSign linehl=MarkLine - sign define MarkE text=E texthl=MarkSign linehl=MarkLine - sign define MarkF text=F texthl=MarkSign linehl=MarkLine + let g:iainsigns = g:iainsigns . " Less=< Greater=> Left=( Right=) SquareLeft=[ SquareRight=] BraceLeft={ BraceRight=} a-a b-b c-c d-d e-e f-f A-A B-B C-C D-D E-E F-F" + endif + + if g:marksigns + " Signs to highlight marks. + " Syntax won't work properly in Vim 6. + let l:signs = g:iainsigns + let l:sign = "" + while strlen(l:signs) + let l:sign = matchstr(l:signs, '^[A-Za-z]\+\(:.\)*[.=-][^ ]\+') + + let l:sign = substitute(l:sign, ':.', "", "") + let l:sign = substitute(l:sign, '=', " texthl=MarkSign text=", "") + let l:sign = substitute(l:sign, '\.', " texthl=MarkDot text=", "") + let l:sign = substitute(l:sign, '-', " texthl=MarkLine text=", "") + + exe "sign define Mark" . l:sign + + let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "") + endwhile if a:resize call Resize_Columns("+", 2) endif call Highlight_Signs() else - exe "sign unplace " . (g:firstsign + 0) - exe "sign unplace " . (g:firstsign + 1) - exe "sign unplace " . (g:firstsign + 2) - exe "sign unplace " . (g:firstsign + 3) - exe "sign unplace " . (g:firstsign + 4) - exe "sign unplace " . (g:firstsign + 5) - exe "sign unplace " . (g:firstsign + 6) - exe "sign unplace " . (g:firstsign + 7) - exe "sign unplace " . (g:firstsign + 8) - exe "sign unplace " . (g:firstsign + 9) - exe "sign unplace " . (g:firstsign + 10) - exe "sign unplace " . (g:firstsign + 11) - exe "sign unplace " . (g:firstsign + 12) - exe "sign unplace " . (g:firstsign + 13) - exe "sign unplace " . (g:firstsign + 14) - exe "sign unplace " . (g:firstsign + 15) - exe "sign unplace " . (g:firstsign + 16) - exe "sign unplace " . (g:firstsign + 17) - exe "sign unplace " . (g:firstsign + 18) - exe "sign unplace " . (g:firstsign + 19) - exe "sign unplace " . (g:firstsign + 20) - exe "sign unplace " . (g:firstsign + 21) - exe "sign unplace " . (g:firstsign + 22) - exe "sign unplace " . (g:firstsign + 23) - exe "sign unplace " . (g:firstsign + 24) - - sign undefine MarkDash - sign undefine MarkDot - sign undefine MarkQuote - sign undefine MarkCaret - sign undefine MarkLess - sign undefine MarkGreater - sign undefine MarkLeft - sign undefine MarkRight - sign undefine MarkSquareLeft - sign undefine MarkSquareRight - sign undefine MarkBraceLeft - sign undefine MarkBraceRight - sign undefine Marka - sign undefine Markb - sign undefine Markc - sign undefine Markd - sign undefine Marke - sign undefine Markf - sign undefine MarkA - sign undefine MarkB - sign undefine MarkC - sign undefine MarkD - sign undefine MarkE - sign undefine MarkF - - call Prep_Signs() + let l:i = 0 + while l:i < 25 + exe "sign unplace " . (g:firstsign + l:i) + let l:i = l:i + 1 + endwhile + + let l:signs = g:iainsigns + let l:sign = "" + while strlen(l:signs) + let l:sign = matchstr(l:signs, '^[A-Za-z]\+') + + exe "sign undefine Mark" . l:sign + call Prep_Sign(tolower(l:sign)) + let l:signs = substitute(l:signs, '^[^ ]\+ *', "", "") + endwhile + if a:resize call Resize_Columns("-", 2) endif @@ -775,13 +802,13 @@ fun! Cycle_List() "{{{2 endif endif call Iain_Vars() - let b:iainlist = b:iainlist + 1 - if b:iainlist > 2 - let b:iainlist = 0 + let w:iainlist = w:iainlist + 1 + if w:iainlist > 2 + let w:iainlist = 0 endif - if b:iainlist == 0 + if w:iainlist == 0 setlocal nolist - elseif b:iainlist == 1 + elseif w:iainlist == 1 exec "setlocal lcs=" . basic setlocal list else @@ -789,7 +816,7 @@ fun! Cycle_List() "{{{2 setlocal list endif - call Resize_Columns(Extra_Columns("list", "&lcs", " =~# 'eol'"), 1) + call Resize_Columns(Extra_Columns("list", "iainlist", " == 2"), 1) endfun "}}}2 " Cycle between hex and decimal display of toolbar stuff. @@ -834,82 +861,6 @@ call Mapping("S", ":filetype detect:") " Toggle marks with \m. call Mapping("m", ":call Cycle_Signs(1):") -fun! Iain_Colour(colour) "{{{2 - if &t_Co == 88 - if a:colour == "darkblue" - return 17 - elseif a:colour == "darkmagenta" - return 33 - elseif a:colour == "darkred" - return 32 - elseif a:colour == "red" - return 64 - endif - elseif &t_Co == 256 - if a:colour == "darkblue" - return 17 - elseif a:colour == "darkmagenta" - return 90 - elseif a:colour == "darkred" - return 88 - elseif a:colour == "red" - return 196 - endif - else - return a:colour - endif -endfun "}}}2 - -" Change status bar colour when various things happen. -" Flags: H/h: Cursor held/moved. -" F/f: Focus gained/lost. -" I/i: Insert mode entered/left. -fun! Highlight_StatusLine(flag) "{{{2 - " Get current status. - call Iain_Vars() - - " Change the status based on the flag. XXX: Does Vim let us to do flags? - let re = "[" . tolower(a:flag) . toupper(a:flag) . "]" - let b:iainstatus = substitute(b:iainstatus, re, a:flag, "") - - let l:normalcolour = "darkblue" - let l:editingcolour = "darkmagenta" - let l:warningcolour = "darkred" - let l:readonlycolour = "red" - - " Default colour. - let l:colour = l:normalcolour - " Maybe override depending on status. - if b:iainstatus =~# "H" - if b:iainstatus =~# "I" - " Held in insert mode. Add extra highlight if we don't have focus. - if b:iainstatus =~# "f" - let l:colour = l:warningcolour - else - let l:colour = l:editingcolour - endif - endif - else - if b:iainstatus =~# "I" - " Regular insert mode. - let l:colour = l:editingcolour - endif - endif - - " Override again if readonly. - if l:colour != l:normalcolour - if getbufvar("", "&ro") - let l:colour = l:readonlycolour - endif - endif - - let l:termcolour = Iain_Colour(l:colour) - - exec "highlight StatusLine gui=bold term=bold cterm=bold guifg=white guibg=" . l:colour . " ctermfg=white ctermbg=" . l:termcolour -endfun "}}}2 - -au Display VimEnter * call Highlight_StatusLine("") - " Show signs by default. au Display VimEnter * call Cycle_Signs(0) endif "}}}1 @@ -988,6 +939,19 @@ fun! Show_GUITabLine() "{{{2 return l:s endfun "}}}2 +" Toggle highlighting cursor line when focus changes. +fun! ToggleCursorLine() "{{{2 + call Iain_Vars() + + if b:iainstatus =~# "f" && b:iainstatus =~# "H" && b:iainstatus =~# "I" + " Focus lost while held in insert mode. + let b:iaincul = getbufvar("", "&cursorline") + setlocal cursorline + elseif ! b:iaincul + setlocal nocursorline + endif +endfun "}}}2 + se tabline=%!Show_TabLine() se guitablabel=%!Show_GUITabLine() @@ -998,6 +962,8 @@ au StatusLine FocusLost * call Highlight_StatusLine("f") au StatusLine InsertEnter * call Highlight_StatusLine("I") au StatusLine InsertLeave * call Highlight_StatusLine("i") +au Display FocusGained,FocusLost * call ToggleCursorLine() + if has("signs") au Signs InsertEnter * call Highlight_Signs() au Signs InsertLeave * call Highlight_Signs() @@ -1026,6 +992,10 @@ se go+=e " Perforce. let g:p4EnableMenu=1 let g:p4Presets='P4CONFIG' + +" BufExplorer. +let g:bufExplorerShowRelativePath=1 +let g:bufExplorerSplitOutPathName=0 endif "}}}1 " Resize after startup.