Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00
Code Issues Releases Activity
2,170 Commits 5 Branches 46 Tags 22 MiB
c4a0916e6b
Commit Graph

1552 Commits

Author SHA1 Message Date
Pavel Labath
7bec4e0be8 Try to make $if_match better handle stranger inputs 
This should fix sf.net #2953283
 2010-02-17 19:45:22 +01:00
Pavel Labath
3b7454fd9b Try to make $if_match better handle stranger inputs 
This should fix sf.net #2953283
 2010-02-17 19:44:22 +01:00
Ben Kibbey
edaf742295 Added AF_UNIX socket support. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-02-17 09:32:01 -08:00
Ben Kibbey
93d8b01f48 Added AF_UNIX socket support. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-02-17 09:31:52 -08:00
Cesare Tirabassi
2c33e6e565 Fix last commit which fails to build when X11 is not enabled 
(cherry picked from commit 925e80ac11)
 2010-02-17 12:43:53 +01:00
Cesare Tirabassi
925e80ac11 Fix last commit which fails to build when X11 is not enabled 2010-02-17 12:38:05 +01:00
Nikolas Garofil
ac6dff791f Fix wrong mixer values on some systems (thanks hoffa) 2010-02-12 18:57:22 +01:00
Nikolas Garofil
29ef435c8f Fix wrong mixer values on some systems (thanks hoffa) 2010-02-12 18:57:02 +01:00
Nikolas Garofil
656177e0de Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock 2010-02-12 03:04:25 +01:00
Nikolas Garofil
96c059773b Warn at wrong alignment setting and make sure it's disabled when the windowtype is dock 2010-02-12 03:03:31 +01:00
Pavel Labath
6526b47b2c Fix compilation without --enable-argb 
Bug reported by zaphire
 2010-02-03 22:38:15 +01:00
Pavel Labath
ab55088784 Fix compilation without --enable-argb 
Bug reported by zaphire
 2010-02-03 22:36:04 +01:00
Cesare Tirabassi
d2ce1d2909 Replaces commit 44e3708cdb 
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
(cherry picked from commit 1eedf2633b)
 2010-01-31 21:00:37 +01:00
Cesare Tirabassi
1eedf2633b Replaces commit 44e3708cdb 
Thanks to ichelm610x for the patch.
I just added memoization to reduce the impact of the many system calls.
 2010-01-31 20:57:02 +01:00
Cesare Tirabassi
da510d34a6 Extend commit 2568030509 to the whole cpu object. 
This is still a workaround, the underlining starvation issue remains
unsolved.
(cherry picked from commit 99fd8ef380)
 2010-01-31 12:00:29 +01:00
Cesare Tirabassi
99fd8ef380 Extend commit 2568030509 to the whole cpu object. 
This is still a workaround, the underlining starvation issue remains
unsolved.
 2010-01-31 11:57:09 +01:00
