Commit Graph

234 Commits

Author SHA1 Message Date
krypt-n
4d164f3083 Remove return NULL from function returning void
gcc didnt catch that. clang did
2015-11-15 22:31:05 +01:00
krypt-n
62d5338277 Merge branch 'scroll-fix' into xft-port
* scroll-fix:
  Fix LemonBoy/bar#154 and krypt-n/bar#18
2015-11-15 13:30:05 +01:00
krypt-n
da26209013 Fix LemonBoy/bar#154 and krypt-n/bar#18
Widening the bitfield by 1 would be a solution aswell.
Problem was that an int:3 has a range of -4 to 3, buttons 4 and 5 did not
fit into it
2015-11-15 13:24:36 +01:00
krypt-n
2f66bb1407 Merge remote-tracking branch 'upstream/master' into xft-port
* upstream/master:
  Prevent load_font calls before connecting to X
  The WM_NAME option takes an argument
  Allow the user to set the WM_NAME atom value
  Warn the user when the area geometry is invalid
  Make the number of clickable areas configurable.
  Don't parse named colors. Expand #rgb format.
2015-11-02 13:49:43 +01:00
LemonBoy
2c0f57c584 Prevent load_font calls before connecting to X 2015-10-30 16:11:22 +01:00
Bastien Dejean
3b5baa93b1 The WM_NAME option takes an argument 2015-10-30 16:11:22 +01:00
LemonBoy
531c575575 Allow the user to set the WM_NAME atom value 2015-10-24 14:44:41 +02:00
LemonBoy
6580e2d4f7 Warn the user when the area geometry is invalid 2015-10-24 14:35:36 +02:00
LemonBoy
255c93dc7a Make the number of clickable areas configurable. 2015-10-24 14:28:51 +02:00
LemonBoy
38422c5014 Don't parse named colors. Expand #rgb format. 2015-10-24 14:04:37 +02:00
krypt-n
882c0bc57d Merge remote-tracking branch 'upstream/master' into xft-port
* upstream/master:
  Account for height of monitors in sorting.
  bar -> lemonbar in .gitignore, remove config.h in .gitignore
  Rewrite *p, *(p+1) as p[0], p[1] for readability.
  Keep percent signs if not followed by {} block.
2015-10-21 20:28:00 +02:00
Giuseppe
1585d7257d Merge pull request #150 from neeasade/monitor_sort
Fix monitor sorting with mix of portrait and landscape layout.
2015-10-21 19:30:56 +02:00
Nathan Isom
7f8a79131b Account for height of monitors in sorting. 2015-10-21 12:24:04 -05:00
neeasade
177deb0860 bar -> lemonbar in .gitignore, remove config.h in .gitignore 2015-10-20 19:56:29 -05:00
Giuseppe
b331ee3927 Merge pull request #137 from chadvoegele/master
Keep percent signs if not followed by {} block.
2015-10-10 16:00:40 +02:00
chad
71ed0d3375 Rewrite *p, *(p+1) as p[0], p[1] for readability. 2015-09-27 15:21:49 -05:00
Chad Voegele
63a55dd06c Keep percent signs if not followed by {} block.
The before code would skip a percent sign even if it was not followed by a {}
block. The after code checks the same condition but only advances p if a {} block
is found and otherwise passes it through as text.
2015-09-27 15:16:56 -05:00
krypt-n
020a3e1848 Merge remote-tracking branch 'upstream/master' into xft-port
* upstream/master:
  Conform to coding standard and errors
  Fixed font selection
2015-07-23 21:05:21 +02:00
Giuseppe
a390ef6a5c Merge pull request #132 from krypt-n/font-count-fix
Don't exceed maximum number of fonts
2015-07-22 23:07:45 +02:00
Giuseppe
04d22b4ae5 Merge pull request #141 from DelusionalLogic/master
Fixed font selection
2015-07-22 23:04:30 +02:00
Jesper Jensen
73d8c58286 Conform to coding standard and errors
An error will not be printed if the parameter to `T` is not valid (- or
a number) and the token will be eaten (just like when an invalid
attribute is found)
2015-07-22 22:55:06 +02:00
Jesper Jensen
49fdc25f37 Fixed font selection
Font selection now correctly handles - as a special case.

