Release 2.6

- Added support for new Vim modes.
- Added ability to control output padding.
- Added iTunes player segment.
- Added support for tmux development builds.
- Added a workaround for a fish bug sometimes occurring when using eval from
  config.fish (upstream status unknown).
- Added a workaround for tmux 2.4 bug: excessive CPU usage when having multiple
  panes (also fixed upstream).
- Fixed clean file status support in mercurial.
- Fixed error when battery capacity is zero and using DBus.
- Fixed mercurial command servers leakage.
- Refactored awesome bindings to use powerline daemon.

docs/source/configuration/reference.rst

@@ -215,6 +215,13 @@ Common configuration is a subdictionary that is a value of ``ext`` key in
 
     All components are enabled by default.
 
+.. _config-ext-update_interval:
+
+``update_interval``
+    Determines how often WM status bars need to be updated, in seconds. Only 
+    valid for WM extensions which use ``powerline-daemon``. Defaults to 
+    2 seconds.
+
 .. _config-colors:
 
 Color definitions
@@ -361,6 +368,10 @@ ascii                       Theme without any unicode characters at all
        is set in the local themes it will be ignored. This option may also be 
        ignored in some bindings.
 
+``outer_padding``
+    Defines number of spaces at the end of output (on the right side) or at 
+    the start of output (on the left side). Defaults to ``1``.
+
 
 ``dividers``
     Defines the dividers used in all Powerline extensions.
@@ -391,7 +402,7 @@ ascii                       Theme without any unicode characters at all
     :ref:`display <config-themes-seg-display>`.
 
     Key :ref:`args <config-themes-seg-args>` (only for function and 
-    segments_list segments) is handled specially: unlike other values it is 
+    segment_list segments) is handled specially: unlike other values it is 
     merged with all other values, except that a single ``{module}.{function}`` 
     key if found prevents merging all ``{function}`` values.
 
@@ -428,7 +439,7 @@ ascii                       Theme without any unicode characters at all
 
     ``type``
         The segment type. Can be one of ``function`` (default), ``string`` or 
-        ``segments_list``:
+        ``segment_list``:
 
         ``function``
             The segment contents is the return value of the function defined in 
@@ -443,7 +454,7 @@ ascii                       Theme without any unicode characters at all
             highlighting group is defined in the :ref:`highlight_groups option 
             <config-themes-seg-highlight_groups>`.
 
