1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-05 21:07:52 +00:00
Commit Graph

318 Commits

Author SHA1 Message Date
Brenden Matthews
3441f53fc6 undo changes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@335 7f574dfc-610e-0410-a909-a81674777703
2005-09-28 03:21:10 +00:00
Brenden Matthews
16e18039bc Fixed small bug in config parsing (thanks robgrady, bug 1306032)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@332 7f574dfc-610e-0410-a909-a81674777703
2005-09-28 02:33:24 +00:00
Brenden Matthews
119ead12de fix for graphs/bars not showing when using max_width
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@330 7f574dfc-610e-0410-a909-a81674777703
2005-09-24 22:16:07 +00:00
Brenden Matthews
ddedc640d1 graphs should stop giving crazy data now
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@327 7f574dfc-610e-0410-a909-a81674777703
2005-09-16 01:55:36 +00:00
Brenden Matthews
cc4081f864 changed it so conky keeps running even if it can't find a file
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@326 7f574dfc-610e-0410-a909-a81674777703
2005-09-16 01:43:58 +00:00
Brenden Matthews
ca591b58c3 x11 patch 1291420
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@325 7f574dfc-610e-0410-a909-a81674777703
2005-09-16 01:11:19 +00:00
Brenden Matthews
74e7721846 right alignment fix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@324 7f574dfc-610e-0410-a909-a81674777703
2005-09-16 01:07:37 +00:00
Brenden Matthews
0f17101d64 small fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@318 7f574dfc-610e-0410-a909-a81674777703
2005-09-11 23:07:28 +00:00
Brenden Matthews
94312d3f66 some small misc bug fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@272 7f574dfc-610e-0410-a909-a81674777703
2005-09-05 02:09:31 +00:00
Brenden Matthews
471fcabc90 fixed graph width issue
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@262 7f574dfc-610e-0410-a909-a81674777703
2005-09-04 03:43:18 +00:00
Johannes Winkelmann
5e2646e70f - fix illegal memory access when using graphs wider than 256px
- increase max graph width to 512


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@257 7f574dfc-610e-0410-a909-a81674777703
2005-08-31 23:18:54 +00:00
Johannes Winkelmann
4ee616c528 16-bit color adjustments: save 6 divisions per graph by using precalculated values
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@247 7f574dfc-610e-0410-a909-a81674777703
2005-08-30 19:13:01 +00:00
Roman Bogorodskiy
6ff47b6101 Fix memory leak in update_diskio().
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@246 7f574dfc-610e-0410-a909-a81674777703
2005-08-30 17:32:58 +00:00
Johannes Winkelmann
5856598c6b Last fixes:
- round usage values
- fix graph colors on 16-bit displays


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@245 7f574dfc-610e-0410-a909-a81674777703
2005-08-30 14:59:37 +00:00
Roman Bogorodskiy
75032800b1 Add APM support for FreeBSD.
Submitted by:	 Daniel Thiele <dthiele@gmx.net>


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@241 7f574dfc-610e-0410-a909-a81674777703
2005-08-30 04:19:16 +00:00
Brenden Matthews
e0f010f9c0 fixed x11.c issue
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@239 7f574dfc-610e-0410-a909-a81674777703
2005-08-30 00:22:55 +00:00
Roman Bogorodskiy
00d0e162cc - Make update_diskio() return 0 instead of total disk I/O since
boot for the first cycle
- Implement ${top} and ${top_mem} support (further review and testing
  required)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@237 7f574dfc-610e-0410-a909-a81674777703
