Commit Graph

187 Commits

Author SHA1 Message Date
krypt-n
ab6fa4c74a Ignore % if not followed by { 2015-02-24 14:05:38 +01:00
krypt-n
3b6b0adc44 Merge branch 'master' into xft-port
* 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
  ...
2015-02-24 14:00:49 +01:00
krypt-n
7f81f57426 Merge branch 'master' of github.com:LemonBoy/bar
* '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
  ...
2015-02-24 13:16:34 +01:00
LemonBoy
d32cd8bce9 Prevent a NULL pointer deference if monitor_create fails 2015-02-18 12:52:24 +01:00
LemonBoy
5186f68658 Fix the 'T' command parsing 2015-02-16 14:22:34 +01:00
LemonBoy
4ee19586a3 Put the elements of rgba_t in the right order. Thanks to @mrshankly for noticing it 2015-02-15 23:54:04 +01:00
Giuseppe
1ef64eab99 Merge pull request #104 from andornaut/patch-1
Document #97 - Nested clickable areas
2015-02-14 00:47:02 +01:00
andornaut
ab3a49962f Document #97 - Nested clickable areas 2015-02-13 18:43:50 -05:00
LemonBoy
8351859593 Support colors in #rrggbb form 2015-02-14 00:32:16 +01:00
LemonBoy
2778c81699 Make bar compile with -Wall and no warning 2015-02-14 00:20:46 +01:00
LemonBoy
d8443785a8 Treat getopt return value as int instead of char. Avoids bar getting stuck in an endless loop on PPC platforms. (Thanks to @electro7) 2015-02-14 00:09:34 +01:00
LemonBoy
704ba652d9 Clean up the code doing color parsing and handling. Implement gradients as a bonus feature (not yet exposed) 2015-02-14 00:06:43 +01:00
LemonBoy
392f23ef36 Strip all the unnecessary stuff when parsing the font list 2015-02-13 14:23:05 +01:00
Giuseppe
7f1f722965 Merge pull request #102 from mrshankly/fix-typo
Fix typo in README.pod about the scroll up/down buttons
2015-02-11 21:15:26 +01:00
João Marques
927c05604c Fix typo in README.pod about the scroll up/down buttons 2015-02-11 20:03:31 +00:00
Giuseppe
0affee3d2f Merge pull request #97 from otommod/stacking-clicks
Allow having clickable areas one inside another
2015-02-11 15:05:33 +01:00
Otto Modinos
8492309a88 change comment style 2015-02-11 14:54:47 +02:00
Otto Modinos
a313800686 move a declaration to the top of the function 2015-02-11 14:53:13 +02:00
Otto Modinos
4ad9cbd823 remove duplicate test 2015-02-11 14:53:12 +02:00
Otto Modinos
bb466a8c16 area_add: Use str directly
I don't why p was used, if there was a reason, please don't merge.
2015-02-11 14:52:44 +02:00
Otto Modinos
3483f1b083 typo, whitin -> within 2015-02-11 14:51:32 +02:00
Otto Modinos
7d2c7ab438 Allow having clickable areas inside another
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.
2015-02-11 14:51:10 +02:00
LemonBoy
e197a15c3a Fix a silly bound-checking error. (#101)
Close a long-standing PR by configuring the window position after mapping it
Set the window title
2015-02-10 20:35:11 +01:00
LemonBoy
6959085f8d Fixed two memory leaks. Don't treat unicode sequences over two bytes long as latin1 codepoints (fixes #99). 2015-01-25 21:14:06 +01:00
Giuseppe
78dc0d0d21 Merge pull request #98 from flannelhead/font-selection
Font selection
2015-01-21 20:12:05 +01:00
Sakari Kapanen
3b8afc6b05 Allow explicitly specifying the font with %{Tindex} 2015-01-21 20:43:22 +02:00
Giuseppe
c39c4e4d8b Merge pull request #95 from jvvv/master
Add break from main loop when X conn has error
2015-01-07 11:32:03 +01:00
John Vogel
145c66b471 Add break from main loop when X conn has error 2015-01-06 18:44:19 -05:00
LemonBoy
5746d15cf8 Handle escaped : in clickable areas. Fixes #92 2014-12-13 12:12:34 +01:00
krypt-n
3d64addd45 Manually applies latest commit from master 2014-11-25 13:17:48 +01:00
krypt-n
585d1633fb Fixes everything being red 2014-11-25 13:16:01 +01:00
LemonBoy
3c2b9ff150 Fix alpha mixing as suggested in #75 2014-11-21 14:19:31 +01:00
krypt-n
4e43c3563b Fixes crash related to last fix 2014-11-20 22:00:11 +01:00
krypt-n
157b7dd28e Merges of-by-one fix 2014-11-20 21:49:30 +01:00
Krypt0n
08d8549e29 Merge pull request #4 from LemonBoy/master
Pulls 95c4138
2014-11-19 09:22:52 +01:00
LemonBoy
95c41381ac Fix a silly off-by-one in the font cache code. Thanks to @easysid for noticing it! 2014-11-18 23:37:43 +01:00
krypt-n
86af874c0b Fixes segfault on color params 2014-11-10 20:33:07 +01:00
krypt-n
0aa0bbf6ff Fixes all non-Wconversion warnings 2014-11-05 21:04:50 +01:00
krypt-n
bb5bc23256 Fixes merging mistake 2014-11-05 20:11:17 +01:00
krypt-n
1c0af0996a Merge branch 'Numeromancer-master' into xft-port
* Numeromancer-master:
  Avoid compiler warning about ignore return from write.
  On input, ignore % w/o a { after.
  Allow colors in the form #RRGGBB (ie w/o alpha).
2014-11-05 20:07:24 +01:00
krypt-n
a0bf113068 Merges fixes 2014-11-05 20:06:56 +01:00
Timothy M. Schaeffer
7d17fa5040 Avoid compiler warning about ignore return from write. 2014-10-30 22:00:24 -04:00
Timothy M. Schaeffer
f07aa2db6f On input, ignore % w/o a { after.
This allows eg “Battery 88%” in the input w/o messing
up the colors.
2014-10-30 21:59:51 -04:00
Timothy M. Schaeffer
f87c249d21 Allow colors in the form #RRGGBB (ie w/o alpha). 2014-10-30 21:58:19 -04:00
krypt-n
2f7408e848 Fixes problem with y offset and right/center alignment 2014-10-09 22:22:28 +02:00
krypt-n
6be47235d4 Fixes multi-monitor drawing 2014-10-09 22:01:23 +02:00
krypt-n
f834c13ea0 Fixes parse-memory leak 2014-10-09 12:58:12 +02:00
krypt-n
3e2e54af90 Restores all xcb_create_window parameters 2014-10-08 23:45:25 +02:00
krypt-n
16b0aa81d1 XCB owns evenqueue 2014-10-08 23:16:48 +02:00
krypt-n
15c668905c Removes unused variables, fixes pointer warning 2014-10-08 23:12:50 +02:00