1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 12:10:03 +00:00
Commit Graph

545 Commits

Author SHA1 Message Date
Brenden Matthews
cb653c0baa fix segfault
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1062 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 04:41:37 +00:00
Phil
d151828d23 make intense use of const keyword
* accidential writes to const char * are being detected
  at compile time
* also clean up casting at some places


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1059 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 03:45:36 +00:00
Phil
418b3d62e0 match signedness and format when scanning into variables
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1058 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 03:01:48 +00:00
Phil
ac2dd1b34b use %llu instead of %Lu
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1057 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 02:28:38 +00:00
Phil
ef3f404cca fix potential segfault in get_ioscheduler().
returning a const char * instead of a char * will lead to
trouble if the string is then tried to be free()'d.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1056 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 02:19:36 +00:00
Phil
e306a2c2e8 some linting on function definitions
* instead of empty args "void" should always be specified.
  Using this, the compiler can detect incorrect function calls,
  like with update_stuff().
* No args seems to be interpreted as "unspecified args" by the
  compiler, as with update_mail_count(). So no checking for
  correctness of arguments when calling was done at all.
* This is not complete yet, as I still don't have any BSD for
  testing.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1055 7f574dfc-610e-0410-a909-a81674777703
2008-03-29 02:01:03 +00:00
Brenden Matthews
59c5fe4d11 oh yeah, battery_percent too
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1054 7f574dfc-610e-0410-a909-a81674777703
2008-03-28 23:23:21 +00:00
Brenden Matthews
60985a41e7 * Fixed messed up percentages (fs_free_perc, fs_used_perc, mpd_percent).
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1053 7f574dfc-610e-0410-a909-a81674777703
2008-03-28 23:17:01 +00:00
Brenden Matthews
8de47c132d adding missing include to smapi code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1052 7f574dfc-610e-0410-a909-a81674777703
2008-03-27 20:01:27 +00:00
Brenden Matthews
5c9e2dcbfc minor updates; changing package naming to meet http://devmanual.gentoo.org/ebuild-writing/file-format/index.html guidelines to begin doing prereleases
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1051 7f574dfc-610e-0410-a909-a81674777703
2008-03-27 19:46:35 +00:00
Brenden Matthews
a56e669356 * Fixed battery_bar default size
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1049 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 21:44:50 +00:00
Phil
3966025939 fix indenting in linux.c
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1048 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 20:43:55 +00:00
Phil
749fb99edd two conky fixes
* opened file for laptop_mode wasn't closed again
* hopefully fix reading interface addresses


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1047 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 20:35:20 +00:00
Phil
004d1cb7ba disk_protect - show queue protection state
* disk protection needs a kernel patch and is useful in combination with hdaps


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1045 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 20:08:16 +00:00
Phil
d6953f4864 check validity of specified config
* I accidentially used wrong args when testing conky -> segfault
* reproduce using 'conky -c /this/doesnt/exist'
* code should be portable, but untested on freebsd


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1044 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 19:24:55 +00:00
Brenden Matthews
c2c01423a8 * $battery_bar sysfs fix (thanks Marcus)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1043 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 05:09:09 +00:00
Brenden Matthews
7613414296 * Fixed linux.c compilation problem due to (suspected) broken linux
headers


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1042 7f574dfc-610e-0410-a909-a81674777703
2008-03-24 03:38:28 +00:00
Brenden Matthews
902ff4ca5c fixed compilation with --disable-x11
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1041 7f574dfc-610e-0410-a909-a81674777703
2008-03-23 17:26:41 +00:00
Phil
6a528f4e17 support displaying current nameservers
* gathers information from /etc/resolv.conf
* included (still commented) code to prevent reading too often,
  as I'm not sure whether reading from a real FS (not /proc or /sys)
  could generate higher load in some cases -> comments please!


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1035 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 22:58:26 +00:00
Phil
bcbca8cb5b enable displaying the used ioscheduler for a given disk
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1034 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 21:10:43 +00:00
Phil
d2ed065fdd laptop_mode displays the current laptop mode
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1033 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 20:13:51 +00:00
Phil
929f1d5878 fixed another memleak issue in smapi.c
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1032 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 19:39:43 +00:00
Phil
8fd27c0026 make default gateway information accessible
* gw_iface prints the interface having a default gateway
* gw_ip prints the gatway's ip
* if_gw jumps if no default gateway exists
* when there are multiple gateways, gw_iface and gw_ip
  only print "multiple" when they are different (allows
  basic debugging of ones networking setup)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1031 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 19:06:09 +00:00
Phil
1fa2c2f809 bury dead code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1030 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 18:21:46 +00:00
Phil
9b222e23e9 hopefully fix spaced_print
* when printing only width bytes to buf, with
  width being set to pad_percents which itself
  is set by the user to zero, nothing is printed
* in the unlikely (but possible) case of width > size,
  this could lead to a segfault


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1029 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 18:18:25 +00:00
Phil
c1cb65ff6d smapi review
* rewrote some functions in src/smapi.c for more
  simplicity and less malloc/free hell
* added object cleanup in free_text_objects(),
  valgrind said it was missing
