nvidia: convert to generic text object payload

diff --git a/src/conky.c b/src/conky.c
index 531b2ba..7360a41 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -90,6 +90,9 @@
 #include "mail.h"
 #include "mboxscan.h"
 #include "net_stat.h"
+#ifdef NVIDIA
+#include "nvidia.h"
+#endif
 #include "read_tcp.h"
 #include "scroll.h"
 #include "specials.h"
@@ -2401,16 +2404,7 @@ void generate_text_internal(char *p, int p_max_size,
                        }
 #ifdef NVIDIA
                        OBJ(nvidia) {
-                               int value = get_nvidia_value(obj->data.nvidia.type, display);
-                               if(value == -1)
-                                       snprintf(p, p_max_size, "N/A");
-                               else if (obj->data.nvidia.type == NV_TEMP)
-                                       temp_print(p, p_max_size, (double)value, TEMP_CELSIUS);
-                               else if (obj->data.nvidia.print_as_float &&
-                                               value > 0 && value < 100)
-                                       snprintf(p, p_max_size, "%.1f", (float)value);
-                               else
-                                       snprintf(p, p_max_size, "%d", value);
+                               print_nvidia_value(obj, display, p, p_max_size);
                        }
 #endif /* NVIDIA */
 #ifdef APCUPSD

diff --git a/src/conky.h b/src/conky.h
index 3318331..d60d461 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -90,10 +90,6 @@ struct text_object;
 #include "mpd.h"
 #endif
 
-#ifdef NVIDIA
-#include "nvidia.h"
-#endif
-
 #ifdef HAVE_CURL
 #include "ccurl_thread.h"
 #endif /* HAVE_CURL */

diff --git a/src/core.c b/src/core.c
index 7856002..ca470f5 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -49,6 +49,9 @@
 #include "mail.h"
 #include "mboxscan.h"
 #include "net_stat.h"
+#ifdef NVIDIA
+#include "nvidia.h"
+#endif
 #include "read_tcp.h"
 #include "scroll.h"
 #include "specials.h"
