#include <gtk/gtk.h>
#include <libappindicator/app-indicator.h>
-#include "cfg.h"
-#include "psensor.h"
-#include "ui.h"
-#include "ui_appindicator.h"
-#include "ui_sensorpref.h"
-#include "ui_status.h"
-#include "ui_pref.h"
+#include <cfg.h>
+#include <psensor.h>
+#include <ui.h>
+#include <ui_appindicator.h>
+#include <ui_sensorpref.h>
+#include <ui_status.h>
+#include <ui_pref.h>
static const char *ICON = "psensor_normal";
static const char *ATTENTION_ICON = "psensor_hot";
+static const char *GLADE_FILE
+= PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor-appindicator.glade";
+
static struct psensor **sensors;
static GtkMenuItem **menu_items;
-static int appindicator_supported = 1;
+static bool appindicator_supported = true;
static AppIndicator *indicator;
static struct ui_psensor *ui_psensor;
-void cb_menu_show(GtkMenuItem *mi, gpointer data)
+void ui_appindicator_menu_show_cb(GtkMenuItem *mi, gpointer data)
{
ui_window_show((struct ui_psensor *)data);
}
void ui_appindicator_cb_preferences(GtkMenuItem *mi, gpointer data)
{
-#ifdef HAVE_APPINDICATOR_029
- gdk_threads_enter();
-#endif
-
ui_pref_dialog_run((struct ui_psensor *)data);
-
-#ifdef HAVE_APPINDICATOR_029
- gdk_threads_leave();
-#endif
}
void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
{
struct ui_psensor *ui = data;
-#ifdef HAVE_APPINDICATOR_029
- gdk_threads_enter();
-#endif
-
if (ui->sensors && *ui->sensors)
ui_sensorpref_dialog_run(*ui->sensors, ui);
-
-#ifdef HAVE_APPINDICATOR_029
- gdk_threads_leave();
-#endif
}
static void
GtkMenuItem **m;
if (!sensors)
- return ;
+ return;
for (s = sensors, m = menu_items; *s; s++, m++)
update_menu_item(*m, *s, use_celsius);
}
static void
-build_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
+create_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
{
int i, j, n, celsius;
const char *name;
struct psensor **sorted_sensors;
- free(menu_items);
-
- celsius = ui->config->temperature_unit == CELSIUS;
+ if (config_get_temperature_unit() == CELSIUS)
+ celsius = 1;
+ else
+ celsius = 0;
- sorted_sensors = ui_get_sensors_ordered_by_position(ui);
+ sorted_sensors = ui_get_sensors_ordered_by_position(ui->sensors);
n = psensor_list_size(sorted_sensors);
- menu_items = malloc(n * sizeof(GtkWidget *));
+ menu_items = malloc((n + 1) * sizeof(GtkWidget *));
+
sensors = malloc((n + 1) * sizeof(struct psensor *));
for (i = 0, j = 0; i < n; i++) {
if (config_is_appindicator_enabled(sorted_sensors[i]->id)) {
}
sensors[j] = NULL;
+ menu_items[j] = NULL;
free(sorted_sensors);
}
-static GtkWidget *get_menu(struct ui_psensor *ui)
+static GtkMenu *load_menu(struct ui_psensor *ui)
{
GError *error;
GtkMenu *menu;
guint ok;
GtkBuilder *builder;
+ log_fct_enter();
+
builder = gtk_builder_new();
error = NULL;
- ok = gtk_builder_add_from_file
- (builder,
- PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "psensor.glade",
- &error);
+ ok = gtk_builder_add_from_file(builder, GLADE_FILE, &error);
if (!ok) {
- log_printf(LOG_ERR, error->message);
+ log_err(_("Failed to load glade file %s: %s"),
+ GLADE_FILE,
+ error->message);
g_error_free(error);
return NULL;
}
menu = GTK_MENU(gtk_builder_get_object(builder, "appindicator_menu"));
- build_sensor_menu_items(ui, menu);
+ create_sensor_menu_items(ui, menu);
gtk_builder_connect_signals(builder, ui);
g_object_ref(G_OBJECT(menu));
g_object_unref(G_OBJECT(builder));
- return GTK_WIDGET(menu);
+ log_fct_exit();
+
+ return menu;
}
static void update_label(struct ui_psensor *ui)
{
char *label, *str, *tmp, *guide;
struct psensor **p;
+ int use_celsius;
- p = ui_get_sensors_ordered_by_position(ui);
+ p = ui_get_sensors_ordered_by_position(ui->sensors);
label = NULL;
guide = NULL;
+
+ if (config_get_temperature_unit() == CELSIUS)
+ use_celsius = 1;
+ else
+ use_celsius = 0;
+
while (*p) {
if (config_is_appindicator_label_enabled((*p)->id)) {
- str = psensor_current_value_to_str
- (*p, ui->config->temperature_unit == CELSIUS);
+ str = psensor_current_value_to_str(*p, use_celsius);
if (label == NULL) {
label = str;
app_indicator_set_label(indicator, label, guide);
}
-void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
+void ui_appindicator_update(struct ui_psensor *ui, bool attention)
{
AppIndicatorStatus status;
if (attention && status == APP_INDICATOR_STATUS_ACTIVE)
app_indicator_set_status(indicator,
- APP_INDICATOR_STATUS_ATTENTION);
+ APP_INDICATOR_STATUS_ATTENTION);
- update_menu_items(ui->config->temperature_unit == CELSIUS);
+ if (config_get_temperature_unit() == CELSIUS)
+ update_menu_items(1);
+ else
+ update_menu_items(0);
}
static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
log_debug("ui_appindicator.unity_fallback()");
- appindicator_supported = 0;
+ appindicator_supported = false;
ico = ui_status_get_icon(ui_psensor);
ui_status_set_visible(0);
- appindicator_supported = 1;
+ appindicator_supported = true;
+}
+
+static void remove_sensor_menu_items(GtkMenu *menu)
+{
+ GtkMenuItem **items;
+
+ if (!menu_items)
+ return;
+
+ items = menu_items;
+ while (*items) {
+ gtk_container_remove(GTK_CONTAINER(menu), GTK_WIDGET(*items));
+
+ items++;
+ }
+
+ free(menu_items);
+ free(sensors);
}
void ui_appindicator_update_menu(struct ui_psensor *ui)
{
- GtkWidget *menu;
+ GtkMenu *menu;
+
+ menu = GTK_MENU(app_indicator_get_menu(indicator));
- menu = get_menu(ui);
- app_indicator_set_menu(indicator, GTK_MENU(menu));
+ if (menu) {
+ remove_sensor_menu_items(menu);
+ create_sensor_menu_items(ui, menu);
+ } else {
+ menu = load_menu(ui);
+
+ if (menu) {
+ app_indicator_set_menu(indicator, menu);
+ g_object_unref(G_OBJECT(menu));
+ }
+ }
- gtk_widget_show_all(menu);
+ if (menu)
+ gtk_widget_show_all(GTK_WIDGET(menu));
}
void ui_appindicator_init(struct ui_psensor *ui)
ui_appindicator_update_menu(ui);
}
-int is_appindicator_supported()
+bool is_appindicator_supported(void)
{
return appindicator_supported;
}
-void ui_appindicator_cleanup()
+void ui_appindicator_cleanup(void)
{
free(sensors);
}