monky
14 years agoBugfix: make sure $else works correct and without memleaks
Nikolas Garofil [Mon, 16 Nov 2009 07:39:05 +0000 (08:39 +0100)]
Bugfix: make sure $else works correct and without memleaks

14 years agoFix invalid free for all $if_-vars
Nikolas Garofil [Sun, 15 Nov 2009 23:21:49 +0000 (00:21 +0100)]
Fix invalid free for all $if_-vars

14 years agofix invalid free in if_up
Nikolas Garofil [Sun, 15 Nov 2009 22:45:33 +0000 (23:45 +0100)]
fix invalid free in if_up

14 years agoForgot to set top_running when $running_processes is used
Pavel Labath [Sun, 15 Nov 2009 22:00:14 +0000 (23:00 +0100)]
Forgot to set top_running when $running_processes is used

14 years agoAdded support for $pid_vmpeak, $pid_vmsize, $pid_vmlck, $pid_vmhwm, $pid_vmrss, ...
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

14 years agoFix ChangeLog messup
Pavel Labath [Sun, 15 Nov 2009 16:56:07 +0000 (17:56 +0100)]
Fix ChangeLog messup

14 years agoRename $running_processes to $running_threads, implement real $running_processes
Pavel Labath [Sun, 15 Nov 2009 16:42:59 +0000 (17:42 +0100)]
Rename $running_processes to $running_threads, implement real $running_processes

14 years agoAdded support for $gid_name
Nikolas Garofil [Sun, 15 Nov 2009 16:46:41 +0000 (17:46 +0100)]
Added support for $gid_name

14 years agoAdded support for $uid_name
Nikolas Garofil [Sun, 15 Nov 2009 16:21:55 +0000 (17:21 +0100)]
Added support for $uid_name

14 years agoAdded support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid...
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

14 years agoAdd support for $pid_parent
Nikolas Garofil [Sun, 15 Nov 2009 12:26:40 +0000 (13:26 +0100)]
Add support for $pid_parent

14 years agoyet another fix for FreeBSD (somehow sneaked through last time)
Phil Sutter [Sat, 14 Nov 2009 15:47:04 +0000 (16:47 +0100)]
yet another fix for FreeBSD (somehow sneaked through last time)

14 years agoprint which features are unsupported at the end of configure
Phil Sutter [Sun, 15 Nov 2009 00:43:30 +0000 (01:43 +0100)]
print which features are unsupported at the end of configure

14 years agofix compiling for freebsd
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.

14 years agoadd generated files for profiling to clean list
Phil Sutter [Sat, 14 Nov 2009 02:09:07 +0000 (03:09 +0100)]
add generated files for profiling to clean list

14 years agoargument of $cmdline_to_pid doesnt have to be the full commandline
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

14 years agofix last commit
Nikolas Garofil [Sat, 14 Nov 2009 21:17:41 +0000 (22:17 +0100)]
fix last commit

14 years agoMake it possible to use other vars as arguments for the $pid-vars, add support for...
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

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Sat, 14 Nov 2009 14:58:06 +0000 (15:58 +0100)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

14 years agoRefactoring of commit 363cf1ab7390a113c64390357dede0e452b91a58
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.

14 years agoShrink proc.c
Nikolas Garofil [Sat, 14 Nov 2009 14:08:41 +0000 (15:08 +0100)]
Shrink proc.c

14 years agoSupport for $pid_state
Nikolas Garofil [Sat, 14 Nov 2009 12:58:07 +0000 (13:58 +0100)]
Support for $pid_state

14 years agoown_window_colour documentation fix
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.

14 years agoAdd middle_middle to the docs
Nikolas Garofil [Sat, 14 Nov 2009 01:37:00 +0000 (02:37 +0100)]
Add middle_middle to the docs

14 years agoAdd middle_middle alignment, mostly for completeness
Pavel Labath [Fri, 13 Nov 2009 20:35:49 +0000 (21:35 +0100)]
Add middle_middle alignment, mostly for completeness

14 years agoAdded support for $pid_chroot
Nikolas Garofil [Fri, 13 Nov 2009 15:54:40 +0000 (16:54 +0100)]
Added support for $pid_chroot

