Fixed a status update bug thanks to Evgeni Golov.

[xfce4-hdaps.git] / panel-plugin / xfce4-hdaps.c

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index 6f7bcfc4abc9910136a57fa3eead658987970039..8dbc74d1765dcbd997f7f999f7736faa962ba283 100644 (file)
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.c
@@ -1,3 +1,23 @@
+/*
+ * xfce4-hdaps, an XFCE4 panel plugin for the HDAPS system.
+ *
+ * Copyright Michael Orlitzky
+ *
+ * http://michael.orlitzky.com/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * http://www.fsf.org/licensing/licenses/gpl.html
+ */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -69,10 +89,10 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) {
   size = xfce_panel_plugin_get_size(hdaps->plugin) - 6;
 
   /* Try to load an icon from the current icon theme. */
-  if (status < HDAPS_OFF) {
+  if (status == HDAPS_ERROR) {
     /* Error */
     icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
-                                   "dialog-error",
+                                   "emblem-noread",
                                    size, 0, NULL);
   }
   else if (status == HDAPS_OFF) {
@@ -107,6 +127,21 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) {
 }
 
 
+
+void hdaps_set_tooltip(HdapsPlugin *hdaps, int status) {
+    
+  if (status == HDAPS_ERROR) {
+    gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, "HDAPS Error", NULL);
+  }
+  else if (status == HDAPS_OFF) {
+    gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, "HDAPS Off", NULL);
+  }
+  else {
+    gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, "HDAPS On", NULL);
+  }
+}
+
+
 static void hdaps_set_defaults(HdapsPlugin *hdaps) {
   DBG("Configuring all settings to defaults.");
   hdaps->device_name = g_strdup(DEFAULT_DEVICE_NAME);
@@ -205,6 +240,15 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) {
      so it's important that they start out n*sync. */
   hdaps->previous_status = HDAPS_OFF;
   hdaps_set_icon(hdaps, HDAPS_OFF);
+
+  /* Create the tooltip widget, and set its initial value.
+   * The first couple of lines are stolen from the battery
+   * status plugin. I make no claim as to their correctness.
+   */
+  hdaps->tooltip = gtk_tooltips_new();
+  g_object_ref(G_OBJECT(hdaps->tooltip));
+  gtk_object_sink(GTK_OBJECT(hdaps->tooltip));
+  hdaps_set_tooltip(hdaps, HDAPS_OFF);
   
   return hdaps;
 }
@@ -238,6 +282,10 @@ static void hdaps_free(XfcePanelPlugin *plugin,
   if (G_LIKELY(hdaps->device_name != NULL)) {
     g_free(hdaps->device_name);
   }
+
+  /* Goodbye, tooltips. */
+  gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, NULL, NULL);
+  g_object_unref(G_OBJECT(hdaps->tooltip));
   
   /* ...and finally free the plugin structure. */
   panel_slice_free(HdapsPlugin, hdaps);
@@ -286,9 +334,21 @@ static gboolean hdaps_update_status(HdapsPlugin *hdaps) {
   /* This just gets the status. */
   int status = parse_int_from_file(hdaps->sysfs_file);
 
+  /* The value in the sysfs_file represents the number of milliseconds
+   * that the drive heads will be parked. Of course, this will
+   * generally count down, and appear different each time we poll.
+   *
+   * So, to determine whether or not HDAPS has gone from "on"
+   * to "off," we treat all values greater than zero the same.
+  */
+  if (status > 0) {
+    status = HDAPS_ON;
+  }
+  
   if (status != hdaps->previous_status) {
     /* And we only update the icon if we need to. */
     hdaps_set_icon(hdaps, status);
+    hdaps_set_tooltip(hdaps, status);
     hdaps->previous_status = status;
   }