1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 19:15:12 +00:00
Commit Graph

1437 Commits

Author SHA1 Message Date
Phil Sutter
44c5a10e04 rewrite human_readable() to minimise padding
Also fix spaced_print(): when given a width of e.g. 3, output at least 3
characters, not 2 as it was before.
2009-03-01 20:24:22 +01:00
Nikolas Garofil
09ac943a3a if_updatenr added 2009-03-01 15:10:01 +01:00
Phil Sutter
a9a59e5d28 move the custom defined memrchr to the right place
And make it static, as tailhead.c is the only user of it.
2009-02-25 00:23:56 +01:00
Phil Sutter
745eec145f fix 966a05a984 2009-02-23 23:28:12 +01:00
Phil Sutter
64af164666 add help text for --print-config option
While here, fix also -C for builds with --disable-x11.
2009-02-22 19:05:53 +01:00
Phil Sutter
e3ed9c62fb whitespace cleanup 2009-02-22 19:05:52 +01:00
Phil Sutter
2c44e6dccf remove x11 dependency of fonts
Instead, we just ignore them. Less errors in output, little less
ifdef's.
2009-02-22 19:04:42 +01:00
Phil Sutter
e28f79a133 split off specials from conky.c
As a side effect, font and colour specific stuff got outsourced, too.
This is because the apropriate functions are used by conky.c as well as
specials.c, so they should be kept on their own.

In the long term I hope for positive impact on the X11 integration mess.
(Take e.g. the mass of X11 ifdefs cluttering conky.c.) Though this
commit contains no optimisations in this direction, just plain
outsourcing, to ensure minimised (intended: none) changes to conky's
interface behaviour.
2009-02-22 19:04:33 +01:00
Phil Sutter
f198fc934b add doxygen support
Since we have no doxygen compatible code comments (we hardly have
comments at all ;) there is not much documentation to be extracted. But
this is still useful, as doxy generates us nice callgraphs showing the
internal code flow chaos. :)

Usage is as follows: after having run ./autogen.sh, doxygen can be
triggered by simply issuing 'make doxy'. This will generate a doxy
config if none exists, and preset some stuff inside (especially
parsing of undocumented stuff). Before all consecutive invocations, the
doxy config (named 'Doxyfile') can be customised to one's personal
needs.
2009-02-22 17:43:10 +01:00
Phil Sutter
3cd87aadf8 fix for building with --disable-x11 2009-02-22 03:08:28 +01:00
Phil Sutter
90a3e8de80 merge tail and head into a single source file
This allows having the same init-function for both objects. Code size
could be further reduced, as the print-functions share some code, too.
2009-02-22 03:00:35 +01:00
Phil Sutter
20809f3198 put tail and head code into separate files
In fact these two objects share a lot of code, so the bigger plan is to
merge them into a single file to share equal code.

This should not change anything to the code flow, besides making conky
startup a bit more robust due to less use of CRIT_ERR.
2009-02-22 03:00:26 +01:00
Phil Sutter
77c59b260d merge ibm-acpi and smapi together
Well, not really. I don't dare putting it all together into a single
source file, as that would just not make sense. Instead, this patch
eliminates the --enable-smapi configure option and all related checks,
replacing them with the equivalents from --enable-ibm.
2009-02-22 02:58:42 +01:00
Phil Sutter
d500f1005a outsource ibm-acpi stuff into it's own source file
Despite this is actually not much code and could stay inside linux.c as
well, this makes sense as I want to combine smapi and ibm-acpi
functionality. Virtually every user of a notebook made by IBM/Lenovo
will want both, so this should be a feature not a bug.

