Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-20 03:51:18 +00:00
Code Issues Releases Activity
2,232 Commits 5 Branches 46 Tags 22 MiB
6d4ba8b2f4
Commit Graph

1622 Commits

Author SHA1 Message Date
Phil Sutter
bc1b82771f convert mpd_percent to callbacks.percentage 2009-12-01 00:32:31 +01:00
Phil Sutter
61591def8e convert mixer values to callbacks.percentage 2009-12-01 00:32:31 +01:00
Phil Sutter
36a202091e convert fs_*_perc to callbacks.percentage 2009-12-01 00:32:31 +01:00
Phil Sutter
61c4efb305 convert entropy_perc to callbacks.percentage 2009-12-01 00:32:31 +01:00
Phil Sutter
0631b2ab2e convert swapperc to callbacks.percentage 2009-12-01 00:32:22 +01:00
Phil Sutter
feba298efa convert memperc to callbacks.percentage 2009-12-01 00:31:09 +01:00
Phil Sutter
07f82f5cb6 convert cpu to callbacks.percentage 2009-12-01 00:29:28 +01:00
Phil Sutter
79f5726832 merge loadgraph to callbacks.graphval 2009-12-01 00:29:28 +01:00
Phil Sutter
bd752e8506 merge {down,up}speedgraph to callbacks.graphval 2009-12-01 00:29:28 +01:00
Phil Sutter
fe05542318 merge diskiographs to callbacks.graphval 2009-12-01 00:29:28 +01:00
Phil Sutter
9581914f7d reuse barval callbacks where applicable 2009-12-01 00:28:53 +01:00
Phil Sutter
cba2460397 merge apcupsd_loadbar to callbacks.barval 2009-12-01 00:07:07 +01:00
Phil Sutter
4988947829 convert xmms2_bar to callbacks.barval 2009-12-01 00:06:23 +01:00
Phil Sutter
997805c46b convert smapi_bat_bar to callbacks.barval 2009-12-01 00:05:20 +01:00
Phil Sutter
fcd3d58960 convert mpd_bar to callbacks.barval 2009-12-01 00:04:35 +01:00
Phil Sutter
f79c58ef47 merge mixer bars to callbacks.barval 2009-12-01 00:02:48 +01:00
Phil Sutter
4d7f2e720d merge lua_bar to callbacks.barval 2009-12-01 00:02:04 +01:00
Phil Sutter
4f8e700d64 convert fs bars to callbacks.barval 2009-12-01 00:01:04 +01:00
Phil Sutter
a5ff5d39d0 merge execibar to callbacks.barval 2009-11-30 23:59:13 +01:00
Phil Sutter
95fbecc385 merge entropy_bar to callbacks.barval 2009-11-30 23:58:09 +01:00
Phil Sutter
b78664d8c5 merge audacious_bar to callbacks.barval 2009-11-30 23:57:04 +01:00
Phil Sutter
086829b017 convert swapbar to callbacks 2009-11-30 23:55:48 +01:00
Phil Sutter
d2f3ae7e15 convert mem{gauge,graph,bar} to callbacks 2009-11-30 23:54:52 +01:00
Phil Sutter
b2b9155514 fix execigauge conversion to callbacks 2009-11-30 23:49:58 +01:00
Phil Sutter
685d4ca4e8 fix execbar merge to callbacks 2009-11-30 23:48:54 +01:00
Phil Sutter
4e63422d10 battery_bar: convert to callbacks.barval 2009-11-30 23:48:04 +01:00
Phil Sutter
a11a1a1253 wireless_link_bar: convert to callbacks.barval 2009-11-30 23:35:49 +01:00
Phil Sutter
c85295202b convert cpubar to callbacks.barval 2009-11-30 23:34:20 +01:00
Phil Sutter
06a4650f60 if_xmms2_connected: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
cec0f3b8c6 cleanup mpd code 2009-11-29 22:21:49 +01:00
Phil Sutter
41f32f8766 if_mpd_playing: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
482f2d50b4 if_mixer_mute: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
5249c9da04 if_mounted: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
9af79a4907 if_up: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
27c1207cd1 if_gw: convert to callbacks.iftest 2009-11-29 22:21:49 +01:00
Phil Sutter
bb70c21c36 nvidia: convert to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
0188eb0aaa top: convert to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
1832cf79c9 ioscheduler: convert to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
712caa8ab3 convert obsd_* to callbacks.print (completely untested) 2009-11-29 22:21:49 +01:00
Phil Sutter
a249b9bc44 convert disk_protect to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
2660cb7590 convert execpi to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
60ad080d1d convert pb_battery to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
3f83bd34f4 convert laptop_mode to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
f3cafc6a7c convert gw_* objects to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
faa47450ad convert sony_fanspeed to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
42b71217e3 loadgraph: convert to callbacks.print 2009-11-29 22:21:49 +01:00
Phil Sutter
ee40c63542 xmms2: outsource code and convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
6bf79b7ebe combine: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
65effae144 scroll: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
67559fdaca moc: convert to callbacks.print and callbacks.free 2009-11-29 22:21:48 +01:00
Phil Sutter
dd8ec48fcb bmpx: convert to callbacks.print 
While here, also drop those calls to memset, as the whole info object is
being zeroed at the beginning of main(). (Probably this is useful upon
config reload, too.)
 2009-11-29 22:21:48 +01:00
