X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps.c;h=95f05eb5f90a14b014b94f6db7d496da45a84e07;hb=c2192722c30e86449a7598eb9c962af39ed2a7e0;hp=c9d9cb5fe54b659ed4316f597d2fdce6fa2f3945;hpb=6aa7cd4dd55e09b88c6fbd85ed2e9fd7cbe833c2;p=xfce4-hdaps.git

diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c
index c9d9cb5..95f05eb 100644
--- a/panel-plugin/xfce4-hdaps.c
+++ b/panel-plugin/xfce4-hdaps.c
@@ -1,7 +1,29 @@
+/*
+ * xfce4-hdaps, an XFCE4 panel plugin for the HDAPS system.
+ *
+ * Copyright (C) 2019 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 Affero 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 Affero General Public License for more details:
+ *
+ *   https://www.gnu.org/licenses/agpl-3.0.html
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include "hdaps.h"
 #include "xfce4-hdaps.h"
 #include "xfce4-hdaps-dialogs.h"
 
@@ -19,7 +41,7 @@
 static void hdaps_construct(XfcePanelPlugin *plugin);
 
 /* Register the plugin with the panel. */
-XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL(hdaps_construct);
+XFCE_PANEL_PLUGIN_REGISTER(hdaps_construct);
 
 
 void hdaps_save(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) {
@@ -124,8 +146,26 @@ void hdaps_set_tooltip(HdapsPlugin *hdaps, int status) {
 
 static void hdaps_set_defaults(HdapsPlugin *hdaps) {
   DBG("Configuring all settings to defaults.");
-  hdaps->device_name = g_strdup(DEFAULT_DEVICE_NAME);
+
+  /* Here we determine the default device name. There are essentially
+     two "defaults," one soft, and the other hard. The soft default
+     is to choose the first supported HDAPS device in the system. This
+     would benefit users who, for example, only have one supported drive
+     named hda. If we can't find any supported HDAPS devices, we use the
+     hard default of DEFAULT_DEVICE_NAME. */
+  char hdaps_devices[MAX_HDAPS_DEVICES][FILENAME_MAX];
+  int found_devices = get_hdaps_device_list(hdaps_devices);
+
+  if (found_devices > 0) {
+    hdaps->device_name = g_strdup(hdaps_devices[0]);
+  }
+  else {
+    hdaps->device_name = g_strdup(DEFAULT_DEVICE_NAME);
+  }
+
   snprintf(hdaps->sysfs_file, FILENAME_MAX, UNLOAD_HEADS_FMT, hdaps->device_name);
+
+  /* The other default is easier. */
   hdaps->poll_frequency = DEFAULT_POLL_FREQUENCY;
 }
 
@@ -210,6 +250,11 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) {
   hdaps->eventbox = gtk_event_box_new();
   gtk_widget_show(hdaps->eventbox);
 
+  /* Make the event box transparent. In newer versions of xfce4-panel
+     users can make the panel transparent, so we don't want to stick a
+     big opaque box on it. */
+  gtk_event_box_set_visible_window(GTK_EVENT_BOX(hdaps->eventbox), FALSE);
+
   /* Set up the hvbox for the widget, which supports
      both horizontal and vertical (hv) orientations. */
   hdaps->hvbox = xfce_hvbox_new(orientation, FALSE, 2);
@@ -301,6 +346,9 @@ static gboolean hdaps_size_changed(XfcePanelPlugin *plugin,
     gtk_widget_set_size_request(GTK_WIDGET(plugin), size, -1);
   }
 
+  /* This fixes an issue where the initial icon size is too small. */
+  hdaps_set_icon(hdaps, hdaps->previous_status);
+
   /* We handled the change, so we're supposed to return TRUE. */
   return TRUE;
 }
@@ -314,6 +362,17 @@ 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);