Cesare Tirabassi
9e5739e612 Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?) 2010-01-30 19:27:01 +01:00
Cesare Tirabassi
9601693afa Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0 2010-01-30 19:24:19 +01:00
Cesare Tirabassi
d620ac6f0f Modify last commit to keep compiler happy since it claims devbuf can never be null (should we really trust gcc that much?) 2010-01-30 19:23:31 +01:00
Pavel Labath
44a4ffae91 Merge branch '1.8.0' into 1.8.1 2010-01-30 17:56:22 +01:00
Pavel Labath
fcc6524db2 Fix small logic error in diskiograph_read/write 2010-01-30 17:48:03 +01:00
Cesare Tirabassi
3db07e589f Fix diskio total computation for kernel > 2.6.31 (sf: #2942117) 
(cherry picked from commit 44e3708cdb)
 2010-01-30 14:24:40 +01:00
Brenden Matthews
8cb56def23 Only ever fork() once. 
(cherry picked from commit 000acfe0fd)
 2010-01-30 14:24:06 +01:00
Cesare Tirabassi
44e3708cdb Fix diskio total computation for kernel > 2.6.31 (sf: #2942117) 2010-01-30 14:19:38 +01:00
Brenden Matthews
c5925930c3 Merge branch '1.8.0' into 1.8.1 
Conflicts:
	src/conky.c
 2010-01-26 13:05:59 -08:00
Brenden Matthews
000acfe0fd Only ever fork() once. 2010-01-26 13:05:04 -08:00
Brenden Matthews
61ad0c2159 Only pause during startup, not after reload. 2010-01-26 12:39:15 -08:00
Brenden Matthews
0ae9108874 Only pause during startup, not after reload. 2010-01-26 12:37:16 -08:00
Pavel Labath
60a6194b84 Add optional argument to $acpiacadapter 
The exact location of the state information seems hardware dependent, so this adds the option to
specify it manually. (linux only)
 2010-01-24 16:12:31 +01:00
Pavel Labath
f5363b6539 Add optional argument to $acpiacadapter 
The exact location of the state information seems hardware dependent, so this adds the option to
specify it manually. (linux only)
 2010-01-24 16:11:55 +01:00
Pavel Labath
ecbfe50ac7 Make conky not crash when drawing on root window 
It was failing in XQueryColor because colourmap was NULL. This seemed to help.
 2010-01-20 00:07:34 +01:00
Pavel Labath
fb1ff85d05 Make conky not crash when drawing on root window 
It was failing in XQueryColor because colourmap was NULL. This seemed to help.
 2010-01-20 00:06:16 +01:00
Pavel Labath
349f5fc1c6 Another off-by-one found by valgrind. 2010-01-17 19:51:00 +01:00
Pavel Labath
bdc8200a21 Another off-by-one found by valgrind. 2010-01-17 19:49:35 +01:00
Dmitry Marakasov
1fa1476970 Add SMP support for FreeBSD. 
Original patch written by Ivan Klymenko <fidaj@ukr.net>.

Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-01-16 10:53:19 -08:00
Nikolas Garofil
a218eb70ef signed to unsigned before comparing 2010-01-16 04:01:49 +01:00
Pavel Labath
a3aa80cab7 Fix "off-by-one" bug in hddtemp found by valgrind 2010-01-15 23:44:39 +01:00
Pavel Labath
ca9ebd9504 Fix $execbar et al. 2010-01-07 22:27:25 +01:00
Brenden Matthews
dc55c7d0a9 Fix small logic error in diskio. 2010-01-06 10:18:48 -08:00
Cesare Tirabassi
8a93c54abe Fix sigsegv if cpu_usage has not yet been populated 2010-01-05 17:08:20 +01:00
Brenden Matthews
bbb267586a Fix some minor memleaks, fix crash on reload. 
It seems that closing xft fonts on reload is a bad idea, but this seems
to result in a memory leak.  As far as I can tell, the leak doesn't grow
beyond the initial allocation however.
 2010-01-02 14:43:23 -08:00
Brenden Matthews
82614ebb22 Added disable_auto_reload option, callback fixes. 
There were some issues with reloading and the threaded callback
framework, which I think are mostly resolved now, but may need more
testing.
 2010-01-02 13:33:17 -08:00
Brenden Matthews
137c900701 Fix reload problem with ARGB. 2010-01-02 12:12:21 -08:00
Brenden Matthews
62f1e47f4a Improve handling of ARGB visuals a bit. 2010-01-02 11:38:44 -08:00
Brenden Matthews
3ecf91ff9b Fix build error for IBM/smapi support. 2010-01-02 10:39:45 -08:00
Cesare Tirabassi
9ba34190c7 The HAPPY NEW YEAR commit 
This should close sf #2850092.
Basically, before this change, for strings which includes
SECRIT_MULTILINE_CHAR the computed maximum substring width was getting
summed to the width of the last substring.
The old behaviour is kept but for the case of strings including
SECRIT_MULTILINE_CHAR, for which now the maximum width of all substrings
is taken.
I don't think this will break anything else but blame me if it does ...
(cherry picked from commit 72bbe51a8c)
 2010-01-02 14:45:12 +01:00
Brenden Matthews
f1b69e26a2 Update copyright notices. 2010-01-01 15:45:11 -08:00
danielb
0de060f8dd Add ARGB visual support. 
This patch adds the possibility to use a argb visual for the conky
window.  Adding a boolean configuration entry 'own_window_argb_visual'.
the 'set_transparent_background' method sets the alpha bytes of the argb
color for transparency, instead of pseudo transparency.  This patch
would close following feature request:
https://sourceforge.net/tracker/?func=detail&aid=1563931&group_id=143975&at
id=757311 and would be a workaround for some reported transparency bugs
(https://sourceforge.net/tracker/?func=detail&aid=1968923&group_id=143975&a
tid=757308 for example)

Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-01-01 15:01:51 -08:00
Ben Kibbey
2e4f58d565 $scroll fix for a text length <= length 
This fixes $scroll to only scroll when the text length is greater than
the specified length; hopefully without breaking anything.

Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-01-01 14:55:45 -08:00
Ben Kibbey
c2e8734cb3 Fix hddtemp with disabled drives. 
Some drives are unable to return their temperature when in standby mode.
If there is more than one drive installed then other drives may not be
able to get parsed. This patch will skip over the unparsable output for
the current drive and let others get parsed.

Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-01-01 14:55:39 -08:00
Phil Sutter
a94b2ec5a1 simplify this conditional a bit 2009-12-13 03:47:26 +01:00
Pavel Labath
3ed13c3cd1 Fix race condition in update_stat() 2009-12-11 22:57:22 +01:00
Pavel Labath
e5b66d7a7f Remove some strange network related code 
Reported by norsetto.
This code disallows network traffic to be 0.
Brenden says it once had a purpose, but noone can think of what would that be atm.
 2009-12-07 21:32:22 +01:00
Nikolas Garofil
4652e834b1 Add support for max_text_width configuration setting 2009-11-25 16:04:49 +01:00
Nikolas Garofil
4c4770eb77 Fix: $scroll,$if_running and $apcupsd_lastxfer can now have long arguments if text_buffer_size is increased 2009-11-24 13:23:58 +01:00
Nikolas Garofil
b2987b9354 Fix: Templates only work when they end with a space or a } 2009-11-23 12:58:20 +01:00
Nikolas Garofil
fb3c59baec Fix building with --disable-x11 2009-11-22 23:05:08 +01:00
Phil Sutter
970420106c fix new_graph parameters 
One should never print into buffers without knowing their size. Although
new_graph consumes only a single char, this may already be too much.
 2009-11-22 21:12:54 +01:00
Phil Sutter
346b4cfbc1 move get_x11_color() to colours.c 2009-11-22 21:07:42 +01:00
Nikolas Garofil
6ee76e5c55 Fix compiling with --disable-x11 2009-11-22 14:05:11 +01:00
Phil Sutter
66df73f74a implement ASCII gauge and enable all gauge objects for use with no X 2009-11-22 02:09:46 +01:00
Phil Sutter
c2eb77c3f0 realise seamless integration of new_bar_in_shell 
The decision about whether to print ASCII or X11 bar is done from within
specials.c, so all those #ifdef + if () blocks can be dropped. This also
implicitly enables the ASCII bar for some bar printing objects which where
forgotten before.
 2009-11-22 02:09:46 +01:00
Nikolas Garofil
c131c1d129 Bugfix: letting XmbSetWMProperties set the windowtitle causes a memleak with some versions of Xlib 2009-11-21 23:58:02 +01:00
Nikolas Garofil
20a7f5eb72 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-11-21 15:50:35 +01:00
Nikolas Garofil
567a86f99a Fix segfault in X11-related code 
Conky sometimes tries to clears part of a window before it's created,
this breaks closing the displaying. For example with this config:
TEXT
$lua
 2009-11-21 15:45:00 +01:00
Phil Sutter
d7f9e64824 allow AF_INET6 in libmpdclient since mpd supports it 
Thanks to Kaleb Elwert (belak, IRC) who reported the problem and tested
the fix.
 2009-11-20 23:00:47 +01:00
Nikolas Garofil
b85b0d5aab Bugfix: Sx in $format_time prints out wrong values when number of seconds ends with a zero and has no numbers behind the point 2009-11-20 15:23:54 +01:00
Phil Sutter
7291184783 simplify conky_version and co. a bit 2009-11-20 00:03:15 +01:00
Phil Sutter
c8bed3a28d voltage: outsource printing code 2009-11-20 00:02:42 +01:00
Phil Sutter
b25be92273 xmms2: do 'gg=G' in vim :) 2009-11-20 00:01:47 +01:00
Phil Sutter
c439c8e7b6 mpd: outsource printing code 
In order to make life a bit easier, the struct mpd_s field "volume" has
been renamed to just "vol" to match the object's name (mpd_vol).