2005-08-29 19:39:35 +00:00
Brenden Matthews
7b33986b3c added $texeci, fixed a bug with own_winodw and double buffer
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@236 7f574dfc-610e-0410-a909-a81674777703
2005-08-29 17:06:31 +00:00
Jason Tan
0159b41637 fixed a bug that caused segfaults if no arguments weren't provided to variables that require arguments. also, changed the addr variable to now require <internface> as an argument, to be consistent with the rest of the net variables...
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@234 7f574dfc-610e-0410-a909-a81674777703
2005-08-29 16:49:09 +00:00
Roman Bogorodskiy
526f99e1aa Connect top.c to the build only on Linux.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@233 7f574dfc-610e-0410-a909-a81674777703
2005-08-29 10:29:31 +00:00
Johannes Winkelmann
0727d1e50d some fixes for update_stat():
- initialize cpu_info struct properly (a large conkyrc could pollute that memory area)
- allocate info.cpu_usage to cpu_count + 1


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@220 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 14:55:10 +00:00
Roman Bogorodskiy
2c8acab933 - Fix make dist without having HAVE_DOCSTUFF defined
- Remove obsolete comment from freebsd.c


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@219 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 14:14:34 +00:00
Roman Bogorodskiy
c336133dea - Hide i8k stuff under "#ifdef __linux__" since I don't think it present
on non-Linux systems
- Fiddle with cpu usage detecting code on FreeBSD. Now it can show usage
  on all CPUs, but usage for some single CPU on SMP system is not supported
  (I have no SMP, so it's hard to write/test SMP support for me).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@218 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 12:59:46 +00:00
Roman Bogorodskiy
313ef55c14 - Implement update_diskio() on FreeBSD (it would not work on FreeBSD <= 4.x,
maybe I will fix it later)
- Add tests for libdevstat to configure.in (needed by update_diskio())


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@217 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 11:56:22 +00:00
Johannes Winkelmann
67a9e3b5e5 Fix regression in get_diskio() (used to ignore valid disks)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@216 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 11:55:11 +00:00
Brenden Matthews
ad781663f6 small fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@215 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 11:39:47 +00:00
Brenden Matthews
52b2d75fad more fixes to new smp stuff, mainly in config parsing
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@213 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 10:36:28 +00:00
Brenden Matthews
e93155d26b smp support, should be the last commit (yeah right!)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@212 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 10:17:41 +00:00
Brenden Matthews
e3f5429f9d smp support?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@211 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 10:10:31 +00:00
Brenden Matthews
af6435c957 smp support?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@210 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 09:49:09 +00:00
Brenden Matthews
22d6007f79 smp support?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@209 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 09:43:28 +00:00
Brenden Matthews
46193ed06c smp support?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@208 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 09:34:00 +00:00
Brenden Matthews
5a179ffde2 smp support?
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@207 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 09:29:24 +00:00
Brenden Matthews
c1330e5693 small fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@205 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 07:58:29 +00:00
Jason Tan
9b1ec59cb3 fixed memory leak in i8k, courtesy of brenden
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@204 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 07:40:49 +00:00
Jason Tan
d0325837d5 added i8k insprion laptop monitoring, via /proc/i8k (third-party driver).
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@203 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 07:15:44 +00:00
Brenden Matthews
e1a20e83d5 oops..mem leak!
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@202 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 06:02:45 +00:00
Brenden Matthews
7542bd4123 alignment fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@200 7f574dfc-610e-0410-a909-a81674777703
2005-08-27 04:55:48 +00:00
Johannes Winkelmann
1ce64d3681 clarify credits for major number definitions
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@199 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 22:52:02 +00:00
Johannes Winkelmann
dc6ac8edaf recent linux kernels don't define certain major numbers; add them if not defined
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@198 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 22:35:39 +00:00
Johannes Winkelmann
c02d7bc18a fix update_diskio() on linux: not all devices were counted before; ignore some virtual devices (LVM, network block devices, RAM disks, loopback)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@196 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 22:15:04 +00:00
Brenden Matthews
bdfab6b089 * Fixed slight vertical misalignment of bars/graphs (sf.net 1273994)
* Diskio fixes (sf.net 1274140


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@195 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 16:29:56 +00:00
Roman Bogorodskiy
dd9eed5114 - Remove old cycles code from get_freq()
- Copy get_freq_dynamic() and rdtsc() from linux.c to make $freq_dyn{_g} work


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@194 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 11:10:52 +00:00
Roman Bogorodskiy
2e94decbf1 Fix typo and add empty update_diskis() (will be implemented a bit later) to
fix build on FreeBSD after recent changes.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@193 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 09:54:57 +00:00
Brenden Matthews
7f3c89f993 $head, mem leak fixes
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@191 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 05:52:43 +00:00
Brenden Matthews
b61eac4b0f undo the disabling of double-buffer when using own_window. this doesn't play well with gnome.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@190 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 03:40:53 +00:00
Brenden Matthews
2210a8459f $execibar and $execigraph were broken. thanks to GimmeFuel for the heads-up
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@188 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 03:26:23 +00:00
Brenden Matthews
940c63233f small fixes. the code feels sexy right now.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@187 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 02:52:54 +00:00
Brenden Matthews
cdb2b0d388 * More own_window fixes
* applied disk io patch (sf.net patch 1271691)
        * applied $freq fixes patch, adds new $freq_dyn (sf.net patch 1271633)
        * removed units from $freq* output
        * fix for graph config parsing


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@185 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 02:16:35 +00:00
Jason Tan
bc36a9500e fixed the 'can't find ~/.conkyrc bug.
' by checking that the file actually existed. if it didn't, then just used default_configuration


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@184 7f574dfc-610e-0410-a909-a81674777703
2005-08-26 01:55:33 +00:00
Brenden Matthews
72ea302dfb own_window additions, such as background colour and transparency switch
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@183 7f574dfc-610e-0410-a909-a81674777703
2005-08-25 09:24:26 +00:00
Brenden Matthews
7bdb0501dc own_window was broken by alignment none patch
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@182 7f574dfc-610e-0410-a909-a81674777703
2005-08-25 07:54:53 +00:00
Brenden Matthews
057300db6f oops..forgot to remove a debug printf
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@180 7f574dfc-610e-0410-a909-a81674777703
2005-08-25 05:15:18 +00:00
Brenden Matthews
34b5637a46 updated todo; fixed scale for netgraphs (sf.net feature request 1256921); fixed small bug in ebuild; doc updates.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@178 7f574dfc-610e-0410-a909-a81674777703
2005-08-25 04:00:55 +00:00
Brenden Matthews
0732d1c4f3 implemented qsort() in top.c instead of using my lame algorithm
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@176 7f574dfc-610e-0410-a909-a81674777703
2005-08-25 01:13:01 +00:00
Roman Bogorodskiy
632224e9c6 Make get_freq() return float.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@168 7f574dfc-610e-0410-a909-a81674777703
2005-08-24 20:52:55 +00:00
Brenden Matthews
c85fa7a089 doc makefile
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@163 7f574dfc-610e-0410-a909-a81674777703
2005-08-24 20:35:25 +00:00
Roman Bogorodskiy
e618a49cf4 In BSD getopt we need to set variable "optreset" to 1 if we are going to call
getopt() for the second time.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@162 7f574dfc-610e-0410-a909-a81674777703
2005-08-24 12:05:47 +00:00
Brenden Matthews
84f29d62fc maximum_width
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@161 7f574dfc-610e-0410-a909-a81674777703
2005-08-24 06:29:53 +00:00
Brenden Matthews
327e723e8e maximum_width
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@160 7f574dfc-610e-0410-a909-a81674777703
2005-08-24 06:21:50 +00:00
Roman Bogorodskiy
9c56581089 - On FreeBSD, first try dev.cpu.0.freq sysctl (see cpufreq(4) for details)
to detect CPU frequency and only then do i386 magic
- Minor cleanup


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@159 7f574dfc-610e-0410-a909-a81674777703
2005-08-24 05:33:10 +00:00
Roman Bogorodskiy
dfd3ce76a5 Fix build on FreeBSD.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@156 7f574dfc-610e-0410-a909-a81674777703
2005-08-23 06:10:25 +00:00
Brenden Matthews
033002fcd8 $execibar $execigraph
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@155 7f574dfc-610e-0410-a909-a81674777703
2005-08-23 03:00:50 +00:00
Brenden Matthews
a066bb6506 configure and makefile updates
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@153 7f574dfc-610e-0410-a909-a81674777703
2005-08-22 23:32:35 +00:00
Brenden Matthews
d675f04728 tiny fix
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@146 7f574dfc-610e-0410-a909-a81674777703
2005-08-22 01:22:34 +00:00
Brenden Matthews
24ebad7227 docgen
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@140 7f574dfc-610e-0410-a909-a81674777703
2005-08-22 00:24:24 +00:00
Brenden Matthews
0d5fb4bdcc fixing autotool stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@133 7f574dfc-610e-0410-a909-a81674777703
2005-08-21 23:09:36 +00:00
Brenden Matthews
e5893c4329 moved stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@130 7f574dfc-610e-0410-a909-a81674777703
2005-08-21 22:10:54 +00:00