Add another flag to autohide the manager when there are no devices

[pmount-gui.git] / main.c

diff --git a/main.c b/main.c
index 24b87fc5994ee8e5c70a4e4a58822eff14b38117..81bc4bffd77899c9b3a80e6ee34f8e98c426c393 100644 (file)
--- a/main.c
+++ b/main.c
@@ -11,6 +11,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/select.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/select.h>

+#include <sys/inotify.h>

 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 


@@ -33,9 +34,16 @@ typedef struct sDevice
 typedef struct sGuiContext
 {
        int manager;
 typedef struct sGuiContext
 {
        int manager;

+       int autohide;
+       Device *devices;
+       GtkWidget *window;

        GtkWidget *list;
        GtkWidget *button;
        char *post_mount_command;
        GtkWidget *list;
        GtkWidget *button;
        char *post_mount_command;

+       int inotify_fd;
+       int dev_wd;
+       GIOChannel *inotify_channel;
+       int refresh_pending;

 } GuiContext;
 
 int verbosity = 0;
 } GuiContext;
 
 int verbosity = 0;


@@ -766,6 +774,82 @@ int toggle_device(Device *device, char *out_buf, int out_size)
        return 0;
 }
 
        return 0;
 }
 

+/**
+Refreshes both the internal devices array and the GUI list.
+*/
+int refresh_devices(GuiContext *context, int umount)
+{
+       GtkListStore *store;
+       GtkTreeSelection *selection;
+       int n_listed;
+       time_t latest;
+       int i;
+       GtkTreeIter iter;
+
+       store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(context->list)));
+       gtk_list_store_clear(store);
+
+       free_devices(context->devices);
+
+       context->devices = get_devices();
+       if(!context->devices)
+               return 0;
+
+       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(context->list));
+
+       /* Populate the list with devices in appropriate state. */
+       n_listed = 0;
+       latest = 0;
+       for(i=0; context->devices[i].node; ++i)
+       {
+               Device *dev;
+
+               dev = &context->devices[i];
+               if(umount<0 || !dev->mount_point==!umount)
+               {
+                       gtk_list_store_append(store, &iter);
+                       gtk_list_store_set(store, &iter,
+                               0, dev->description,
+                               1, dev,
+                               2, !!dev->mount_point,
+                               3, dev->mount_point,
+                               -1);
+                       if(dev->time>latest)
+                       {
+                               /* Pre-select the device that appeared on the system most recently. */
+                               latest = dev->time;
+                               gtk_tree_selection_select_iter(selection, &iter);
+                       }
+
+                       ++n_listed;
+               }
+       }
+
+       return n_listed;
+}
+
+/**
+Handles an automatic refresh of the device list in response to inotify events.
+*/
+gboolean refresh_devices_idle(gpointer data)
+{
+       GuiContext *context = (GuiContext *)data;
+       int n_listed;
+
+       n_listed = refresh_devices(context, -1);
+       context->refresh_pending = 0;
+
+       if(context->autohide)
+       {
+               if(n_listed)
+                       gtk_widget_show_all(context->window);
+               else
+                       gtk_widget_hide(context->window);
+       }
+
+       return FALSE;
+}
+

 /**
 Callback for selection in the device list changing.  Updates the action button
 label according to device status.
 /**
 Callback for selection in the device list changing.  Updates the action button
 label according to device status.


@@ -777,7 +861,9 @@ void selection_changed(GtkTreeSelection *selection, gpointer user_data)
        GtkTreeModel *model;
        Device *device;
 
        GtkTreeModel *model;
        Device *device;
 

-       gtk_tree_selection_get_selected(selection, &model, &iter);
+       if(!gtk_tree_selection_get_selected(selection, &model, &iter))
+               return;
+

        gtk_tree_model_get(model, &iter, 1, &device, -1);
        gtk_button_set_label(GTK_BUTTON(context->button), (device->mount_point ? "Unmount" : "Mount"));
 }
        gtk_tree_model_get(model, &iter, 1, &device, -1);
        gtk_button_set_label(GTK_BUTTON(context->button), (device->mount_point ? "Unmount" : "Mount"));
 }


@@ -888,6 +974,32 @@ gboolean key_press(GtkWidget *widget, GdkEvent *event, gpointer user_data)
        return FALSE;
 }
 
        return FALSE;
 }
 

+/**
+Callback for inotify events.
+*/
+gboolean inotify_event_available(GIOChannel *source, GIOCondition condition, gpointer user_data)
+{
+       GuiContext *context = (GuiContext *)user_data;
+       int fd;
+       char eventbuf[sizeof(struct inotify_event)+NAME_MAX+1];
+       int len;
+
+       fd = g_io_channel_unix_get_fd(source);
+       len = read(fd, eventbuf, sizeof(eventbuf));
+       if(len>=(int)sizeof(struct inotify_event))
+       {
+               if(!context->refresh_pending)
+               {
+                       g_timeout_add(500, &refresh_devices_idle, context);
+                       context->refresh_pending = 1;
+               }
+       }
+
+       (void)condition;
+
+       return TRUE;
+}
+

 void show_help(void)
 {
        printf("pmount-gui\n"
 void show_help(void)
 {
        printf("pmount-gui\n"


@@ -898,32 +1010,34 @@ void show_help(void)
                "  -u  Unmount a device (default is mount)\n"
                "  -r  Run a command after mounting\n"
                "  -m  Start a persistent mount manager\n"
                "  -u  Unmount a device (default is mount)\n"
                "  -r  Run a command after mounting\n"
                "  -m  Start a persistent mount manager\n"

+               "  -M  Like -m, but hide the window if there are no devices\n"

                "  -h  Display this help\n");
 }
 
 int main(int argc, char **argv)
 {
        GuiContext context;
                "  -h  Display this help\n");
 }
 
 int main(int argc, char **argv)
 {
        GuiContext context;

-       GtkWidget *window;

        GtkWidget *box;
        GtkWidget *viewport;
        GtkListStore *store;
        GtkTreeSelection *selection;
        GtkCellRenderer *mounted_toggle;
        GtkWidget *box;
        GtkWidget *viewport;
        GtkListStore *store;
        GtkTreeSelection *selection;
        GtkCellRenderer *mounted_toggle;

-       GtkTreeIter iter;
-       Device *devices;
-       int i;
-       time_t latest;

        int opt;
        int umount = 0;
        int n_listed;
 
        context.manager = 0;
        int opt;
        int umount = 0;
        int n_listed;
 
        context.manager = 0;

+       context.autohide = 0;
+       context.devices = NULL;

        context.post_mount_command = NULL;
        context.post_mount_command = NULL;

+       context.inotify_fd = -1;
+       context.dev_wd = -1;
+       context.inotify_channel = NULL;
+       context.refresh_pending = 0;

 
        gtk_init(&argc, &argv);
 
 
        gtk_init(&argc, &argv);
 

-       while((opt = getopt(argc, argv, "vur:mh"))!=-1) switch(opt)
+       while((opt = getopt(argc, argv, "vur:mMh"))!=-1) switch(opt)

        {
        case 'v':
                ++verbosity;
        {
        case 'v':
                ++verbosity;


@@ -936,19 +1050,24 @@ int main(int argc, char **argv)
                break;
        case 'm':
                context.manager = 1;
                break;
        case 'm':
                context.manager = 1;

+               context.autohide = 0;
+               break;
+       case 'M':
+               context.manager = 1;
+               context.autohide = 1;

                break;
        case 'h':
                show_help();
                return 0;
        }
 
                break;
        case 'h':
                show_help();
                return 0;
        }
 

-       window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-       gtk_container_set_border_width(GTK_CONTAINER(window), 5);
-       g_signal_connect(window, "destroy", G_CALLBACK(&gtk_main_quit), NULL);
-       g_signal_connect(window, "key-press-event", G_CALLBACK(&key_press), NULL);
+       context.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+       gtk_container_set_border_width(GTK_CONTAINER(context.window), 5);
+       g_signal_connect(context.window, "destroy", G_CALLBACK(&gtk_main_quit), NULL);
+       g_signal_connect(context.window, "key-press-event", G_CALLBACK(&key_press), NULL);

 
        box = gtk_vbox_new(FALSE, 5);
 
        box = gtk_vbox_new(FALSE, 5);

-       gtk_container_add(GTK_CONTAINER(window), box);
+       gtk_container_add(GTK_CONTAINER(context.window), box);

 
        viewport = gtk_viewport_new(NULL, NULL);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_IN);
 
        viewport = gtk_viewport_new(NULL, NULL);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_IN);