-        ``segments_list``
+        ``segment_list``
             Sub-list of segments. This list only allows :ref:`function 
             <config-themes-seg-function>`, :ref:`segments 
             <config-themes-seg-segments>` and :ref:`args 
@@ -458,7 +469,7 @@ ascii                       Theme without any unicode characters at all
         Segment name. If present allows referring to this segment in 
         :ref:`segment_data <config-themes-segment_data>` dictionary by this 
         name. If not ``string`` segments may not be referred there at all and 
-        ``function`` and ``segments_list`` segments may be referred there using 
+        ``function`` and ``segment_list`` segments may be referred there using 
         either ``{module}.{function_name}`` or ``{function_name}``, whichever 
         will be found first. Function name is taken from :ref:`function key 
         <config-themes-seg-function>`.

docs/source/installation.rst

@@ -30,7 +30,7 @@ Generic requirements
   with bazaar repositories.
 * ``pyuv`` python package. Required for :ref:`libuv-based watcher 
   <config-common-watcher>` to work.
-* ``i3-ipc`` python package. Required for i3wm bindings and segments.
+* ``i3ipc`` python package. Required for i3wm bindings and segments.
 * ``xrandr`` program. Required for the multi-monitor lemonbar binding and the 
   :py:func:`powerline.listers.i3wm.output_lister`.
 

docs/source/usage/shell-prompts.rst

@@ -111,7 +111,7 @@ following in ``~/.profile``:
 
 .. code-block:: bash
 
-    if test "x$0" != "x${0#dash}" ; then
+    if test "$0" != "${0#dash}" ; then
         export ENV={repository_root}/powerline/bindings/shell/powerline.sh
     fi
 

powerline/__init__.py

@@ -419,6 +419,11 @@ def _get_log_keys(common_config):
 	))
 
 
+DEFAULT_UPDATE_INTERVAL = 2
+'''Default value for :ref:`update_interval <config-ext-update_interval>`
+'''
+
+
 class Powerline(object):
 	'''Main powerline class, entrance point for all powerline uses. Sets 
 	powerline up and loads the configuration.
@@ -514,6 +519,7 @@ def init(self,
 		self.setup_args = ()
 		self.setup_kwargs = {}
 		self.imported_modules = set()
+		self.update_interval = DEFAULT_UPDATE_INTERVAL
 
 	get_encoding = staticmethod(get_preferred_output_encoding)
 	'''Get encoding used by the current application
@@ -638,6 +644,7 @@ def create_renderer(self, load_main=False, load_colors=False, load_colorscheme=F
 					or self.ext_config.get('local_themes') != self.prev_ext_config.get('local_themes')
 				):
 					self.renderer_options['local_themes'] = self.get_local_themes(self.ext_config.get('local_themes'))
+				self.update_interval = self.ext_config.get('update_interval', 2)
 				load_colorscheme = (
 					load_colorscheme
 					or not self.prev_ext_config

powerline/bindings/awesome/powerline-awesome.py

@@ -4,38 +4,17 @@
 
 import sys
 
-from time import sleep
-from subprocess import Popen, PIPE
+from powerline.bindings.wm import DEFAULT_UPDATE_INTERVAL
+from powerline.bindings.wm.awesome import run
 
-from powerline import Powerline
-from powerline.lib.monotonic import monotonic
 
-powerline = Powerline('wm', renderer_module='pango_markup')
-powerline.update_renderer()
+def main():
+	try:
+		interval = float(sys.argv[1])
+	except IndexError:
+		interval = DEFAULT_UPDATE_INTERVAL
+	run(interval=interval)
 
-try:
-	interval = float(sys.argv[1])
-except IndexError:
-	interval = 2
 
-
-def read_to_log(pl, client):
-	for line in client.stdout:
-		if line:
-			pl.info(line, prefix='awesome-client')
-	for line in client.stderr:
-		if line:
-			pl.error(line, prefix='awesome-client')
-	if client.wait():
-		pl.error('Client exited with {0}', client.returncode, prefix='awesome')
-
-
-while True:
-	start_time = monotonic()
-	s = powerline.render(side='right')
-	request = 'powerline_widget:set_markup(\'' + s.replace('\\', '\\\\').replace('\'', '\\\'') + '\')\n'
-	client = Popen(['awesome-client'], shell=False, stdout=PIPE, stderr=PIPE, stdin=PIPE)
-	client.stdin.write(request.encode('utf-8'))
-	client.stdin.close()
-	read_to_log(powerline.pl, client)
-	sleep(max(interval - (monotonic() - start_time), 0.1))
+if __name__ == '__main__':
+	main()

powerline/bindings/awesome/powerline.lua

@@ -6,6 +6,5 @@ powerline_widget:set_align('right')
 
 function powerline(mode, widget) end
 
-bindings_path = string.gsub(debug.getinfo(1).source:match('@(.*)$'), '/[^/]+$', '')
-powerline_cmd = bindings_path .. '/powerline-awesome.py'
-awful.util.spawn_with_shell('ps -C powerline-awesome.py || ' .. powerline_cmd)
+awful.util.spawn_with_shell('powerline-daemon -q')
+awful.util.spawn_with_shell('powerline wm.awesome')

powerline/bindings/bar/powerline-bar.py

@@ -11,6 +11,7 @@
 
 from powerline.lemonbar import LemonbarPowerline
 from powerline.lib.encoding import get_unicode_writer
+from powerline.bindings.wm import DEFAULT_UPDATE_INTERVAL
 
 
 if __name__ == '__main__':
@@ -29,7 +30,7 @@
 
 	def render(reschedule=False):
 		if reschedule:
-			Timer(0.5, render, kwargs={'reschedule': True}).start()
+			Timer(DEFAULT_UPDATE_INTERVAL, render, kwargs={'reschedule': True}).start()
 
 		global lock
 		with lock:

powerline/bindings/bash/powerline.sh

@@ -21,7 +21,7 @@ _powerline_tmux_setenv() {
 }
 
 _powerline_tmux_set_pwd() {
-	if test "x$_POWERLINE_SAVED_PWD" != "x$PWD" ; then
+	if test "$_POWERLINE_SAVED_PWD" != "$PWD" ; then
 		_POWERLINE_SAVED_PWD="$PWD"
 		_powerline_tmux_setenv PWD "$PWD"
 	fi
@@ -39,8 +39,8 @@ _powerline_init_tmux_support() {
 		trap '_powerline_tmux_set_columns' WINCH
 		_powerline_tmux_set_columns
 
-		test "x$PROMPT_COMMAND" != "x${PROMPT_COMMAND/_powerline_tmux_set_pwd}" ||
-			PROMPT_COMMAND="${PROMPT_COMMAND}"$'\n_powerline_tmux_set_pwd'
+		test "$PROMPT_COMMAND" != "${PROMPT_COMMAND/_powerline_tmux_set_pwd}" \
+			|| PROMPT_COMMAND="${PROMPT_COMMAND}"$'\n_powerline_tmux_set_pwd'
 	fi
 }
 
@@ -82,8 +82,8 @@ _powerline_setup_prompt() {
 	if test -z "${POWERLINE_COMMAND}" ; then
 		POWERLINE_COMMAND="$("$POWERLINE_CONFIG_COMMAND" shell command)"
 	fi
-	test "x$PROMPT_COMMAND" != "x${PROMPT_COMMAND%_powerline_set_prompt*}" ||
-		PROMPT_COMMAND=$'_powerline_set_prompt\n'"${PROMPT_COMMAND}"
+	test "$PROMPT_COMMAND" != "${PROMPT_COMMAND%_powerline_set_prompt*}" \
+		|| PROMPT_COMMAND=$'_powerline_set_prompt\n'"${PROMPT_COMMAND}"
 	PS2="$(_powerline_local_prompt left -r.bash 0 0 continuation)"
 	PS3="$(_powerline_local_prompt left '' 0 0 select)"
 }

powerline/bindings/config.py

@@ -99,7 +99,7 @@ def __getattr__(self, attr):
 def init_tmux_environment(pl, args, set_tmux_environment=set_tmux_environment):
 	'''Initialize tmux environment from tmux configuration
 	'''
-	powerline = ShellPowerline(finish_args(os.environ, EmptyArgs('tmux', args.config_path)))
+	powerline = ShellPowerline(finish_args(None, os.environ, EmptyArgs('tmux', args.config_path)))
 	# TODO Move configuration files loading out of Powerline object and use it 
 	# directly
 	powerline.update_renderer()

powerline/bindings/fish/powerline-setup.fish

@@ -34,7 +34,7 @@ function powerline-setup
 			set -g POWERLINE_COMMAND (env $POWERLINE_CONFIG_COMMAND shell command)
 		end
 		function _powerline_set_default_mode --on-variable fish_key_bindings
-			if test x$fish_key_bindings != xfish_vi_key_bindings
+			if test $fish_key_bindings != fish_vi_key_bindings
 				set -g _POWERLINE_DEFAULT_MODE default
 			else
 				set -g -e _POWERLINE_DEFAULT_MODE
@@ -62,7 +62,7 @@ function powerline-setup
 				set rpromptpast
 				set columnsexpr '(_powerline_columns)'
 			end
-			eval "
+			echo "
 			function fish_prompt
 				env \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell $promptside $addargs
 			end
@@ -73,7 +73,7 @@ function powerline-setup
 			function _powerline_set_columns --on-signal WINCH
 				set -g _POWERLINE_COLUMNS $columnsexpr
 			end
-			"
+			" | source
 			_powerline_set_columns
 		end
 		_powerline_set_default_mode

powerline/bindings/rc/powerline.rc

@@ -37,7 +37,7 @@ fn _powerline_common_setup {
 }
 
 fn _powerline_tmux_pane {
-	if (test x$TMUX_PANE '!=' x) {
+	if (test -n $TMUX_PANE) {
 		echo $TMUX_PANE | tr -d ' %'
 	} else {
 		TMUX=$_POWERLINE_TMUX tmux display -p '#D' | tr -d ' %'
@@ -54,9 +54,9 @@ if (test -z $POWERLINE_CONFIG_COMMAND) {
 		echo powerline-config executable not found, unable to proceed >[2=1]
 	}
 }
-if (test x$POWERLINE_CONFIG_COMMAND '!=' x) {
+if (test -n $POWERLINE_CONFIG_COMMAND) {
 	if ($POWERLINE_CONFIG_COMMAND shell --shell rcsh uses prompt) {
-		if (test x$POWERLINE_COMMAND_ARGS '!=' x) {
+		if (test -n $POWERLINE_COMMAND_ARGS) {
 			# Perform splitting
 			POWERLINE_COMMAND_ARGS=( `{echo $POWERLINE_COMMAND_ARGS} )
 		}
