DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Also collect some flags for each filesystem listed

Browse Source
This commit is contained in:
Pierre Pronchery 2014-01-08 20:48:14 -06:00
parent a3d9ecd4c8
commit 6ffa7655bf
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/plugins/volumes.c
View File

@ -39,6 +39,7 @@ enum _VolumesColumn
DC_PIXBUF = 0, DC_PIXBUF = 0,
DC_NAME, DC_NAME,
DC_FILESYSTEM, DC_FILESYSTEM,
DC_FLAGS,
DC_MOUNTPOINT, DC_MOUNTPOINT,
DC_FREE, DC_FREE,
DC_FREE_DISPLAY, DC_FREE_DISPLAY,
@ -47,6 +48,12 @@ enum _VolumesColumn
#define DC_LAST DC_UPDATED #define DC_LAST DC_UPDATED
#define DC_COUNT (DC_LAST + 1) #define DC_COUNT (DC_LAST + 1)
typedef enum _VolumesFlag
{
DF_READONLY = 1,
DF_REMOVABLE
} VolumesFlag;
typedef enum _VolumesPixbuf typedef enum _VolumesPixbuf
{ {
DP_HARDDISK = 0, DP_HARDDISK = 0,
@ -117,8 +124,9 @@ static Volumes * _volumes_init(BrowserPluginHelper * helper)
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(volumes->window), gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(volumes->window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
volumes->store = gtk_list_store_new(DC_COUNT, GDK_TYPE_PIXBUF, volumes->store = gtk_list_store_new(DC_COUNT, GDK_TYPE_PIXBUF,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT,
G_TYPE_UINT, G_TYPE_STRING, G_TYPE_BOOLEAN); G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING,
G_TYPE_BOOLEAN);
volumes->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL( volumes->view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(
volumes->store)); volumes->store));
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(volumes->view), FALSE); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(volumes->view), FALSE);
@ -172,7 +180,8 @@ static GtkWidget * _volumes_get_widget(Volumes * volumes)
/* volumes_refresh */ /* volumes_refresh */
static void _refresh_add(Volumes * volumes, char const * name, static void _refresh_add(Volumes * volumes, char const * name,
char const * device, char const * filesystem, char const * device, char const * filesystem,
char const * mountpoint, fsblkcnt_t free, fsblkcnt_t total); unsigned int flags, char const * mountpoint,
fsblkcnt_t free, fsblkcnt_t total);
static void _refresh_get_iter(Volumes * volumes, GtkTreeIter * iter, static void _refresh_get_iter(Volumes * volumes, GtkTreeIter * iter,
char const * mountpoint); char const * mountpoint);
static void _refresh_purge(Volumes * volumes); static void _refresh_purge(Volumes * volumes);
@ -190,6 +199,7 @@ static void _volumes_refresh(Volumes * volumes, GList * selection)
int res; int res;
int i; int i;
#endif #endif
unsigned int flags = 0;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, path); fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, path);
@ -209,27 +219,41 @@ static void _volumes_refresh(Volumes * volumes, GList * selection)
return; return;
_refresh_reset(volumes); _refresh_reset(volumes);
for(i = 0; i < res; i++) for(i = 0; i < res; i++)
_refresh_add(volumes, NULL, mnt[i].f_mntfromname, {
mnt[i].f_fstypename, mnt[i].f_mntonname, flags = 0;
mnt[i].f_bavail, mnt[i].f_blocks); flags |= (mnt[i].f_flag & ST_RDONLY) ? DF_READONLY : 0;
_refresh_add(volumes, (mnt[i].f_flag & ST_ROOTFS)
? _("Root filesystem") : NULL,
mnt[i].f_mntfromname, mnt[i].f_fstypename,
flags, mnt[i].f_mntonname, mnt[i].f_bavail,
mnt[i].f_blocks);
}
#elif defined(MNT_NOWAIT) #elif defined(MNT_NOWAIT)
if((res = getmntinfo(&mnt, MNT_NOWAIT)) <= 0) if((res = getmntinfo(&mnt, MNT_NOWAIT)) <= 0)
return; return;
_refresh_reset(volumes); _refresh_reset(volumes);
for(i = 0; i < res; i++) for(i = 0; i < res; i++)
_refresh_add(volumes, NULL, mnt[i].f_mntfromname, {
mnt[i].f_fstypename, mnt[i].f_mntonname, flags = 0;
mnt[i].f_bavail, mnt[i].f_blocks); flags |= (mnt[i].f_flags & MNT_RDONLY) ? DF_READONLY : 0;
_refresh_add(volumes, (mnt[i].f_flags & MNT_ROOTFS)
? _("Root filesystem") : NULL,
mnt[i].f_mntfromname, mnt[i].f_fstypename,
flags, mnt[i].f_mntonname, mnt[i].f_bavail,
mnt[i].f_blocks);
}
#else #else
_refresh_reset(volumes); _refresh_reset(volumes);
_refresh_add(volumes, NULL, NULL, NULL, "/", 0, 0); _refresh_add(volumes, _("Root filesystem"), NULL, NULL, flags, "/", 0,
0);
#endif #endif
_refresh_purge(volumes); _refresh_purge(volumes);
} }
static void _refresh_add(Volumes * volumes, char const * name, static void _refresh_add(Volumes * volumes, char const * name,
char const * device, char const * filesystem, char const * device, char const * filesystem,
char const * mountpoint, fsblkcnt_t free, fsblkcnt_t total) unsigned int flags, char const * mountpoint,
fsblkcnt_t free, fsblkcnt_t total)
{ {
GtkTreeIter iter; GtkTreeIter iter;
VolumesPixbuf dp = DP_HARDDISK; VolumesPixbuf dp = DP_HARDDISK;
@ -252,12 +276,14 @@ static void _refresh_add(Volumes * volumes, char const * name,
for(i = 0; i < sizeof(cdrom) / sizeof(*cdrom); i++) for(i = 0; i < sizeof(cdrom) / sizeof(*cdrom); i++)
if(strncmp(cdrom[i], device, strlen(cdrom[i])) == 0) if(strncmp(cdrom[i], device, strlen(cdrom[i])) == 0)
{ {
flags |= DF_REMOVABLE;
dp = DP_CDROM; dp = DP_CDROM;
break; break;
} }
for(i = 0; i < sizeof(removable) / sizeof(removable); i++) for(i = 0; i < sizeof(removable) / sizeof(removable); i++)
if(strncmp(removable[i], device, strlen(removable[i])) == 0) if(strncmp(removable[i], device, strlen(removable[i])) == 0)
{ {
flags |= DF_REMOVABLE;
dp = DP_REMOVABLE; dp = DP_REMOVABLE;
break; break;
} }
@ -278,8 +304,9 @@ static void _refresh_add(Volumes * volumes, char const * name,
_refresh_get_iter(volumes, &iter, mountpoint); _refresh_get_iter(volumes, &iter, mountpoint);
gtk_list_store_set(volumes->store, &iter, gtk_list_store_set(volumes->store, &iter,
DC_PIXBUF, volumes->icons[dp], DC_NAME, name, DC_PIXBUF, volumes->icons[dp], DC_NAME, name,
DC_FILESYSTEM, filesystem, DC_MOUNTPOINT, mountpoint, DC_FILESYSTEM, filesystem, DC_FLAGS, flags,
DC_FREE, f, DC_FREE_DISPLAY, buf, DC_UPDATED, TRUE, -1); DC_MOUNTPOINT, mountpoint, DC_FREE, f,
DC_FREE_DISPLAY, buf, DC_UPDATED, TRUE, -1);
} }
static void _refresh_get_iter(Volumes * volumes, GtkTreeIter * iter, static void _refresh_get_iter(Volumes * volumes, GtkTreeIter * iter,