X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=panel-plugin%2Fxfce4-hdaps.c;h=b00e48c7dbba00ccc9bfa2126d7cb66e5264b993;hb=60ffd1d1b7266d9a030b2c864135ff444f0cb917;hp=6f7bcfc4abc9910136a57fa3eead658987970039;hpb=63eef27ea56fc385cf1eb7af33211e697b384c3e;p=xfce4-hdaps.git diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c index 6f7bcfc..b00e48c 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 #endif +#include "hdaps.h" #include "xfce4-hdaps.h" #include "xfce4-hdaps-dialogs.h" @@ -19,11 +41,11 @@ 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) { - + XfceRc *rc; gchar *file; @@ -46,15 +68,15 @@ void hdaps_save(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) { DBG("Failed to open the configuration file. Bailing."); return; } - - + + /* Write any user-configured values to the resource file. */ if (hdaps->device_name) { xfce_rc_write_entry(rc, "device_name", hdaps->device_name); } - + xfce_rc_write_int_entry(rc, "poll_frequency", hdaps->poll_frequency); - + /* close the rc file */ xfce_rc_close(rc); } @@ -69,10 +91,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) { @@ -91,7 +113,7 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) { if (hdaps->icon) { gtk_widget_destroy(hdaps->icon); } - + if (icon) { hdaps->icon = gtk_image_new_from_pixbuf(icon); g_object_unref(G_OBJECT(icon)); @@ -102,21 +124,53 @@ void hdaps_set_icon(HdapsPlugin *hdaps, int status) { gtk_box_pack_start(GTK_BOX(hdaps->hvbox), GTK_WIDGET(hdaps->icon), FALSE, FALSE, 0); gtk_widget_show(hdaps->icon); - + return; } + +void hdaps_set_tooltip(HdapsPlugin *hdaps, int status) { + if (status == HDAPS_ERROR) { + gtk_widget_set_tooltip_text(GTK_WIDGET(hdaps->eventbox), "HDAPS Error"); + } + else if (status == HDAPS_OFF) { + gtk_widget_set_tooltip_text(GTK_WIDGET(hdaps->eventbox), "HDAPS Off"); + } + else { + 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; } static void hdaps_read(HdapsPlugin *hdaps) { - + XfceRc *rc; gchar *file; const gchar *saved_device_name; @@ -129,7 +183,7 @@ static void hdaps_read(HdapsPlugin *hdaps) { DBG("Retaining default settings."); return; } - + /* Open the config file read-only. */ rc = xfce_rc_simple_open(file, TRUE); @@ -141,9 +195,9 @@ static void hdaps_read(HdapsPlugin *hdaps) { DBG("Retaining default settings."); return; } - + /* Read the settings, one at a time. */ - + /* We use saved_device_name here because we need to dupe the string after we read it in from the config file. */ @@ -157,7 +211,7 @@ static void hdaps_read(HdapsPlugin *hdaps) { hdaps->poll_frequency = xfce_rc_read_int_entry(rc, "poll_frequency", DEFAULT_POLL_FREQUENCY); - + /* And close the config file. */ xfce_rc_close(rc); } @@ -174,12 +228,12 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) { /* The HdapsPlugin gets a copy of the XfcePanelPlugin. */ hdaps->plugin = plugin; - + /* Set default values right before reading in the user's settings. This way, hdaps_read() doesn't have to set defaults on error conditions. */ hdaps_set_defaults(hdaps); - + /* Read any user settings into the HdapsPlugin. */ hdaps_read(hdaps); @@ -195,9 +249,14 @@ 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); + hdaps->hvbox = gtk_box_new(orientation, 2); gtk_widget_show(hdaps->hvbox); gtk_container_add(GTK_CONTAINER(hdaps->eventbox), hdaps->hvbox); @@ -205,7 +264,8 @@ 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); - + hdaps_set_tooltip(hdaps, HDAPS_OFF); + return hdaps; } @@ -213,7 +273,7 @@ static HdapsPlugin *hdaps_new(XfcePanelPlugin *plugin) { static void hdaps_free(XfcePanelPlugin *plugin, HdapsPlugin *hdaps) { - + GtkWidget *dialog; /* Destroy the dialog if it's still open. */ @@ -238,7 +298,7 @@ static void hdaps_free(XfcePanelPlugin *plugin, if (G_LIKELY(hdaps->device_name != NULL)) { g_free(hdaps->device_name); } - + /* ...and finally free the plugin structure. */ panel_slice_free(HdapsPlugin, hdaps); } @@ -248,9 +308,9 @@ static void hdaps_free(XfcePanelPlugin *plugin, static void hdaps_orientation_changed(XfcePanelPlugin *plugin, GtkOrientation orientation, 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); } @@ -258,7 +318,7 @@ static void hdaps_orientation_changed(XfcePanelPlugin *plugin, static gboolean hdaps_size_changed(XfcePanelPlugin *plugin, gint size, HdapsPlugin *hdaps) { - + GtkOrientation orientation; /* Get the current orientation of the plugin. */ @@ -273,6 +333,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; } @@ -281,17 +344,29 @@ static gboolean hdaps_size_changed(XfcePanelPlugin *plugin, static gboolean hdaps_update_status(HdapsPlugin *hdaps) { /* This checks the status of HDAPS and updates the - widget accordingly. */ + widget accordingly. */ /* 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; } - + return TRUE; } @@ -346,7 +421,7 @@ static void hdaps_construct(XfcePanelPlugin *plugin) { /* Show the "about" right-click menu item, and connect its event handler. */ - xfce_panel_plugin_menu_show_about(plugin); + xfce_panel_plugin_menu_show_about(plugin); g_signal_connect(G_OBJECT(plugin), "about", G_CALLBACK(hdaps_about), hdaps);