/*
* xfce4-hdaps, an XFCE4 panel plugin for the HDAPS system.
*
- * Copyright Michael Orlitzky
+ * Copyright (C) 2019 Michael Orlitzky
*
- * http://michael.orlitzky.com/
+ * 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.
+ * 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 General Public License for more details.
+ * 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
*
- * http://www.fsf.org/licensing/licenses/gpl.html
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include "hdaps.h"
#include "xfce4-hdaps.h"
#include "xfce4-hdaps-dialogs.h"
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) {
void hdaps_set_tooltip(HdapsPlugin *hdaps, int status) {
-
if (status == HDAPS_ERROR) {
- gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, "HDAPS Error", NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(hdaps->eventbox), "HDAPS Error");
}
else if (status == HDAPS_OFF) {
- gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, "HDAPS Off", NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(hdaps->eventbox), "HDAPS Off");
}
else {
- gtk_tooltips_set_tip(hdaps->tooltip, hdaps->eventbox, "HDAPS On", NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(hdaps->eventbox), "HDAPS On");
}
}
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;
}
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);
+ hdaps->hvbox = gtk_box_new(orientation, 2);
gtk_widget_show(hdaps->hvbox);
gtk_container_add(GTK_CONTAINER(hdaps->eventbox), hdaps->hvbox);
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;
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);
}
HdapsPlugin *hdaps) {
/* Change the plugin's orientation. Basically magic to me. */
- xfce_hvbox_set_orientation(XFCE_HVBOX(hdaps->hvbox), orientation);
+ gtk_orientable_set_orientation(GTK_ORIENTABLE(hdaps->hvbox), orientation);
}
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;
}
/* 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);