Nikolas Garofil [Sat, 21 Nov 2009 22:58:02 +0000 (23:58 +0100)]
Bugfix: letting XmbSetWMProperties set the windowtitle causes a memleak with some versions of Xlib
Nikolas Garofil [Sat, 21 Nov 2009 14:50:35 +0000 (15:50 +0100)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Sat, 21 Nov 2009 14:45:00 +0000 (15:45 +0100)]
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
Phil Sutter [Fri, 20 Nov 2009 21:49:57 +0000 (22:49 +0100)]
allow AF_INET6 in libmpdclient since mpd supports it
Thanks to Kaleb Elwert (belak, IRC) who reported the problem and tested
the fix.
Nikolas Garofil [Fri, 20 Nov 2009 14:23:54 +0000 (15:23 +0100)]
Bugfix: Sx in $format_time prints out wrong values when number of seconds ends with a zero and has no numbers behind the point
Phil Sutter [Mon, 16 Nov 2009 00:37:45 +0000 (01:37 +0100)]
simplify conky_version and co. a bit
Phil Sutter [Thu, 12 Nov 2009 23:24:54 +0000 (00:24 +0100)]
voltage: outsource printing code
Phil Sutter [Mon, 9 Nov 2009 22:21:58 +0000 (23:21 +0100)]
xmms2: do 'gg=G' in vim :)
Phil Sutter [Mon, 9 Nov 2009 21:11:06 +0000 (22:11 +0100)]
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
Phil Sutter [Thu, 19 Nov 2009 22:59:50 +0000 (23:59 +0100)]
lines, words: outsource code
Phil Sutter [Sun, 8 Nov 2009 18:01:42 +0000 (19:01 +0100)]
smapi: outsource printing code
Phil Sutter [Sun, 8 Nov 2009 16:22:48 +0000 (17:22 +0100)]
ibm: convert to common signature
Phil Sutter [Sun, 8 Nov 2009 15:36:35 +0000 (16:36 +0100)]
mixer: convert to common signature
Phil Sutter [Sun, 8 Nov 2009 13:01:14 +0000 (14:01 +0100)]
{down,up}speedgraph: convert to match common signature
Phil Sutter [Sun, 8 Nov 2009 12:54:42 +0000 (13:54 +0100)]
diskio: convert print functions to match common signature
Phil Sutter [Thu, 19 Nov 2009 22:39:08 +0000 (23:39 +0100)]
cleanup times_in_seconds enhancement
This also adds code to unset the variable before reloading the config.
Phil Sutter [Thu, 19 Nov 2009 22:00:15 +0000 (23:00 +0100)]
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).
Phil Sutter [Mon, 16 Nov 2009 21:43:59 +0000 (22:43 +0100)]
fix potential buffer overflow when printing top values
Phil Sutter [Mon, 16 Nov 2009 20:31:51 +0000 (21:31 +0100)]
lua: outsource code
Phil Sutter [Mon, 16 Nov 2009 19:58:26 +0000 (20:58 +0100)]
i8k: outsource code
Nikolas Garofil [Thu, 19 Nov 2009 11:32:14 +0000 (12:32 +0100)]
Add support for $pid_read and $pid_write
Nikolas Garofil [Wed, 18 Nov 2009 23:21:49 +0000 (00:21 +0100)]
$format_time treats ( and ) as special chars
Nikolas Garofil [Wed, 18 Nov 2009 23:04:49 +0000 (00:04 +0100)]
Added support for \Sx to $format_time
Nikolas Garofil [Wed, 18 Nov 2009 20:25:05 +0000 (21:25 +0100)]
Make $user_time, $mpd_elapsed and $mpd_length compatible with times_in_seconds
Nikolas Garofil [Wed, 18 Nov 2009 19:27:53 +0000 (20:27 +0100)]
Make sure $format_time only works when times_in_seconds is enabled
Nikolas Garofil [Wed, 18 Nov 2009 19:07:47 +0000 (20:07 +0100)]
Add support for time_in_seconds configuration setting
Nikolas Garofil [Wed, 18 Nov 2009 17:02:10 +0000 (18:02 +0100)]
Fix bug in $pid_cmdline
Nikolas Garofil [Wed, 18 Nov 2009 16:13:20 +0000 (17:13 +0100)]
Fix bug in $pid_nice, $pid_priority, $pid_time, $pid_time_kernelmode and $pid_time_usermode
Nikolas Garofil [Wed, 18 Nov 2009 14:35:35 +0000 (15:35 +0100)]
Added support for $format_time
Nikolas Garofil [Mon, 16 Nov 2009 20:42:55 +0000 (21:42 +0100)]
Fix default config when built without x11
Nikolas Garofil [Mon, 16 Nov 2009 19:19:57 +0000 (20:19 +0100)]
Bugfix: crash when apcupsd isnt running
Phil Sutter [Mon, 16 Nov 2009 01:15:13 +0000 (02:15 +0100)]
fix potential buffer overflow in parse_conky_vars()
Phil Sutter [Mon, 16 Nov 2009 18:52:12 +0000 (19:52 +0100)]
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.
Phil Sutter [Sun, 15 Nov 2009 03:48:56 +0000 (04:48 +0100)]
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.
Pavel Labath [Mon, 16 Nov 2009 17:17:16 +0000 (18:17 +0100)]
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.
Nikolas Garofil [Mon, 16 Nov 2009 16:37:25 +0000 (17:37 +0100)]
fix minor mistake in docs
Nikolas Garofil [Mon, 16 Nov 2009 15:59:41 +0000 (16:59 +0100)]
Use seconds instead of centiseconds as unit for $pid_time_kernelmode, $pid_time_usermode and $pid_time
Nikolas Garofil [Mon, 16 Nov 2009 14:30:57 +0000 (15:30 +0100)]
Added support for $pid_time_usermode, $pid_time_kernelmode and $pid_time
Nikolas Garofil [Mon, 16 Nov 2009 14:01:43 +0000 (15:01 +0100)]
Add support for $pid_nice and $pid_priority
Nikolas Garofil [Mon, 16 Nov 2009 08:54:17 +0000 (09:54 +0100)]
Added support for $pid_threads and $pid_thread_list
Nikolas Garofil [Mon, 16 Nov 2009 07:39:05 +0000 (08:39 +0100)]
Bugfix: make sure $else works correct and without memleaks
Nikolas Garofil [Sun, 15 Nov 2009 23:21:49 +0000 (00:21 +0100)]
Fix invalid free for all $if_-vars
Nikolas Garofil [Sun, 15 Nov 2009 22:45:33 +0000 (23:45 +0100)]
fix invalid free in if_up
Pavel Labath [Sun, 15 Nov 2009 22:00:14 +0000 (23:00 +0100)]
Forgot to set top_running when $running_processes is used
Nikolas Garofil [Sun, 15 Nov 2009 18:44:37 +0000 (19:44 +0100)]
Added support for $pid_vmpeak, $pid_vmsize, $pid_vmlck, $pid_vmhwm, $pid_vmrss, $pid_vmdata, $pid_vmstk, $pid_vmexe, $pid_vmlib, $pid_vmpte
Pavel Labath [Sun, 15 Nov 2009 16:56:07 +0000 (17:56 +0100)]
Fix ChangeLog messup
Pavel Labath [Sun, 15 Nov 2009 16:42:59 +0000 (17:42 +0100)]
Rename $running_processes to $running_threads, implement real $running_processes
Nikolas Garofil [Sun, 15 Nov 2009 16:46:41 +0000 (17:46 +0100)]
Added support for $gid_name
Nikolas Garofil [Sun, 15 Nov 2009 16:21:55 +0000 (17:21 +0100)]
Added support for $uid_name
Nikolas Garofil [Sun, 15 Nov 2009 13:49:55 +0000 (14:49 +0100)]
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
Nikolas Garofil [Sun, 15 Nov 2009 12:26:40 +0000 (13:26 +0100)]
Add support for $pid_parent
Phil Sutter [Sat, 14 Nov 2009 15:47:04 +0000 (16:47 +0100)]
yet another fix for FreeBSD (somehow sneaked through last time)
Phil Sutter [Sun, 15 Nov 2009 00:43:30 +0000 (01:43 +0100)]
print which features are unsupported at the end of configure
Phil Sutter [Sat, 14 Nov 2009 03:19:51 +0000 (04:19 +0100)]
fix compiling for freebsd
Tested using default options, lua disabled as only lua50 available in
7.2-RELEASE.
Phil Sutter [Sat, 14 Nov 2009 02:09:07 +0000 (03:09 +0100)]
add generated files for profiling to clean list
Nikolas Garofil [Sat, 14 Nov 2009 23:51:38 +0000 (00:51 +0100)]
argument of $cmdline_to_pid doesnt have to be the full commandline
Nikolas Garofil [Sat, 14 Nov 2009 21:17:41 +0000 (22:17 +0100)]
fix last commit
Nikolas Garofil [Sat, 14 Nov 2009 21:07:54 +0000 (22:07 +0100)]
Make it possible to use other vars as arguments for the $pid-vars, add support for $pid_state_short, add support for $cmdline_to_pid
Cesare Tirabassi [Sat, 14 Nov 2009 14:58:06 +0000 (15:58 +0100)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Sat, 14 Nov 2009 14:57:45 +0000 (15:57 +0100)]
Refactoring of commit
363cf1ab7390a113c64390357dede0e452b91a58
The problem with the original commit was that some session-managers set
stdin to /dev/null for the processes they launch, therefore the variable
wasn't very effective.
This commit change the variable conky_user_time to user_time.
This variable has a mandatory argument, a console identifier
(eg. tty7, pts/0, etc.).
Once called, this will list how long the user for the given console has been
logged in for.
This commit also allows multiple user_time to be specified for different
consoles, as well as correctly handle a conky restart.
Nikolas Garofil [Sat, 14 Nov 2009 14:08:41 +0000 (15:08 +0100)]
Shrink proc.c
Nikolas Garofil [Sat, 14 Nov 2009 12:58:07 +0000 (13:58 +0100)]
Support for $pid_state
Pavel Labath [Sat, 14 Nov 2009 11:22:02 +0000 (12:22 +0100)]
own_window_colour documentation fix
the manpage says the hex color string should include the '#', but that's not true (not now,
anyway). Also, the syntax highlighting is wrong, but i don't know how to fix that.
Nikolas Garofil [Sat, 14 Nov 2009 01:37:00 +0000 (02:37 +0100)]
Add middle_middle to the docs
Pavel Labath [Fri, 13 Nov 2009 20:35:49 +0000 (21:35 +0100)]
Add middle_middle alignment, mostly for completeness
Nikolas Garofil [Fri, 13 Nov 2009 15:54:40 +0000 (16:54 +0100)]
Added support for $pid_chroot
Cesare Tirabassi [Fri, 13 Nov 2009 15:36:49 +0000 (16:36 +0100)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Fri, 13 Nov 2009 15:30:04 +0000 (16:30 +0100)]
Add $conky_user_time (sf.net #2830919)
The bug reporter asks if it is possible to add a variable giving the "current
user time" only, since the variable user_times reports the times for ALL
logged users.
AFAIK, the only info one can gather inside conky, is the login time for the
tty connected to conky's standard input.
This commit adds support for it (it should work on any posix compliant *nix).
Note that in coherence with the definition, the variable is called
conky_user_time (for a single user stand-alone machine used as a desktop
this would be the "current" user time).
Nikolas Garofil [Fri, 13 Nov 2009 15:29:44 +0000 (16:29 +0100)]
Fix bug in $pid_openfiles
Phil Sutter [Thu, 12 Nov 2009 23:39:00 +0000 (00:39 +0100)]
drop adt746x objects
This was really creepy stuff. Last updated in April, 2006 to work with
kernels > 2.6.12. I consider this "fobar" (fscking obsolete beyond all
recognition) and doubt anyone still uses this. If you do, blame me. :)
Nikolas Garofil [Thu, 12 Nov 2009 23:38:13 +0000 (00:38 +0100)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Thu, 12 Nov 2009 23:36:46 +0000 (00:36 +0100)]
Added support for $pid_openfiles
Phil Sutter [Thu, 12 Nov 2009 22:50:17 +0000 (23:50 +0100)]
entropy: outsource code
This patch ought to be small and simple ...
The reason why it's not is me wanting the entropy data out of struct
information. This means update_entropy() can not be used anymore, as it
uses this globally available object.
The solution I am presenting here is quite messy regarding header
includes. Hopefully this will go away soon as I plan on creating some
sort of "OS library" containing all OS specific routines and defining
macros for easier capability checking in the non-specific code. This on
the other hand means we'll need "wrappers" around OS specific objects,
but that's not as bad as it seems - having non-specific text objects
only will definitely clean up the code, and capabilities can be checked
where they should be.
Phil Sutter [Thu, 12 Nov 2009 20:32:59 +0000 (21:32 +0100)]
top: fix segfault for $if_running
The "name" field may be zero, which makes strcmp() freak out.
Nikolas Garofil [Thu, 12 Nov 2009 20:48:15 +0000 (21:48 +0100)]
fix potential bugs in snprintf
Nikolas Garofil [Thu, 12 Nov 2009 20:33:57 +0000 (21:33 +0100)]
Fix building without C99
Nikolas Garofil [Thu, 12 Nov 2009 19:34:43 +0000 (20:34 +0100)]
Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr
Nikolas Garofil [Thu, 12 Nov 2009 14:42:18 +0000 (15:42 +0100)]
Added support for $pid_environ_list
Nikolas Garofil [Wed, 11 Nov 2009 21:56:12 +0000 (22:56 +0100)]
Add support for $pid_environ
Nikolas Garofil [Wed, 11 Nov 2009 15:27:19 +0000 (16:27 +0100)]
Add cwd to $pid and split into $pid_cmdline and $pid_cwd
Nikolas Garofil [Wed, 11 Nov 2009 12:44:50 +0000 (13:44 +0100)]
fix previous commit
Nikolas Garofil [Wed, 11 Nov 2009 12:43:14 +0000 (13:43 +0100)]
fix tiny compile problem
Nikolas Garofil [Wed, 11 Nov 2009 12:23:05 +0000 (13:23 +0100)]
Fix memleak and change literals to defines
Nikolas Garofil [Wed, 11 Nov 2009 10:33:28 +0000 (11:33 +0100)]
Add proc.c and proc.h
Nikolas Garofil [Wed, 11 Nov 2009 09:55:25 +0000 (10:55 +0100)]
Add support for ${pid cmdline}
Nikolas Garofil [Tue, 10 Nov 2009 12:23:00 +0000 (13:23 +0100)]
Fix $if_mpd_playing and $mpd_percent when you stop playing a song, thanks Sakari Matikka
Nikolas Garofil [Mon, 9 Nov 2009 23:15:30 +0000 (00:15 +0100)]
Fix memleak
Nikolas Garofil [Mon, 9 Nov 2009 01:38:20 +0000 (02:38 +0100)]
Fix $scroll only scrolls once
Nikolas Garofil [Sun, 8 Nov 2009 20:49:28 +0000 (21:49 +0100)]
Fix segfault and memleaks in curl
Nikolas Garofil [Sun, 8 Nov 2009 19:30:50 +0000 (20:30 +0100)]
Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky
Nikolas Garofil [Sun, 8 Nov 2009 19:29:43 +0000 (20:29 +0100)]
Make sure there is no optimization with --enable-debug and --enable-testing
Phil Sutter [Sun, 8 Nov 2009 19:16:25 +0000 (20:16 +0100)]
ifblock objects: fix bug for sub-object parsing ifblocks
When dropping the ifblock field of struct text_object, I short-sightedly
reused the sub field for holding the pointer to the matching else/endif.
This however doesn't work for objects parsing their own object list, as
they need the sub field for themselfs.
Since we have it, simply reuse the special_data field instead and hope
there won't ever be an object which is both special and ifblock. ;)
Phil Sutter [Sun, 8 Nov 2009 02:28:43 +0000 (03:28 +0100)]
fix conversion bug when freeing exec objects
Nikolas Garofil [Sun, 8 Nov 2009 17:00:13 +0000 (18:00 +0100)]
Fix building with metar but without xoap
Nikolas Garofil [Sat, 7 Nov 2009 22:46:46 +0000 (23:46 +0100)]
Use a define for the maximum number of network devices
Nikolas Garofil [Sat, 7 Nov 2009 17:14:04 +0000 (18:14 +0100)]
Added support for $threads and fixed $processes on Linux
Nikolas Garofil [Sat, 7 Nov 2009 17:13:21 +0000 (18:13 +0100)]
Revert "Added support for and fixed on Linux"
This reverts commit
43c7c0373b5aa88075e6c6c63e2c743edac26523.
Nikolas Garofil [Sat, 7 Nov 2009 17:06:07 +0000 (18:06 +0100)]
Added support for and fixed on Linux
Nikolas Garofil [Sat, 7 Nov 2009 14:32:03 +0000 (15:32 +0100)]
Fix building with --disable-xft and add ncurses to the -v option
Nikolas Garofil [Sat, 7 Nov 2009 12:21:47 +0000 (13:21 +0100)]
Fix building with --disable-iostats