14 years agoMerge branch 'master' of git.omp.am:/home/omp/git/conky
Cesare Tirabassi [Fri, 13 Nov 2009 15:36:49 +0000 (16:36 +0100)]
Merge branch 'master' of git.omp.am:/home/omp/git/conky

14 years agoAdd $conky_user_time (sf.net #2830919)
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).

14 years agoFix bug in $pid_openfiles
Nikolas Garofil [Fri, 13 Nov 2009 15:29:44 +0000 (16:29 +0100)]
Fix bug in $pid_openfiles

14 years agodrop adt746x objects
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. :)

14 years agoMerge branch 'master' of ssh://git.omp.am/home/omp/git/conky
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

14 years agoAdded support for $pid_openfiles
Nikolas Garofil [Thu, 12 Nov 2009 23:36:46 +0000 (00:36 +0100)]
Added support for $pid_openfiles

14 years agoentropy: outsource code
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.

14 years agotop: fix segfault for $if_running
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.

14 years agofix potential bugs in snprintf
Nikolas Garofil [Thu, 12 Nov 2009 20:48:15 +0000 (21:48 +0100)]
fix potential bugs in snprintf

14 years agoFix building without C99
Nikolas Garofil [Thu, 12 Nov 2009 20:33:57 +0000 (21:33 +0100)]
Fix building without C99

14 years agoAdded support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr
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

14 years agoAdded support for $pid_environ_list
Nikolas Garofil [Thu, 12 Nov 2009 14:42:18 +0000 (15:42 +0100)]
Added support for $pid_environ_list

14 years agoAdd support for $pid_environ
Nikolas Garofil [Wed, 11 Nov 2009 21:56:12 +0000 (22:56 +0100)]
Add support for $pid_environ

14 years agoAdd cwd to $pid and split into $pid_cmdline and $pid_cwd
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

14 years agofix previous commit
Nikolas Garofil [Wed, 11 Nov 2009 12:44:50 +0000 (13:44 +0100)]
fix previous commit

14 years agofix tiny compile problem
Nikolas Garofil [Wed, 11 Nov 2009 12:43:14 +0000 (13:43 +0100)]
fix tiny compile problem

14 years agoFix memleak and change literals to defines
Nikolas Garofil [Wed, 11 Nov 2009 12:23:05 +0000 (13:23 +0100)]
Fix memleak and change literals to defines

14 years agoAdd proc.c and proc.h
Nikolas Garofil [Wed, 11 Nov 2009 10:33:28 +0000 (11:33 +0100)]
Add proc.c and proc.h

14 years agoAdd support for ${pid cmdline}
Nikolas Garofil [Wed, 11 Nov 2009 09:55:25 +0000 (10:55 +0100)]
Add support for ${pid cmdline}

14 years agoFix $if_mpd_playing and $mpd_percent when you stop playing a song, thanks Sakari...
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

14 years agoFix memleak
Nikolas Garofil [Mon, 9 Nov 2009 23:15:30 +0000 (00:15 +0100)]
Fix memleak

14 years agoFix $scroll only scrolls once
Nikolas Garofil [Mon, 9 Nov 2009 01:38:20 +0000 (02:38 +0100)]
Fix $scroll only scrolls once

14 years agoFix segfault and memleaks in curl
Nikolas Garofil [Sun, 8 Nov 2009 20:49:28 +0000 (21:49 +0100)]
Fix segfault and memleaks in curl

14 years agoMerge branch 'master' of ssh://git.omp.am/home/omp/git/conky
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

14 years agoMake sure there is no optimization with --enable-debug and --enable-testing
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

14 years agoifblock objects: fix bug for sub-object parsing ifblocks
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. ;)

14 years agofix conversion bug when freeing exec objects
Phil Sutter [Sun, 8 Nov 2009 02:28:43 +0000 (03:28 +0100)]
fix conversion bug when freeing exec objects

14 years agoFix building with metar but without xoap
Nikolas Garofil [Sun, 8 Nov 2009 17:00:13 +0000 (18:00 +0100)]
Fix building with metar but without xoap

14 years agoUse a define for the maximum number of network devices
Nikolas Garofil [Sat, 7 Nov 2009 22:46:46 +0000 (23:46 +0100)]
Use a define for the maximum number of network devices

