* upstream/master:
Update the usage text
Minor change to -f handling
travis: Run a apt-get update before installing the needed packages
Use the maximum width reported by the font if the attributes table isn't found
Remove the ability of the -f switch to accept a comma-separated list of fonts. The user is expected
to use multiple times -f whenever he wants to specify one or more fonts. This has the side effect of
enabling the user to use fonts whose name contains a comma.
* master: (22 commits)
Prevent a NULL pointer deference if monitor_create fails
Fix the 'T' command parsing
Put the elements of rgba_t in the right order. Thanks to @mrshankly for noticing it
Document #97 - Nested clickable areas
Support colors in #rrggbb form
Make bar compile with -Wall and no warning
Treat getopt return value as int instead of char. Avoids bar getting stuck in an endless loop on PPC platforms. (Thanks to @electro7)
Clean up the code doing color parsing and handling. Implement gradients as a bonus feature (not yet exposed)
Strip all the unnecessary stuff when parsing the font list
Fix typo in README.pod about the scroll up/down buttons
change comment style
move a declaration to the top of the function
remove duplicate test
area_add: Use str directly
typo, whitin -> within
Allow having clickable areas inside another
Fix a silly bound-checking error. (#101) Close a long-standing PR by configuring the window position after mapping it Set the window title
Fixed two memory leaks. Don't treat unicode sequences over two bytes long as latin1 codepoints (fixes#99).
Allow explicitly specifying the font with %{Tindex}
Add break from main loop when X conn has error
...
* 'master' of github.com:LemonBoy/bar: (22 commits)
Prevent a NULL pointer deference if monitor_create fails
Fix the 'T' command parsing
Put the elements of rgba_t in the right order. Thanks to @mrshankly for noticing it
Document #97 - Nested clickable areas
Support colors in #rrggbb form
Make bar compile with -Wall and no warning
Treat getopt return value as int instead of char. Avoids bar getting stuck in an endless loop on PPC platforms. (Thanks to @electro7)
Clean up the code doing color parsing and handling. Implement gradients as a bonus feature (not yet exposed)
Strip all the unnecessary stuff when parsing the font list
Fix typo in README.pod about the scroll up/down buttons
change comment style
move a declaration to the top of the function
remove duplicate test
area_add: Use str directly
typo, whitin -> within
Allow having clickable areas inside another
Fix a silly bound-checking error. (#101) Close a long-standing PR by configuring the window position after mapping it Set the window title
Fixed two memory leaks. Don't treat unicode sequences over two bytes long as latin1 codepoints (fixes#99).
Allow explicitly specifying the font with %{Tindex}
Add break from main loop when X conn has error
...
Previously, if you started several areas, one inside another, only the
inermost one would get registered and eventually triggered. This patch
fixes that, allowing you to use multiple areas around text to respond to
several different buttons, for example, both scroll-up and scroll-down.
If you define two areas that respond to the same button, only the
innermost one would get triggered. I think this makes sense.
