Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-10-02 15:09:07 +00:00
Code Issues Releases Activity
6cce8e8e11
conky/src/core.cc

2060 lines
71 KiB
C++
Raw Normal View History

Update modelines and stuff.
2010-01-07 03:45:19 +00:00
/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
* vim: ts=4 sw=4 noet ai cindent syntax=cpp
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
*
* Conky, a system monitor, based on torsmo
*
* Any original torsmo code is licensed under the BSD license
*
* All code written since the fork of torsmo is licensed under the GPL
*
* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
Update copyright notices.
2010-01-01 23:46:17 +00:00
* Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
* (see AUTHORS)
* All rights reserved.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* local headers */
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
#include "core.h"
#include "text_object.h"
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#include "algebra.h"
#include "build.h"
convert bsd apm objects to callbacks.print
2009-11-29 13:14:06 +00:00
#include "bsdapm.h"
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#include "colours.h"
combine: outsource code
2009-10-17 14:14:25 +00:00
#include "combine.h"
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#include "diskio.h"
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-12 22:50:17 +00:00
#include "entropy.h"
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
#include "exec.h"
i8k: outsource code
2009-11-16 19:58:26 +00:00
#include "i8k.h"
Fix building without Imlib2
2010-10-30 15:44:33 +00:00
#ifdef BUILD_IMLIB2
convert image to callbacks.print
2009-11-28 21:45:01 +00:00
#include "imlib2.h"
Fix building without Imlib2
2010-10-30 15:44:33 +00:00
#endif
Add support for ${pid cmdline}
2009-11-11 09:55:25 +00:00
#include "proc.h"
Add support for MySQL Warning: Altough the current version works (for me), the syntax of the configoptions and vars will probably change over time. Contact me if you have ideas. The following is a example of how you can use it now: mysql_host someserver.com mysql_db my_database mysql_user loginname mysql_password "s3cr3t" TEXT ${mysql select var1 from some_table}${mysql select var2 from some_table}
2010-04-18 15:52:41 +00:00
#ifdef BUILD_MYSQL
#include "mysql.h"
#endif
Add support for $ical
2010-04-27 14:42:21 +00:00
#ifdef BUILD_ICAL
#include "ical.h"
#endif
Add support for $irc
2010-04-30 17:32:42 +00:00
#ifdef BUILD_IRC
#include "irc.h"
#endif
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#include "fonts.h"
#endif
#include "fs.h"
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_IBM
hide smapi internal functions and cleanup header
2009-12-17 21:11:42 +00:00
#include "ibm.h"
#include "smapi.h"
#endif
Get $iconv vars working again
2010-01-20 17:17:30 +00:00
#ifdef BUILD_ICONV
iconv: outsource code into it's own file While testing, I found two already existing bugs: * the variable 'a' passed to iconv_convert() needs to be passed by reference in order to allow for the desired side effect. * Somehow the trailing junk after an iconv_conversion to a shorter string messes things up (and gets printed!). I couldn't exactly find out why this happens, but setting (*p) = 0; solves this problem.
2009-10-03 18:01:33 +00:00
#include "iconv_tools.h"
#endif
include llua.h where it's really needed
2009-12-28 20:05:40 +00:00
#include "llua.h"
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#include "logging.h"
#include "mixer.h"
#include "mail.h"
#include "mboxscan.h"
make out_to_ncurses a lua setting this completes the porting of bool settings
2010-04-30 17:33:21 +00:00
#include "nc.h"
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
#include "net_stat.h"
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_NVIDIA
nvidia: convert to generic text object payload
2009-10-03 14:14:23 +00:00
#include "nvidia.h"
#endif
Merge read_tcp and read_udp as much as possible
2010-04-17 00:31:37 +00:00
#include "read_tcpip.h"
scroll: outsource code
2009-10-06 23:04:32 +00:00
#include "scroll.h"
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#include "specials.h"
#include "temphelper.h"
outsource the whole template object machinery
2009-09-03 21:53:20 +00:00
#include "template.h"
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#include "tailhead.h"
outsource time, utime and tztime into a separate file
2009-10-03 15:46:59 +00:00
#include "timeinfo.h"
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#include "top.h"
gid_name, uid_name: outsource sub object parsing and convert to callbacks.print
2009-11-29 15:40:23 +00:00
#include "user.h"
convert user objects to callbacks.{print,free}
2009-11-25 23:51:19 +00:00
#include "users.h"
make $curl use the new callback system instead of timed_thread ps: this breaks $rss and $weather, they need to be ported as well
2010-12-31 15:43:49 +00:00
#ifdef BUILD_CURL
#include "ccurl_thread.h"
#endif /* BUILD_CURL */
Make $weather use the new callback system
2011-01-06 10:14:24 +00:00
#ifdef BUILD_WEATHER_METAR
#include "weather.h"
#endif /* BUILD_WEATHER_METAR */
Make $rss use the new callback system
2011-02-15 23:33:22 +00:00
#ifdef BUILD_RSS
#include "rss.h"
#endif /* BUILD_RSS */
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
#ifdef BUILD_AUDACIOUS
#include "audacious.h"
#endif
Cmus support added to conky
2011-05-10 20:40:53 +00:00
#ifdef BUILD_CMUS
#include "cmus.h"
#endif
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* check for OS and include appropriate headers */
#if defined(__linux__)
#include "linux.h"
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include "freebsd.h"
#elif defined(__OpenBSD__)
#include "openbsd.h"
#endif
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#include <string.h>
#include <ctype.h>
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* strip a leading /dev/ if any, following symlinks first
*
* BEWARE: this function returns a pointer to static content
* which gets overwritten in consecutive calls. I.e.:
* this function is NOT reentrant.
*/
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
const char *dev_name(const char *path)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
{
static char buf[255]; /* should be enough for pathnames */
ssize_t buflen;
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (!path)
return NULL;
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#define DEV_NAME(x) \
x != NULL && strlen(x) > 5 && strncmp(x, "/dev/", 5) == 0 ? x + 5 : x
if ((buflen = readlink(path, buf, 254)) == -1)
return DEV_NAME(path);
buf[buflen] = '\0';
return DEV_NAME(buf);
#undef DEV_NAME
}
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
static struct text_object *new_text_object_internal(void)
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
{
Switch some more bits to C++, more CMake changes.
2009-12-10 04:05:32 +00:00
struct text_object *obj = (text_object*)malloc(sizeof(struct text_object));
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
memset(obj, 0, sizeof(struct text_object));
return obj;
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
static struct text_object *create_plain_text(const char *s)
{
struct text_object *obj;
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (s == NULL || *s == '\0') {
return NULL;
}
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
obj = new_text_object_internal();
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
convert OBJ_text to callbacks This is tricky: there is no such thing as $text. In fact, everything below TEXT in the conkyrc which is NOT a text object will become one of type OBJ_text. To make life easy, introduce a function obj_be_plain_text() converting a given object to the given plain text.
2009-11-29 19:04:55 +00:00
obj_be_plain_text(obj, s);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
return obj;
}
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
curl
2010-04-19 12:54:03 +00:00
#ifdef BUILD_CURL
Add support for $stock
2010-04-19 12:45:05 +00:00
void stock_parse_arg(struct text_object *obj, const char *arg)
{
char stock[8];
fix bug in stock
2010-04-24 16:09:09 +00:00
char data[16];
Add support for $stock
2010-04-19 12:45:05 +00:00
obj->data.s = NULL;
fix bug in stock
2010-04-24 16:09:09 +00:00
if(sscanf(arg, "%7s %15s", stock, data) != 2) {
Add support for $stock
2010-04-19 12:45:05 +00:00
NORM_ERR("wrong number of arguments for $stock");
return;
}
if(!strcasecmp("ask", data)) strcpy(data, "a");
else if(!strcasecmp("adv", data)) strcpy(data, "a2");
else if(!strcasecmp("asksize", data)) strcpy(data, "a5");
else if(!strcasecmp("bid", data)) strcpy(data, "b");
Add some more stock data that yahoo is providing
2010-04-22 14:52:15 +00:00
else if(!strcasecmp("askrt", data)) strcpy(data, "b2");
else if(!strcasecmp("bidrt", data)) strcpy(data, "b3");
else if(!strcasecmp("bookvalue", data)) strcpy(data, "b4");
else if(!strcasecmp("bidsize", data)) strcpy(data, "b6");
else if(!strcasecmp("change", data)) strcpy(data, "c1");
else if(!strcasecmp("commission", data)) strcpy(data, "c3");
else if(!strcasecmp("changert", data)) strcpy(data, "c6");
else if(!strcasecmp("ahcrt", data)) strcpy(data, "c8");
else if(!strcasecmp("ds", data)) strcpy(data, "d");
else if(!strcasecmp("ltd", data)) strcpy(data, "d1");
else if(!strcasecmp("tradedate", data)) strcpy(data, "d2");
else if(!strcasecmp("es", data)) strcpy(data, "e");
else if(!strcasecmp("ei", data)) strcpy(data, "e1");
else if(!strcasecmp("epsecy", data)) strcpy(data, "e7");
else if(!strcasecmp("epseny", data)) strcpy(data, "e8");
else if(!strcasecmp("epsenq", data)) strcpy(data, "e9");
else if(!strcasecmp("floatshares", data)) strcpy(data, "f6");
else if(!strcasecmp("dayslow", data)) strcpy(data, "g");
else if(!strcasecmp("dayshigh", data)) strcpy(data, "h");
else if(!strcasecmp("52weeklow", data)) strcpy(data, "j");
else if(!strcasecmp("52weekhigh", data)) strcpy(data, "k");
else if(!strcasecmp("hgp", data)) strcpy(data, "g1");
else if(!strcasecmp("ag", data)) strcpy(data, "g3");
else if(!strcasecmp("hg", data)) strcpy(data, "g4");
else if(!strcasecmp("hgprt", data)) strcpy(data, "g5");
else if(!strcasecmp("hgrt", data)) strcpy(data, "g6");
else if(!strcasecmp("moreinfo", data)) strcpy(data, "i");
else if(!strcasecmp("obrt", data)) strcpy(data, "i5");
Add almost all stock data yahoo provides
2010-04-24 12:57:04 +00:00
else if(!strcasecmp("mc", data)) strcpy(data, "j1");
else if(!strcasecmp("mcrt", data)) strcpy(data, "j3");
else if(!strcasecmp("ebitda", data)) strcpy(data, "j4");
else if(!strcasecmp("c52wlow", data)) strcpy(data, "j5");
else if(!strcasecmp("pc52wlow", data)) strcpy(data, "j6");
else if(!strcasecmp("cprt", data)) strcpy(data, "k2");
else if(!strcasecmp("lts", data)) strcpy(data, "k3");
else if(!strcasecmp("c52whigh", data)) strcpy(data, "k4");
else if(!strcasecmp("pc52whigh", data)) strcpy(data, "k5");
else if(!strcasecmp("ltp", data)) strcpy(data, "l1");
else if(!strcasecmp("hl", data)) strcpy(data, "l2");
else if(!strcasecmp("ll", data)) strcpy(data, "l3");
else if(!strcasecmp("dr", data)) strcpy(data, "m");
else if(!strcasecmp("drrt", data)) strcpy(data, "m2");
else if(!strcasecmp("50ma", data)) strcpy(data, "m3");
else if(!strcasecmp("200ma", data)) strcpy(data, "m4");
else if(!strcasecmp("c200ma", data)) strcpy(data, "m5");
else if(!strcasecmp("pc200ma", data)) strcpy(data, "m6");
else if(!strcasecmp("c50ma", data)) strcpy(data, "m7");
else if(!strcasecmp("pc50ma", data)) strcpy(data, "m8");
else if(!strcasecmp("name", data)) strcpy(data, "n");
else if(!strcasecmp("notes", data)) strcpy(data, "n4");
else if(!strcasecmp("open", data)) strcpy(data, "o");
else if(!strcasecmp("pc", data)) strcpy(data, "p");
else if(!strcasecmp("pricepaid", data)) strcpy(data, "p1");
else if(!strcasecmp("cip", data)) strcpy(data, "p2");
else if(!strcasecmp("ps", data)) strcpy(data, "p5");
else if(!strcasecmp("pb", data)) strcpy(data, "p6");
else if(!strcasecmp("edv", data)) strcpy(data, "q");
else if(!strcasecmp("per", data)) strcpy(data, "r");
else if(!strcasecmp("dpd", data)) strcpy(data, "r1");
else if(!strcasecmp("perrt", data)) strcpy(data, "r2");
else if(!strcasecmp("pegr", data)) strcpy(data, "r5");
else if(!strcasecmp("pepsecy", data)) strcpy(data, "r6");
else if(!strcasecmp("pepseny", data)) strcpy(data, "r7");
else if(!strcasecmp("symbol", data)) strcpy(data, "s");
else if(!strcasecmp("sharesowned", data)) strcpy(data, "s1");
else if(!strcasecmp("shortratio", data)) strcpy(data, "s7");
else if(!strcasecmp("ltt", data)) strcpy(data, "t1");
else if(!strcasecmp("tradelinks", data)) strcpy(data, "t6");
else if(!strcasecmp("tt", data)) strcpy(data, "t7");
else if(!strcasecmp("1ytp", data)) strcpy(data, "t8");
else if(!strcasecmp("volume", data)) strcpy(data, "v");
else if(!strcasecmp("hv", data)) strcpy(data, "v1");
else if(!strcasecmp("hvrt", data)) strcpy(data, "v7");
else if(!strcasecmp("52weekrange", data)) strcpy(data, "w");
else if(!strcasecmp("dvc", data)) strcpy(data, "w1");
else if(!strcasecmp("dvcrt", data)) strcpy(data, "w4");
else if(!strcasecmp("se", data)) strcpy(data, "x");
else if(!strcasecmp("dy", data)) strcpy(data, "y");
Add support for $stock
2010-04-19 12:45:05 +00:00
else {
complete stock error mesg
2010-04-24 16:26:17 +00:00
NORM_ERR("\"%s\" is not supported by $stock. Supported: 1ytp, 200ma, 50ma, 52weeklow, 52weekhigh, 52weekrange, adv, ag, ahcrt, ask, askrt, asksize, bid, bidrt, bidsize, bookvalue, c200ma, c50ma, c52whigh, c52wlow, change, changert, cip, commission, cprt, dayshigh, dayslow, dpd, dr, drrt, ds, dvc, dvcrt, dy, ebitda, edv, ei, epsecy, epsenq, epseny, es, floatshares, hg, hgp, hgprt, hl, hv, hvrt, ll, ltd, ltp, lts, ltt, mc, mcrt, moreinfo, name, notes, obrt, open, pb, pc, pc200ma, pc50ma, pc52whigh, pc52wlow, pegr, pepsecy, pepseny, per, perrt, pricepaid, ps, se, sharesowned, shortratio, symbol, tradedate, tradelinks, tt, volume", data);
Add support for $stock
2010-04-19 12:45:05 +00:00
return;
}
#define MAX_FINYAH_URL_LENGTH 64
obj->data.s = (char*) malloc(MAX_FINYAH_URL_LENGTH);
snprintf(obj->data.s, MAX_FINYAH_URL_LENGTH, "http://download.finance.yahoo.com/d/quotes.csv?s=%s&f=%s", stock, data);
}
curl
2010-04-19 12:54:03 +00:00
#endif /* BUILD_CURL */
Add support for $stock
2010-04-19 12:45:05 +00:00
Use the new callback system instead of add_update_callback() & co.
2010-12-31 12:39:54 +00:00
legacy_cb_handle *create_cb_handle(int (*fn)())
{
if(fn)
return new legacy_cb_handle(conky::register_cb<legacy_cb>(1, fn));
else
return NULL;
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* construct_text_object() creates a new text_object */
Fix 3 memleaks that happen when scroll receives wrong args
2010-02-15 15:02:29 +00:00
struct text_object *construct_text_object(char *s, const char *arg, long
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
line, void **ifblock_opaque, void *free_at_crash)
Uhh..ansohus
2009-08-06 06:54:40 +00:00
{
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
// struct text_object *obj = new_text_object();
struct text_object *obj = new_text_object_internal();
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
obj->line = line;
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
/* helper defines for internal use only */
#define __OBJ_HEAD(a, n) if (!strcmp(s, #a)) { \
Use the new callback system instead of add_update_callback() & co.
2010-12-31 12:39:54 +00:00
obj->cb_handle = create_cb_handle(n);
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
#define __OBJ_IF obj_be_ifblock_if(ifblock_opaque, obj)
Bugfix: memleak at crash caused by missing arg
2010-04-15 11:00:54 +00:00
#define __OBJ_ARG(...) if (!arg) { free(s); CRIT_ERR(obj, free_at_crash, __VA_ARGS__); }
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
/* defines to be used below */
#define OBJ(a, n) __OBJ_HEAD(a, n) {
#define OBJ_ARG(a, n, ...) __OBJ_HEAD(a, n) __OBJ_ARG(__VA_ARGS__) {
#define OBJ_IF(a, n) __OBJ_HEAD(a, n) __OBJ_IF; {
#define OBJ_IF_ARG(a, n, ...) __OBJ_HEAD(a, n) __OBJ_ARG(__VA_ARGS__) __OBJ_IF; {
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#define END } } else
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (s[0] == '#') {
obj->data.l = get_x11_color(s);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
} else
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
simplify this conditional a bit
2009-12-13 01:34:29 +00:00
#ifndef __OpenBSD__
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
OBJ(acpitemp, 0)
obj->data.i = open_acpi_temperature(arg);
convert acpitemp to callbacks.{print,free}
2009-11-26 00:38:53 +00:00
obj->callbacks.print = &print_acpitemp;
obj->callbacks.free = &free_acpitemp;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(acpiacadapter, 0)
Add optional argument to $acpiacadapter The exact location of the state information seems hardware dependent, so this adds the option to specify it manually. (linux only)
2010-01-24 14:34:03 +00:00
if(arg) {
#ifdef __linux__
if(strpbrk(arg, "/.") != NULL) {
/*
* a bit of paranoia. screen out funky paths
* i hope no device will have a '.' in its name
*/
NORM_ERR("acpiacadapter: arg must not contain '/' or '.'");
} else
obj->data.opaque = strdup(arg);
#else
NORM_ERR("acpiacadapter: arg is only used on linux");
#endif
}
convert some non-openbsd objects to callbacks.{print,iftest}
2009-11-26 00:51:41 +00:00
obj->callbacks.print = &print_acpiacadapter;
Add optional argument to $acpiacadapter The exact location of the state information seems hardware dependent, so this adds the option to specify it manually. (linux only)
2010-01-24 14:34:03 +00:00
obj->callbacks.free = &gen_free_opaque;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif /* !__OpenBSD__ */
simplify this conditional a bit
2009-12-13 01:34:29 +00:00
END OBJ(freq, 0)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
get_cpu_count();
if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
|| atoi(&arg[0]) > info.cpu_count) {
obj->data.i = 1;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* NORM_ERR("freq: Invalid CPU number or you don't have that many CPUs! "
"Displaying the clock for CPU 1."); */
} else {
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
obj->data.i = atoi(&arg[0]);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
}
convert freq and freq_g to callbacks.print
2009-11-26 00:42:54 +00:00
obj->callbacks.print = &print_freq;
update machinery: clean up * Remove leftover INFO_* values from object definitions which didn't trigger anything. * Drop the whole INFO_* enum as it's values are not used anymore.
2009-09-06 23:12:11 +00:00
END OBJ(freq_g, 0)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
get_cpu_count();
if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
|| atoi(&arg[0]) > info.cpu_count) {
obj->data.i = 1;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* NORM_ERR("freq_g: Invalid CPU number or you don't have that many "
"CPUs! Displaying the clock for CPU 1."); */
} else {
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
obj->data.i = atoi(&arg[0]);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
}
convert freq and freq_g to callbacks.print
2009-11-26 00:42:54 +00:00
obj->callbacks.print = &print_freq_g;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(read_tcp, 0, "read_tcp: Needs \"(host) port\" as argument(s)")
Merge read_tcp and read_udp as much as possible
2010-04-17 00:31:37 +00:00
parse_read_tcpip_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_read_tcp;
Merge read_tcp and read_udp as much as possible
2010-04-17 00:31:37 +00:00
obj->callbacks.free = &free_read_tcpip;
Add support for $read_udp
2010-04-16 16:53:48 +00:00
END OBJ_ARG(read_udp, 0, "read_udp: Needs \"(host) port\" as argument(s)")
Merge read_tcp and read_udp as much as possible
2010-04-17 00:31:37 +00:00
parse_read_tcpip_arg(obj, arg, free_at_crash);
Add support for $read_udp
2010-04-16 16:53:48 +00:00
obj->callbacks.print = &print_read_udp;
Merge read_tcp and read_udp as much as possible
2010-04-17 00:31:37 +00:00
obj->callbacks.free = &free_read_tcpip;
Add support for $tcp_ping
2010-04-23 23:40:24 +00:00
END OBJ_ARG(tcp_ping, 0, "tcp_ping: Needs \"host (port)\" as argument(s)")
parse_tcp_ping_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_tcp_ping;
obj->callbacks.free = &free_tcp_ping;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#if defined(__linux__)
END OBJ(voltage_mv, 0)
get_cpu_count();
if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
|| atoi(&arg[0]) > info.cpu_count) {
obj->data.i = 1;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* NORM_ERR("voltage_mv: Invalid CPU number or you don't have that many "
"CPUs! Displaying voltage for CPU 1."); */
} else {
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
obj->data.i = atoi(&arg[0]);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
}
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_voltage_mv;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(voltage_v, 0)
get_cpu_count();
if (!arg || !isdigit(arg[0]) || strlen(arg) >= 2 || atoi(&arg[0]) == 0
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
|| atoi(&arg[0]) > info.cpu_count) {
obj->data.i = 1;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* NORM_ERR("voltage_v: Invalid CPU number or you don't have that many "
"CPUs! Displaying voltage for CPU 1."); */
} else {
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
obj->data.i = atoi(&arg[0]);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
}
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_voltage_v;
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
An attempt at making wifi work Someone who has iwlib should really test this.
2010-01-11 00:13:42 +00:00
#ifdef BUILD_WLAN
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(wireless_essid, &update_net_stats)
When using without argument, make sure that it shows the essid of the first device that has one instead of using the default network device (because most of the times this will be a non-wireless device)
2010-02-21 14:12:38 +00:00
obj->data.opaque = get_net_stat(arg, obj, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_wireless_essid;
Add support for $wireless_channel (based on a patch by Timothy Ball)
2010-06-07 07:54:25 +00:00
END OBJ(wireless_channel, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_channel;
Add support for $wireless_freq
2010-06-07 08:50:02 +00:00
END OBJ(wireless_freq, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_wireless_frequency;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(wireless_mode, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_wireless_mode;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(wireless_bitrate, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_wireless_bitrate;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(wireless_ap, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_wireless_ap;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(wireless_link_qual, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_wireless_link_qual;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(wireless_link_qual_max, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_wireless_link_qual_max;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(wireless_link_qual_perc, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_wireless_link_qual_perc;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(wireless_link_bar, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_bar_arg(obj, arg, free_at_crash);
wireless_link_bar: convert to callbacks.barval
2009-11-22 17:15:36 +00:00
obj->callbacks.barval = &wireless_link_barval;
An attempt at making wifi work Someone who has iwlib should really test this.
2010-01-11 00:13:42 +00:00
#endif /* BUILD_WLAN */
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif /* __linux__ */
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#ifndef __OpenBSD__
END OBJ(acpifan, 0)
convert some non-openbsd objects to callbacks.{print,iftest}
2009-11-26 00:51:41 +00:00
obj->callbacks.print = &print_acpifan;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(battery, 0)
char bat[64];
if (arg) {
sscanf(arg, "%63s", bat);
} else {
strcpy(bat, "BAT0");
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
}
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(bat, text_buffer_size.get(*state));
convert some non-openbsd objects to callbacks.{print,iftest}
2009-11-26 00:51:41 +00:00
obj->callbacks.print = &print_battery;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(battery_short, 0)
char bat[64];
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (arg) {
sscanf(arg, "%63s", bat);
} else {
strcpy(bat, "BAT0");
}
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(bat, text_buffer_size.get(*state));
convert some non-openbsd objects to callbacks.{print,iftest}
2009-11-26 00:51:41 +00:00
obj->callbacks.print = &print_battery_short;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(battery_time, 0)
char bat[64];
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (arg) {
sscanf(arg, "%63s", bat);
} else {
strcpy(bat, "BAT0");
}
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(bat, text_buffer_size.get(*state));
convert some non-openbsd objects to callbacks.{print,iftest}
2009-11-26 00:51:41 +00:00
obj->callbacks.print = &print_battery_time;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(battery_percent, 0)
char bat[64];
if (arg) {
sscanf(arg, "%63s", bat);
} else {
strcpy(bat, "BAT0");
}
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(bat, text_buffer_size.get(*state));
convert some non-openbsd objects to callbacks.{print,iftest}
2009-11-26 00:51:41 +00:00
obj->callbacks.percentage = &battery_percentage;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(battery_bar, 0)
char bat[64];
Fix battery_bar not parsing arguments correctly (sf: #2998034, lp: #569195)
2010-05-23 09:25:19 +00:00
arg = scan_bar(obj, arg, 100);
if (arg && strlen(arg)>0) {
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
sscanf(arg, "%63s", bat);
} else {
strcpy(bat, "BAT0");
}
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(bat, text_buffer_size.get(*state));
battery_bar: convert to callbacks.barval
2009-11-22 20:54:02 +00:00
obj->callbacks.barval = &get_battery_perct_bar;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif /* !__OpenBSD__ */
#if defined(__linux__)
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(disk_protect, 0, "disk_protect needs an argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(dev_name(arg), text_buffer_size.get(*state));
convert disk_protect to callbacks.print
2009-11-16 00:31:55 +00:00
obj->callbacks.print = &print_disk_protect_queue;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_version, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_version;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_bios, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_bios;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_serial, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_serial;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_cpu_temp, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_cpu_temp;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_left_fan_status, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_left_fan_status;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_right_fan_status, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_right_fan_status;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_left_fan_rpm, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_left_fan_rpm;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_right_fan_rpm, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_right_fan_rpm;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_ac_status, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_ac_status;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(i8k_buttons_status, &update_i8k)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_i8k_buttons_status;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#if defined(BUILD_IBM)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(ibm_fan, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &get_ibm_acpi_fan;
misc smaller fixes
2009-10-28 02:54:53 +00:00
END OBJ_ARG(ibm_temps, &get_ibm_acpi_temps, "ibm_temps: needs an argument")
ibm: put specific code to where it belongs
2009-10-13 21:01:31 +00:00
parse_ibm_temps_arg(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_ibm_temps;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(ibm_volume, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &get_ibm_acpi_volume;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(ibm_brightness, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &get_ibm_acpi_brightness;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif
/* information from sony_laptop kernel module
* /sys/devices/platform/sony-laptop */
END OBJ(sony_fanspeed, 0)
convert sony_fanspeed to callbacks.print
2009-11-15 23:59:39 +00:00
obj->callbacks.print = &get_sony_fanspeed;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ_IF(if_gw, &update_gateway_info)
if_gw: convert to callbacks.iftest
2009-11-16 22:20:58 +00:00
obj->callbacks.iftest = &gateway_exists;
convert gateway objects to callbacks.free
2009-11-29 19:52:36 +00:00
obj->callbacks.free = &free_gateway_info;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(ioscheduler, 0, "get_ioscheduler needs an argument (e.g. hda)")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(dev_name(arg), text_buffer_size.get(*state));
ioscheduler: convert to callbacks.print
2009-11-16 21:27:53 +00:00
obj->callbacks.print = &print_ioscheduler;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(laptop_mode, 0)
convert laptop_mode to callbacks.print
2009-11-16 00:15:39 +00:00
obj->callbacks.print = &print_laptop_mode;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(pb_battery, 0, "pb_battery: needs one argument: status, percent or time")
if (strcmp(arg, "status") == EQUAL) {
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
obj->data.i = PB_BATT_STATUS;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
} else if (strcmp(arg, "percent") == EQUAL) {
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
obj->data.i = PB_BATT_PERCENT;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
} else if (strcmp(arg, "time") == EQUAL) {
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
obj->data.i = PB_BATT_TIME;
} else {
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
NORM_ERR("pb_battery: illegal argument '%s', defaulting to status", arg);
obj->data.i = PB_BATT_STATUS;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
}
convert pb_battery to callbacks.print
2009-11-16 00:20:35 +00:00
obj->callbacks.print = get_powerbook_batt_info;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif /* __linux__ */
#if (defined(__FreeBSD__) || defined(__linux__))
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_IF_ARG(if_up, 0, "if_up needs an argument")
if_up: convert to generic object payload
2009-10-09 02:30:02 +00:00
parse_if_up_arg(obj, arg);
if_up: convert to callbacks.iftest
2009-11-16 22:23:27 +00:00
obj->callbacks.iftest = &interface_up;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_if_up;
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
#endif
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#if defined(__OpenBSD__)
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(obsd_sensors_temp, 0, "obsd_sensors_temp: needs an argument")
obsd_sensors: cleanup code (untested)
2009-10-09 01:55:46 +00:00
parse_obsd_sensor(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_obsd_sensors_temp;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(obsd_sensors_fan, 0, "obsd_sensors_fan: needs 2 arguments (device and sensor number)")
obsd_sensors: cleanup code (untested)
2009-10-09 01:55:46 +00:00
parse_obsd_sensor(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_obsd_sensors_fan;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(obsd_sensors_volt, 0, "obsd_sensors_volt: needs 2 arguments (device and sensor number)")
obsd_sensors: cleanup code (untested)
2009-10-09 01:55:46 +00:00
parse_obsd_sensor(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_obsd_sensors_volt;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(obsd_vendor, 0)
convert obsd_* to callbacks.print (completely untested)
2009-11-16 00:41:53 +00:00
obj->callbacks.print = &get_obsd_vendor;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(obsd_product, 0)
convert obsd_* to callbacks.print (completely untested)
2009-11-16 00:41:53 +00:00
obj->callbacks.print = &get_obsd_product;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif /* __OpenBSD__ */
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(buffers, &update_meminfo)
convert buffers and cached to callbacks.print
2009-11-26 00:10:19 +00:00
obj->callbacks.print = &print_buffers;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(cached, &update_meminfo)
convert buffers and cached to callbacks.print
2009-11-26 00:10:19 +00:00
obj->callbacks.print = &print_cached;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#define SCAN_CPU(__arg, __var) { \
int __offset = 0; \
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
if (__arg && sscanf(__arg, " cpu%d %n", &__var, &__offset) > 0) \
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
__arg += __offset; \
else \
__var = 0; \
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
}
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(cpu, &update_cpu_usage)
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
SCAN_CPU(arg, obj->data.i);
convert cpu to callbacks.percentage
2009-11-25 00:30:21 +00:00
obj->callbacks.percentage = &cpu_percentage;
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
DBGP2("Adding $cpu for CPU %d", obj->data.i);
Fix compiling without X11 support
2010-11-13 22:59:31 +00:00
#ifdef BUILD_X11
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(cpugauge, &update_cpu_usage)
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
SCAN_CPU(arg, obj->data.i);
convert cpu_barval to double
2009-12-04 00:19:07 +00:00
scan_gauge(obj, arg, 1);
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.gaugeval = &cpu_barval;
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
DBGP2("Adding $cpugauge for CPU %d", obj->data.i);
Fix compiling without X11 support
2010-11-13 22:59:31 +00:00
#endif
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(cpubar, &update_cpu_usage)
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
SCAN_CPU(arg, obj->data.i);
convert cpu_barval to double
2009-12-04 00:19:07 +00:00
scan_bar(obj, arg, 1);
convert cpubar to callbacks.barval
2009-11-22 17:02:56 +00:00
obj->callbacks.barval = &cpu_barval;
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
DBGP2("Adding $cpubar for CPU %d", obj->data.i);
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(cpugraph, &update_cpu_usage)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
char *buf = 0;
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
SCAN_CPU(arg, obj->data.i);
convert cpu_barval to double
2009-12-04 00:19:07 +00:00
buf = scan_graph(obj, arg, 1);
text_object: use field i instead of cpu_index
2009-10-17 14:55:12 +00:00
DBGP2("Adding $cpugraph for CPU %d", obj->data.i);
Use free_and_zero in conky.cc and core.cc where appropriate
2010-02-23 21:06:04 +00:00
free_and_zero(buf);
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.graphval = &cpu_barval;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(loadgraph, &update_load_average)
move loadavg and loadgraph code to common.c
2009-10-25 12:49:10 +00:00
scan_loadgraph_arg(obj, arg);
merge loadgraph to callbacks.graphval
2009-11-23 23:24:17 +00:00
obj->callbacks.graphval = &loadgraphval;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(diskio, &update_diskio)
diskio: convert to generic object payload
2009-10-07 20:44:17 +00:00
parse_diskio_arg(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_diskio;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(diskio_read, &update_diskio)
diskio: convert to generic object payload
2009-10-07 20:44:17 +00:00
parse_diskio_arg(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_diskio_read;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(diskio_write, &update_diskio)
diskio: convert to generic object payload
2009-10-07 20:44:17 +00:00
parse_diskio_arg(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_diskio_write;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(diskiograph, &update_diskio)
diskio: convert to generic object payload
2009-10-07 20:44:17 +00:00
parse_diskiograph_arg(obj, arg);
merge diskiographs to callbacks.graphval
2009-11-23 23:17:52 +00:00
obj->callbacks.graphval = &diskiographval;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(diskiograph_read, &update_diskio)
diskio: convert to generic object payload
2009-10-07 20:44:17 +00:00
parse_diskiograph_arg(obj, arg);
merge diskiographs to callbacks.graphval
2009-11-23 23:17:52 +00:00
obj->callbacks.graphval = &diskiographval_read;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(diskiograph_write, &update_diskio)
diskio: convert to generic object payload
2009-10-07 20:44:17 +00:00
parse_diskiograph_arg(obj, arg);
merge diskiographs to callbacks.graphval
2009-11-23 23:17:52 +00:00
obj->callbacks.graphval = &diskiographval_write;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color, 0)
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
Port out_to_x setting to lua-config
2010-02-25 21:28:34 +00:00
if (out_to_x.get(*state)) {
make default_{shade_,outline_,}color lua settings
2010-03-11 11:08:55 +00:00
obj->data.l = arg ? get_x11_color(arg) : default_color.get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
}
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
#ifdef BUILD_NCURSES
make out_to_ncurses a lua setting this completes the porting of bool settings
2010-04-30 17:33:21 +00:00
if (out_to_ncurses.get(*state)) {
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
obj->data.l = COLOR_WHITE;
if(arg) {
if(strcasecmp(arg, "red") == 0) {
obj->data.l = COLOR_RED;
}else if(strcasecmp(arg, "green") == 0) {
obj->data.l = COLOR_GREEN;
}else if(strcasecmp(arg, "yellow") == 0) {
obj->data.l = COLOR_YELLOW;
}else if(strcasecmp(arg, "blue") == 0) {
obj->data.l = COLOR_BLUE;
}else if(strcasecmp(arg, "magenta") == 0) {
obj->data.l = COLOR_MAGENTA;
}else if(strcasecmp(arg, "cyan") == 0) {
obj->data.l = COLOR_CYAN;
}else if(strcasecmp(arg, "black") == 0) {
obj->data.l = COLOR_BLACK;
}
}
set_current_text_color(obj->data.l);
init_pair(obj->data.l, obj->data.l, COLOR_BLACK);
}
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_NCURSES */
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
#ifdef BUILD_X11
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color0, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[0].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color1, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[1].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color2, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[2].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color3, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[3].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color4, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[4].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color5, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[5].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color6, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[6].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color7, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[7].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color8, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[8].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(color9, 0)
Make colorN a lua setting
2010-03-11 10:28:12 +00:00
obj->data.l = color[9].get(*state);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
set_current_text_color(obj->data.l);
color: convert to callbacks.print
2009-11-08 15:25:11 +00:00
obj->callbacks.print = &new_fg;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(font, 0)
font: convert scan_font to match common signature
2009-11-08 12:46:42 +00:00
scan_font(obj, arg);
font: convert to callbacks.print
2009-11-29 18:43:27 +00:00
obj->callbacks.print = &new_font;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(conky_version, 0)
convert OBJ_text to callbacks This is tricky: there is no such thing as $text. In fact, everything below TEXT in the conkyrc which is NOT a text object will become one of type OBJ_text. To make life easy, introduce a function obj_be_plain_text() converting a given object to the given plain text.
2009-11-29 19:04:55 +00:00
obj_be_plain_text(obj, VERSION);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(conky_build_date, 0)
convert OBJ_text to callbacks This is tricky: there is no such thing as $text. In fact, everything below TEXT in the conkyrc which is NOT a text object will become one of type OBJ_text. To make life easy, introduce a function obj_be_plain_text() converting a given object to the given plain text.
2009-11-29 19:04:55 +00:00
obj_be_plain_text(obj, BUILD_DATE);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(conky_build_arch, 0)
convert OBJ_text to callbacks This is tricky: there is no such thing as $text. In fact, everything below TEXT in the conkyrc which is NOT a text object will become one of type OBJ_text. To make life easy, introduce a function obj_be_plain_text() converting a given object to the given plain text.
2009-11-29 19:04:55 +00:00
obj_be_plain_text(obj, BUILD_ARCH);
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(downspeed, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_downspeed;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(downspeedf, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_downspeedf;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(downspeedgraph, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_graph_arg(obj, arg, free_at_crash);
merge {down,up}speedgraph to callbacks.graphval
2009-11-23 23:21:16 +00:00
obj->callbacks.graphval = &downspeedgraphval;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(else, 0)
obj_be_ifblock_else(ifblock_opaque, obj);
convert $else to callbacks.iftest
2009-11-28 21:53:20 +00:00
obj->callbacks.iftest = &gen_false_iftest;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(endif, 0)
obj_be_ifblock_endif(ifblock_opaque, obj);
convert $endif to callbacks.print
2009-11-28 22:02:58 +00:00
obj->callbacks.print = &gen_print_nothing;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(eval, 0)
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg ? arg : "", text_buffer_size.get(*state));
convert eval to callbacks.print
2009-11-26 00:15:33 +00:00
obj->callbacks.print = &print_evaluate;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#if defined(BUILD_IMLIB2) && defined(BUILD_X11)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(image, 0)
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg ? arg : "", text_buffer_size.get(*state));
convert image to callbacks.print
2009-11-28 21:45:01 +00:00
obj->callbacks.print = &print_image_callback;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_IMLIB2 */
Add support for MySQL Warning: Altough the current version works (for me), the syntax of the configoptions and vars will probably change over time. Contact me if you have ideas. The following is a example of how you can use it now: mysql_host someserver.com mysql_db my_database mysql_user loginname mysql_password "s3cr3t" TEXT ${mysql select var1 from some_table}${mysql select var2 from some_table}
2010-04-18 15:52:41 +00:00
#ifdef BUILD_MYSQL
END OBJ_ARG(mysql, 0, "mysql needs a query")
obj->data.s = strdup(arg);
obj->callbacks.print = &print_mysql;
#endif /* BUILD_MYSQL */
Add support for $no_update
2010-04-17 13:19:44 +00:00
END OBJ_ARG(no_update, 0, "no_update needs arguments")
scan_no_update(obj, arg);
obj->callbacks.print = &print_no_update;
obj->callbacks.free = &free_no_update;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(exec, 0)
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
scan_exec_arg(obj, arg);
Combine print_execp and print_exec as much as possible
2010-02-11 00:08:25 +00:00
obj->parse = false;
obj->thread = false;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_exec;
obj->callbacks.free = &free_exec;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(execp, 0)
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
scan_exec_arg(obj, arg);
Let execp use fill_p
2010-02-10 18:45:42 +00:00
obj->parse = true;
Combine print_execp and print_exec as much as possible
2010-02-11 00:08:25 +00:00
obj->thread = false;
obj->callbacks.print = &print_exec;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_exec;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(execbar, 0)
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
scan_exec_arg(obj, arg);
fix execbar merge to callbacks
2009-11-22 21:06:04 +00:00
obj->callbacks.barval = &execbarval;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_exec;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(execgauge, 0)
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
scan_exec_arg(obj, arg);
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.gaugeval = &execbarval;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_exec;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(execgraph, 0)
specials: convert graph objects to new style
2009-10-29 02:08:08 +00:00
scan_execgraph_arg(obj, arg);
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.graphval = &execbarval;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_exec;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
END OBJ_ARG(execibar, 0, "execibar needs arguments")
convert exec bars to double
2009-12-04 01:09:41 +00:00
scan_execi_bar_arg(obj, arg);
merge execibar to callbacks.barval
2009-11-30 22:59:13 +00:00
obj->callbacks.barval = &execi_barval;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_execi;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
END OBJ_ARG(execigraph, 0, "execigraph needs arguments")
specials: convert graph objects to new style
2009-10-29 02:08:08 +00:00
scan_execgraph_arg(obj, arg);
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.graphval = &execi_barval;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_execi;
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
END OBJ_ARG(execigauge, 0, "execigauge needs arguments")
convert exec bars to double
2009-12-04 01:09:41 +00:00
scan_execi_gauge_arg(obj, arg);
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.gaugeval = &execi_barval;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_execi;
Fix compiling without X11 support
2010-11-13 22:59:31 +00:00
#endif /* BUILD_X11 */
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
END OBJ_ARG(execi, 0, "execi needs arguments")
scan_execi_arg(obj, arg);
Let execp use fill_p
2010-02-10 18:45:42 +00:00
obj->parse = false;
Combine print_texeci and print_execi as much as possible
2010-02-10 20:23:21 +00:00
obj->thread = false;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_execi;
obj->callbacks.free = &free_execi;
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
END OBJ_ARG(execpi, 0, "execpi needs arguments")
scan_execi_arg(obj, arg);
Combine print_execi and print_execpi as much as possible
2010-02-10 14:02:00 +00:00
obj->parse = true;
Combine print_texeci and print_execi as much as possible
2010-02-10 20:23:21 +00:00
obj->thread = false;
Combine print_execi and print_execpi as much as possible
2010-02-10 14:02:00 +00:00
obj->callbacks.print = &print_execi;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_execi;
exec: put all exec-related stuff into it's own file While here, also merge the execi and texeci fields of struct text_object, so more common code can be shared in between.
2009-10-15 19:51:21 +00:00
END OBJ_ARG(texeci, 0, "texeci needs arguments")
scan_execi_arg(obj, arg);
Let execp use fill_p
2010-02-10 18:45:42 +00:00
obj->parse = false;
Combine print_texeci and print_execi as much as possible
2010-02-10 20:23:21 +00:00
obj->thread = true;
obj->callbacks.print = &print_execi;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_execi;
Implements texecpi variable
2010-02-07 09:29:43 +00:00
END OBJ_ARG(texecpi, 0, "texecpi needs arguments")
scan_execi_arg(obj, arg);
Combine print_texeci and print_texecpi as much as possible
2010-02-10 14:21:00 +00:00
obj->parse = true;
Combine print_texeci and print_execi as much as possible
2010-02-10 20:23:21 +00:00
obj->thread = true;
obj->callbacks.print = &print_execi;
Implements texecpi variable
2010-02-07 09:29:43 +00:00
obj->callbacks.free = &free_execi;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(fs_bar, &update_fs_stats)
fs_bar, fs_bar_free: merge init and print routines
2009-10-04 13:50:47 +00:00
init_fs_bar(obj, arg);
convert fs bars to callbacks.barval
2009-11-23 22:34:21 +00:00
obj->callbacks.barval = &fs_barval;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(fs_bar_free, &update_fs_stats)
fs_bar, fs_bar_free: merge init and print routines
2009-10-04 13:50:47 +00:00
init_fs_bar(obj, arg);
convert fs bars to callbacks.barval
2009-11-23 22:34:21 +00:00
obj->callbacks.barval = &fs_free_barval;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(fs_free, &update_fs_stats)
fs_*: convert to generic object payload
2009-10-04 14:53:21 +00:00
init_fs(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_fs_free;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(fs_used_perc, &update_fs_stats)
fs_*: convert to generic object payload
2009-10-04 14:53:21 +00:00
init_fs(obj, arg);
convert fs_*_perc to callbacks.percentage
2009-11-25 00:43:36 +00:00
obj->callbacks.percentage = &fs_used_percentage;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(fs_free_perc, &update_fs_stats)
fs_*: convert to generic object payload
2009-10-04 14:53:21 +00:00
init_fs(obj, arg);
convert fs_*_perc to callbacks.percentage
2009-11-25 00:43:36 +00:00
obj->callbacks.percentage = &fs_free_percentage;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(fs_size, &update_fs_stats)
fs_*: convert to generic object payload
2009-10-04 14:53:21 +00:00
init_fs(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_fs_size;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(fs_type, &update_fs_stats)
fs_*: convert to generic object payload
2009-10-04 14:53:21 +00:00
init_fs(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_fs_type;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(fs_used, &update_fs_stats)
fs_*: convert to generic object payload
2009-10-04 14:53:21 +00:00
init_fs(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_fs_used;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(hr, 0)
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-08 13:49:27 +00:00
obj->data.l = arg ? atoi(arg) : 1;
hr, stippled_hr: convert to callbacks.print
2009-11-08 16:08:02 +00:00
obj->callbacks.print = &new_hr;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(nameserver, &update_dns_data)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_nameserver_arg(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_nameserver;
convert nameserver to callbacks.free
2009-11-29 19:55:42 +00:00
obj->callbacks.free = &free_dns_data;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(offset, 0)
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-08 13:49:27 +00:00
obj->data.l = arg ? atoi(arg) : 1;
offset, align, tailhead: convert to callbacks.print
2009-11-08 16:02:19 +00:00
obj->callbacks.print = &new_offset;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(voffset, 0)
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-08 13:49:27 +00:00
obj->data.l = arg ? atoi(arg) : 1;
offset, align, tailhead: convert to callbacks.print
2009-11-08 16:02:19 +00:00
obj->callbacks.print = &new_voffset;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(goto, 0, "goto needs arguments")
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-08 13:49:27 +00:00
obj->data.l = atoi(arg);
goto, tab: convert to callbacks.print
2009-11-08 15:54:30 +00:00
obj->callbacks.print = &new_goto;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(tab, 0)
specials: convert tab object to new style
2009-10-29 02:18:24 +00:00
scan_tab(obj, arg);
goto, tab: convert to callbacks.print
2009-11-08 15:54:30 +00:00
obj->callbacks.print = &new_tab;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#ifdef __linux__
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(i2c, 0, "i2c needs arguments")
sysfs objects: merge init and print routines
2009-10-04 16:05:47 +00:00
parse_i2c_sensor(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_sysfs_sensor;
obj->callbacks.free = &free_sysfs_sensor;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(platform, 0, "platform needs arguments")
sysfs objects: merge init and print routines
2009-10-04 16:05:47 +00:00
parse_platform_sensor(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_sysfs_sensor;
obj->callbacks.free = &free_sysfs_sensor;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(hwmon, 0, "hwmon needs argumanets")
sysfs objects: merge init and print routines
2009-10-04 16:05:47 +00:00
parse_hwmon_sensor(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_sysfs_sensor;
obj->callbacks.free = &free_sysfs_sensor;
reenable top for all target OS's Occurs to work fine on FreeBSD, the other BSD's probably need more work, anyway.
2009-11-18 15:15:37 +00:00
#endif /* __linux__ */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END
/* we have four different types of top (top, top_mem, top_time and top_io). To
* avoid having almost-same code four times, we have this special
* handler. */
top: convert to callbacks.print
2009-11-16 21:49:31 +00:00
/* XXX: maybe fiddle them apart later, as print_top() does
* nothing else than just that, using an ugly switch(). */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (strncmp(s, "top", 3) == EQUAL) {
top: add update callbacks conditionally, drop useless check
2009-12-12 18:50:36 +00:00
if (parse_top_args(s, arg, obj)) {
Make sure template_ in calc_cpu_total() can also be TMPL_LONGPROC
2010-11-23 17:50:40 +00:00
#ifdef __linux__
determine_longstat_file();
#endif
Use the new callback system instead of add_update_callback() & co.
2010-12-31 12:39:54 +00:00
obj->cb_handle = create_cb_handle(update_top);
top: add update callbacks conditionally, drop useless check
2009-12-12 18:50:36 +00:00
} else {
free(obj);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
return NULL;
}
reenable top for all target OS's Occurs to work fine on FreeBSD, the other BSD's probably need more work, anyway.
2009-11-18 15:15:37 +00:00
} else
#ifdef __linux__
OBJ(addr, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_addr;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(addrs, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_addrs;
Add $v6addrs to increase IPv6 support This is only the beginning of the ipv6 support, This var isn't documented and only works on Linux. It should also be patched to show the addresses in compressed format Some other vars should also be added to see things like netmask, scope, routes, ...
2011-02-09 17:49:52 +00:00
#ifdef BUILD_IPV6
END OBJ(v6addrs, &update_net_stats)
parse_net_stat_arg(obj, arg, free_at_crash);
obj->callbacks.print = &print_v6addrs;
#endif /* BUILD_IPV6 */
reenable top for all target OS's Occurs to work fine on FreeBSD, the other BSD's probably need more work, anyway.
2009-11-18 15:15:37 +00:00
END
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif /* __linux__ */
reenable top for all target OS's Occurs to work fine on FreeBSD, the other BSD's probably need more work, anyway.
2009-11-18 15:15:37 +00:00
OBJ_ARG(tail, 0, "tail needs arguments")
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
init_tailhead("tail", arg, obj, free_at_crash);
offset, align, tailhead: convert to callbacks.print
2009-11-08 16:02:19 +00:00
obj->callbacks.print = &print_tail;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_tailhead;
tail, head: use OBJ_ARG to simplify code
2009-10-04 12:44:20 +00:00
END OBJ_ARG(head, 0, "head needs arguments")
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
init_tailhead("head", arg, obj, free_at_crash);
offset, align, tailhead: convert to callbacks.print
2009-11-08 16:02:19 +00:00
obj->callbacks.print = &print_head;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_tailhead;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(lines, 0, "lines needs an argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_lines;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(words, 0, "words needs a argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_words;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(loadavg, &update_load_average)
move loadavg and loadgraph code to common.c
2009-10-25 12:49:10 +00:00
scan_loadavg_arg(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_loadavg;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_IF_ARG(if_empty, 0, "if_empty needs an argument")
Switch some more bits to C++, more CMake changes.
2009-12-10 04:05:32 +00:00
obj->sub = (text_object*)malloc(sizeof(struct text_object));
no need to save the args passed to if_empty and if_match
2009-10-27 00:24:52 +00:00
extract_variable_text_internal(obj->sub, arg);
convert some ifblock objects to callbacks.iftest
2009-11-26 00:30:58 +00:00
obj->callbacks.iftest = &if_empty_iftest;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_IF_ARG(if_match, 0, "if_match needs arguments")
Switch some more bits to C++, more CMake changes.
2009-12-10 04:05:32 +00:00
obj->sub = (text_object*)malloc(sizeof(struct text_object));
no need to save the args passed to if_empty and if_match
2009-10-27 00:24:52 +00:00
extract_variable_text_internal(obj->sub, arg);
convert some ifblock objects to callbacks.iftest
2009-11-26 00:30:58 +00:00
obj->callbacks.iftest = &check_if_match;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_IF_ARG(if_existing, 0, "if_existing needs an argument or two")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
convert some ifblock objects to callbacks.iftest
2009-11-26 00:30:58 +00:00
obj->callbacks.iftest = &if_existing_iftest;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_IF_ARG(if_mounted, 0, "if_mounted needs an argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
if_mounted: convert to callbacks.iftest
2009-11-16 22:30:53 +00:00
obj->callbacks.iftest = &check_mount;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#ifdef __linux__
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_IF_ARG(if_running, &update_top, "if_running needs an argument")
top_running = 1;
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
convert some ifblock objects to callbacks.iftest
2009-11-26 00:30:58 +00:00
obj->callbacks.iftest = &if_running_iftest;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#else
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_IF_ARG(if_running, 0, "if_running needs an argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
char buf[text_buffer_size.get(*state)];
Revert "auesnthaeou" This reverts commit 70adc04fc28cd92c976301aa36b0dcb8d719389b. Oops, didn't mean to push this. I'll start a new branch now (so I don't do this again...).
2009-08-07 07:21:56 +00:00
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
snprintf(buf, text_buffer_size.get(*state), "pidof %s >/dev/null", arg);
obj->data.s = strndup(buf, text_buffer_size.get(*state));
convert some ifblock objects to callbacks.iftest
2009-11-26 00:30:58 +00:00
/* XXX: maybe use a different callback here */
obj->callbacks.iftest = &if_running_iftest;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif
END OBJ(kernel, 0)
convert kernel and machine to callbacks.print
2009-11-25 23:12:44 +00:00
obj->callbacks.print = &print_kernel;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(machine, 0)
convert kernel and machine to callbacks.print
2009-11-25 23:12:44 +00:00
obj->callbacks.print = &print_machine;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(new_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_new_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(seen_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_seen_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(unseen_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_unseen_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(flagged_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_flagged_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(unflagged_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_unflagged_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(forwarded_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_forwarded_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(unforwarded_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_unforwarded_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(replied_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_replied_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(unreplied_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_unreplied_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(draft_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_draft_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(trashed_mails, 0)
local_mails: put code to where it belongs Note that the code does not only use a pre-processor generator for defining the print functions, but also for their prototypes. Sadly, this generated a conflict in mboxscan.c which this patch resolves, too.
2009-10-24 23:13:50 +00:00
parse_local_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_trashed_mails;
obj->callbacks.free = &free_local_mails;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(mboxscan, 0)
mboxscan: convert to generic object payload
2009-10-06 19:59:45 +00:00
parse_mboxscan_arg(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mboxscan;
obj->callbacks.free = &free_mboxscan;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(mem, &update_meminfo)
convert mem and swap objects to callbacks.print
2009-11-25 23:09:38 +00:00
obj->callbacks.print = &print_mem;
$memwithbuffers object and bar (sf.net #2954143) I've added $memwithbuffers to complement $mem, $memeasyfree, etc. This variable indicates the used system memory, regardless of buffers/caches. If the "no_buffers" option is set to "no", it will be the same as $mem. The reason I find this change useful is that I like to display both the total used system memory and the memory being used by applications. I've also included a memwithbuffersbar, which is the same as membar except that it uses $memwithbuffers as the size instead of $mem. Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-02-18 17:17:27 +00:00
END OBJ(memwithbuffers, &update_meminfo)
obj->callbacks.print = &print_memwithbuffers;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(memeasyfree, &update_meminfo)
convert mem and swap objects to callbacks.print
2009-11-25 23:09:38 +00:00
obj->callbacks.print = &print_memeasyfree;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(memfree, &update_meminfo)
convert mem and swap objects to callbacks.print
2009-11-25 23:09:38 +00:00
obj->callbacks.print = &print_memfree;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(memmax, &update_meminfo)
convert mem and swap objects to callbacks.print
2009-11-25 23:09:38 +00:00
obj->callbacks.print = &print_memmax;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(memperc, &update_meminfo)
convert memperc to callbacks.percentage
2009-11-25 00:33:13 +00:00
obj->callbacks.percentage = &mem_percentage;
add a $memdirty variable patch contributed by Piotr Karbowski (sf.net #3138195)
2011-01-04 13:48:33 +00:00
#ifdef __linux__
END OBJ(memdirty, &update_meminfo)
obj->callbacks.print = &print_memdirty;
#endif
Fix compiling without X11 support
2010-11-13 22:59:31 +00:00
#ifdef BUILD_X11
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(memgauge, &update_meminfo)
convert mem_barval to double
2009-12-04 00:22:36 +00:00
scan_gauge(obj, arg, 1);
convert mem{gauge,graph,bar} to callbacks
2009-11-23 22:15:34 +00:00
obj->callbacks.gaugeval = &mem_barval;
Fix compiling without X11 support
2010-11-13 22:59:31 +00:00
#endif
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(membar, &update_meminfo)
convert mem_barval to double
2009-12-04 00:22:36 +00:00
scan_bar(obj, arg, 1);
convert mem{gauge,graph,bar} to callbacks
2009-11-23 22:15:34 +00:00
obj->callbacks.barval = &mem_barval;
$memwithbuffers object and bar (sf.net #2954143) I've added $memwithbuffers to complement $mem, $memeasyfree, etc. This variable indicates the used system memory, regardless of buffers/caches. If the "no_buffers" option is set to "no", it will be the same as $mem. The reason I find this change useful is that I like to display both the total used system memory and the memory being used by applications. I've also included a memwithbuffersbar, which is the same as membar except that it uses $memwithbuffers as the size instead of $mem. Signed-off-by: Pavel Labath <pavelo@centrum.sk>
2010-02-18 17:17:27 +00:00
END OBJ(memwithbuffersbar, &update_meminfo)
scan_bar(obj, arg, 1);
obj->callbacks.barval = &mem_with_buffers_barval;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(memgraph, &update_meminfo)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
char *buf = 0;
convert mem_barval to double
2009-12-04 00:22:36 +00:00
buf = scan_graph(obj, arg, 1);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
Use free_and_zero in conky.cc and core.cc where appropriate
2010-02-23 21:06:04 +00:00
free_and_zero(buf);
convert mem{gauge,graph,bar} to callbacks
2009-11-23 22:15:34 +00:00
obj->callbacks.graphval = &mem_barval;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11*/
update machinery: clean up * Remove leftover INFO_* values from object definitions which didn't trigger anything. * Drop the whole INFO_* enum as it's values are not used anymore.
2009-09-06 23:12:11 +00:00
END OBJ(mixer, 0)
mixer: convert to generic object payload
2009-10-06 19:48:26 +00:00
parse_mixer_arg(obj, arg);
convert mixer values to callbacks.percentage
2009-11-25 00:47:53 +00:00
obj->callbacks.percentage = &mixer_percentage;
update machinery: clean up * Remove leftover INFO_* values from object definitions which didn't trigger anything. * Drop the whole INFO_* enum as it's values are not used anymore.
2009-09-06 23:12:11 +00:00
END OBJ(mixerl, 0)
mixer: convert to generic object payload
2009-10-06 19:48:26 +00:00
parse_mixer_arg(obj, arg);
convert mixer values to callbacks.percentage
2009-11-25 00:47:53 +00:00
obj->callbacks.percentage = &mixerl_percentage;
update machinery: clean up * Remove leftover INFO_* values from object definitions which didn't trigger anything. * Drop the whole INFO_* enum as it's values are not used anymore.
2009-09-06 23:12:11 +00:00
END OBJ(mixerr, 0)
mixer: convert to generic object payload
2009-10-06 19:48:26 +00:00
parse_mixer_arg(obj, arg);
convert mixer values to callbacks.percentage
2009-11-25 00:47:53 +00:00
obj->callbacks.percentage = &mixerr_percentage;
update machinery: clean up * Remove leftover INFO_* values from object definitions which didn't trigger anything. * Drop the whole INFO_* enum as it's values are not used anymore.
2009-09-06 23:12:11 +00:00
END OBJ(mixerbar, 0)
mixer: convert to generic object payload
2009-10-06 19:48:26 +00:00
scan_mixer_bar(obj, arg);
merge mixer bars to callbacks.barval
2009-11-23 22:41:44 +00:00
obj->callbacks.barval = &mixer_barval;
update machinery: clean up * Remove leftover INFO_* values from object definitions which didn't trigger anything. * Drop the whole INFO_* enum as it's values are not used anymore.
2009-09-06 23:12:11 +00:00
END OBJ(mixerlbar, 0)
mixer: convert to generic object payload
2009-10-06 19:48:26 +00:00
scan_mixer_bar(obj, arg);
merge mixer bars to callbacks.barval
2009-11-23 22:41:44 +00:00
obj->callbacks.barval = &mixerl_barval;
update machinery: clean up * Remove leftover INFO_* values from object definitions which didn't trigger anything. * Drop the whole INFO_* enum as it's values are not used anymore.
2009-09-06 23:12:11 +00:00
END OBJ(mixerrbar, 0)
mixer: convert to generic object payload
2009-10-06 19:48:26 +00:00
scan_mixer_bar(obj, arg);
merge mixer bars to callbacks.barval
2009-11-23 22:41:44 +00:00
obj->callbacks.barval = &mixerr_barval;
update machinery: clean up * Remove leftover INFO_* values from object definitions which didn't trigger anything. * Drop the whole INFO_* enum as it's values are not used anymore.
2009-09-06 23:12:11 +00:00
END OBJ_IF(if_mixer_mute, 0)
mixer: convert to generic object payload
2009-10-06 19:48:26 +00:00
parse_mixer_arg(obj, arg);
if_mixer_mute: convert to callbacks.iftest
2009-11-16 22:32:35 +00:00
obj->callbacks.iftest = &check_mixer_muted;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
drop update_x11info() instead: - call XDefaultScreen() and XScreenCount() directly from the print callback - have no update callback at all for the desktop objects (seems to work well without)
2009-11-25 23:02:57 +00:00
END OBJ(monitor, 0)
convert desktop and monitor objects to callbacks.print
2009-11-25 22:56:19 +00:00
obj->callbacks.print = &print_monitor;
drop update_x11info() instead: - call XDefaultScreen() and XScreenCount() directly from the print callback - have no update callback at all for the desktop objects (seems to work well without)
2009-11-25 23:02:57 +00:00
END OBJ(monitor_number, 0)
convert desktop and monitor objects to callbacks.print
2009-11-25 22:56:19 +00:00
obj->callbacks.print = &print_monitor_number;
drop update_x11info() instead: - call XDefaultScreen() and XScreenCount() directly from the print callback - have no update callback at all for the desktop objects (seems to work well without)
2009-11-25 23:02:57 +00:00
END OBJ(desktop, 0)
convert desktop and monitor objects to callbacks.print
2009-11-25 22:56:19 +00:00
obj->callbacks.print = &print_desktop;
drop update_x11info() instead: - call XDefaultScreen() and XScreenCount() directly from the print callback - have no update callback at all for the desktop objects (seems to work well without)
2009-11-25 23:02:57 +00:00
END OBJ(desktop_number, 0)
convert desktop and monitor objects to callbacks.print
2009-11-25 22:56:19 +00:00
obj->callbacks.print = &print_desktop_number;
drop update_x11info() instead: - call XDefaultScreen() and XScreenCount() directly from the print callback - have no update callback at all for the desktop objects (seems to work well without)
2009-11-25 23:02:57 +00:00
END OBJ(desktop_name, 0)
convert desktop and monitor objects to callbacks.print
2009-11-25 22:56:19 +00:00
obj->callbacks.print = &print_desktop_name;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
Added support for $format_time
2009-11-18 14:35:35 +00:00
END OBJ_ARG(format_time, 0, "format_time needs a pid as argument")
Switch some more bits to C++, more CMake changes.
2009-12-10 04:05:32 +00:00
obj->sub = (text_object*)malloc(sizeof(struct text_object));
Added support for $format_time
2009-11-18 14:35:35 +00:00
extract_variable_text_internal(obj->sub, arg);
convert format_time to callbacks.print
2009-11-25 23:20:42 +00:00
obj->callbacks.print = &print_format_time;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(nodename, 0)
convert nodename to callbacks.print
2009-11-25 23:22:25 +00:00
obj->callbacks.print = &print_nodename;
Add support for $nodename_short This is different implementation (compared to 9e3156a4a6502d82c527d13474cca33c4441c2b9) because 1.8.1 was still regular c instead of c++
2010-04-14 16:41:25 +00:00
END OBJ(nodename_short, 0)
obj->callbacks.print = &print_nodename_short;
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 21:07:54 +00:00
END OBJ_ARG(cmdline_to_pid, 0, "cmdline_to_pid needs a command line as argument")
scan_cmdline_to_pid_arg(obj, arg, free_at_crash);
trivial conversion of cmdline_to_pid to callbacks.print
2009-11-26 00:11:33 +00:00
obj->callbacks.print = &print_cmdline_to_pid;
convert cmdline_to_pid to callbacks.free
2009-11-29 19:47:00 +00:00
obj->callbacks.free = &gen_free_opaque;
Added support for $pid_chroot
2009-11-13 15:54:40 +00:00
END OBJ_ARG(pid_chroot, 0, "pid_chroot needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_chroot;
Add cwd to $pid and split into $pid_cmdline and $pid_cwd
2009-11-11 15:27:19 +00:00
END OBJ_ARG(pid_cmdline, 0, "pid_cmdline needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_cmdline;
Add cwd to $pid and split into $pid_cmdline and $pid_cwd
2009-11-11 15:27:19 +00:00
END OBJ_ARG(pid_cwd, 0, "pid_cwd needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_cwd;
Add support for $pid_environ
2009-11-11 21:56:12 +00:00
END OBJ_ARG(pid_environ, 0, "pid_environ needs arguments")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_environ;
Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr
2009-11-12 19:34:43 +00:00
END OBJ_ARG(pid_environ_list, 0, "pid_environ_list needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_environ_list;
Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr
2009-11-12 19:34:43 +00:00
END OBJ_ARG(pid_exe, 0, "pid_exe needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_exe;
Add support for $pid_nice and $pid_priority
2009-11-16 14:01:43 +00:00
END OBJ_ARG(pid_nice, 0, "pid_nice needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_nice;
Added support for $pid_openfiles
2009-11-12 23:36:46 +00:00
END OBJ_ARG(pid_openfiles, 0, "pid_openfiles needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_openfiles;
Add support for $pid_parent
2009-11-15 12:26:40 +00:00
END OBJ_ARG(pid_parent, 0, "pid_parent needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_parent;
Add support for $pid_nice and $pid_priority
2009-11-16 14:01:43 +00:00
END OBJ_ARG(pid_priority, 0, "pid_priority needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_priority;
Support for $pid_state
2009-11-14 12:58:07 +00:00
END OBJ_ARG(pid_state, 0, "pid_state needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_state;
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 21:07:54 +00:00
END OBJ_ARG(pid_state_short, 0, "pid_state_short needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_state_short;
Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr
2009-11-12 19:34:43 +00:00
END OBJ_ARG(pid_stderr, 0, "pid_stderr needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_stderr;
Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr
2009-11-12 19:34:43 +00:00
END OBJ_ARG(pid_stdin, 0, "pid_stdin needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_stdin;
Added support for $pid_exe and $pid_stdin, $pid_stdout and $pid_stderr
2009-11-12 19:34:43 +00:00
END OBJ_ARG(pid_stdout, 0, "pid_stdout needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_stdout;
Added support for $pid_threads and $pid_thread_list
2009-11-16 08:54:17 +00:00
END OBJ_ARG(pid_threads, 0, "pid_threads needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_threads;
Added support for $pid_threads and $pid_thread_list
2009-11-16 08:54:17 +00:00
END OBJ_ARG(pid_thread_list, 0, "pid_thread_list needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_thread_list;
Added support for $pid_time_usermode, $pid_time_kernelmode and $pid_time
2009-11-16 14:30:57 +00:00
END OBJ_ARG(pid_time_kernelmode, 0, "pid_time_kernelmode needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_time_kernelmode;
Added support for $pid_time_usermode, $pid_time_kernelmode and $pid_time
2009-11-16 14:30:57 +00:00
END OBJ_ARG(pid_time_usermode, 0, "pid_time_usermode needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_time_usermode;
Added support for $pid_time_usermode, $pid_time_kernelmode and $pid_time
2009-11-16 14:30:57 +00:00
END OBJ_ARG(pid_time, 0, "pid_time needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_time;
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
2009-11-15 13:49:55 +00:00
END OBJ_ARG(pid_uid, 0, "pid_uid needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_uid;
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
2009-11-15 13:49:55 +00:00
END OBJ_ARG(pid_euid, 0, "pid_euid needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_euid;
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
2009-11-15 13:49:55 +00:00
END OBJ_ARG(pid_suid, 0, "pid_suid needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_suid;
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
2009-11-15 13:49:55 +00:00
END OBJ_ARG(pid_fsuid, 0, "pid_fsuid needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_fsuid;
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
2009-11-15 13:49:55 +00:00
END OBJ_ARG(pid_gid, 0, "pid_gid needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_gid;
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
2009-11-15 13:49:55 +00:00
END OBJ_ARG(pid_egid, 0, "pid_egid needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_egid;
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
2009-11-15 13:49:55 +00:00
END OBJ_ARG(pid_sgid, 0, "pid_sgid needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_sgid;
Added support for $pid_uid, $pid_euid, $pid_suid, $pid_fsuid, $pid_gid, $pid_egid, $pid_sgid and $pid_fsgid
2009-11-15 13:49:55 +00:00
END OBJ_ARG(pid_fsgid, 0, "pid_fsgid needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_fsgid;
Added support for $gid_name
2009-11-15 16:46:41 +00:00
END OBJ_ARG(gid_name, 0, "gid_name needs a gid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
gid_name, uid_name: outsource sub object parsing and convert to callbacks.print
2009-11-29 15:40:23 +00:00
obj->callbacks.print = &print_gid_name;
Added support for $uid_name
2009-11-15 16:21:55 +00:00
END OBJ_ARG(uid_name, 0, "uid_name needs a uid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
gid_name, uid_name: outsource sub object parsing and convert to callbacks.print
2009-11-29 15:40:23 +00:00
obj->callbacks.print = &print_uid_name;
Add support for $pid_read and $pid_write
2009-11-19 11:32:14 +00:00
END OBJ_ARG(pid_read, 0, "pid_read needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_read;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmpeak, 0, "pid_vmpeak needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmpeak;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmsize, 0, "pid_vmsize needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmsize;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmlck, 0, "pid_vmlck needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmlck;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmhwm, 0, "pid_vmhwm needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmhwm;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmrss, 0, "pid_vmrss needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmrss;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmdata, 0, "pid_vmdata needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmdata;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmstk, 0, "pid_vmstk needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmstk;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmexe, 0, "pid_vmexe needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmexe;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmlib, 0, "pid_vmlib needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmlib;
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 18:44:37 +00:00
END OBJ_ARG(pid_vmpte, 0, "pid_vmpte needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_vmpte;
Add support for $pid_read and $pid_write
2009-11-19 11:32:14 +00:00
END OBJ_ARG(pid_write, 0, "pid_write needs a pid as argument")
pid objects: outsource sub object evaluation
2009-11-29 15:27:12 +00:00
extract_object_args_to_sub(obj, arg);
pid objects: convert to callbacks.print
2009-11-29 15:34:15 +00:00
obj->callbacks.print = &print_pid_write;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(processes, &update_total_processes)
convert processes and threads objects to callbacks.print
2009-11-26 00:06:53 +00:00
obj->callbacks.print = &print_processes;
fix compiling for freebsd Tested using default options, lua disabled as only lua50 available in 7.2-RELEASE.
2009-11-14 03:19:51 +00:00
#ifdef __linux__
Add support for $distribution
2010-04-15 14:05:42 +00:00
END OBJ(distribution, 0)
obj->callbacks.print = &print_distribution;
Rename $running_processes to $running_threads, implement real $running_processes
2009-11-15 16:42:59 +00:00
END OBJ(running_processes, &update_top)
Forgot to set top_running when $running_processes is used
2009-11-15 22:00:14 +00:00
top_running = 1;
convert processes and threads objects to callbacks.print
2009-11-26 00:06:53 +00:00
obj->callbacks.print = &print_running_processes;
Added support for $threads and fixed $processes on Linux
2009-11-07 17:14:04 +00:00
END OBJ(threads, &update_threads)
convert processes and threads objects to callbacks.print
2009-11-26 00:06:53 +00:00
obj->callbacks.print = &print_threads;
Rename $running_processes to $running_threads, implement real $running_processes
2009-11-15 16:42:59 +00:00
END OBJ(running_threads, &update_stat)
convert processes and threads objects to callbacks.print
2009-11-26 00:06:53 +00:00
obj->callbacks.print = &print_running_threads;
Rename $running_processes to $running_threads, implement real $running_processes
2009-11-15 16:42:59 +00:00
#else
END OBJ(running_processes, &update_running_processes)
convert processes and threads objects to callbacks.print
2009-11-26 00:06:53 +00:00
obj->callbacks.print = &print_running_processes;
Rename $running_processes to $running_threads, implement real $running_processes
2009-11-15 16:42:59 +00:00
#endif /* __linux__ */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(shadecolor, 0)
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
make default_{shade_,outline_,}color lua settings
2010-03-11 11:08:55 +00:00
obj->data.l = arg ? get_x11_color(arg) : default_shade_color.get(*state);
shadecolor: convert to callbacks.print
2009-11-08 15:28:02 +00:00
obj->callbacks.print = &new_bg;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(outlinecolor, 0)
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
make default_{shade_,outline_,}color lua settings
2010-03-11 11:08:55 +00:00
obj->data.l = arg ? get_x11_color(arg) : default_outline_color.get(*state);
outlinecolor: convert to callbacks.print
2009-11-08 15:26:02 +00:00
obj->callbacks.print = &new_outline;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(stippled_hr, 0)
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
specials: convert stippled_hr object to new style
2009-10-29 02:22:58 +00:00
scan_stippled_hr(obj, arg);
hr, stippled_hr: convert to callbacks.print
2009-11-08 16:08:02 +00:00
obj->callbacks.print = &new_stippled_hr;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(swap, &update_meminfo)
convert mem and swap objects to callbacks.print
2009-11-25 23:09:38 +00:00
obj->callbacks.print = &print_swap;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(swapfree, &update_meminfo)
convert mem and swap objects to callbacks.print
2009-11-25 23:09:38 +00:00
obj->callbacks.print = &print_swapfree;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(swapmax, &update_meminfo)
convert mem and swap objects to callbacks.print
2009-11-25 23:09:38 +00:00
obj->callbacks.print = &print_swapmax;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(swapperc, &update_meminfo)
convert swapperc to callbacks.percentage
2009-11-25 00:34:54 +00:00
obj->callbacks.percentage = &swap_percentage;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(swapbar, &update_meminfo)
convert swap_barval to double
2009-12-04 00:25:41 +00:00
scan_bar(obj, arg, 1);
convert swapbar to callbacks
2009-11-30 22:55:48 +00:00
obj->callbacks.barval = &swap_barval;
/* XXX: swapgraph, swapgauge? */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(sysname, 0)
convert sysname to callbacks.print
2009-11-25 23:29:50 +00:00
obj->callbacks.print = &print_sysname;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(time, 0)
outsource time, utime and tztime into a separate file
2009-10-03 15:46:59 +00:00
scan_time(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_time;
obj->callbacks.free = &free_time;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(utime, 0)
outsource time, utime and tztime into a separate file
2009-10-03 15:46:59 +00:00
scan_time(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_utime;
obj->callbacks.free = &free_time;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(tztime, 0)
outsource time, utime and tztime into a separate file
2009-10-03 15:46:59 +00:00
scan_tztime(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_tztime;
obj->callbacks.free = &free_tztime;
Add support for $ical
2010-04-27 14:42:21 +00:00
#ifdef BUILD_ICAL
END OBJ_ARG(ical, 0, "ical requires arguments")
parse_ical_args(obj, arg, free_at_crash, s);
obj->callbacks.print = &print_ical;
obj->callbacks.free = &free_ical;
#endif
Add support for $irc
2010-04-30 17:32:42 +00:00
#ifdef BUILD_IRC
END OBJ_ARG(irc, 0, "irc requires arguments")
parse_irc_args(obj, arg);
obj->callbacks.print = &print_irc;
obj->callbacks.free = &free_irc;
#endif
Get $iconv vars working again
2010-01-20 17:17:30 +00:00
#ifdef BUILD_ICONV
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(iconv_start, 0, "Iconv requires arguments")
iconv: outsource code into it's own file While testing, I found two already existing bugs: * the variable 'a' passed to iconv_convert() needs to be passed by reference in order to allow for the desired side effect. * Somehow the trailing junk after an iconv_conversion to a shorter string messes things up (and gets printed!). I couldn't exactly find out why this happens, but setting (*p) = 0; solves this problem.
2009-10-03 18:01:33 +00:00
init_iconv_start(obj, free_at_crash, arg);
convert iconv objects to callbacks
2009-11-29 13:24:14 +00:00
obj->callbacks.print = &print_iconv_start;
obj->callbacks.free = &free_iconv;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(iconv_stop, 0)
iconv: outsource code into it's own file While testing, I found two already existing bugs: * the variable 'a' passed to iconv_convert() needs to be passed by reference in order to allow for the desired side effect. * Somehow the trailing junk after an iconv_conversion to a shorter string messes things up (and gets printed!). I couldn't exactly find out why this happens, but setting (*p) = 0; solves this problem.
2009-10-03 18:01:33 +00:00
init_iconv_stop();
convert iconv objects to callbacks
2009-11-29 13:24:14 +00:00
obj->callbacks.print = &print_iconv_stop;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(totaldown, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_totaldown;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(totalup, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_totalup;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(updates, 0)
convert $updates to callbacks.print
2009-11-29 18:48:24 +00:00
obj->callbacks.print = &print_updates;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ_IF(if_updatenr, 0)
text_object: completely remove the need for data.ifblock
2009-10-29 02:52:59 +00:00
obj->data.i = arg ? atoi(arg) : 0;
if(obj->data.i == 0) CRIT_ERR(obj, free_at_crash, "if_updatenr needs a number above 0 as argument");
set_updatereset(obj->data.i > get_updatereset() ? obj->data.i : get_updatereset());
convert if_updatenr to callbacks.iftest
2009-11-29 18:50:59 +00:00
obj->callbacks.iftest = &updatenr_iftest;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(alignr, 0)
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-08 13:49:27 +00:00
obj->data.l = arg ? atoi(arg) : 1;
offset, align, tailhead: convert to callbacks.print
2009-11-08 16:02:19 +00:00
obj->callbacks.print = &new_alignr;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(alignc, 0)
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-08 13:49:27 +00:00
obj->data.l = arg ? atoi(arg) : 0;
offset, align, tailhead: convert to callbacks.print
2009-11-08 16:02:19 +00:00
obj->callbacks.print = &new_alignc;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(upspeed, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_upspeed;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(upspeedf, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_upspeedf;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(upspeedgraph, &update_net_stats)
net_stats: outsource network-related objects
2009-10-17 14:43:12 +00:00
parse_net_stat_graph_arg(obj, arg, free_at_crash);
merge {down,up}speedgraph to callbacks.graphval
2009-11-23 23:21:16 +00:00
obj->callbacks.graphval = &upspeedgraphval;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(uptime_short, &update_uptime)
convert uptime objects to callbacks.print
2009-11-25 23:34:01 +00:00
obj->callbacks.print = &print_uptime_short;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(uptime, &update_uptime)
convert uptime objects to callbacks.print
2009-11-25 23:34:01 +00:00
obj->callbacks.print = &print_uptime;
fix compiling for freebsd Tested using default options, lua disabled as only lua50 available in 7.2-RELEASE.
2009-11-14 03:19:51 +00:00
#if defined(__linux__)
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(user_names, &update_users)
convert user objects to callbacks.{print,free}
2009-11-25 23:51:19 +00:00
obj->callbacks.print = &print_user_names;
obj->callbacks.free = &free_user_names;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(user_times, &update_users)
convert user objects to callbacks.{print,free}
2009-11-25 23:51:19 +00:00
obj->callbacks.print = &print_user_times;
obj->callbacks.free = &free_user_times;
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.
2009-11-14 14:57:45 +00:00
END OBJ_ARG(user_time, 0, "user time needs a console name as argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
convert user objects to callbacks.{print,free}
2009-11-25 23:51:19 +00:00
obj->callbacks.print = &print_user_time;
obj->callbacks.free = &free_user_time;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(user_terms, &update_users)
convert user objects to callbacks.{print,free}
2009-11-25 23:51:19 +00:00
obj->callbacks.print = &print_user_terms;
obj->callbacks.free = &free_user_terms;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(user_number, &update_users)
convert user objects to callbacks.{print,free}
2009-11-25 23:51:19 +00:00
obj->callbacks.print = &print_user_number;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(gw_iface, &update_gateway_info)
convert gw_* objects to callbacks.print
2009-11-16 00:09:37 +00:00
obj->callbacks.print = &print_gateway_iface;
convert gateway objects to callbacks.free
2009-11-29 19:52:36 +00:00
obj->callbacks.free = &free_gateway_info;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(gw_ip, &update_gateway_info)
convert gw_* objects to callbacks.print
2009-11-16 00:09:37 +00:00
obj->callbacks.print = &print_gateway_ip;
convert gateway objects to callbacks.free
2009-11-29 19:52:36 +00:00
obj->callbacks.free = &free_gateway_info;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif /* !__linux__ */
#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
|| defined(__OpenBSD__)) && (defined(i386) || defined(__i386__))
END OBJ(apm_adapter, 0)
convert bsd apm objects to callbacks.print
2009-11-29 13:14:06 +00:00
obj->callbacks.print = &print_apm_adapter;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(apm_battery_life, 0)
convert bsd apm objects to callbacks.print
2009-11-29 13:14:06 +00:00
obj->callbacks.print = &print_apm_battery_life;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(apm_battery_time, 0)
convert bsd apm objects to callbacks.print
2009-11-29 13:14:06 +00:00
obj->callbacks.print = &print_apm_battery_time;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#endif /* __FreeBSD__ */
END OBJ(imap_unseen, 0)
mail: put imap and pop3 code to where it belongs
2009-10-24 23:17:30 +00:00
parse_imap_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_imap_unseen;
obj->callbacks.free = &free_mail_obj;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(imap_messages, 0)
mail: put imap and pop3 code to where it belongs
2009-10-24 23:17:30 +00:00
parse_imap_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_imap_messages;
obj->callbacks.free = &free_mail_obj;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(pop3_unseen, 0)
mail: put imap and pop3 code to where it belongs
2009-10-24 23:17:30 +00:00
parse_pop3_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_pop3_unseen;
obj->callbacks.free = &free_mail_obj;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(pop3_used, 0)
mail: put imap and pop3 code to where it belongs
2009-10-24 23:17:30 +00:00
parse_pop3_mail_args(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_pop3_used;
obj->callbacks.free = &free_mail_obj;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_IBM
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(smapi, 0, "smapi needs an argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_smapi;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_IF_ARG(if_smapi_bat_installed, 0, "if_smapi_bat_installed needs an argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
convert if_smapi_bat_installed to callbacks.iftest
2009-11-25 01:06:14 +00:00
obj->callbacks.iftest = &smapi_bat_installed;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(smapi_bat_perc, 0, "smapi_bat_perc needs an argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
convert smapi_bat_perc to callbacks.percentage
2009-11-25 00:59:58 +00:00
obj->callbacks.percentage = &smapi_bat_percentage;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(smapi_bat_temp, 0, "smapi_bat_temp needs an argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_smapi_bat_temp;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(smapi_bat_power, 0, "smapi_bat_power needs an argument")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_smapi_bat_power;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(smapi_bat_bar, 0, "smapi_bat_bar needs an argument")
int cnt;
if(sscanf(arg, "%i %n", &obj->data.i, &cnt) <= 0) {
NORM_ERR("first argument to smapi_bat_bar must be an integer value");
obj->data.i = -1;
specials: introduce dedicated per-object data and merge graph objects
2009-10-25 20:47:47 +00:00
} else
convert smapi_bat_barval to double
2009-12-04 00:27:58 +00:00
arg = scan_bar(obj, arg + cnt, 100);
convert smapi_bat_bar to callbacks.barval
2009-11-23 22:48:12 +00:00
obj->callbacks.barval = &smapi_bat_barval;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_IBM */
#ifdef BUILD_MPD
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#define mpd_set_maxlen(name) \
if (arg) { \
int i; \
sscanf(arg, "%d", &i); \
if (i > 0) \
obj->data.i = i + 1; \
else \
NORM_ERR(#name ": invalid length argument"); \
}
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_artist, 0)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
mpd_set_maxlen(mpd_artist);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_artist;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_title, 0)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
mpd_set_maxlen(mpd_title);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_title;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_random, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_random;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_repeat, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_repeat;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_elapsed, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_elapsed;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_length, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_length;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_track, 0)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
mpd_set_maxlen(mpd_track);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_track;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_name, 0)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
mpd_set_maxlen(mpd_name);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_name;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_file, 0)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
mpd_set_maxlen(mpd_file);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_file;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_percent, 0)
convert mpd_percent to callbacks.percentage
2009-11-25 00:57:28 +00:00
obj->callbacks.percentage = &mpd_percentage;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_album, 0)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
mpd_set_maxlen(mpd_album);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_album;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_vol, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_vol;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_bitrate, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_bitrate;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_status, 0)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_status;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_bar, 0)
convert mpd_barval to double
2009-12-04 00:29:56 +00:00
scan_bar(obj, arg, 1);
convert mpd_bar to callbacks.barval
2009-11-23 22:45:08 +00:00
obj->callbacks.barval = &mpd_barval;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ(mpd_smart, 0)
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
mpd_set_maxlen(mpd_smart);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_mpd_smart;
Make mpd vars use the new update system
2011-03-26 18:33:42 +00:00
END OBJ_IF(if_mpd_playing, 0)
if_mpd_playing: convert to callbacks.iftest
2009-11-16 22:37:01 +00:00
obj->callbacks.iftest = &check_mpd_playing;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
#undef mpd_set_maxlen
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_MPD */
#ifdef BUILD_MOC
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_state, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_state;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_file, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_file;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_title, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_title;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_artist, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_artist;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_song, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_song;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_album, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_album;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_totaltime, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_totaltime;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_timeleft, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_timeleft;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_curtime, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_curtime;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_bitrate, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_bitrate;
Make moc vars use the new callback system
2011-03-26 13:55:05 +00:00
END OBJ(moc_rate, 0)
moc: convert to callbacks.print and callbacks.free
2009-11-08 18:44:03 +00:00
obj->callbacks.print = &print_moc_rate;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_MOC */
Cmus support added to conky
2011-05-10 20:40:53 +00:00
#ifdef BUILD_CMUS
END OBJ(cmus_state, 0)
obj->callbacks.print = &print_cmus_state;
END OBJ(cmus_file, 0)
obj->callbacks.print = &print_cmus_file;
END OBJ(cmus_title, 0)
obj->callbacks.print = &print_cmus_title;
END OBJ(cmus_artist, 0)
obj->callbacks.print = &print_cmus_artist;
END OBJ(cmus_album, 0)
obj->callbacks.print = &print_cmus_album;
END OBJ(cmus_totaltime, 0)
obj->callbacks.print = &print_cmus_totaltime;
END OBJ(cmus_timeleft, 0)
obj->callbacks.print = &print_cmus_timeleft;
END OBJ(cmus_curtime, 0)
obj->callbacks.print = &print_cmus_curtime;
END OBJ(cmus_random, 0)
obj->callbacks.print = &print_cmus_random;
END OBJ(cmus_state, 0)
obj->callbacks.print = &print_cmus_state;
END OBJ(cmus_file, 0)
obj->callbacks.print = &print_cmus_file;
END OBJ(cmus_title, 0)
obj->callbacks.print = &print_cmus_title;
END OBJ(cmus_artist, 0)
obj->callbacks.print = &print_cmus_artist;
END OBJ(cmus_album, 0)
obj->callbacks.print = &print_cmus_album;
END OBJ(cmus_totaltime, 0)
obj->callbacks.print = &print_cmus_totaltime;
END OBJ(cmus_timeleft, 0)
obj->callbacks.print = &print_cmus_timeleft;
END OBJ(cmus_curtime, 0)
obj->callbacks.print = &print_cmus_curtime;
END OBJ(cmus_random, 0)
obj->callbacks.print = &print_cmus_random;
END OBJ(cmus_repeat, 0)
obj->callbacks.print = &print_cmus_repeat;
END OBJ(cmus_aaa, 0)
obj->callbacks.print = &print_cmus_aaa;
END OBJ(cmus_track, 0)
obj->callbacks.print = &print_cmus_track;
END OBJ(cmus_genre, 0)
obj->callbacks.print = &print_cmus_genre;
END OBJ(cmus_date, 0)
obj->callbacks.print = &print_cmus_date;
END OBJ(cmus_progress, 0)
scan_bar(obj, arg, 1);
obj->callbacks.barval = &cmus_progress;
END OBJ(cmus_percent, 0)
obj->callbacks.percentage = &cmus_percent;
#endif /* BUILD_CMUS */
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_XMMS2
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_artist, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_artist;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_album, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_album;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_title, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_title;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_genre, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_genre;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_comment, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_comment;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_url, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_url;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_tracknr, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_tracknr;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_bitrate, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_bitrate;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_date, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_date;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_id, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_id;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_duration, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_duration;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_elapsed, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_elapsed;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_size, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_size;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_status, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_status;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_percent, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_percent;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_bar, &update_xmms2)
convert xmms2_barval to double
2009-12-04 00:31:21 +00:00
scan_bar(obj, arg, 1);
convert xmms2_bar to callbacks.barval
2009-11-23 22:50:15 +00:00
obj->callbacks.barval = &xmms2_barval;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_smart, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_smart;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_playlist, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_playlist;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(xmms2_timesplayed, &update_xmms2)
xmms2: outsource code and convert to callbacks.print
2009-11-09 22:38:12 +00:00
obj->callbacks.print = &print_xmms2_timesplayed;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ_IF(if_xmms2_connected, &update_xmms2)
if_xmms2_connected: convert to callbacks.iftest
2009-11-16 22:47:44 +00:00
obj->callbacks.iftest = &if_xmms2_connected;
convert xmms2 objects to callbacks.free
2009-11-29 20:06:59 +00:00
obj->callbacks.free = &free_xmms2;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_XMMS2 */
#ifdef BUILD_AUDACIOUS
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_status, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_status;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ_ARG(audacious_title, 0, "audacious_title needs an argument")
sscanf(arg, "%d", &obj->data.i);
if (obj->data.i > 0) {
++ obj->data.i;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
} else {
CRIT_ERR(obj, free_at_crash, "audacious_title: invalid length argument");
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
}
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_title;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_length, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_length;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_length_seconds, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_length_seconds;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_position, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_position;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_position_seconds, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_position_seconds;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_bitrate, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_bitrate;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_frequency, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_frequency;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_channels, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_channels;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_filename, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_filename;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_playlist_length, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_playlist_length;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_playlist_position, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_playlist_position;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_main_volume, 0)
audacious: convert to callbacks.print
2009-11-08 18:19:42 +00:00
obj->callbacks.print = &print_audacious_main_volume;
Make audacious vars use the new update system
2011-03-25 14:06:26 +00:00
END OBJ(audacious_bar, 0)
convert audacious_barval to double
2009-12-04 00:32:49 +00:00
scan_bar(obj, arg, 1);
merge audacious_bar to callbacks.barval
2009-11-23 22:22:50 +00:00
obj->callbacks.barval = &audacious_barval;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_AUDACIOUS */
#ifdef BUIL_BMPX
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(bmpx_title, &update_bmpx)
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-08 18:27:01 +00:00
obj->callbacks.print = &print_bmpx_title;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(bmpx_artist, &update_bmpx)
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-08 18:27:01 +00:00
obj->callbacks.print = &print_bmpx_artist;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(bmpx_album, &update_bmpx)
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-08 18:27:01 +00:00
obj->callbacks.print = &print_bmpx_album;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(bmpx_track, &update_bmpx)
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-08 18:27:01 +00:00
obj->callbacks.print = &print_bmpx_track;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(bmpx_uri, &update_bmpx)
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-08 18:27:01 +00:00
obj->callbacks.print = &print_bmpx_uri;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(bmpx_bitrate, &update_bmpx)
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-08 18:27:01 +00:00
obj->callbacks.print = &print_bmpx_bitrate;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_BMPX */
#ifdef BUILD_EVE
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(eve, 0, "eve needs arguments: <userid> <apikey> <characterid>")
spend some time with eve.{c,h} * minimise core code hooks * drop useless exporting of private functions (and make them static) * reorder functions in eve.c so no prototypes are needed * drop massive header include and add double include barrier in eve.h
2009-10-04 16:39:28 +00:00
scan_eve(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_eve;
obj->callbacks.free = &free_eve;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_EVE */
#ifdef BUILD_CURL
OBJ -> OBJ_ARG; apparently forgotten in 9f22ba
2009-09-15 21:54:31 +00:00
END OBJ_ARG(curl, 0, "curl needs arguments: <uri> <interval in minutes>")
curl: put init and print code to where it belongs This also fixes a bug in arg parsing, effectively forcing an interval to be specified.
2009-10-04 19:06:52 +00:00
curl_parse_arg(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &curl_print;
obj->callbacks.free = &curl_obj_free;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_CURL */
#ifdef BUILD_RSS
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(rss, 0, "rss needs arguments: <uri> <interval in minutes> <action> [act_par] [spaces in front]")
rss: move init and print code into rss.c
2009-10-04 17:04:08 +00:00
rss_scan_arg(obj, arg);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &rss_print_info;
obj->callbacks.free = &rss_free_obj_info;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_RSS */
#ifdef BUILD_WEATHER_METAR
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(weather, 0, "weather needs arguments: <uri> <locID> <data_type> [interval in minutes]")
weather objects: move init and print code to weather.c
2009-10-04 17:42:01 +00:00
scan_weather_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_weather;
obj->callbacks.free = &free_weather;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_WEATHER_METAR */
#ifdef BUILD_WEATHER_XOAP
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(weather_forecast, 0, "weather_forecast needs arguments: <uri> <locID> <day> <data_type> [interval in minutes]")
weather objects: move init and print code to weather.c
2009-10-04 17:42:01 +00:00
scan_weather_forecast_arg(obj, arg, free_at_crash);
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_weather_forecast;
obj->callbacks.free = &free_weather;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_WEATHER_XOAP */
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(lua, 0, "lua needs arguments: <function name> [function parameters]")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_lua;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(lua_parse, 0, "lua_parse needs arguments: <function name> [function parameters]")
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_lua_parse;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(lua_bar, 0, "lua_bar needs arguments: <height>,<width> <function name> [function parameters]")
convert lua_barval to double
2009-12-04 00:34:11 +00:00
arg = scan_bar(obj, arg, 100);
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
if(arg) {
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
} else {
CRIT_ERR(obj, free_at_crash, "lua_bar needs arguments: <height>,<width> <function name> [function parameters]");
}
merge lua_bar to callbacks.barval
2009-11-23 22:36:57 +00:00
obj->callbacks.barval = &lua_barval;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(lua_graph, 0, "lua_graph needs arguments: <function name> [height],[width] [gradient colour 1] [gradient colour 2] [scale] [-t] [-l]")
char *buf = 0;
convert lua_barval to double
2009-12-04 00:34:11 +00:00
buf = scan_graph(obj, arg, 100);
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
if (buf) {
obj->data.s = buf;
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
} else {
CRIT_ERR(obj, free_at_crash, "lua_graph needs arguments: <function name> [height],[width] [gradient colour 1] [gradient colour 2] [scale] [-t] [-l]");
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
}
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.graphval = &lua_barval;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(lua_gauge, 0, "lua_gauge needs arguments: <height>,<width> <function name> [function parameters]")
convert lua_barval to double
2009-12-04 00:34:11 +00:00
arg = scan_gauge(obj, arg, 100);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (arg) {
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
} else {
CRIT_ERR(obj, free_at_crash, "lua_gauge needs arguments: <height>,<width> <function name> [function parameters]");
}
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.gaugeval = &lua_barval;
bunch of trivial conversions to gen_free_opaque()
2009-11-20 00:44:28 +00:00
obj->callbacks.free = &gen_free_opaque;
Fix compiling without X11 support
2010-11-13 22:59:31 +00:00
#endif /* BUILD_X11 */
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_HDDTEMP
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(hddtemp, &update_hddtemp)
Rewrite hddtemp support for better scaling Instead of connecting once for each object, have a central update routine (limiting support to only a single hddtemp daemon to connect to).
2009-09-06 19:53:53 +00:00
if (arg)
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
obj->data.s = strndup(arg, text_buffer_size.get(*state));
hddtemp: convert to callbacks.print
2009-11-08 16:12:37 +00:00
obj->callbacks.print = &print_hddtemp;
hddtemp: convert to callbacks.free
2009-11-08 03:18:19 +00:00
obj->callbacks.free = &free_hddtemp;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_HDDTEMP */
#ifdef BUILD_PORT_MONITORS
tcp_portmon: drop useless function pointer cast, use OBJ_ARG
2009-10-04 15:08:08 +00:00
END OBJ_ARG(tcp_portmon, &tcp_portmon_update, "tcp_portmon: needs arguments")
tcp_portmon: convert to generic object payload
2009-10-04 15:22:25 +00:00
tcp_portmon_init(obj, arg);
tcp-portmon: convert to callbacks.print
2009-11-08 15:41:42 +00:00
obj->callbacks.print = &tcp_portmon_action;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &tcp_portmon_free;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_PORT_MONITORS */
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(entropy_avail, &update_entropy)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_entropy_avail;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(entropy_perc, &update_entropy)
convert entropy_perc to callbacks.percentage
2009-11-25 00:38:56 +00:00
obj->callbacks.percentage = &entropy_percentage;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(entropy_poolsize, &update_entropy)
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.print = &print_entropy_poolsize;
update machinery: let CALLBACK() die again There are no INFO_* variables any more, so the argument passed to OBJ() is always a function pointer or zero. By checking the argument passed in add_update_callback(), the branch in the OBJ() macro can be dropped, too.
2009-09-06 23:22:16 +00:00
END OBJ(entropy_bar, &update_entropy)
convert entropy_barval to double
2009-12-04 00:35:23 +00:00
scan_bar(obj, arg, 1);
merge entropy_bar to callbacks.barval
2009-11-23 22:26:11 +00:00
obj->callbacks.barval = &entropy_barval;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(blink, 0, "blink needs a argument")
Switch some more bits to C++, more CMake changes.
2009-12-10 04:05:32 +00:00
obj->sub = (text_object*)malloc(sizeof(struct text_object));
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
extract_variable_text_internal(obj->sub, arg);
convert blink to callbacks.print
2009-11-29 11:56:09 +00:00
obj->callbacks.print = &print_blink;
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(to_bytes, 0, "to_bytes needs a argument")
Switch some more bits to C++, more CMake changes.
2009-12-10 04:05:32 +00:00
obj->sub = (text_object*)malloc(sizeof(struct text_object));
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
extract_variable_text_internal(obj->sub, arg);
convert to_bytes to callbacks.print
2009-11-29 11:47:11 +00:00
obj->callbacks.print = &print_to_bytes;
curl
2010-04-19 12:54:03 +00:00
#ifdef BUILD_CURL
Add support for $stock
2010-04-19 12:45:05 +00:00
END OBJ_ARG(stock, 0, "stock needs arguments")
stock_parse_arg(obj, arg);
obj->callbacks.print = &print_stock;
obj->callbacks.free = &free_stock;
curl
2010-04-19 12:54:03 +00:00
#endif /* BUILD_CURL */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END OBJ(scroll, 0)
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
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-08 13:49:27 +00:00
/* allocate a follower to reset any color changes */
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_X11 */
Fix 3 memleaks that happen when scroll receives wrong args
2010-02-15 15:02:29 +00:00
parse_scroll_arg(obj, arg, free_at_crash, s);
scroll: convert to callbacks.print
2009-11-08 18:50:27 +00:00
obj->callbacks.print = &print_scroll;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_scroll;
Replace a CRIT_ERR in combine by trying,throwing and catching PS: I want to replace all similar CRIT_ERR's like this, opinions ?
2010-11-16 12:41:44 +00:00
END OBJ(combine, 0)
try {
parse_combine_arg(obj, arg);
}
catch(combine_needs_2_args_error &e) {
free(obj);
throw obj_create_error(e.what());
}
combine: convert to callbacks.print
2009-11-08 18:53:34 +00:00
obj->callbacks.print = &print_combine;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_combine;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_NVIDIA
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(nvidia, 0, "nvidia needs an argument")
nvidia: convert to generic text object payload
2009-10-03 14:14:23 +00:00
if (set_nvidia_type(obj, arg)) {
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
CRIT_ERR(obj, free_at_crash, "nvidia: invalid argument"
" specified: '%s'\n", arg);
}
nvidia: convert to callbacks.print
2009-11-16 21:54:30 +00:00
obj->callbacks.print = &print_nvidia_value;
huge bunch of trivial conversions to obj->callbacks
2009-11-08 02:12:22 +00:00
obj->callbacks.free = &free_nvidia;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_NVIDIA */
#ifdef BUILD_APCUPSD
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
END OBJ_ARG(apcupsd, &update_apcupsd, "apcupsd needs arguments: <host> <port>")
cleanup apcupsd a bit, fix some whitespace errors
2009-12-17 22:07:15 +00:00
if (apcupsd_scan_arg(arg)) {
minor indenting fixup
2009-09-09 23:42:04 +00:00
CRIT_ERR(obj, free_at_crash, "apcupsd needs arguments: <host> <port>");
}
use gen_print_nothing for $apcupsd
2009-11-28 22:05:14 +00:00
obj->callbacks.print = &gen_print_nothing;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_name, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_name;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_model, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_model;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_upsmode, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_upsmode;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_cable, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_cable;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_status, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_status;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_linev, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_linev;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_load, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_load;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_loadbar, &update_apcupsd)
convert apcupsd_loadbarval to double
2009-12-04 00:37:32 +00:00
scan_bar(obj, arg, 100);
merge apcupsd_loadbar to callbacks.barval
2009-11-23 22:56:50 +00:00
obj->callbacks.barval = &apcupsd_loadbarval;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#ifdef BUILD_X11
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_loadgraph, &update_apcupsd)
char* buf = 0;
convert apcupsd_loadbarval to double
2009-12-04 00:37:32 +00:00
buf = scan_graph(obj, arg, 100);
Use free_and_zero in conky.cc and core.cc where appropriate
2010-02-23 21:06:04 +00:00
free_and_zero(buf);
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.graphval = &apcupsd_loadbarval;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_loadgauge, &update_apcupsd)
convert apcupsd_loadbarval to double
2009-12-04 00:37:32 +00:00
scan_gauge(obj, arg, 100);
reuse barval callbacks where applicable
2009-11-30 23:10:22 +00:00
obj->callbacks.gaugeval = &apcupsd_loadbarval;
Fix compiling without X11 support
2010-11-13 22:59:31 +00:00
#endif /* BUILD_X11 */
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_charge, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_charge;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_timeleft, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_timeleft;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_temp, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_temp;
minor indenting fixup
2009-09-09 23:42:04 +00:00
END OBJ(apcupsd_lastxfer, &update_apcupsd)
apcupsd: convert to callbacks.print
2009-11-08 17:14:42 +00:00
obj->callbacks.print = &print_apcupsd_lastxfer;
Use consistent naming for build option macros. Probably have broken some build features with this commit.
2010-01-07 02:38:12 +00:00
#endif /* BUILD_APCUPSD */
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
END {
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
char *buf = (char *)malloc(text_buffer_size.get(*state));
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Improve unknown var error
2010-04-15 22:20:08 +00:00
NORM_ERR("unknown variable '$%s'", s);
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
snprintf(buf, text_buffer_size.get(*state), "${%s}", s);
convert OBJ_text to callbacks This is tricky: there is no such thing as $text. In fact, everything below TEXT in the conkyrc which is NOT a text object will become one of type OBJ_text. To make life easy, introduce a function obj_be_plain_text() converting a given object to the given plain text.
2009-11-29 19:04:55 +00:00
obj_be_plain_text(obj, buf);
ISO C++ forbids variable length arrays
2009-12-17 21:19:58 +00:00
free(buf);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
}
#undef OBJ
core: add OBJ_ARG() and OBJ_IF_ARG() to force arguments These macros can be used just like their OBJ() and OBJ_IF() counterparts, just that they bail out hard when arg is unset. While here, also cleanup the macro definition by using __* macros and fully cleanup the macro namespace when the job is done. Although this makes conky kind of less robust when it comes to configuration errors, aborting is the right thing to do to avoid ambiguity between unknown text objects.
2009-09-09 23:35:57 +00:00
#undef OBJ_IF
#undef OBJ_ARG
#undef OBJ_IF_ARG
#undef __OBJ_HEAD
#undef __OBJ_IF
#undef __OBJ_ARG
#undef END
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
return obj;
}
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/*
* - assumes that *string is '#'
* - removes the part from '#' to the end of line ('\n' or '\0')
* - it removes the '\n'
* - copies the last char into 'char *last' argument, which should be a pointer
* to a char rather than a string.
*/
static size_t remove_comment(char *string, char *last)
{
char *end = string;
while (*end != '\0' && *end != '\n') {
++end;
}
if (last) *last = *end;
if (*end == '\n') end++;
strfold(string, end - string);
return end - string;
}
size_t remove_comments(char *string)
{
char *curplace;
size_t folded = 0;
for (curplace = string; *curplace != 0; curplace++) {
if (*curplace == '\\' && *(curplace + 1) == '#') {
// strcpy can't be used for overlapping strings
strfold(curplace, 1);
folded += 1;
} else if (*curplace == '#') {
folded += remove_comment(curplace, 0);
}
}
return folded;
}
int extract_variable_text_internal(struct text_object *retval, const char *const_p)
{
struct text_object *obj;
char *p, *s, *orig_p;
long line;
void *ifblock_opaque = NULL;
char *tmp_p;
char *arg = 0;
size_t len = 0;
Make max_user_text a lua setting
2010-08-29 18:01:05 +00:00
p = strndup(const_p, max_user_text.get(*state) - 1);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
while (text_contains_templates(p)) {
char *tmp;
tmp = find_and_replace_templates(p);
free(p);
p = tmp;
}
s = orig_p = p;
if (strcmp(p, const_p)) {
Improve handling of ARGB visuals a bit. Conflicts: src/conky.cc
2010-01-02 19:43:29 +00:00
DBGP2("replaced all templates in text: input is\n'%s'\noutput is\n'%s'", const_p, p);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
} else {
Improve handling of ARGB visuals a bit. Conflicts: src/conky.cc
2010-01-02 19:43:29 +00:00
DBGP2("no templates to replace");
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
}
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
memset(retval, 0, sizeof(struct text_object));
line = global_text_lines;
while (*p) {
if (*p == '\n') {
line++;
}
if (*p == '$') {
*p = '\0';
obj = create_plain_text(s);
if (obj != NULL) {
append_object(retval, obj);
Uhh..ansohus
2009-08-06 06:54:40 +00:00
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
*p = '$';
p++;
s = p;
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (*p != '$') {
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
char *buf = (char *)malloc(text_buffer_size.get(*state));
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
const char *var;
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* variable is either $foo or ${foo} */
if (*p == '{') {
unsigned int brl = 1, brr = 0;
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
p++;
s = p;
while (*p && brl != brr) {
if (*p == '{') {
brl++;
}
if (*p == '}') {
brr++;
}
p++;
}
p--;
} else {
s = p;
if (*p == '#') {
p++;
}
while (*p && (isalnum((int) *p) || *p == '_')) {
p++;
}
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
}
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* copy variable to buffer */
Make text_buffer_size a lua setting
2010-08-29 21:50:32 +00:00
len = (p - s > (int)text_buffer_size.get(*state)-1) ? (int)text_buffer_size.get(*state)-1 : (p - s);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
strncpy(buf, s, len);
buf[len] = '\0';
if (*p == '}') {
p++;
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
s = p;
/* search for variable in environment */
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
var = getenv(buf);
if (var) {
obj = create_plain_text(var);
if (obj) {
append_object(retval, obj);
}
ISO C++ forbids variable length arrays
2009-12-17 21:19:58 +00:00
free(buf);
Uhh..ansohus
2009-08-06 06:54:40 +00:00
continue;
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
}
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* if variable wasn't found in environment, use some special */
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
arg = 0;
/* split arg */
if (strchr(buf, ' ')) {
arg = strchr(buf, ' ');
*arg = '\0';
arg++;
while (isspace((int) *arg)) {
arg++;
}
if (!*arg) {
arg = 0;
}
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
}
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* lowercase variable name */
tmp_p = buf;
while (*tmp_p) {
*tmp_p = tolower(*tmp_p);
tmp_p++;
}
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Replace a CRIT_ERR in combine by trying,throwing and catching PS: I want to replace all similar CRIT_ERR's like this, opinions ?
2010-11-16 12:41:44 +00:00
try {
obj = construct_text_object(buf, arg,
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
line, &ifblock_opaque, orig_p);
Replace a CRIT_ERR in combine by trying,throwing and catching PS: I want to replace all similar CRIT_ERR's like this, opinions ?
2010-11-16 12:41:44 +00:00
}
catch(obj_create_error &e) {
free(buf);
free(orig_p);
throw e;
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (obj != NULL) {
append_object(retval, obj);
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
}
ISO C++ forbids variable length arrays
2009-12-17 21:19:58 +00:00
free(buf);
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
continue;
Uhh..ansohus
2009-08-06 06:54:40 +00:00
} else {
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
obj = create_plain_text("$");
s = p + 1;
if (obj != NULL) {
append_object(retval, obj);
}
Uhh..ansohus
2009-08-06 06:54:40 +00:00
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
} else if (*p == '\\' && *(p+1) == '#') {
strfold(p, 1);
} else if (*p == '#') {
char c;
Bugfix: When the first line behind TEXT was a comment, the start of the second line wasn't parsed
2010-04-10 18:11:20 +00:00
if (remove_comment(p, &c) && p >= orig_p && c == '\n') {
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
/* if remove_comment removed a newline, we need to 'back up' with p */
p--;
Uhh..ansohus
2009-08-06 06:54:40 +00:00
}
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
p++;
Uhh..ansohus
2009-08-06 06:54:40 +00:00
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
obj = create_plain_text(s);
if (obj != NULL) {
append_object(retval, obj);
Uhh..ansohus
2009-08-06 06:54:40 +00:00
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
if (!ifblock_stack_empty(&ifblock_opaque)) {
NORM_ERR("one or more $endif's are missing");
Uhh..ansohus
2009-08-06 06:54:40 +00:00
}
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
free(orig_p);
return 0;
Uhh..ansohus
2009-08-06 06:54:40 +00:00
}
move extract_object_args_to_sub() to a more convenient place
2009-12-28 01:57:12 +00:00
void extract_object_args_to_sub(struct text_object *obj, const char *args)
{
obj->sub = (struct text_object *)malloc(sizeof(struct text_object));
memset(obj->sub, 0, sizeof(struct text_object));
extract_variable_text_internal(obj->sub, args);
}
cleanup free_text_objects()
2009-11-29 20:24:03 +00:00
/* Frees the list of text objects root points to. */
void free_text_objects(struct text_object *root)
Uhh..ansohus
2009-08-06 06:54:40 +00:00
{
Revert "Uhh..ansohus" This reverts commit 9827726ae5a13a49a9bcb3528db9a251e0e99530. Or this.
2009-08-07 07:24:24 +00:00
struct text_object *obj;
Uhh..ansohus
2009-08-06 06:54:40 +00:00
Use free_and_zero in [st]*.cc where appropriate
2010-02-24 10:52:59 +00:00
if(root && root->prev) {
for (obj = root->prev; obj; obj = root->prev) {
root->prev = obj->prev;
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-19 23:25:45 +00:00
Use free_and_zero in [st]*.cc where appropriate
2010-02-24 10:52:59 +00:00
if (obj->callbacks.free) {
(*obj->callbacks.free)(obj);
}
cleanup free_text_objects()
2009-11-29 20:24:03 +00:00
free_text_objects(obj->sub);
Minimize change in free_text_objects introduced by b88d69dbfc4f6d0ce28f01c8d26c14b356918d70
2010-02-22 13:22:24 +00:00
free_and_zero(obj->sub);
Use free_and_zero in [st]*.cc where appropriate
2010-02-24 10:52:59 +00:00
free_and_zero(obj->special_data);
Use the new callback system instead of add_update_callback() & co.
2010-12-31 12:39:54 +00:00
delete obj->cb_handle;
cleanup free_text_objects()
2009-11-29 20:24:03 +00:00
Use free_and_zero in [st]*.cc where appropriate
2010-02-24 10:52:59 +00:00
free(obj);
}
Started on breaking up conky.c. These changes will likely result in breakage, particularly with different features enabled/disabled.
2009-08-05 22:46:51 +00:00
}
}
Copy Permalink