14 years agoAdded support for $threads and fixed $processes on Linux
Nikolas Garofil [Sat, 7 Nov 2009 17:14:04 +0000 (18:14 +0100)]
Added support for $threads and fixed $processes on Linux

14 years agoRevert "Added support for and fixed 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.

14 years agoAdded support for and fixed on Linux
Nikolas Garofil [Sat, 7 Nov 2009 17:06:07 +0000 (18:06 +0100)]
Added support for  and fixed  on Linux

14 years agoFix building with --disable-xft and add ncurses to the -v option
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

14 years agoFix building with --disable-iostats
Nikolas Garofil [Sat, 7 Nov 2009 12:21:47 +0000 (13:21 +0100)]
Fix building with --disable-iostats

14 years agoFix building with --disable-x11 --disable-lua --disable-ncurses
Nikolas Garofil [Sat, 7 Nov 2009 11:21:48 +0000 (12:21 +0100)]
Fix building with --disable-x11 --disable-lua --disable-ncurses

14 years agoMinor autoconf fix for iconv
Nikolas Garofil [Sat, 7 Nov 2009 00:15:20 +0000 (01:15 +0100)]
Minor autoconf fix for iconv

14 years agoscan_graph: allow giving a "hint" about a good scale value
Phil Sutter [Thu, 5 Nov 2009 23:05:08 +0000 (00:05 +0100)]
scan_graph: allow giving a "hint" about a good scale value

This is more or less a temporary fix to restore the former behaviour. In
the long term objects will define a max value, which will be of use for
all kinds of meters.

14 years agoweather: fix this embarrassing bug
Phil Sutter [Thu, 5 Nov 2009 21:27:34 +0000 (22:27 +0100)]
weather: fix this embarrassing bug

14 years agogit ignore temporary files in lua/
Phil Sutter [Thu, 5 Nov 2009 21:06:03 +0000 (22:06 +0100)]
git ignore temporary files in lua/

14 years agotop: drop problematic field totalmem
Phil Sutter [Tue, 3 Nov 2009 22:11:14 +0000 (23:11 +0100)]
top: drop problematic field totalmem

