Revert "Uhh..ansohus"

[monky] / src / text_object.h

diff --git a/src/text_object.h b/src/text_object.h
index 0c1c3f4..519c318 100644 (file)
--- a/src/text_object.h
+++ b/src/text_object.h
@@ -1,4 +1,6 @@
-/* Conky, a system monitor, based on torsmo
+/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ *
+ * Conky, a system monitor, based on torsmo
  *
  * Any original torsmo code is licensed under the BSD license
  *
@@ -236,6 +238,9 @@ enum text_object_type {
 #ifdef X11
        OBJ_monitor,
        OBJ_monitor_number,
+       OBJ_desktop,
+       OBJ_desktop_number,
+       OBJ_desktop_name,
 #endif /* X11 */
        OBJ_nameserver,
        OBJ_nodename,
@@ -247,6 +252,7 @@ enum text_object_type {
        OBJ_outlinecolor,
        OBJ_stippled_hr,
        OBJ_swap,
+       OBJ_swapfree,
        OBJ_swapbar,
        OBJ_swapmax,
        OBJ_swapperc,
@@ -371,13 +377,21 @@ enum text_object_type {
 #ifdef EVE
        OBJ_eve,
 #endif /* EVE */
+#ifdef HAVE_CURL
+       OBJ_curl,
+#endif /* HAVE_CURL */
 #ifdef RSS
        OBJ_rss,
 #endif /* RSS */
+#ifdef WEATHER
+       OBJ_weather,
+#endif /* WEATHER */
+#ifdef XOAP
+       OBJ_weather_forecast,
+#endif /* XOAP */
 #ifdef HAVE_LUA
        OBJ_lua,
        OBJ_lua_parse,
-       OBJ_lua_read_parse,
        OBJ_lua_bar,
 #ifdef X11
        OBJ_lua_graph,
@@ -394,6 +408,9 @@ enum text_object_type {
 #ifdef HDDTEMP
        OBJ_hddtemp,
 #endif /* HDDTEMP */
+       OBJ_include,
+       OBJ_blink,
+       OBJ_to_bytes,
        OBJ_scroll,
        OBJ_combine,
        OBJ_entropy_avail,
@@ -482,15 +499,11 @@ struct text_object {
 
                struct {
                        int wantedlines;
-                       int readlines;
                        char *logfile;
-                       double last_update;
-                       float interval;
                        char *buffer;
-                       /* If not -1, a file descriptor to read from when
-                        * logfile is a FIFO. */
-                       int fd;
-               } tail;
+                       int current_use;
+                       int max_uses;
+               } headtail;
 
                struct {
                        double last_update;
@@ -530,20 +543,42 @@ struct text_object {
                        char *userid;
                } eve;
 #endif
+#ifdef HAVE_CURL
+               struct {
+                       char *uri;
+                       float interval;
+               } curl;
+#endif
 #ifdef RSS
                struct {
                        char *uri;
                        char *action;
                        int act_par;
-                       int delay;
+                       float interval;
                        unsigned int nrspaces;
                } rss;
 #endif
+#ifdef WEATHER
+               struct {
+                       char *uri;
+                       char *data_type;
+                       int interval;
+               } weather;
+#endif
+#ifdef XOAP
+               struct {
+                       char *uri;
+                       unsigned int day;
+                       char *data_type;
+                       int interval;
+               } weather_forecast;
+#endif
                struct {
                        char *text;
                        unsigned int show;
                        unsigned int step;
                        unsigned int start;
+                       long resetcolor;
                } scroll;
 
                struct {