224 Commits

Author SHA1 Message Date
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 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 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 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 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 v1.1 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  and 
  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  and 
  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 and 2015-03-03 11:29:35 +01:00
Giuseppe
75dbf3397e Merge pull request from otommod/click-fix
Fix 
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  - 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. () 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 ).
  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  - 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. () 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 ).
  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 from andornaut/patch-1
Document  - Nested clickable areas
2015-02-14 00:47:02 +01:00
andornaut
ab3a49962f Document - 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