Phil Sutter
6371551153 audacious: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
974d28a667 apcupsd: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
ac80e6f55f hddtemp: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
49cacbbc91 offset, align, tailhead: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
e0a3a82932 fs objects: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
18d2319d73 tcp-portmon: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
d0a2c51f4b font: convert scan_font to match common signature 2009-11-29 22:21:48 +01:00
Phil Sutter
9247d838c3 hddtemp: convert to callbacks.free 2009-11-29 22:21:48 +01:00
Phil Sutter
eb612dfcb0 hr, stippled_hr: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
4927eb85a2 goto, tab: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
9c8805ee7b shadecolor: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
f9036f58a2 outlinecolor: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
1a6803454c color: convert to callbacks.print 2009-11-29 22:21:48 +01:00
Phil Sutter
08122354a9 convert some special printing functions to common signature 
Also add a little hack to $scroll to omit the need to call new_fg() from
inside print_scroll(). Instead of inserting a new special after printing
the scrolled text, insert a new object after the scroll object when
parsing text objects to handle the color reset.
 2009-11-29 22:21:48 +01:00
Phil Sutter
2e83ff05c5 text object list: allow appending a list of objects 2009-11-29 22:21:11 +01:00
Phil Sutter
02d104cc6a free_text_objects: drop empty switch cases 2009-11-29 21:40:48 +01:00
Phil Sutter
9cf2b88242 bunch of trivial conversions to gen_free_opaque() 2009-11-29 21:40:48 +01:00
Phil Sutter
697e64272e text_object: provide generic object free routine 
This is a valid replacement to a custom routine for objects using data.s
or data.opaque to point to dynamically allocated data.
 2009-11-29 21:40:48 +01:00
Phil Sutter
fa3118993e huge bunch of trivial conversions to obj->callbacks 2009-11-29 21:40:38 +01:00
Phil Sutter
7b05bdd665 text_object: introduce text_object_callbacks 
The callback functions are:
print - to be called from generate_text_internal()
iftest - same as print for ifblock objects (triggers jumping)
barval - same as above for bar objects (returns current bar value)
gaugeval - same as above for gauge objects
graphval - same as above for graph objects
percentage - for percentage objects, returns actual percentage
free  - called in free_text_objects()

Until conversion is complete, if the function pointer is NULL the old
lookup by type is being done.

Note that it's possible to assign both 'print' and 'iftest' callbacks.
In this case, the code simply ignores the 'iftest' callback, though this
could easily be changed (always calling DO_JUMP at last, of course) in
order to allow ifblock objects to print something in addition to jumping
somewhere (or not).
 2009-11-29 21:33:30 +01:00