This change is also reflected in the documentation.
2015-07-22 17:39:31 +02:00
krypt-n
088ddb6b51 Implements same check for offsets, moves offset adding to seperate
function
2015-06-02 09:38:31 +02:00
krypt-n
61ffd9e35e Merge branch 'font-count-fix' into xft-port
* font-count-fix:
  Check force_count to be lower than MAX_FONT_COUNT
2015-06-02 09:32:26 +02:00
krypt-n
a8fa2766fb Check force_count to be lower than MAX_FONT_COUNT 2015-06-02 09:27:53 +02:00
krypt-n
c9f1425cac Adds per font -o 2015-06-02 09:03:55 +02:00
krypt-n
a707113b55 Merge remote-tracking branch 'upstream/master' into xft-port
* 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
2015-06-02 08:44:28 +02:00
LemonBoy
a9f285fd28 Update the usage text
The -f option doesn't accept a comma separated list of font names anymore
2015-05-03 17:06:36 +02:00
LemonBoy
7880eac8c9 Minor change to -f handling
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.
2015-04-23 23:07:42 +02:00
LemonBoy
25c3441925 travis: Run a apt-get update before installing the needed packages 2015-04-15 11:04:53 +02:00
LemonBoy
b82d96a68e Use the maximum width reported by the font if the attributes table isn't found 2015-04-15 10:21:52 +02:00
krypt-n
b95a7dfc88 Makes -o work with bitmap fonts 2015-03-30 18:53:53 +02:00
krypt-n
7708d363d7 Updates binary name in gitignore 2015-03-30 18:50:00 +02:00
Juan Luis Boya García
4f60256cd1 Allow to add a vertical offset to the text 2015-03-30 15:38:04 +02:00
Juan Luis Boya García
a683a72a5b Allow to add a vertical offset to the text 2015-03-30 15:31:52 +02:00
krypt-n
06136a641e Merge branch 'master' into xft-port
* master:
  Minor spelling errors
  Change the project name to lemonbar
  Remove the now useless palette.pl script
2015-03-16 14:39:07 +01:00
krypt-n
854af9cbad Merge branch 'master' of github.com:LemonBoy/bar
* 'master' of github.com:LemonBoy/bar:
  Minor spelling errors
  Change the project name to lemonbar
  Remove the now useless palette.pl script
2015-03-16 14:35:05 +01:00
LemonBoy
ebb625b529 Minor spelling errors 2015-03-15 21:35:54 +01:00
LemonBoy
72106b17b1 Change the project name to lemonbar 2015-03-14 13:51:29 +01:00
LemonBoy
19167c2e55 Remove the now useless palette.pl script 2015-03-08 19:45:47 +01:00
krypt-n
ca190220b4 Adds background transparency 2015-03-04 20:06:09 +01:00
krypt-n
9323151793 Merge branch 'master' into xft-port
* master:
  Fix a silly error when redrawing the background. Fixes #108 and #82
  fix non left alignments causing wrong clicks
2015-03-03 15:34:02 +01:00
krypt-n
eb5d99467d Merge branch 'master' of github.com:LemonBoy/bar
* 'master' of github.com:LemonBoy/bar:
  Fix a silly error when redrawing the background. Fixes #108 and #82
  fix non left alignments causing wrong clicks
2015-03-03 15:28:28 +01:00
LemonBoy
fe4ff881dd Fix a silly error when redrawing the background. Fixes #108 and #82 2015-03-03 11:29:35 +01:00
Giuseppe
75dbf3397e Merge pull request #106 from otommod/click-fix
Fix #105
2015-02-27 15:53:19 +01:00
Otto Modinos
eeb88f8ae0 fix non left alignments causing wrong clicks 2015-02-27 15:57:19 +02:00
krypt-n
bcc4d97a1f Removes old utf handling 2015-02-24 14:09:23 +01:00
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