X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.vimrc;h=98c3c52c9faf8aae6d78a9be880090b2138ffe27;hp=62bd8d7b29f93546b56c8014272d93b6c1146aa2;hb=732626fa6ddea589ef0e67d3627ebb42f81734d4;hpb=d0d885039e0b7f2242d6db6eb2ba36da132f1b94 diff --git a/.vimrc b/.vimrc index 62bd8d7..98c3c52 100644 --- a/.vimrc +++ b/.vimrc @@ -1,6 +1,4 @@ """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" -" $Id$ -"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Multi-version vimrc compatible with version 4 and above. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -61,6 +59,11 @@ se tags=~/.tags,./tags,tags " Don't timeout waiting to interpet, eg, OA as an escape code. se ttimeoutlen=100 +" Use ^B to search backward when completing. +inoremap +" Use ^L to show matching completions but don't select one. +inoremap + """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" " Handle options only available in Vim 5 and above. """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" @@ -79,9 +82,6 @@ se wildignore+=*.o,*.obj " So there's no need to assign them low priority. se suffixes-=*.o,*.obj -" Vim 5 hardcodes the size of numbers column to 8. -let numberwidth=8 - " Save sessions in UNIX format with / as file separator. This is " cross-platform. se ssop+=unix,slash @@ -105,7 +105,7 @@ se hlsearch se titlestring=%{Show_TitleString()} " Syntax highlighting. New versions will use syn enable instead. -if version < 600 +if version < "600" syn on endif @@ -133,6 +133,9 @@ fun! Iain_Vars() " Window Flags: (F)ocused, (I)nsert mode, Cursor (H)old. let b:iainstatus = "Fih" endif + if ! exists("g:iainextracolumns") + let g:iainextracolumns = 0 + endif endfun " Helper for status line. @@ -180,28 +183,28 @@ endfun " Show the window title. fun! Show_TitleString() if bufname("") == "" - let ts1='Vim' + let l:ts1='Vim' else - let ts1=printf("%s [%2d:%s]", expand('%t'), bufnr(""), expand('%f')) + let l:ts1=printf("%2d: %s", bufnr(""), expand('%t')) endif - return printf("%s (%s) %s", ts1, getcwd(), v:servername) + return printf("%s (%s) %s", l:ts1, getcwd(), v:servername) endfun " Show the status line. fun! Show_StatusLine() call Iain_Vars() - let sl1='%2n\:\ %<%f\ [%{Show_List()}%{Show_Case()}%{Show_Tabstop()}%{Show_Paste()}%Y%M%R]\ %=' - let sl3='L:%4.6l/%-4.6L\ C:%3.6c\ \|\ %P' - let hexformat='%b' + 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:hexformat='%b' if b:iainhex - let hexformat='0\x%02B' + let l:hexformat='0\x%02B' endif if b:iainverbose - let sl2=hexformat . '\ \|\ P:%4.6o\ ' + let l:sl2=l:hexformat . '\ \|\ P:%4.6o\ ' else - let sl2='' + let l:sl2='' endif - exec "set statusline=" . sl1 . sl2 . sl3 + exec "set statusline=" . l:sl1 . l:sl2 . l:sl3 endfun " Toggle case-sensitivity. @@ -209,6 +212,56 @@ fun! Invert_Case() let &ic = ! &ic endfun +" Grow or shrink the window size. +fun! Resize_Columns(op) + " Vim 5 hardcodes the size of numbers column to 8. + if version >= "700" + let l:numberwidth = &numberwidth + else + let l:numberwidth = 8 + endif + + let l:resize = "se columns" . a:op . "=" . l:numberwidth + + " HACK: Inside screen there is an extra line for the status bar. Vim + " manages the resize by sending an escape sequence to set the number of + " lines and number of columns in one action. To do this it will first query + " the number of lines and then set by . Because of the extra line for the status bar this results in + " the real terminal being shrunk by a line. We ask for the terminal to grow + " by a line so it ends up actually being the same. + if &term =~ '^screen' + let l:resize .= " lines+=1" + endif + + exec l:resize +endfun + +" Toggle number display. +fun! Number() + call Iain_Vars() + let &number = ! &number + + if version >= "700" + let l:i = 0 + let l:num_numbers = 0 + while l:i <= winnr("$") + if getwinvar(l:i, "&number") == 1 + let l:num_numbers = l:num_numbers + 1 + endif + let l:i = l:i + 1 + endwhile + + if l:num_numbers == 0 + let g:iainextracolumns = 0 + call Resize_Columns("-") + elseif g:iainextracolumns == 0 + let g:iainextracolumns = 1 + call Resize_Columns("+") + endif + endif +endfun + " Restore window size. au VimLeave * if exists("oldcols") | let &columns=oldcols | endif @@ -263,10 +316,10 @@ call Mapping("p", ":se paste!:") " Swap case-sensitivity with \c. call Mapping("c", ":call Invert_Case():") " Change number mode with \n. -call Mapping("n", ":se number!:") -" Expand or shrink window size with \> and \<. For use after toggling number. -call Mapping(">", ":exe 'se columns+=' . numberwidth:") -call Mapping("<", ":exe 'se columns-=' . numberwidth:") +call Mapping("n", ":call Number():") +" Expand or shrink window size with \> and \<. +call Mapping(">", ":call Resize_Columns('+'):") +call Mapping("<", ":call Resize_Columns('-'):") " Clear search pattern with \/. call Mapping("/", ":let @/=\"\":") @@ -297,6 +350,7 @@ syn enable if has("gui_running") se guifont=DejaVu\ Sans\ Mono\ 10 colo darkblue + hi LineNr guibg=#303030 elseif &t_Co > 16 try colo iain @@ -306,6 +360,8 @@ endif if has("win32") se guifont=DejaVu_Sans_Mono:h10:cANSI endif +hi! link TabLineSel StatusLine +hi! link TabLine StatusLineNC " Ignore whitespace when diffing. se diffopt=filler,iwhite @@ -385,7 +441,36 @@ call Mapping("q", ":call Cycle_Quickfix():") " updated as a side-effect. call Mapping("s", ":filetype detect:") +fun! Iain_Colour(colour) + 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 + " 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) " Get current status. call Iain_Vars() @@ -394,41 +479,40 @@ fun! Highlight_StatusLine(flag) 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 s:colour = "darkblue" - let s:termcolour = "" - let s:term88colour = "17" - let s:term256colour = "17" + 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 s:colour = "darkmagenta" + let l:colour = l:warningcolour else - let s:colour = "darkred" + let l:colour = l:editingcolour endif - let s:term88colour = "32" - let s:term256colour = "88" endif else if b:iainstatus =~# "I" " Regular insert mode. - let s:colour = "darkred" - let s:term88colour = "32" - let s:term256colour = "88" + let l:colour = l:editingcolour endif endif - if &t_Co == 88 - let s:termcolour = s:term88colour - elseif &t_Co == 256 - let s:termcolour = s:term256colour - else - let s:termcolour = s:colour + " Override again if readonly. + if l:colour != l:normalcolour + if getbufvar("", "&ro") + let l:colour = l:readonlycolour + endif endif - exec "highlight StatusLine guifg=white guibg=" . s:colour . " ctermbg=white ctermfg=" . s:termcolour + let l:termcolour = Iain_Colour(l:colour) + + exec "highlight StatusLine guifg=white guibg=" . l:colour . " ctermbg=white ctermfg=" . l:termcolour endfun call Highlight_StatusLine("") @@ -440,6 +524,77 @@ endif if version >= "700" version 7.0 +" Helper to show tab name. +fun! TabName(label, gui) + let l:label = a:label + if l:label == "" + let l:label = "No Name" + if a:gui + let l:label = "[" . l:label . "]" + endif + else + let l:label = fnamemodify(l:label, ":t") + if strlen(l:label) >= 18 + let l:label = l:label[0:17] . ".." + endif + endif + return l:label +endfun + +" Find out if any buffer was modified. +fun! TabModified(buflist) + let l:i = 0 + while i < len(a:buflist) + if getbufvar(a:buflist[l:i], "&modified") == 1 + return "+" + endif + let l:i = l:i + 1 + endwhile + return "" +endfun + +" Tab line. +fun! Show_TabLine() + let l:s = "%#TabLineFill#Tabs:" + + let l:i = 0 + while l:i < tabpagenr("$") + let l:i = l:i + 1 + " Get the label. + let l:buflist = tabpagebuflist(l:i) + let l:winnr = tabpagewinnr(l:i) + let l:n = tabpagewinnr(l:i, "$") + let l:label = TabName(bufname(l:buflist[l:winnr - 1]), 0) + let l:modified = TabModified(l:buflist) + + " Choose highlighting. + if l:i == tabpagenr() + let l:s .= "%#TabLineSel#[" . l:n . l:modified . " " . l:label . "]" + else + let l:s .= "%#TabLine# " . l:n . l:modified . " " . l:label . " " + endif + endwhile + + " Padding. + let l:s .= "%#TabLine#%T" + return l:s +endfun + +" Per tab label for the GUI. +fun! Show_GUITabLine() + let l:buflist = tabpagebuflist(v:lnum) + let l:winnr = tabpagewinnr(v:lnum) + let l:s = tabpagewinnr(v:lnum, "$") + let l:label = TabName(bufname(l:buflist[l:winnr - 1]), 1) + let l:modified = TabModified(l:buflist) + + let l:s .= l:modified . " " . l:label + return l:s +endfun + +se tabline=%!Show_TabLine() +se guitablabel=%!Show_GUITabLine() + au CursorHoldI * call Highlight_StatusLine("H") au CursorMovedI * call Highlight_StatusLine("h") au FocusGained * call Highlight_StatusLine("F") @@ -447,6 +602,9 @@ au FocusLost * call Highlight_StatusLine("f") au InsertEnter * call Highlight_StatusLine("I") au InsertLeave * call Highlight_StatusLine("i") +" Limit the size of the popup menu when completing. +se pumheight=20 + " Make diffs vertical by default. se diffopt+=vertical @@ -454,7 +612,15 @@ se diffopt+=vertical se numberwidth=5 " Add "previous tab" mapping as gb. -map gb :tabPrev +map gb :tabprevious: + +" Transparency. +if has("gui_macvim") + se transparency=15 +endif + +" Yet more GUI options. Add tabs. +se go+=e " Perforce. let g:p4EnableMenu=1