* fixed indenting in construct_text_object()
* fixed use of spaced_print() in generate_text_internal()


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1028 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 18:08:47 +00:00
Brenden Matthews
94bb46b868 added $execpi, new ebuild, various other misc updates
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1027 7f574dfc-610e-0410-a909-a81674777703
2008-03-22 06:10:54 +00:00
Brenden Matthews
ed92bf7f60 small fix for newly introduced bug in non-xft font loading--thanks Phil
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1025 7f574dfc-610e-0410-a909-a81674777703
2008-03-21 23:39:38 +00:00
Brenden Matthews
14f23fb664 fixing warning
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1024 7f574dfc-610e-0410-a909-a81674777703
2008-03-21 23:17:37 +00:00
Brenden Matthews
934c3a94e8 fixing up text_buffer_size stuff
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1021 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 21:28:19 +00:00
Brenden Matthews
4fe68fcc04 fixing problem where p_max_size becomes <1
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1020 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 20:56:13 +00:00
Brenden Matthews
46e129e7b1 * Added CRLF characters to POP3 and IMAP stuff (should play nicer with
some servers now).
	* Added preliminary support for parsing the output of external commands
	(via $execp)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1019 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 20:33:31 +00:00
Brenden Matthews
e48d5ce71e cleaning up
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1018 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 19:22:29 +00:00
Brenden Matthews
a76c4fb437 trying to fix more leaks
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1017 7f574dfc-610e-0410-a909-a81674777703
2008-03-20 05:28:23 +00:00
Brenden Matthews
2698046591 2008-03-19
* Fixed a number of small memory leaks.
	* Performed some minor profiling on Conky; introduced
	small_text_buffer_size and large_text_buffer_size config options instead
	of just text_buffer_size.
	* Fixed some minor bugs introduced by new patches.


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1014 7f574dfc-610e-0410-a909-a81674777703
2008-03-19 22:28:23 +00:00
Brenden Matthews
4ad58c9d04 adding $Id$
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1013 7f574dfc-610e-0410-a909-a81674777703
2008-03-18 17:10:27 +00:00
Brenden Matthews
6928262418 adding missing files
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1012 7f574dfc-610e-0410-a909-a81674777703
2008-03-18 17:09:47 +00:00
Brenden Matthews
b77da1255a updating new file props
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1011 7f574dfc-610e-0410-a909-a81674777703
2008-03-18 17:08:22 +00:00
Brenden Matthews
a1452f5db4 * Applied 12 patches:
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
        2) Improved audacious support patch (thanks Miroslav)
        3) tp_smapi support patch for IBM laptops (thanks Phil)
        4) user info patch (thanks Roland)
        5) added conky build info patch (thanks Roland)
        6) added if_up patch (thanks Phil)
        7) added reload on SIGHUP patch (thanks Jonas)
        8) added pad percentages patch (thanks Jonas)
        9) added fs_type patch (thanks Ryan)
        10) added xmms2 fixes patch (thanks Lassi)
        11) fix sysfs crash patch (thanks Phil)
        12) multiple ip patch ($addrs)
    * Added more alignment support (top_middle, bottom_middle, middle_left,
    and middle_right).


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1010 7f574dfc-610e-0410-a909-a81674777703
2008-03-18 00:23:16 +00:00
Brenden Matthews
dd3b471f2d * Applied 2 patches:
1) sysfs battery support (for Linux >=2.6.24) (thanks Kapil)
		2) Improved audacious support patch (thanks Miroslav)


git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1009 7f574dfc-610e-0410-a909-a81674777703
2008-03-17 22:27:20 +00:00
Roman Bogorodskiy
ae8c4198b8 Fix compilation.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1008 7f574dfc-610e-0410-a909-a81674777703
2008-02-24 16:35:18 +00:00
Kevin Lyles
3d26a4880e Reformatted all code
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1007 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 20:30:45 +00:00
Kevin Lyles
3cf1a29768 Refactored the top and top_mem handling to use a switch statement
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1006 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:31 +00:00
Kevin Lyles
9c3ae23a15 Fixed a few minor type issues
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1005 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:23 +00:00
Kevin Lyles
c96f5b1143 Removed unused macros and removed X11 options from the options string unless X11 is enabled
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1004 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:13 +00:00
Kevin Lyles
32c8f71eaa Added missing break statements and a missing freebsd kernel check
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1003 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:01:00 +00:00
Kevin Lyles
2a7a05342f Fixed a typo and re-added an accidentally removed line
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1002 7f574dfc-610e-0410-a909-a81674777703
2008-02-20 10:00:45 +00:00
Kevin Lyles
9a44d8b1c8 Fixed broken compilation on FreeBSD
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1001 7f574dfc-610e-0410-a909-a81674777703
2008-02-19 18:48:54 +00:00
Kevin Lyles
e7b786d79a Fixed round_to_int to handle negative numbers properly
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1000 7f574dfc-610e-0410-a909-a81674777703
2008-02-19 03:33:12 +00:00
Kevin Lyles
e39a3ad8e4 Fixed some typos and restored a few accidentally removed lines in the recent diskio patch.
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@999 7f574dfc-610e-0410-a909-a81674777703
2008-02-10 11:14:19 +00:00