#endif
enum text_object_type {
+ OBJ_read_tcp,
OBJ_addr,
#if defined(__linux__)
OBJ_addrs,
OBJ_battery,
OBJ_battery_time,
OBJ_battery_percent,
-#ifdef X11
OBJ_battery_bar,
-#endif
OBJ_battery_short,
#endif /* !__OpenBSD__ */
OBJ_buffers,
OBJ_conky_build_arch,
OBJ_font,
OBJ_cpu,
+ OBJ_cpubar,
#ifdef X11
OBJ_cpugauge,
- OBJ_cpubar,
OBJ_cpugraph,
OBJ_loadgraph,
-#endif
+#endif /* X11 */
OBJ_diskio,
OBJ_diskio_read,
OBJ_diskio_write,
OBJ_diskiograph,
OBJ_diskiograph_read,
OBJ_diskiograph_write,
-#endif
+#endif /* X11 */
OBJ_downspeed,
OBJ_downspeedf,
#ifdef X11
OBJ_downspeedgraph,
-#endif
+#endif /* X11 */
OBJ_else,
OBJ_endif,
OBJ_eval,
OBJ_exec,
OBJ_execi,
OBJ_texeci,
+ OBJ_execbar,
+ OBJ_execibar,
#ifdef X11
OBJ_execgauge,
- OBJ_execbar,
OBJ_execgraph,
- OBJ_execibar,
OBJ_execigraph,
OBJ_execigauge,
-#endif
+#endif /* X11 */
OBJ_execp,
OBJ_execpi,
OBJ_freq,
OBJ_freq_g,
-#ifdef X11
OBJ_fs_bar,
OBJ_fs_bar_free,
-#endif
OBJ_fs_free,
OBJ_fs_free_perc,
OBJ_fs_size,
OBJ_smapi,
#ifdef X11
OBJ_smapi_bat_bar,
-#endif
+#endif /* X11 */
OBJ_smapi_bat_perc,
OBJ_smapi_bat_temp,
OBJ_smapi_bat_power,
OBJ_wireless_link_qual,
OBJ_wireless_link_qual_max,
OBJ_wireless_link_qual_perc,
-#ifdef X11
OBJ_wireless_link_bar,
-#endif
#endif /* __linux__ */
#if defined(__FreeBSD__) || defined(__linux__)
OBJ_if_up,
OBJ_top,
OBJ_top_mem,
OBJ_top_time,
+#ifdef IOSTATS
+ OBJ_top_io,
+#endif
OBJ_tail,
OBJ_head,
OBJ_lines,
OBJ_memfree,
#ifdef X11
OBJ_memgauge,
- OBJ_membar,
OBJ_memgraph,
-#endif
+#endif /* X11 */
+ OBJ_membar,
OBJ_memmax,
OBJ_memperc,
OBJ_mixer,
OBJ_mixerbar,
OBJ_mixerlbar,
OBJ_mixerrbar,
-#endif
+#endif /* X11 */
OBJ_if_mixer_mute,
#ifdef X11
OBJ_monitor,
OBJ_monitor_number,
-#endif
+#endif /* X11 */
OBJ_nameserver,
OBJ_nodename,
OBJ_nvidia,
OBJ_outlinecolor,
OBJ_stippled_hr,
OBJ_swap,
-#ifdef X11
OBJ_swapbar,
-#endif
OBJ_swapmax,
OBJ_swapperc,
OBJ_sysname,
OBJ_upspeedf,
#ifdef X11
OBJ_upspeedgraph,
-#endif
+#endif /* X11 */
OBJ_uptime,
OBJ_uptime_short,
OBJ_user_names,
OBJ_mpd_vol,
OBJ_mpd_bitrate,
OBJ_mpd_status,
-#ifdef X11
OBJ_mpd_bar,
-#endif
OBJ_mpd_elapsed,
OBJ_mpd_length,
OBJ_mpd_track,
OBJ_mpd_percent,
OBJ_mpd_smart,
OBJ_if_mpd_playing,
-#endif
+#endif /* MPD */
#ifdef MOC
OBJ_moc_state,
OBJ_moc_file,
OBJ_moc_curtime,
OBJ_moc_bitrate,
OBJ_moc_rate,
-#endif
+#endif /* MOC */
#ifdef XMMS2
OBJ_xmms2_artist,
OBJ_xmms2_album,
OBJ_xmms2_status,
#ifdef X11
OBJ_xmms2_bar,
-#endif
+#endif /* X11 */
OBJ_xmms2_smart,
OBJ_xmms2_playlist,
OBJ_xmms2_timesplayed,
OBJ_if_xmms2_connected,
-#endif
+#endif /* XMMS2 */
#ifdef AUDACIOUS
OBJ_audacious_status,
OBJ_audacious_title,
OBJ_audacious_main_volume,
#ifdef X11
OBJ_audacious_bar,
-#endif
-#endif
+#endif /* X11 */
+#endif /* AUDACIOUS */
#ifdef BMPX
OBJ_bmpx_title,
OBJ_bmpx_artist,
OBJ_bmpx_track,
OBJ_bmpx_uri,
OBJ_bmpx_bitrate,
-#endif
+#endif /* BMPX */
#ifdef EVE
OBJ_eve,
-#endif
+#endif /* EVE */
#ifdef RSS
OBJ_rss,
-#endif
+#endif /* RSS */
#ifdef HAVE_LUA
OBJ_lua,
+ OBJ_lua_parse,
+ OBJ_lua_read_parse,
OBJ_lua_bar,
-#endif
+#ifdef X11
+ OBJ_lua_graph,
+ OBJ_lua_gauge,
+#endif /* X11 */
+#endif /* HAVE_LUA */
#ifdef TCP_PORT_MONITOR
OBJ_tcp_portmon,
-#endif
+#endif /* TCP_PORT_MONITOR */
#ifdef HAVE_ICONV
OBJ_iconv_start,
OBJ_iconv_stop,
-#endif
+#endif /* HAVE_ICONV */
#ifdef HDDTEMP
OBJ_hddtemp,
-#endif
+#endif /* HDDTEMP */
+ OBJ_blink,
+ OBJ_to_bytes,
OBJ_scroll,
OBJ_combine,
OBJ_entropy_avail,
+ OBJ_entropy_perc,
OBJ_entropy_poolsize,
-#ifdef X11
OBJ_entropy_bar,
-#endif
#ifdef APCUPSD
OBJ_apcupsd,
OBJ_apcupsd_name,
OBJ_apcupsd_status,
OBJ_apcupsd_linev,
OBJ_apcupsd_load,
-#ifdef X11
OBJ_apcupsd_loadbar,
+#ifdef X11
OBJ_apcupsd_loadgraph,
OBJ_apcupsd_loadgauge,
-#endif
+#endif /* X11 */
OBJ_apcupsd_charge,
OBJ_apcupsd_timeleft,
OBJ_apcupsd_temp,
OBJ_apcupsd_lastxfer,
-#endif
+#endif /* APCUPSD */
};
struct text_object {
char *fmt; /* time display formatting */
} tztime;
-#ifdef X11
struct {
struct fs_stat *fs;
int w, h;
} fsbar; /* 3 */
+#ifdef X11
struct {
int l;
int w, h;
struct {
int num;
int type;
+ int was_parsed;
+ char *s;
} top;
struct {
char *right;
} combine;
+ struct {
+ char *host;
+ unsigned int port;
+ } read_tcp;
+
struct local_mail_s local_mail;
#ifdef NVIDIA
struct nvidia_s nvidia;
long line;
unsigned int c, d, e;
float f;
- char showaslog;
- char global_mode;
+ char char_a, char_b;
};
/* text object list helpers */