X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vimrc;h=77a1d45b38d9a25a070df700ed03c86b27eaec3c;hb=eae36419db72d287dc1af274027ab1c2d3d18dec;hp=1d33447c5f82a0aefcef4edaacc207ff05ef491a;hpb=41b041e1eacb02ba97c7826e20fa90b5be700663;p=profile.git

diff --git a/.vimrc b/.vimrc
index 1d33447..77a1d45 100644
--- a/.vimrc
+++ b/.vimrc
@@ -113,6 +113,10 @@ fun! Iain_Vars()
   if ! exists("b:iainverbose")
     let b:iainverbose = 0
   endif
+  if ! exists("b:iainstatus")
+    " Window Flags: (F)ocused, (I)nsert mode, Cursor (H)old.
+    let b:iainstatus = "Fih"
+  endif
 endfun
 
 " Helper for status line.
@@ -242,11 +246,11 @@ syn enable
 
 " Nice GUI colour.
 if has("gui_running")
-  se guifont=Bitstream\ Vera\ Sans\ Mono\ 10
+  se guifont=DejaVu\ Sans\ Mono\ 10
   colo darkblue
 endif
 if has("win32")
-  se guifont=Bitstream_Vera_Sans_Mono:h10:cANSI
+  se guifont=DejaVu_Sans_Mono:h10:cANSI
 endif
 
 " Ignore whitespace when diffing.
@@ -345,8 +349,42 @@ if version >= "700"
 version 7.0
 
 " Change status bar colour when entering insert mode.
-au InsertEnter * highlight StatusLine guifg=white guibg=darkred ctermbg=white ctermfg=darkred
-au InsertLeave * highlight StatusLine guifg=white guibg=blue ctermbg=white ctermfg=blue
+fun! Highlight_StatusLine(flag)
+  " 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, "")
+
+  " Default colour.
+  let colour = "darkblue"
+  " 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 colour = "darkmagenta"
+      else
+        let colour = "darkred"
+      endif
+    endif
+  else
+    if b:iainstatus =~# "I"
+      " Regular insert mode.
+      let colour = "darkred"
+    endif
+  endif
+
+  exec "highlight StatusLine guifg=white guibg=" . colour . " ctermbg=white ctermfg=" . colour
+endfun
+
+au CursorHoldI * call Highlight_StatusLine("H")
+au CursorMovedI * call Highlight_StatusLine("h")
+au FocusGained * call Highlight_StatusLine("F")
+au FocusLost * call Highlight_StatusLine("f")
+au InsertEnter * call Highlight_StatusLine("I")
+au InsertLeave * call Highlight_StatusLine("i")
 
 " Make diffs vertical by default.
 se diffopt+=vertical