projects
/
psensor-pkg-debian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.2.0
[psensor-pkg-debian.git]
/
src
/
ui_appindicator.c
diff --git
a/src/ui_appindicator.c
b/src/ui_appindicator.c
index
c8887c2
..
ed4cc64
100644
(file)
--- a/
src/ui_appindicator.c
+++ b/
src/ui_appindicator.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
4
jeanfi@gmail.com
+ * Copyright (C) 2010-201
6
jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@
-23,55
+23,42
@@
#include <gtk/gtk.h>
#include <libappindicator/app-indicator.h>
#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 *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 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;
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)
{
{
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);
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;
}
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);
if (ui->sensors && *ui->sensors)
ui_sensorpref_dialog_run(*ui->sensors, ui);
-
-#ifdef HAVE_APPINDICATOR_029
- gdk_threads_leave();
-#endif
}
static void
}
static void
@@
-96,26
+83,28
@@
static void update_menu_items(int use_celsius)
GtkMenuItem **m;
if (!sensors)
GtkMenuItem **m;
if (!sensors)
- return
;
+ return;
for (s = sensors, m = menu_items; *s; s++, m++)
update_menu_item(*m, *s, use_celsius);
}
static void
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;
{
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);
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 = malloc((n + 1) * sizeof(struct psensor *));
for (i = 0, j = 0; i < n; i++) {
if (config_is_appindicator_enabled(sorted_sensors[i]->id)) {
@@
-136,53
+125,63
@@
build_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
}
sensors[j] = NULL;
}
sensors[j] = NULL;
+ menu_items[j] = NULL;
free(sorted_sensors);
}
free(sorted_sensors);
}
-static Gtk
Widget *get
_menu(struct ui_psensor *ui)
+static Gtk
Menu *load
_menu(struct ui_psensor *ui)
{
GError *error;
GtkMenu *menu;
guint ok;
GtkBuilder *builder;
{
GError *error;
GtkMenu *menu;
guint ok;
GtkBuilder *builder;
+ log_fct_enter();
+
builder = gtk_builder_new();
error = NULL;
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) {
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"));
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));
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;
}
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;
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)) {
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;
if (label == NULL) {
label = str;
@@
-199,9
+198,9
@@
static void update_label(struct ui_psensor *ui)
if (is_temp_type((*p)->type))
str = "999UUU";
if (is_temp_type((*p)->type))
str = "999UUU";
- else if (
is_fan_type((*p)->type)
)
+ else if (
(*p)->type & SENSOR_TYPE_RPM
)
str = "999UUU";
str = "999UUU";
- else /*
cpu load
*/
+ else /*
percent
*/
str = "999%";
if (guide == NULL) {
str = "999%";
if (guide == NULL) {
@@
-223,7
+222,7
@@
static void update_label(struct ui_psensor *ui)
app_indicator_set_label(indicator, label, guide);
}
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;
{
AppIndicatorStatus status;
@@
-240,9
+239,12
@@
void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
if (attention && status == APP_INDICATOR_STATUS_ACTIVE)
app_indicator_set_status(indicator,
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)
}
static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
@@
-251,7
+253,7
@@
static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
log_debug("ui_appindicator.unity_fallback()");
log_debug("ui_appindicator.unity_fallback()");
- appindicator_supported =
0
;
+ appindicator_supported =
false
;
ico = ui_status_get_icon(ui_psensor);
ico = ui_status_get_icon(ui_psensor);
@@
-267,17
+269,47
@@
unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon)
ui_status_set_visible(0);
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)
{
}
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)
}
void ui_appindicator_init(struct ui_psensor *ui)
@@
-298,12
+330,12
@@
void ui_appindicator_init(struct ui_psensor *ui)
ui_appindicator_update_menu(ui);
}
ui_appindicator_update_menu(ui);
}
-
int is_appindicator_supported(
)
+
bool is_appindicator_supported(void
)
{
return appindicator_supported;
}
{
return appindicator_supported;
}
-void ui_appindicator_cleanup()
+void ui_appindicator_cleanup(
void
)
{
free(sensors);
}
{
free(sensors);
}