Although format_media_player_time() is probably meant to be used by all
supported media players, it's currently being used by mpd only. So for
now this function can reside statically in mpd.c
 2009-11-20 00:01:33 +01:00
Phil Sutter
87873bceeb lines, words: outsource code 2009-11-19 23:59:50 +01:00
Phil Sutter
ea22f21252 smapi: outsource printing code 2009-11-19 23:57:38 +01:00
Phil Sutter
bb35c25284 ibm: convert to common signature 2009-11-19 23:57:16 +01:00
Phil Sutter
91b0c66617 mixer: convert to common signature 2009-11-19 23:56:01 +01:00
Phil Sutter
80e41032cd {down,up}speedgraph: convert to match common signature 2009-11-19 23:52:39 +01:00
Phil Sutter
80114f3b1e diskio: convert print functions to match common signature 2009-11-19 23:51:13 +01:00
Phil Sutter
b9f1dc7283 cleanup times_in_seconds enhancement 
This also adds code to unset the variable before reloading the config.
 2009-11-19 23:39:08 +01:00
Phil Sutter
45a183d840 xlib: do exit() on IOError instead of abort() 
The IOError happens every time I close conky's normal own window, so I
guess the situation is not as abnormal as abort() indicates. Calling
exit() instead should really suffice and give the process a chance to
clean up (by calling destructor routines for instance).
 2009-11-19 23:04:09 +01:00