The field totalmem was formerly used to hold the percentage of used mem
by a process. So at update time, the field info.memmax was being
addressed, which is potentially being updated at the same time, As all
updating routines potentially run in parallel. Though there is an
(quite) easy fix for this: calculate the percentage upon object
printing. This works because conky synchronises all update routines
right before printing the result. (To omit locking on it's own.)

14 years agoenum special_types: define nonspecial for completeness
Phil Sutter [Tue, 27 Oct 2009 19:56:00 +0000 (20:56 +0100)]
enum special_types: define nonspecial for completeness

14 years agoif_gw: no need to free unused obj->data.s
Phil Sutter [Fri, 30 Oct 2009 00:31:43 +0000 (01:31 +0100)]
if_gw: no need to free unused obj->data.s

14 years agotext_object: completely remove the need for data.ifblock
Phil Sutter [Thu, 29 Oct 2009 02:52:59 +0000 (03:52 +0100)]
text_object: completely remove the need for data.ifblock

14 years agodrop useless ifblock.str
Phil Sutter [Thu, 29 Oct 2009 02:41:23 +0000 (03:41 +0100)]
drop useless ifblock.str

14 years agono need to save the args passed to if_empty and if_match
Phil Sutter [Tue, 27 Oct 2009 00:24:52 +0000 (01:24 +0100)]
no need to save the args passed to if_empty and if_match

14 years agodrop a few unused fields from struct text_object
Phil Sutter [Tue, 27 Oct 2009 00:15:30 +0000 (01:15 +0100)]
drop a few unused fields from struct text_object

14 years agodrop struct text_object field pair, since it got unused due to latest commits
Phil Sutter [Sun, 25 Oct 2009 21:58:04 +0000 (22:58 +0100)]
drop struct text_object field pair, since it got unused due to latest commits

14 years agodrop struct text_object field f
Phil Sutter [Sun, 25 Oct 2009 21:47:53 +0000 (22:47 +0100)]
drop struct text_object field f

14 years agodrop now unused SIZE_DEFAULTS macro
Phil Sutter [Sun, 25 Oct 2009 21:37:08 +0000 (22:37 +0100)]
drop now unused SIZE_DEFAULTS macro

14 years agospecials: convert stippled_hr object to new style
Phil Sutter [Thu, 29 Oct 2009 02:22:58 +0000 (03:22 +0100)]
specials: convert stippled_hr object to new style

14 years agospecials: convert tab object to new style
Phil Sutter [Thu, 29 Oct 2009 02:18:24 +0000 (03:18 +0100)]
specials: convert tab object to new style

14 years agospecials: convert gauge objects to new style
Phil Sutter [Thu, 29 Oct 2009 02:13:47 +0000 (03:13 +0100)]
specials: convert gauge objects to new style

14 years agospecials: convert graph objects to new style
Phil Sutter [Thu, 29 Oct 2009 02:08:08 +0000 (03:08 +0100)]
specials: convert graph objects to new style

14 years agomisc smaller fixes
Phil Sutter [Wed, 28 Oct 2009 02:54:53 +0000 (03:54 +0100)]
misc smaller fixes

14 years agospecials: introduce dedicated per-object data and merge graph objects
Phil Sutter [Sun, 25 Oct 2009 20:47:47 +0000 (21:47 +0100)]
specials: introduce dedicated per-object data and merge graph objects

14 years agoreview load* code
Phil Sutter [Sun, 25 Oct 2009 13:13:26 +0000 (14:13 +0100)]
review load* code

14 years agomove loadavg and loadgraph code to common.c
Phil Sutter [Sun, 25 Oct 2009 12:49:10 +0000 (13:49 +0100)]
move loadavg and loadgraph code to common.c

14 years agolocal_mails: convert to generic object payload
Phil Sutter [Sat, 24 Oct 2009 23:59:07 +0000 (01:59 +0200)]
local_mails: convert to generic object payload

This also includes a little header include cleanup.

14 years agomail: convert to generic object payload
Phil Sutter [Sat, 24 Oct 2009 23:49:58 +0000 (01:49 +0200)]
mail: convert to generic object payload

14 years agomail: use a private common struct mail_s instead of info.mail
Phil Sutter [Sat, 24 Oct 2009 23:43:08 +0000 (01:43 +0200)]
mail: use a private common struct mail_s instead of info.mail

14 years agotext_object: use field i instead of cpu_index
Phil Sutter [Sat, 17 Oct 2009 14:55:12 +0000 (16:55 +0200)]
text_object: use field i instead of cpu_index

14 years agoif_up: convert to generic object payload
Phil Sutter [Fri, 9 Oct 2009 02:30:02 +0000 (04:30 +0200)]
if_up: convert to generic object payload

14 years agodrop now unused sensor field
Phil Sutter [Fri, 9 Oct 2009 01:58:16 +0000 (03:58 +0200)]
drop now unused sensor field

14 years agoobsd_sensors: cleanup code (untested)
Phil Sutter [Fri, 9 Oct 2009 01:55:46 +0000 (03:55 +0200)]
obsd_sensors: cleanup code (untested)

14 years agoibm: convert to generic object payload
Phil Sutter [Fri, 9 Oct 2009 01:44:45 +0000 (03:44 +0200)]
ibm: convert to generic object payload

14 years agonet_stats: convert to generic object payload
Phil Sutter [Fri, 9 Oct 2009 01:16:17 +0000 (03:16 +0200)]
net_stats: convert to generic object payload

14 years agodiskio: convert to generic object payload
Phil Sutter [Wed, 7 Oct 2009 20:44:17 +0000 (22:44 +0200)]
diskio: convert to generic object payload

14 years agocombine: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 23:20:45 +0000 (01:20 +0200)]
combine: convert to generic object payload

14 years agoscroll: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 23:04:32 +0000 (01:04 +0200)]
scroll: convert to generic object payload

14 years agoread_tcp: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 22:27:04 +0000 (00:27 +0200)]
read_tcp: convert to generic object payload

14 years agoexec: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 22:09:14 +0000 (00:09 +0200)]
exec: convert to generic object payload

14 years agotop: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 20:33:28 +0000 (22:33 +0200)]
top: convert to generic object payload

14 years agomboxscan: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 19:59:45 +0000 (21:59 +0200)]
mboxscan: convert to generic object payload

14 years agomixer: convert to generic object payload
Phil Sutter [Tue, 6 Oct 2009 19:48:26 +0000 (21:48 +0200)]
mixer: convert to generic object payload