* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
OBJ_font,
OBJ_cpu,
OBJ_cpubar,
-#ifdef X11
OBJ_cpugauge,
+#ifdef X11
OBJ_cpugraph,
OBJ_loadgraph,
#endif /* X11 */
OBJ_texeci,
OBJ_execbar,
OBJ_execibar,
-#ifdef X11
OBJ_execgauge,
+ OBJ_execigauge,
+#ifdef X11
OBJ_execgraph,
OBJ_execigraph,
- OBJ_execigauge,
#endif /* X11 */
OBJ_execp,
OBJ_execpi,
OBJ_unseen_mails,
OBJ_flagged_mails,
OBJ_unflagged_mails,
+ OBJ_format_time,
OBJ_forwarded_mails,
OBJ_unforwarded_mails,
OBJ_replied_mails,
OBJ_mem,
OBJ_memeasyfree,
OBJ_memfree,
-#ifdef X11
OBJ_memgauge,
+#ifdef X11
OBJ_memgraph,
#endif /* X11 */
OBJ_membar,
OBJ_mixer,
OBJ_mixerl,
OBJ_mixerr,
-#ifdef X11
OBJ_mixerbar,
OBJ_mixerlbar,
OBJ_mixerrbar,
-#endif /* X11 */
OBJ_if_mixer_mute,
#ifdef X11
OBJ_monitor,
OBJ_pid_egid,
OBJ_pid_sgid,
OBJ_pid_fsgid,
+ OBJ_pid_read,
OBJ_pid_vmpeak,
OBJ_pid_vmsize,
OBJ_pid_vmlck,
OBJ_pid_vmexe,
OBJ_pid_vmlib,
OBJ_pid_vmpte,
+ OBJ_pid_write,
OBJ_gid_name,
OBJ_uid_name,
OBJ_processes,
OBJ_lua,
OBJ_lua_parse,
OBJ_lua_bar,
+ OBJ_lua_gauge,
#ifdef X11
OBJ_lua_graph,
- OBJ_lua_gauge,
#endif /* X11 */
#endif /* HAVE_LUA */
#ifdef TCP_PORT_MONITOR
OBJ_apcupsd_linev,
OBJ_apcupsd_load,
OBJ_apcupsd_loadbar,
+ OBJ_apcupsd_loadgauge,
#ifdef X11
OBJ_apcupsd_loadgraph,
- OBJ_apcupsd_loadgauge,
#endif /* X11 */
OBJ_apcupsd_charge,
OBJ_apcupsd_timeleft,
struct text_object {
struct text_object *next, *prev; /* doubly linked list of text objects */
struct text_object *sub; /* for objects parsing text into objects */
+ struct text_object *ifblock_next; /* jump target for ifblock objects */
union {
void *opaque; /* new style generic per object data */
char *s; /* some string */