Phil Sutter
6f9bfe970a fix potential buffer overflow when printing top values 2009-11-19 23:04:09 +01:00
Phil Sutter
9efa384bbc lua: outsource code 2009-11-19 23:04:09 +01:00
Phil Sutter
b6d1ff6c42 i8k: outsource code 2009-11-19 23:04:09 +01:00
Nikolas Garofil
fe1d7da3d5 Add support for $pid_read and $pid_write 2009-11-19 12:32:14 +01:00
Nikolas Garofil
f8bae62234 $format_time treats ( and ) as special chars 2009-11-19 00:21:49 +01:00
Nikolas Garofil
59594e70d2 Added support for \Sx to $format_time 2009-11-19 00:04:49 +01:00
Nikolas Garofil
4a1be880d3 Make $user_time, $mpd_elapsed and $mpd_length compatible with times_in_seconds 2009-11-18 21:25:05 +01:00
Nikolas Garofil
d9ad73af65 Make sure $format_time only works when times_in_seconds is enabled 2009-11-18 20:27:53 +01:00
Nikolas Garofil
8f42831a62 Add support for time_in_seconds configuration setting 2009-11-18 20:07:47 +01:00
Nikolas Garofil
4cfb042df9 Fix bug in $pid_cmdline 2009-11-18 18:02:10 +01:00
Nikolas Garofil
6046198053 Fix bug in $pid_nice, $pid_priority, $pid_time, $pid_time_kernelmode and $pid_time_usermode 2009-11-18 17:13:20 +01:00
Nikolas Garofil
0215298c27 Added support for $format_time 2009-11-18 15:35:35 +01:00
Nikolas Garofil
90f5701f3e Bugfix: crash when apcupsd isnt running 2009-11-16 20:19:57 +01:00
Phil Sutter
a1ddcc0786 fix potential buffer overflow in parse_conky_vars() 2009-11-16 19:52:48 +01:00
Phil Sutter
70e5afe5ac ifblock: fix clash with specials when freeing objects 
Murphy hit me again: in my naive attempt to fix the clash between
ifblocks and objects parsing text objects due to the double use of the
'sub' field, I overlooked this problem with reusing the 'special_data'
field. So here comes the real thing (TM), donating ifblocks their own
field for pointing to the jump target.
 2009-11-16 19:52:12 +01:00
Phil Sutter
44f76f4876 drop leftover freq_dynamic code in freebsd.c and openbsd.c 
As the comment states, those functions were originally copied from
linux.c; in fact just the code which has been removed due to licensing
issues.
 2009-11-16 19:41:06 +01:00
Pavel Labath
e97b67aa20 IPv6 support for $tcp_portmon 
In theory, this may fail to compile on ancient systems that don't have IPv6 types (struct
sockaddr_in6 et al.) available. If it turns out that such systems are still in use, the best way
to solve it would be to provide dummy declarations via configure tests.
 2009-11-16 18:17:16 +01:00
Nikolas Garofil
84d6095c40 Use seconds instead of centiseconds as unit for $pid_time_kernelmode, $pid_time_usermode and $pid_time 2009-11-16 16:59:41 +01:00
Nikolas Garofil
7b05f78de8 Added support for $pid_time_usermode, $pid_time_kernelmode and $pid_time 2009-11-16 15:30:57 +01:00
Nikolas Garofil
015d275098 Add support for $pid_nice and $pid_priority 2009-11-16 15:01:43 +01:00
Nikolas Garofil
f93aa2a68d Added support for $pid_threads and $pid_thread_list 2009-11-16 09:54:17 +01:00