status icon

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 5ee6c96..a88e25e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -24,6 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include <gtk/gtk.h>
 
@@ -57,6 +59,8 @@
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
 #include "ui_appindicator.h"
+#else
+#include "ui_status.h"
 #endif
 
 #ifdef HAVE_LIBNOTIFY
@@ -71,7 +75,7 @@
 
 static const char *program_name;
 
-void print_version()
+static void print_version()
 {
        printf("psensor %s\n", VERSION);
        printf(_("Copyright (C) %s jeanfi@gmail.com\n\
@@ -82,7 +86,7 @@ There is NO WARRANTY, to the extent permitted by law.\n"),
               "2010-2011");
 }
 
-void print_help()
+static void print_help()
 {
        printf(_("Usage: %s [OPTION]...\n"), program_name);
 
@@ -129,6 +133,18 @@ update_psensor_values_size(struct psensor **sensors, struct config *cfg)
        }
 }
 
+static void log_measures(struct psensor **sensors)
+{
+       if (log_level == LOG_DEBUG)
+               while (*sensors) {
+                       log_printf(LOG_DEBUG, "%s %.2f",
+                                  (*sensors)->name,
+                                  psensor_get_current_value(*sensors));
+
+                       sensors++;
+               }
+}
+
 void update_psensor_measures(struct ui_psensor *ui)
 {
        struct psensor **sensors = ui->sensors;
@@ -152,6 +168,9 @@ void update_psensor_measures(struct ui_psensor *ui)
 #ifdef HAVE_LIBATIADL
                amd_psensor_list_update(sensors);
 #endif
+
+               log_measures(sensors);
+
                g_mutex_unlock(ui->sensors_mutex);
 
                sleep(cfg->sensor_update_interval);
@@ -204,7 +223,7 @@ void cb_alarm_raised(struct psensor *sensor, void *data)
 #endif
 }
 
-void associate_colors(struct psensor **sensors)
+static void associate_colors(struct psensor **sensors)
 {
        /* number of uniq colors */
 #define COLORS_COUNT 8
@@ -239,7 +258,7 @@ void associate_colors(struct psensor **sensors)
        }
 }
 
-void
+static void
 associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
        struct psensor **sensor_cur = sensors;
@@ -263,7 +282,7 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
        }
 }
 
-void associate_preferences(struct psensor **sensors)
+static void associate_preferences(struct psensor **sensors)
 {
        struct psensor **sensor_cur = sensors;
        while (*sensor_cur) {
@@ -281,11 +300,33 @@ void associate_preferences(struct psensor **sensors)
        }
 }
 
+static void log_init()
+{
+       char *home, *path, *dir;
+
+       home = getenv("HOME");
+
+       if (!home)
+               return ;
+
+       dir = malloc(strlen(home)+1+strlen(".psensor")+1);
+       sprintf(dir, "%s/%s", home, ".psensor");
+       mkdir(dir, 0777);
+
+       path = malloc(strlen(dir)+1+strlen("log")+1);
+       sprintf(path, "%s/%s", dir, "log");
+
+       log_open(path);
+
+       free(dir);
+       free(path);
+}
 
 static struct option long_options[] = {
        {"version", no_argument, 0, 'v'},
        {"help", no_argument, 0, 'h'},
        {"url", required_argument, 0, 'u'},
+       {"debug", no_argument, 0, 'd'},
        {0, 0, 0, 0}
 };
 
@@ -307,7 +348,7 @@ int main(int argc, char **argv)
        textdomain(PACKAGE);
 #endif
 
-       while ((optc = getopt_long(argc, argv, "vhu:", long_options,
+       while ((optc = getopt_long(argc, argv, "vhdu:", long_options,
                                   NULL)) != -1) {
                switch (optc) {
                case 'u':
@@ -320,6 +361,10 @@ int main(int argc, char **argv)
                case 'v':
                        print_version();
                        exit(EXIT_SUCCESS);
+               case 'd':
+                       printf(_("Enables debug mode.\n"));
+                       log_level = LOG_DEBUG;
+                       break;
                default:
                        cmdok = 0;
                        break;
@@ -332,11 +377,13 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
+       log_init();
+
        g_thread_init(NULL);
        gdk_threads_init();
        /* gdk_threads_enter(); */
 
-       gtk_init(&argc, &argv);
+       gtk_init(NULL, NULL);
 
 #ifdef HAVE_LIBNOTIFY
        ui.notification_last_time = NULL;
@@ -400,14 +447,18 @@ int main(int argc, char **argv)
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
        ui_appindicator_init(&ui);
+#else
+       ui_status_create();
 #endif
 
+       gdk_notify_startup_complete();
+
        /* main loop */
        gtk_main();
 
-       psensor_cleanup();
+       g_mutex_lock(ui.sensors_mutex);
 
-       psensor_list_free(ui.sensors);
+       psensor_cleanup();
 
 #ifdef HAVE_NVIDIA
        nvidia_cleanup();
@@ -415,5 +466,18 @@ int main(int argc, char **argv)
 #ifdef HAVE_LIBATIADL
        amd_cleanup();
 #endif
+#ifdef HAVE_REMOTE_SUPPORT
+       rsensor_cleanup();
+#endif
+
+       psensor_list_free(ui.sensors);
+       ui.sensors = NULL;
+
+       g_mutex_unlock(ui.sensors_mutex);
+
+       config_cleanup();
+
+       log_close();
+
        return 0;
 }