@@ -1109,7 +1112,7 @@ struct text_object *construct_text_object(const char *s, const char *arg, long
                parse_combine_arg(obj, arg, free_at_crash);
 #ifdef NVIDIA
        END OBJ_ARG(nvidia, 0, "nvidia needs an argument")
-               if (set_nvidia_type(&obj->data.nvidia, arg)) {
+               if (set_nvidia_type(obj, arg)) {
                        CRIT_ERR(obj, free_at_crash, "nvidia: invalid argument"
                                 " specified: '%s'\n", arg);
                }
@@ -1682,6 +1685,7 @@ void free_text_objects(struct text_object *root, int internal)
 #endif /* IBM */
 #ifdef NVIDIA
                        case OBJ_nvidia:
+                               free_nvidia(obj);
                                break;
 #endif /* NVIDIA */
 #ifdef MPD

diff --git a/src/nvidia.c b/src/nvidia.c
index c2be832..b0c299f 100644 (file)
--- a/src/nvidia.c
+++ b/src/nvidia.c
@@ -28,7 +28,11 @@
  *
  */
 
+#include "conky.h"
+#include "logging.h"
 #include "nvidia.h"
+#include "temphelper.h"
+#include <NVCtrl/NVCtrlLib.h>
 
 const int nvidia_query_to_attr[] = {NV_CTRL_GPU_CORE_TEMPERATURE,
                                    NV_CTRL_GPU_CORE_THRESHOLD,
@@ -37,7 +41,22 @@ const int nvidia_query_to_attr[] = {NV_CTRL_GPU_CORE_TEMPERATURE,
                                    NV_CTRL_GPU_CURRENT_CLOCK_FREQS,
                                    NV_CTRL_IMAGE_SETTINGS};
 
-int get_nvidia_value(QUERY_ID qid, Display *dpy){
+typedef enum _QUERY_ID {
+       NV_TEMP,
+       NV_TEMP_THRESHOLD,
+       NV_TEMP_AMBIENT,
+       NV_GPU_FREQ,
+       NV_MEM_FREQ,
+       NV_IMAGE_QUALITY
+} QUERY_ID;
+
+struct nvidia_s {
+       int interval;
+       int print_as_float;
+       QUERY_ID type;
+};
+
+static int get_nvidia_value(QUERY_ID qid, Display *dpy){
        int tmp;
        if(!XNVCTRLQueryAttribute(dpy, 0, 0, nvidia_query_to_attr[qid], &tmp)){
                return -1;
@@ -50,37 +69,66 @@ int get_nvidia_value(QUERY_ID qid, Display *dpy){
        return tmp;
 }
 
-int set_nvidia_type(struct nvidia_s *nvidia, const char *arg)
+int set_nvidia_type(struct text_object *obj, const char *arg)
 {
-       if (!arg || !arg[0] || !arg[1])
-               return 1;
+       struct nvidia_s *nvs;
+
+       nvs = obj->data.opaque = malloc(sizeof(struct nvidia_s));
+       memset(nvs, 0, sizeof(struct nvidia_s));
 
-       nvidia->print_as_float = 0;
        switch(arg[0]) {
                case 't':                              // temp or threshold
-                       nvidia->print_as_float = 1;
+                       nvs->print_as_float = 1;
                        if (arg[1] == 'e')
-                               nvidia->type = NV_TEMP;
+                               nvs->type = NV_TEMP;
                        else if (arg[1] == 'h')
-                               nvidia->type = NV_TEMP_THRESHOLD;
+                               nvs->type = NV_TEMP_THRESHOLD;
                        else
                                return 1;
                        break;
                case 'a':                              // ambient temp
-                       nvidia->print_as_float = 1;
-                       nvidia->type = NV_TEMP_AMBIENT;
+                       nvs->print_as_float = 1;
+                       nvs->type = NV_TEMP_AMBIENT;
                        break;
                case 'g':                              // gpufreq
-                       nvidia->type = NV_GPU_FREQ;
+                       nvs->type = NV_GPU_FREQ;
                        break;
                case 'm':                              // memfreq
-                       nvidia->type = NV_MEM_FREQ;
+                       nvs->type = NV_MEM_FREQ;
                        break;
                case 'i':                              // imagequality
-                       nvidia->type = NV_IMAGE_QUALITY;
+                       nvs->type = NV_IMAGE_QUALITY;
                        break;
                default:
                        return 1;
        }
        return 0;
 }
+
+void print_nvidia_value(struct text_object *obj, Display *dpy, char *p, int p_max_size)
+{
+       int value;
+       struct nvidia_s *nvs = obj->data.opaque;
+
+       if (!nvs ||
+           (value = get_nvidia_value(nvs->type, dpy)) == -1) {
+               snprintf(p, p_max_size, "N/A");
+               return;
+       }
+       if (nvs->type == NV_TEMP)
+               temp_print(p, p_max_size, (double)value, TEMP_CELSIUS);
+       else if (nvs->print_as_float &&
+                       value > 0 && value < 100)
+               snprintf(p, p_max_size, "%.1f", (float)value);
+       else
+               snprintf(p, p_max_size, "%d", value);
+}
+
+void free_nvidia(struct text_object *obj)
+{
+       if (obj->data.opaque) {
+               free(obj->data.opaque);
+               obj->data.opaque = NULL;
+       }
+}
+

diff --git a/src/nvidia.h b/src/nvidia.h
index 92b979c..6be4254 100644 (file)
--- a/src/nvidia.h
+++ b/src/nvidia.h
@@ -31,25 +31,11 @@
 #ifndef NVIDIA_CONKY_H
 #define NVIDIA_CONKY_H
 
+#include "text_object.h"
 #include <X11/Xlib.h>
-#include <NVCtrl/NVCtrlLib.h>
 
-typedef enum _QUERY_ID {
-       NV_TEMP,
-       NV_TEMP_THRESHOLD,
-       NV_TEMP_AMBIENT,
-       NV_GPU_FREQ,
-       NV_MEM_FREQ,
-       NV_IMAGE_QUALITY
-} QUERY_ID;
-
-struct nvidia_s {
-       int interval;
-       int print_as_float;
-       QUERY_ID type;
-};
-
-int get_nvidia_value(QUERY_ID qid, Display *dpy);
-int set_nvidia_type(struct nvidia_s *, const char *);
+int set_nvidia_type(struct text_object *, const char *);
+void print_nvidia_value(struct text_object *, Display *, char *, int);
+void free_nvidia(struct text_object *);
 
 #endif

diff --git a/src/text_object.h b/src/text_object.h
index 9062d55..0da9ea6 100644 (file)
--- a/src/text_object.h
+++ b/src/text_object.h
@@ -39,10 +39,6 @@
 #include "mail.h"              /* local_mail_s */
 #include "fs.h"                        /* struct fs_stat */
 
-#ifdef NVIDIA
-#include "nvidia.h"            /* nvidia_s */
-#endif
-
 enum text_object_type {
        OBJ_read_tcp,
        OBJ_addr,
@@ -578,10 +574,6 @@ struct text_object {
                } read_tcp;
 
                struct local_mail_s local_mail;
-#ifdef NVIDIA
-               struct nvidia_s nvidia;
-#endif /* NVIDIA */
-
        } data;
        int type;
        int a, b;