Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-03 15:17:24 +00:00
Code Issues Releases Activity
2,217 Commits 5 Branches 46 Tags 22 MiB
540f78f0bd
Commit Graph

1593 Commits

Author SHA1 Message Date
Nikolas Garofil
691036e3c3 Bugfix: $alignr only worked on the first line of $execp, $execpi, $lua and $lua_parse 2010-05-05 22:13:09 +02:00
Nikolas Garofil
13188c8b11 Bugfix: memory and thread-deleting problems 
This patch is the C version of a32d9e41a4
(from the master branch).
 2010-05-05 18:57:27 +02:00
Nikolas Garofil
36ebcf347d Bugfix: read_tcp treated a succesfull connection as failed and vice versa 2010-04-15 19:56:14 +02:00
Nikolas Garofil
6b3c69882a Bugfix: "out_to_x no" was ignored when in a file included with ${include path_to_file} 2010-04-14 21:27:56 +02:00
Laurent Papier
9e3156a4a6 Add $nodename_short. 
Signed-off-by: Brenden Matthews <brenden@diddyinc.com>
 2010-04-12 17:41:23 -07:00
Nikolas Garofil
df5de28d17 Removed all code depending on MIXER_IS_ALSA 
Reasons:
-As far as i know, all systems can use the non-MIXER_IS_ALSA way to get the values
-This code shows wrong mixer values
 2010-04-13 02:36:50 +02:00
Nikolas Garofil
0443579095 Bugfix: adding/removing use_xft in the config had no effect unless you restarted conky, reloading the config was not enough 2010-04-12 23:36:20 +02:00
Brenden Matthews
48659dd402 Don't use alarm() in texeci to terminate long processes. 2010-04-12 14:09:44 -07:00
Pavel Labath
13c973d1b5 inotifi_init1() is not available on older systems 
-> replace with inotify_init() + fcntl()
atomicity should not be important here, since we don't have any threads running at the point of
the call
 2010-04-12 22:45:03 +02:00
Nikolas Garofil
02d97f9445 Bugfix: mixerbar showed wrong values 2010-04-12 14:40:15 +02:00
Nikolas Garofil
99eeeae6d0 Bugfix: ac-adapter is sometimes called ADP1 in sysfs instead of AC 2010-04-12 12:45:10 +02:00
Nikolas Garofil
9a334e4462 Bugfix: battery_bar should also work without argument 2010-04-11 19:49:27 +02:00
Nikolas Garofil
f7dcc664d7 Bugfix: When the first line behind TEXT was a comment, the start of the second line wasn't parsed 2010-04-10 20:06:04 +02:00
Brenden Matthews
c9f1625908 Fix X error when border_width is <1. 2010-04-07 10:59:45 -07:00
Brenden Matthews
04fd11b631 Fix device name parsing for diskio variables. 
See:
https://sourceforge.net/tracker/?func=detail&aid=2981517&group_id=143975&atid=757308
 2010-04-07 10:20:25 -07:00
Brenden Matthews
9c5e5d86bd Fix bug in $if_existing. 
Ref:
http://sourceforge.net/tracker/?func=detail&aid=2979974&group_id=143975&atid=757308
 2010-04-07 10:14:45 -07:00
Brenden Matthews
c8e6874065 Fix build failure with ncurses disabled. 
Ref: http://bugs.gentoo.org/show_bug.cgi?id=313081
 2010-04-07 09:34:33 -07:00
Pavel Labath
0a0a18656c Merge branch '1.8.0' into 1.8.1 2010-03-18 21:35:15 +01:00
Pavel Labath
c3f28e192a Fix a leak in mpd.c (refcount fail) 2010-03-18 21:34:11 +01:00
Pavel Labath
516ffa41b7 Merge branch '1.8.0' into 1.8.1 2010-03-13 01:15:33 +01:00
Brenden Matthews
acfbad9b16 Build fix due to bad include ordering. 2010-03-03 11:21:41 -08:00
Pavel Labath
e639ad45ae Merge branch '1.8.0' into 1.8.1 
Conflicts:
	configure.ac.in
 2010-03-03 11:59:15 +01:00
Pavel Labath
0c83d64a86 Fix crash when using $desktop_name with out_to_x no 2010-03-03 11:56:25 +01:00
Cesare Tirabassi
fde58c9d93 Fix sf: #2961602 
Add missing --quiet option and optional arguments to --pause and --interval
(cherry picked from commit a9e5820a34)
 2010-03-02 20:29:15 +01:00
Cesare Tirabassi
a9e5820a34 Fix sf: #2961602 
Add missing --quiet option and optional arguments to --pause and --interval
 2010-03-02 20:26:59 +01:00
Pavel Labath
e6a220b3a7 s/substract/subtract/ 2010-02-28 14:06:18 +01:00
Pavel Labath
1dc3870c8a s/substract/subtract/ 2010-02-28 14:06:05 +01:00
Nikolas Garofil
ba06e0acad Fix removing the config and sending a SIGUSR1 results in segfault 
This re-implements the fix of the previous commit because that one
assumed that only overwriting the configfile can cause the config
to reload
 2010-02-23 14:41:11 +01:00
Nikolas Garofil
72f5aa7ece Fix removing the config and sending a SIGUSR1 results in segfault 
This re-implements the fix of the previous commit because that one
assumed that only overwriting the configfile can cause the config
to reload
 2010-02-23 14:38:08 +01:00
Cesare Tirabassi
8ca6ea6aec Fix LP: #525926; conky sigsegv if config file is deleted 
Basically, we only relod if the file is modified but still handle the case
where the watch gets lost. Maybe we should just ignore IN_IGNORE altogether?
(cherry picked from commit 085c39d394)
 2010-02-22 22:48:32 +01:00
Cesare Tirabassi
085c39d394 Fix LP: #525926; conky sigsegv if config file is deleted 
Basically, we only relod if the file is modified but still handle the case
where the watch gets lost. Maybe we should just ignore IN_IGNORE altogether?
 2010-02-22 22:45:51 +01:00
Nikolas Garofil
d35aad5bfa Fix wrong output when nesting $combine-s 2010-02-22 19:35:36 +01:00
Nikolas Garofil
29f013b34d Fix wrong output when nesting $combine-s 2010-02-22 19:35:03 +01:00
Nikolas Garofil
80ee83c87f Fix memleak 2010-02-22 16:50:10 +01:00
Nikolas Garofil
7a8c1e45c8 Fix memleak 2010-02-22 16:49:38 +01:00
Nikolas Garofil
87a33551f7 Fix output of $combine when used in combination with $head 2010-02-22 16:35:25 +01:00
Nikolas Garofil
f48124bdea Fix output of $combine when used in combination with $head 2010-02-22 16:34:14 +01:00
Nikolas Garofil
caf38b3a12 Fix current_mail_spool memleak 2010-02-18 01:34:19 +01:00
Nikolas Garofil
7bf902f14a Fix current_mail_spool memleak 2010-02-18 01:33:49 +01:00
Nikolas Garofil
53e4299162 Fix memleak in if_match 2010-02-17 20:36:01 +01:00
Nikolas Garofil
597586f289 Fix memleak in if_match 2010-02-17 20:34:53 +01:00
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