Phil Sutter
d989f5b34a cleanup exec.c 2009-11-29 21:28:58 +01:00
Brenden Matthews
f36f747aca Add (broken) cmake build stuff. 2009-11-26 11:25:32 -08: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
Nikolas Garofil
f3e250df55 Bugfix: make sure $else works correct and without memleaks 2009-11-16 08:39:05 +01:00
Nikolas Garofil
5eebf1c516 Fix invalid free for all $if_-vars 2009-11-16 00:21:49 +01:00
Nikolas Garofil
f0211cd43d fix invalid free in if_up 2009-11-15 23:45:33 +01:00
Pavel Labath
ec879680d2 Forgot to set top_running when $running_processes is used 2009-11-15 23:00:14 +01:00
Nikolas Garofil
2ed76a345f Added support for $pid_vmpeak, $pid_vmsize, $pid_vmlck, $pid_vmhwm, $pid_vmrss, $pid_vmdata, $pid_vmstk, $pid_vmexe, $pid_vmlib, $pid_vmpte 2009-11-15 19:44:37 +01:00
Pavel Labath
72412c463b Rename $running_processes to $running_threads, implement real $running_processes 2009-11-15 17:55:03 +01:00
Nikolas Garofil
2c2e87061b Added support for $gid_name 2009-11-15 17:46:41 +01:00
Nikolas Garofil
3fa868f35b Added support for $uid_name 2009-11-15 17:21:55 +01:00
Nikolas Garofil
d38049fb96 Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid 2009-11-15 14:49:55 +01:00
Nikolas Garofil
b8e6b1a58d Add support for $pid_parent 2009-11-15 13:26:40 +01:00
Phil Sutter
68278e4a45 yet another fix for FreeBSD (somehow sneaked through last time) 2009-11-14 16:47:30 +01:00
Phil Sutter
40792b7d05 fix compiling for freebsd 
Tested using default options, lua disabled as only lua50 available in
7.2-RELEASE.
 2009-11-15 01:36:17 +01:00
Phil Sutter
8f1eae1b94 add generated files for profiling to clean list 2009-11-15 01:36:17 +01:00
Nikolas Garofil
038e182c38 argument of $cmdline_to_pid doesnt have to be the full commandline 2009-11-15 00:51:38 +01:00
Nikolas Garofil
7b6e01b869 fix last commit 2009-11-14 22:17:41 +01:00
Nikolas Garofil
fa459f0539 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 2009-11-14 22:07:54 +01:00
Cesare Tirabassi
e582acf1a0 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-11-14 15:58:06 +01:00
Cesare Tirabassi
0ee5e9935a Refactoring of commit 363cf1ab73 
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.
 2009-11-14 15:57:45 +01:00
Nikolas Garofil
1a4c2c61e8 Shrink proc.c 2009-11-14 15:08:41 +01:00
Nikolas Garofil
44de7fe6be Support for $pid_state 2009-11-14 13:58:07 +01:00
Pavel Labath
6db3b5809d Add middle_middle alignment, mostly for completeness 2009-11-13 21:35:49 +01:00
Nikolas Garofil
ab0b80e495 Added support for $pid_chroot 2009-11-13 16:54:40 +01:00
Cesare Tirabassi
f1272dbd31 Merge branch 'master' of git.omp.am:/home/omp/git/conky 2009-11-13 16:36:49 +01:00
Cesare Tirabassi
363cf1ab73 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).
 2009-11-13 16:30:04 +01:00
Nikolas Garofil
e9d92ae717 Fix bug in $pid_openfiles 2009-11-13 16:29:44 +01:00
Phil Sutter
bde5845077 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. :)
 2009-11-13 00:47:23 +01:00
Nikolas Garofil
52df1d2bf2 Merge branch 'master' of ssh://git.omp.am/home/omp/git/conky 2009-11-13 00:38:13 +01:00
Nikolas Garofil
52629bef61 Added support for $pid_openfiles 2009-11-13 00:36:46 +01:00
Phil Sutter
8922603b91 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.
 2009-11-13 00:02:16 +01:00
Phil Sutter
e787870eb4 top: fix segfault for $if_running 
The "name" field may be zero, which makes strcmp() freak out.
 2009-11-13 00:02:16 +01:00