New branch for nouveau driver

code cleanup. Changed version to 0.4.0

README

@@ -1,4 +1,4 @@
-This is dead simple Windo Wmaker app for monitoring CPU and GPU temperature.
+This is dead simple Window Wmaker app for monitoring CPU and GPU temperature.
 Hardcoded Core2 and Nvidia GPU support. Based on WMTempMon dockapp.
 
-author: roman.dobosz@gmail.com
+Depends on lmsensors and optionally on nvidia-settings packages.

wmgeneral/wmgeneral.c

@@ -366,7 +366,7 @@ void setMaskXY(int x, int y) {
 /*******************************************************************************\
 |* openXwindow																   *|
 \*******************************************************************************/
-void openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits, int pixmask_width, int pixmask_height) {
+void openXwindow(int argc, char *argv[], char *pixmap_bytes[], const char *pixmask_bits, int pixmask_width, int pixmask_height) {
 
 	unsigned int	borderwidth = 1;
 	XClassHint		classHint;

wmgeneral/wmgeneral.h

@@ -45,7 +45,7 @@ Display		*display;
 void AddMouseRegion(int index, int left, int top, int right, int bottom);
 int CheckMouseRegion(int x, int y);
 
-void openXwindow(int argc, char *argv[], char **, char *, int, int);
+void openXwindow(int argc, char *argv[], char **, const char *, int, int);
 void RedrawWindow(void);
 void RedrawWindowXY(int x, int y);
 

wmtempnv/wmtempnv.c

@@ -2,11 +2,10 @@
  * wmtempnv: a sensor monitor for WindowMaker. this little app is mainly based
  * on wmsensormon and other simple dockapps.
  *
- * version = 0.1
+ * version = 0.4
- * date: Fri Oct 31 20:41:14 CET 2008 @861 /Internet Time/
+ *
- * author: Roman 'gryf' Dobosz
+ * requirements: configured lm_sensors, sensor program and nouveau
- * requirements: configured lm_sensors and sensor program, nvidia-settings, cut,
+ *
- *               grep.
  * licence: gpl
  */
 
@@ -46,7 +45,7 @@ int main(int argc, char **argv){
             offset1 = get_offset(temp1, 1);
             temp2 = get_temp(1);
             offset2 = get_offset(temp2, 1);
-			temp3 = get_temp(2);
+            temp3 = get_temp(2) / 1000;
             offset3 = get_offset(temp3, 0);
             counter = 200;
         }
@@ -91,7 +90,6 @@ int get_offset(int temp, int cpu){
     }
 }
 
-
 void display_values(int temp, int offset, int offset2){
     char text[5], num1, num2, num3, num4;
 
@@ -115,7 +113,7 @@ int get_temp(int core_number){
     int core=0;
     char cmd[] = "                                                                                           ";
     if(core_number==2){
-		sprintf(cmd, "echo `nvidia-settings -q 'GPUCoreTemp'|grep Attribute|cut -d ':' -f 3|cut -d '.' -f 1`");
+        sprintf(cmd, "echo `cat /sys/devices/pci0000:00/0000:00:01.0/0000:01:00.0/hwmon/hwmon0/temp1_input`");
     }else{
         sprintf(cmd, "echo `sensors |grep 'Core %d'|cut -d ':' -f 2|cut -d '.' -f 1`", core_number);
     }

wmtempnv/wmtempnv_mask.xbm

@@ -1,6 +1,6 @@
 #define wmtempnv_mask_width 64
 #define wmtempnv_mask_height 64
-static unsigned char wmtempnv_mask_bits[] = {
+static const char wmtempnv_mask_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,