@@ -75,11 +75,11 @@ if (test x$POWERLINE_CONFIG_COMMAND '!=' x) {
 		}
 		_powerline_common_setup
 	}
-	if (test x$TMUX '!=' x) {
+	if (test -n $TMUX) {
 		if ($POWERLINE_CONFIG_COMMAND shell --shell rcsh uses tmux) {
 			_POWERLINE_TMUX=$TMUX
 			fn _powerline_tmux_setenv {
-				if (test x$2 '!=' x) {
+				if (test -n $2) {
 					TMUX=$_POWERLINE_TMUX tmux setenv -g TMUX_$1^_`{
 						_powerline_tmux_pane
 					} $2

powerline/bindings/shell/powerline.sh

@@ -115,7 +115,7 @@ _powerline_tmux_setenv() {
 }
 
 _powerline_tmux_set_pwd() {
-	if test "x$_POWERLINE_SAVED_PWD" != "x$PWD" ; then
+	if test "$_POWERLINE_SAVED_PWD" != "$PWD" ; then
 		_POWERLINE_SAVED_PWD="$PWD"
 		_powerline_tmux_setenv PWD "$PWD"
 	fi

powerline/bindings/tmux/__init__.py

@@ -76,6 +76,8 @@ def get_tmux_version(pl):
 	version_string = get_tmux_output(pl, '-V')
 	_, version_string = version_string.split(' ')
 	version_string = version_string.strip()
+	if version_string == 'master':
+		return TmuxVersionInfo(float('inf'), 0, version_string)
 	major, minor = version_string.split('.')
 	suffix = DIGITS.subn('', minor)[0] or None
 	minor = NON_DIGITS.subn('', minor)[0]

powerline/bindings/tmux/powerline-base.conf

@@ -1,11 +1,11 @@
 set -g status on
 set -g status-interval 2
 set -g status-left-length 20
-set -g status-right '#(env "$POWERLINE_COMMAND" $POWERLINE_COMMAND_ARGS tmux right -R pane_id=\"`tmux display -p "#D"`\")'
+set -g status-right '#(env "$POWERLINE_COMMAND" $POWERLINE_COMMAND_ARGS tmux right -R pane_id=\"`tmux display -p "#""D"`\")'
 set -g status-right-length 150
 set -g window-status-format "#[$_POWERLINE_WINDOW_COLOR]$_POWERLINE_LEFT_HARD_DIVIDER_SPACES#I#F #[$_POWERLINE_WINDOW_DIVIDER_COLOR]$_POWERLINE_LEFT_SOFT_DIVIDER#[default]#W $_POWERLINE_LEFT_HARD_DIVIDER_SPACES"
 set -g window-status-current-format "#[$_POWERLINE_WINDOW_CURRENT_HARD_DIVIDER_COLOR]$_POWERLINE_LEFT_HARD_DIVIDER#[$_POWERLINE_WINDOW_CURRENT_COLOR]#I#F $_POWERLINE_LEFT_SOFT_DIVIDER#[$_POWERLINE_WINDOW_NAME_COLOR]#W #[$_POWERLINE_WINDOW_CURRENT_HARD_DIVIDER_NEXT_COLOR]$_POWERLINE_LEFT_HARD_DIVIDER"
 
 # Legacy status-left definition to be overwritten for tmux Versions 1.8+
-set -g status-left "#[$_POWERLINE_SESSION_COLOR] #S #[$_POWERLINE_SESSION_HARD_DIVIDER_NEXT_COLOR]$_POWERLINE_LEFT_HARD_DIVIDER#(env \"\$POWERLINE_COMMAND\" tmux left -R pane_id=\"`tmux display -p '#D'`\")"
+set -g status-left "#[$_POWERLINE_SESSION_COLOR] #S #[$_POWERLINE_SESSION_HARD_DIVIDER_NEXT_COLOR]$_POWERLINE_LEFT_HARD_DIVIDER#(env \"\$POWERLINE_COMMAND\" tmux left -R pane_id=\"`tmux display -p '#''D'`\")"
 # vim: ft=tmux

powerline/bindings/tmux/powerline_tmux_1.7_plus.conf

@@ -1,3 +1,3 @@
-set -g status-right '#(env "$POWERLINE_COMMAND" $POWERLINE_COMMAND_ARGS tmux right -R pane_id="`tmux display -p "#D"`" --width=`tmux display -p "#{client_width}"` -R width_adjust=`tmux show-options -g status-left-length | cut -d" " -f 2`)'
-set -g status-left "#[$_POWERLINE_SESSION_COLOR] #S #[$_POWERLINE_SESSION_HARD_DIVIDER_NEXT_COLOR]$_POWERLINE_LEFT_HARD_DIVIDER#(env \"\$POWERLINE_COMMAND\" tmux left --width=`tmux display -p '#{client_width}'` -R width_adjust=`tmux show-options -g status-right-length | cut -d' ' -f2` -R pane_id=\"`tmux display -p '#D'`\")"
+set -g status-right '#(env "$POWERLINE_COMMAND" $POWERLINE_COMMAND_ARGS tmux right -R pane_id="`tmux display -p "#""D"`" --width=`tmux display -p "#""{client_width}"` -R width_adjust=`tmux show-options -g status-left-length | cut -d" " -f 2`)'
+set -g status-left "#[$_POWERLINE_SESSION_COLOR] #S #[$_POWERLINE_SESSION_HARD_DIVIDER_NEXT_COLOR]$_POWERLINE_LEFT_HARD_DIVIDER#(env \"\$POWERLINE_COMMAND\" tmux left --width=`tmux display -p '#''{client_width}'` -R width_adjust=`tmux show-options -g status-right-length | cut -d' ' -f2` -R pane_id=\"`tmux display -p '#''D'`\")"
 # vim: ft=tmux

powerline/bindings/tmux/powerline_tmux_1.8_plus.conf

@@ -1,5 +1,5 @@
 # powerline_tmux_1.8_plus.conf
 # tmux Version 1.8 introduces the 'client_prefix' format variable, applicable
 # for versions 1.8+
-set -qg status-left "#{?client_prefix,#[fg=$_POWERLINE_SESSION_PREFIX_FG]#[bg=$_POWERLINE_SESSION_PREFIX_BG]#[$_POWERLINE_SESSION_PREFIX_ATTR],#[fg=$_POWERLINE_SESSION_FG]#[bg=$_POWERLINE_SESSION_BG]#[$_POWERLINE_SESSION_ATTR]} #S #{?client_prefix,#[fg=$_POWERLINE_SESSION_PREFIX_BG],#[fg=$_POWERLINE_SESSION_BG]}#[bg=$_POWERLINE_BACKGROUND_BG]#[nobold]$_POWERLINE_LEFT_HARD_DIVIDER#(env \$POWERLINE_COMMAND \$POWERLINE_COMMAND_ARGS tmux left --width=`tmux display -p '#{client_width}'` -R width_adjust=`tmux show-options -g status-right-length | cut -d' ' -f2` -R pane_id=\"`tmux display -p '#D'`\")"
+set -qg status-left "#{?client_prefix,#[fg=$_POWERLINE_SESSION_PREFIX_FG]#[bg=$_POWERLINE_SESSION_PREFIX_BG]#[$_POWERLINE_SESSION_PREFIX_ATTR],#[fg=$_POWERLINE_SESSION_FG]#[bg=$_POWERLINE_SESSION_BG]#[$_POWERLINE_SESSION_ATTR]} #S #{?client_prefix,#[fg=$_POWERLINE_SESSION_PREFIX_BG],#[fg=$_POWERLINE_SESSION_BG]}#[bg=$_POWERLINE_BACKGROUND_BG]#[nobold]$_POWERLINE_LEFT_HARD_DIVIDER#(env \$POWERLINE_COMMAND \$POWERLINE_COMMAND_ARGS tmux left --width=`tmux display -p '#''{client_width}'` -R width_adjust=`tmux show-options -g status-right-length | cut -d' ' -f2` -R pane_id=\"`tmux display -p '#''D'`\")"
 # vim: ft=tmux

powerline/bindings/tmux/powerline_tmux_2.1_plus.conf

@@ -1,2 +1,3 @@
 # Starting from tmux-2.1 escaping of dollar signs inside #() is harmful
-set -qg status-left "#{?client_prefix,#[fg=$_POWERLINE_SESSION_PREFIX_FG]#[bg=$_POWERLINE_SESSION_PREFIX_BG]#[$_POWERLINE_SESSION_PREFIX_ATTR],#[fg=$_POWERLINE_SESSION_FG]#[bg=$_POWERLINE_SESSION_BG]#[$_POWERLINE_SESSION_ATTR]} #S #{?client_prefix,#[fg=$_POWERLINE_SESSION_PREFIX_BG],#[fg=$_POWERLINE_SESSION_BG]}#[bg=$_POWERLINE_BACKGROUND_BG]#[nobold]$_POWERLINE_LEFT_HARD_DIVIDER#(env $POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS tmux left --width=`tmux display -p '#{client_width}'` -R width_adjust=`tmux show-options -g status-right-length | cut -d' ' -f2` -R pane_id=\"`tmux display -p '#D'`\")"
+set -qg status-left "#{?client_prefix,#[fg=$_POWERLINE_SESSION_PREFIX_FG]#[bg=$_POWERLINE_SESSION_PREFIX_BG]#[$_POWERLINE_SESSION_PREFIX_ATTR],#[fg=$_POWERLINE_SESSION_FG]#[bg=$_POWERLINE_SESSION_BG]#[$_POWERLINE_SESSION_ATTR]} #S #{?client_prefix,#[fg=$_POWERLINE_SESSION_PREFIX_BG],#[fg=$_POWERLINE_SESSION_BG]}#[bg=$_POWERLINE_BACKGROUND_BG]#[nobold]$_POWERLINE_LEFT_HARD_DIVIDER#(env $POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS tmux left --width=`tmux display -p '#''{client_width}'` -R width_adjust=`tmux show-options -g status-right-length | cut -d' ' -f2` -R pane_id=\"`tmux display -p '#''D'`\")"
+set -g window-status-format "#[$_POWERLINE_WINDOW_COLOR]$_POWERLINE_LEFT_HARD_DIVIDER_SPACES#I#{?window_flags,#F, } #[$_POWERLINE_WINDOW_DIVIDER_COLOR]$_POWERLINE_LEFT_SOFT_DIVIDER#[default]#W $_POWERLINE_LEFT_HARD_DIVIDER_SPACES"

powerline/bindings/wm/__init__.py

@@ -5,6 +5,10 @@
 
 from powerline.theme import requires_segment_info
 from powerline.lib.shell import run_cmd
+from powerline.bindings.wm.awesome import AwesomeThread
+
+
+DEFAULT_UPDATE_INTERVAL = 0.5
 
 
 conn = None
@@ -36,3 +40,8 @@ def get_connected_xrandr_outputs(pl):
 	return (match.groupdict() for match in XRANDR_OUTPUT_RE.finditer(
 	    run_cmd(pl, ['xrandr', '-q'])
 	))
+
+
+wm_threads = {
+	'awesome': AwesomeThread,
+}