nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1590 from acrisci/bug/i3bar-no-markup-default 

i3bar: don't parse markup on statusline by default
This commit is contained in:
Michael Stapelberg 2015-03-28 10:08:41 +01:00
parent 856e1f9772 beaf904943
commit af71d3a2f1
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/i3bar-protocol
View File

@ -117,10 +117,8 @@ click_events::
=== Blocks in detail === Blocks in detail
full_text:: full_text::
The most simple block you can think of is one which just includes the The +full_text+ will be displayed by i3bar on the status line. This is the
only required key, the +full_text+ key. i3bar will display the string only required key.
value parsed as
https://developer.gnome.org/pango/stable/PangoMarkupFormat.html[Pango markup].
short_text:: short_text::
Where appropriate, the +short_text+ (string) entry should also be Where appropriate, the +short_text+ (string) entry should also be
provided. It will be used in case the status line needs to be shortened provided. It will be used in case the status line needs to be shortened
@ -174,8 +172,8 @@ separator_block_width::
is 9 pixels), since the separator line is drawn in the middle. is 9 pixels), since the separator line is drawn in the middle.
markup:: markup::
A string that indicates how the text of the block should be parsed. Set to A string that indicates how the text of the block should be parsed. Set to
+"pango"+ to use https://developer.gnome.org/pango/stable/PangoMarkupFormat.html[Pango markup] +"pango"+ to use https://developer.gnome.org/pango/stable/PangoMarkupFormat.html[Pango markup].
(default). Set to +"none"+ to not use any markup. Set to +"none"+ to not use any markup (default).
If you want to put in your own entries into a block, prefix the key with an If you want to put in your own entries into a block, prefix the key with an
underscore (_). i3bar will ignore all keys it doesn’t understand, and prefixing underscore (_). i3bar will ignore all keys it doesn’t understand, and prefixing

3
i3bar/src/child.c
View File

@ -164,9 +164,6 @@ static int stdin_start_map(void *context) {
/* Default width of the separator block. */ /* Default width of the separator block. */
ctx->block.sep_block_width = logical_px(9); ctx->block.sep_block_width = logical_px(9);
/* Use markup by default */
ctx->block.is_markup = true;
return 1; return 1;
} }