@@ -980,6 +1099,19 @@ int main(int argc, char **argv)
                gtk_tree_view_column_add_attribute(mounted_column, mount_point_renderer, "text", 3);
 
                gtk_tree_view_insert_column(GTK_TREE_VIEW(context.list), mounted_column, -1);
                gtk_tree_view_column_add_attribute(mounted_column, mount_point_renderer, "text", 3);
 
                gtk_tree_view_insert_column(GTK_TREE_VIEW(context.list), mounted_column, -1);

+
+               context.inotify_fd = inotify_init();
+               if(context.inotify_fd>=0)
+               {
+                       context.dev_wd = inotify_add_watch(context.inotify_fd, "/dev/disk/by-id", IN_CREATE|IN_DELETE);
+
+                       context.inotify_channel = g_io_channel_unix_new(context.inotify_fd);
+                       g_io_add_watch(context.inotify_channel, G_IO_IN, &inotify_event_available, &context);
+               }
+               else
+                       printf("Warning: Unable to initialize inotify\n");
+
+               umount = -1;

        }
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(context.list));
        }
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(context.list));


@@ -989,37 +1121,11 @@ int main(int argc, char **argv)
        g_signal_connect(context.button, "clicked", G_CALLBACK(&button_clicked), &context);
        gtk_box_pack_start(GTK_BOX(box), context.button, FALSE, TRUE, 0);
 
        g_signal_connect(context.button, "clicked", G_CALLBACK(&button_clicked), &context);
        gtk_box_pack_start(GTK_BOX(box), context.button, FALSE, TRUE, 0);
 

