X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fnvidia.c;h=5f378d8d7a4ffd36ff792de7c65c1befb46833f7;hb=3293e076c500eef4ca11a72bfb6954412c341228;hp=7b49fe27152b1b352254028a82d75f5b02d267ae;hpb=81c691d15afc0ccffd3da3a480478f0a66bb60f4;p=monky

diff --git a/src/nvidia.c b/src/nvidia.c
index 7b49fe2..5f378d8 100644
--- a/src/nvidia.c
+++ b/src/nvidia.c
@@ -1,4 +1,5 @@
 /* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+ * vim: ts=4 sw=4 noet ai cindent syntax=c
  *
  * Conky, a system monitor, based on torsmo
  *
@@ -9,7 +10,7 @@
  * Please see COPYING for details
  *
  * Copyright (c) 2008 Markus Meissner
- * 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.
  *
@@ -25,11 +26,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * vim: ts=4 sw=4 noet ai cindent syntax=c
- *
  */
 
+#include "conky.h"
+#include "logging.h"
 #include "nvidia.h"
+#include "temphelper.h"
+#include "x11.h"
+#include <NVCtrl/NVCtrlLib.h>
 
 const int nvidia_query_to_attr[] = {NV_CTRL_GPU_CORE_TEMPERATURE,
 				    NV_CTRL_GPU_CORE_THRESHOLD,
@@ -38,9 +42,27 @@ 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 Display *nvdisplay;
+
+static int get_nvidia_value(QUERY_ID qid){
 	int tmp;
-	if(!XNVCTRLQueryAttribute(dpy, 0, 0, nvidia_query_to_attr[qid], &tmp)){
+	Display *dpy = nvdisplay ? nvdisplay : display;
+	if(!dpy || !XNVCTRLQueryAttribute(dpy, 0, 0, nvidia_query_to_attr[qid], &tmp)){
 		return -1;
 	}
 	/* FIXME: when are the low 2 bytes of NV_GPU_FREQ needed? */
@@ -51,37 +73,79 @@ 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, char *p, int p_max_size)
+{
+	int value;
+	struct nvidia_s *nvs = obj->data.opaque;
+
+	if (!nvs ||
+	    (value = get_nvidia_value(nvs->type)) == -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;
+	}
+}
+
+void set_nvidia_display(const char *disp)
+{
+	if(nvdisplay) {
+		XCloseDisplay(nvdisplay);
+		nvdisplay = NULL;
+	}
+	if(disp) {
+		if ((nvdisplay = XOpenDisplay(disp)) == NULL) {
+			CRIT_ERR(NULL, NULL, "can't open nvidia display: %s", XDisplayName(disp));
+		}
+	}
+}
+