From e14f5e4208e3290bcc55ac6ca4d35d1ea34dd7e4 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@ya.ru>
Date: Wed, 20 Feb 2013 00:26:59 +0400
Subject: [PATCH] Fix problem with wrong window ID/winnr after some window
 operations

Removed autocommands as well. Powerline() function is now responsible both for
displaying powerline and for updating statuslines. No cmdwin events not
triggered workaround nonsense anymore.

Fixes #237
Fixes #236
Fixes #222
Fixes #232
---
 powerline/bindings/vim/plugin/powerline.vim | 37 ++++++++++-----------
 powerline/renderers/vim.py                  |  6 ++--
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/powerline/bindings/vim/plugin/powerline.vim b/powerline/bindings/vim/plugin/powerline.vim
index 388721e9..c6d6423b 100644
--- a/powerline/bindings/vim/plugin/powerline.vim
+++ b/powerline/bindings/vim/plugin/powerline.vim
@@ -47,26 +47,28 @@ else
 		\"endfunction"
 endif
 
-function! Powerline(winnr, current)
-	return s:pyeval('powerline.renderer.render('. a:winnr .', '. a:current .')')
+function! s:GetWinID(winnr)
+	let r = getwinvar(a:winnr, 'window_id')
+	if empty(r)
+		let r = s:pyeval('str(uuid.uuid4())')
+		call setwinvar(a:winnr, 'window_id', r)
+		call setwinvar(a:winnr, '&statusline', '%!Powerline("'.r.'")')
+	endif
+	return r
 endfunction
 
-function! s:UpdateWindows(use_last_current_window_id)
-	if ! exists('w:window_id')
-		let w:window_id = s:pyeval('str(uuid.uuid4())')
-	endif
-	for winnr in range(1, winnr('$'))
-		let current = 0
-		if w:window_id == getwinvar(winnr, 'window_id') || (a:use_last_current_window_id && getwinvar(winnr, 'window_id') == s:last_current_window_id)
-			let current = 1
-			if bufname(winbufnr(winnr)) isnot# '[Command Line]'
-				let s:last_current_window_id = getwinvar(winnr, 'window_id')
-			endif
-		endif
-		call setwinvar(winnr, '&statusline', '%!Powerline('. winnr .', '. current .')')
-	endfor
+function! Powerline(window_id)
+	let winidx = index(map(range(1, winnr('$')), 's:GetWinID(v:val)'), a:window_id)
+	let current = w:window_id is# a:window_id
+	return s:pyeval('powerline.renderer.render("'. a:window_id .'", '. winidx .', '. current .')')
 endfunction
 
+function! PowerlineNew()
+	return Powerline(s:GetWinID(winnr()))
+endfunction
+
+set statusline=%!PowerlineNew()
+
 function! PowerlineRegisterCachePurgerEvent(event)
 	exec s:powerline_pycmd 'from powerline.segments.vim import launchevent as powerline_launchevent'
 	augroup Powerline
@@ -74,10 +76,7 @@ function! PowerlineRegisterCachePurgerEvent(event)
 	augroup END
 endfunction
 
-let s:last_current_window_id = ''
 augroup Powerline
 	autocmd!
-	autocmd BufEnter,BufWinEnter,WinEnter,CmdwinEnter * call s:UpdateWindows(0) | redrawstatus
-	autocmd CmdwinLeave * call s:UpdateWindows(1)
 	autocmd ColorScheme * exec s:powerline_pycmd 'powerline.renderer.reset_highlight()'
 augroup END
diff --git a/powerline/renderers/vim.py b/powerline/renderers/vim.py
index fabd535b..fdb0bcf8 100644
--- a/powerline/renderers/vim.py
+++ b/powerline/renderers/vim.py
@@ -20,21 +20,19 @@ class VimRenderer(Renderer):
 		super(VimRenderer, self).__init__(*args, **kwargs)
 		self.hl_groups = {}
 
-	def render(self, winnr, current):
+	def render(self, window_id, winidx, current):
 		'''Render all segments.
 
 		This method handles replacing of the percent placeholder for vim
 		statuslines, and it caches segment contents which are retrieved and
 		used in non-current windows.
 		'''
-		window_id = vim_getwinvar(winnr, 'window_id')
 		if current:
 			mode = vim_mode()
 		else:
 			mode = 'nc'
 		segment_info = {
-			'window': vim.windows[winnr - 1],
-			'winnr': winnr,
+			'window': vim.windows[winidx],
 			'mode': mode,
 			'window_id': window_id,
 			}