Brenden Matthews
ddef05d4eb
Update version, copyright.
2012-05-03 16:34:44 -07:00
Pavel Labath
43d81169f6
Use initializer list for member initialization
2010-11-26 18:03:41 +01:00
Nikolas Garofil
99c359b212
Fix displaying UTF-8 without XFT
2010-11-26 17:59:07 +01:00
Pavel Labath
cd5e3f8fa0
Make font and xftalpha lua settings
2010-09-08 17:30:04 +02:00
Pavel Labath
00e91d8c31
Merge remote branch 'origin/master' into lua-config
...
Conflicts:
src/conky.cc
src/x11.cc
2010-04-22 21:17:14 +02:00
Pavel Labath
927394505c
Make use_xft a lua setting
2010-04-21 19:33:39 +02:00
Pavel Labath
405a175366
add vi modeline
2010-03-12 19:05:59 +01:00
Pavel Labath
54630eb39e
Header housekeeping: remove unneeded extern "C", add modelines, add inclusion guards
...
hopefully, this doesn't break anything
2010-02-25 21:50:50 +01:00
Brenden Matthews
7e78f036f0
Use consistent naming for build option macros.
...
Probably have broken some build features with this commit.
2010-01-06 18:39:44 -08:00
Brenden Matthews
cf9e498b24
Update copyright notices.
2010-01-01 15:46:17 -08:00
Brenden Matthews
b6331b4eb6
Switch some more bits to C++, more CMake changes.
2009-12-09 20:05:32 -08:00
Brenden Matthews
043cf686c6
Revert "Uhh..ansohus"
...
This reverts commit 9827726ae5
.
Or this.
2009-08-07 01:24:24 -06:00
Brenden Matthews
098e28598f
Revert "auesnthaeou"
...
This reverts commit 70adc04fc2
.
Oops, didn't mean to push this. I'll start a new branch now (so I don't
do this again...).
2009-08-07 01:21:56 -06:00
Brenden Matthews
70adc04fc2
auesnthaeou
2009-08-06 21:56:40 -06:00
Brenden Matthews
9827726ae5
Uhh..ansohus
2009-08-06 00:54:40 -06:00
Cesare Tirabassi
81c691d15a
add emacs indentation variables to source files in line with current vim settings
2009-07-28 23:44:22 +02:00
Brenden Matthews
1571bb1aad
Fix regression with loading of non-Xft fonts (sf.net #2804324 ).
2009-06-10 14:08:39 -06:00
Brenden Matthews
00e559aef8
reload_config() fix, fix default net graph args.
...
Closing the X display on reload caused some weirdness. We can just
leave it open between reloads. For whatever reason we had a macro
inside quotes for the default net device.
2009-06-06 22:53:40 -06:00
Brenden Matthews
8686ce0347
Apparently some people want more than 64 fonts.
2009-06-06 02:13:42 -06:00
Nikolas Garofil
c91e2ed38e
Make sure that no X11 stuff is in the binary when not requested
2009-05-31 16:48:16 +02:00
Brenden Matthews
f05829ad9a
Update copyright stuff, fix conky.conf weirdness.
2009-03-29 22:55:51 -06:00
Phil Sutter
e28f79a133
split off specials from conky.c
...
As a side effect, font and colour specific stuff got outsourced, too.
This is because the apropriate functions are used by conky.c as well as
specials.c, so they should be kept on their own.
In the long term I hope for positive impact on the X11 integration mess.
(Take e.g. the mass of X11 ifdefs cluttering conky.c.) Though this
commit contains no optimisations in this direction, just plain
outsourcing, to ensure minimised (intended: none) changes to conky's
interface behaviour.
2009-02-22 19:04:33 +01:00