log_printf can be called concurently (removed static buffer)

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index 1590cea..9bf4b82 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -23,15 +23,61 @@
 #include "ui_pref.h"
 #include "ui_sensorpref.h"
 #include "ui_sensorlist.h"
+#include "ui_appindicator.h"
+
+static void save_window_pos(struct ui_psensor *ui)
+{
+       gboolean visible;
+       GtkWindow *win;
+       struct config *cfg;
+
+       visible = gtk_widget_get_visible(ui->main_window);
+       log_printf(LOG_DEBUG, "Window visible: %d", visible);
+
+       if (visible == TRUE) {
+               cfg = ui->config;
+
+               win = GTK_WINDOW(ui->main_window);
+
+               gtk_window_get_position(win, &cfg->window_x, &cfg->window_y);
+               log_printf(LOG_DEBUG,
+                          "Window position: %d %d",
+                          cfg->window_x,
+                          cfg->window_y);
+
+               gtk_window_get_size(win,
+                                   &cfg->window_w,
+                                   &cfg->window_h);
+               log_printf(LOG_DEBUG,
+                          "Window size: %d %d",
+                          cfg->window_w,
+                          cfg->window_h);
+
+               cfg->window_divider_pos
+                       = gtk_paned_get_position(GTK_PANED(ui->sensor_box));
+
+               config_save(cfg);
+       }
+}
 
 static gboolean
 on_delete_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
+       struct ui_psensor *ui = data;
+
+       save_window_pos(ui);
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-       gtk_widget_hide(((struct ui_psensor *)data)->main_window);
+       if (is_appindicator_supported()) {
+               log_printf(LOG_DEBUG, "hiding, WM is supporting appindicator");
+               gtk_widget_hide(ui->main_window);
+       } else {
+               log_printf(LOG_DEBUG,
+                          "quitting, WM not supporting appindicator");
+               ui_psensor_quit(ui);
+       }
 #else
-       ui_psensor_quit();
+       ui_psensor_quit(ui);
 #endif
 
        return TRUE;
@@ -61,7 +107,7 @@ static void cb_about(GtkMenuItem *mi, gpointer data)
 
 static void cb_menu_quit(GtkMenuItem *mi, gpointer data)
 {
-       ui_psensor_quit();
+       ui_psensor_quit((struct ui_psensor *)data);
 }
 
 static void cb_preferences(GtkMenuItem *mi, gpointer data)
@@ -77,8 +123,12 @@ static void cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
                ui_sensorpref_dialog_run(*ui->sensors, ui);
 }
 
-void ui_psensor_quit()
+void ui_psensor_quit(struct ui_psensor *ui)
 {
+       save_window_pos(ui);
+
+       log_printf(LOG_DEBUG, "Destroy main window");
+       gtk_widget_destroy(ui->main_window);
        gtk_main_quit();
 }
 
@@ -173,8 +223,18 @@ void ui_window_create(struct ui_psensor *ui)
        GdkPixbuf *icon;
        GtkIconTheme *icon_theme;
        GtkWidget *menubar;
+       struct config *cfg;
+
+       cfg = ui->config;
+       if (cfg->window_restore_enabled)
+               gtk_window_move(GTK_WINDOW(window),
+                               cfg->window_x,
+                               cfg->window_y);
+
+       gtk_window_set_default_size(GTK_WINDOW(window),
+                                   cfg->window_w,
+                                   cfg->window_h);
 
-       gtk_window_set_default_size(GTK_WINDOW(window), 800, 200);
 
        gtk_window_set_title(GTK_WINDOW(window),
                             _("Psensor - Temperature Monitor"));
@@ -223,11 +283,10 @@ void ui_window_create(struct ui_psensor *ui)
        if (ui->config->hide_on_startup)
                gtk_widget_show_all(ui->main_box);
        else
-               gtk_widget_show_all(ui->main_window);
+               ui_window_show(ui);
 #else
-       gtk_widget_show_all(ui->main_window);
+       ui_window_show(ui);
 #endif
-
 }
 
 static void menu_bar_show(unsigned int show, struct ui_psensor *ui)
@@ -280,6 +339,11 @@ void ui_window_update(struct ui_psensor *ui)
                                GTK_WIDGET(ui->w_graph), TRUE, TRUE);
        }
 
+       if (cfg->window_restore_enabled)
+               gtk_paned_set_position(GTK_PANED(ui->sensor_box),
+                                      ui->config->window_divider_pos);
+
+
        if (!init)
                g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));
 
@@ -290,3 +354,9 @@ void ui_window_update(struct ui_psensor *ui)
        else
                menu_bar_show(1, ui);
 }
+
+void ui_window_show(struct ui_psensor *ui)
+{
+       gtk_widget_show_all(ui->main_window);
+
+}