-       devices = get_devices();
-       n_listed = 0;
-       if(devices)
-       {
-               /* Populate the list with devices in appropriate state. */
-               latest = 0;
-               for(i=0; devices[i].node; ++i)
-                       if(!devices[i].mount_point==!umount || context.manager)
-                       {
-                               gtk_list_store_append(store, &iter);
-                               gtk_list_store_set(store, &iter,
-                                       0, devices[i].description,
-                                       1, &devices[i],
-                                       2, !!devices[i].mount_point,
-                                       3, devices[i].mount_point,
-                                       -1);
-                               if(devices[i].time>latest)
-                               {
-                                       /* Pre-select the device that appeared on the system most recently. */
-                                       latest = devices[i].time;
-                                       gtk_tree_selection_select_iter(selection, &iter);
-                               }
+       n_listed = refresh_devices(&context, umount);

 
 

-                               ++n_listed;
-                       }
-
-       }
-
-       if(n_listed || context.manager)
-               gtk_widget_show_all(window);
-       else
+       if(n_listed || (context.manager && !context.autohide))
+               gtk_widget_show_all(context.window);
+       else if(!context.manager)

        {
                GtkWidget *dialog;
 
        {
                GtkWidget *dialog;
 


@@ -1032,7 +1138,9 @@ int main(int argc, char **argv)
 
        gtk_main();
 
 
        gtk_main();
 

-       free_devices(devices);
+       free_devices(context.devices);
+       if(context.inotify_fd>=0)
+               close(context.inotify_fd);

 
        return 0;
 }
 
        return 0;
 }