Besides making the ibm-acpi objects being built optionally, this should
not change anything to the code flow.
2009-02-22 02:58:29 +01:00
Phil Sutter
4161f90c6f rewrite linux diskio code
Instead of using a hardcoded maximum number of slots for
stats of different disks, use a linked list. Also since the algorithm to
update each device's counters is the same for updating the totals, share
equal code, which in my eyes not only saves a bunch of LoC, but also
drastically increases readability.
2009-02-22 02:57:11 +01:00
Phil Sutter
a619cb3e3c fix potential segfault
The segfault can be triggered by using any diskio object with a
non-existent device, as prepare_diskio_stat() then returns 0 and the
call to obj->data.diskio->current in conky.c:4050 pulls the trigger.

In fact, it's not a problem when the device doesn't exist, as
update_diskio() simply won't fill in any values. So skip the check and
upon device node appearance everything goes it's normal way.

While there, also eliminate double readout of the last line of
/proc/diskstats: after the last line has been read, FEOF is not yet set.
BUT fgets() will return NULL when trying to read the next line. So
better check for fgets()'s return value instead of using feof().

Also strncmp() is useless here, since we really want to compare the full
paths. Besides, text_buffer_size also should be big enough to not make a
difference here.
2009-02-22 02:55:22 +01:00
Phil Sutter
65c27816c4 fix coding style of the last few patches
Also, note that free() does not zero the passed pointer. So conditional
freeing always needs to look like this:
| if (var) {
|     free(var);
|     var = 0;
| }
2009-02-22 02:54:44 +01:00
Brenden Matthews
f92978c5e5 No space between number and units please. 2009-02-17 22:50:43 -07:00
Sattvik
482dd1b82f Null mpd variables should have an empty string patch sf.net id #2564747. 2009-02-17 22:42:08 -07:00
Tamim Khan
d1180b4729 XMMS2 fix and refactoring patch sf.net id #2579357 (thanks Tamim). 2009-02-17 22:29:42 -07:00
Nicolas Sierro
cf77d3f1f9 Extended support for local Maildir patch sf.net id #2561323 (thanks Nicolas). 2009-02-17 22:26:15 -07:00
Martin Tůma
f7aeae2c01 Fix shown battery status patch.
Fix shown battery status when the battery is not charging any more but is not full charged patch sf.net id #2556056 (thanks Martin).
2009-02-17 22:19:25 -07:00
Carpathia
5640da7c84 Patch to clarify things in conky.conf sf.net id #2548805 (thanks Carpathia). 2009-02-17 22:14:59 -07:00
Alexander Monakov
24ddc9665e Fix nvidia memory frequency reading patch sf.net id #2493134. 2009-02-17 22:10:15 -07:00
Alexander Monakov
966a05a984 Fix diskio_read/write patch sf.net id #2493084 (thanks Alexander). 2009-02-17 22:04:38 -07:00
Kim Holviala
27bb931e41 Patch by Kim Holviala sf.net id #2484548.
* change the height of execbar and execibar to be the same as other
		bars have by default (6 pixels)
		* treat mixer values as percentages as they're usually 0-100 (switch
		to spaced_print() with pad_percents)
		* change temp_print() from snprintf() to spaced_print()
		* remove decimals from temp_print() as none of the current sources can
		supply values smaller than 1 degree (C or F, doesn't matter)
		* add a space between number and the unit in human_readable()
		* fix number printing in human_readable()
		* network $upspeed and $downspeed now use human_readable()
2009-02-17 22:00:23 -07:00
Swoög
b516e19440 Patch to add $battery_short variable. 2009-02-17 21:49:45 -07:00
Brenden Matthews
b4cd98868f Misc compilation fixes. 2009-02-17 21:45:06 -07:00
Nikolas Garofil
1085d2b27e out_to_x can now be turned off 2009-02-15 18:58:03 +01:00
Nikolas Garofil
227e5a3d38 docs and syntax for overwrite_file and append_file 2009-02-12 23:04:39 +01:00
Nikolas Garofil
65bae86ca7 append_file output method 2009-02-12 22:45:18 +01:00
Nikolas Garofil
3a11f1469f overwrite_file output method 2009-02-12 22:35:00 +01:00
Nikolas Garofil
4c25a9680e Added output_to_stderr 2009-02-10 09:43:20 +01:00
Brenden Matthews
c3003dc1a3 Fix my last 'fix'. 2009-02-09 12:36:10 -07:00
Brenden Matthews
850f7dfbc1 Fix warning on older versions of gcc. 2009-02-08 10:29:49 -07:00
Brenden Matthews
5b9d47c039 Couple fixes for the top_time stuff. 2009-02-08 10:13:54 -07:00
Alexander Graf
9da5648d2a better combine top, top_mem and top_time handlers 2009-02-08 17:19:10 +01:00
Alexander Graf
e6c9ff751c Also free process list when ${top_time} is used 2009-02-08 16:16:12 +01:00
Alexander Graf
1ac4104e0b top.c: Allow heavier optimization
This makes it possible for the compiler to do better optimizations by
adding "static" to functions which do not need to be exported.

Since some of them (e.g. the compare_*() functions) are called very
often, this may decrease conky's need of resources a bit.
2009-02-08 16:13:45 +01:00
Alexander Graf
04623066d7 Don't do unneeded sp_acopy() calls 2009-02-08 16:05:42 +01:00
Alexander Graf
b4f06b7547 Update README and conky.1
With my last patch I did only update the XML documentation file without
updating the auto-generated manpage and README file.

This patch also updates README and conky.1.
2009-02-07 17:44:19 +01:00
Alexander Graf
9c679bf33f Add ${top_time} sorting processes by CPU time 2009-02-07 15:01:50 +01:00
mipas
cd49afbd19 Build fix patch
This patch fixes build errors on some platforms due to missing includes.
2008-12-22 20:59:42 -07:00
Phil Sutter
c54b96fb24 simplify declaration of ifblock objects
Like OBJ_THREAD, OBJ_IF automatically calls obj_be_ifblock_if() when the
object matches.
2008-12-22 19:43:12 +01:00
Phil Sutter
dd31cc77eb use a global struct moc_s
Since there is no choice of which moc player to get information from,
all moc objects' data source can be identical. Also hide some internal
data (the thread e.g.). Since from now on there can only be one moc
thread (not highlander ;), we don't need to treat the thread object
specially.

While here, fix indenting.
2008-12-22 19:36:24 +01:00
Phil Sutter
2f3fb23ff7 separate parsing and interpreting text objects for certain objects
All objects parsing text into objects formerly parsed and evaluated
their arguments each update interval. This does only make sense when the
parsed text could change between updates, which is the case for execp
and execpi objects, but none of the others. So have them parse the text
when creating them, so each update interval only the output has to be
re-extracted.

In fact, this should give a performance boost when using any of the
affected objects, as parsing the input text is quite expensive since
we're evaluating templates.
2008-12-22 18:36:44 +01:00
Phil Sutter
2de1840b39 move and add function prototypes to src/conky.c 2008-12-22 17:55:21 +01:00
Phil Sutter
da7bc63996 do not use a global ifblock stack
Using a global ifblock stack for all parsed ifblock objects causes
problems when doing sub-parsing in objects taking other objects as
parameters, because the possibly non-empty stack at startup leads to
false alarm when checking for stack emptiness after parsing the objects.

Use a void ** as the object to pass around, so callers don't need to
know struct ifblock_stack_obj.
2008-12-22 17:49:38 +01:00
Phil Sutter
05624868e3 treat mpd opjects as non-threaded
In fact, they are. But we don't want to treat them as those, because
the rewrite made the only situation when threaded objects matter
uncritical, i.e. when an object calls calling parse_conky_vars().
2008-12-20 16:17:22 +01:00
Phil Sutter
b31af01d91 add if_match object comparing strings, floats and ints
In general, argument types should match, but for combined long and
double usage the long is being converted to double before evaluation.

A few examples:
${if_match ${cpu} < 30}
${if_match "asdf" != "qwer"}
${if_match 0.5 < 0.50001}
${if_match 49.999 < 50}
2008-12-20 16:14:57 +01:00