Import Upstream version 0.4

1 files changed, 271 insertions, 591 deletions

diff --git a/computer.c b/computer.c
index 462b7305..7ae9ee8d 100644
--- a/computer.c
+++ b/computer.c
@@ -1,642 +1,322 @@
 /*
- * Distribuition detection routines
- * Copyright (c) 2003 Leandro Pereira <leandro@linuxmag.com.br>
+ *    HardInfo - Displays System Information
+ *    Copyright (C) 2003-2006 Leandro A. F. Pereira <leandro@linuxmag.com.br>
  *
- * May be distributed under the terms of GNU General Public License version 2.
+ *    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, version 2.
+ *
+ *    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.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "hardinfo.h"
-#include "computer.h"
-
+#include <stdlib.h>
+#include <string.h>
 #include <gtk/gtk.h>
+#include <config.h>
+#include <time.h>
+#include <string.h>
 #include <sys/utsname.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdlib.h>
-
-static struct {
-    gchar *file, *codename;
-} distro_db[] = {
-    {    DB_PREFIX "debian_version",		"deb"	},
-    {    DB_PREFIX "slackware-version",		"slk"	},
-    {    DB_PREFIX "mandrake-release",		"mdk"	}, 
-    {    DB_PREFIX "gentoo-release",		"gnt"	}, 
-    {    DB_PREFIX "conectiva-release",		"cnc"	}, 
-    {    DB_PREFIX "versão-conectiva",		"cnc"	}, 
-    {    DB_PREFIX "turbolinux-release",	"tl"	}, 
-    {    DB_PREFIX "yellowdog-release", 	"yd"	}, 
-    {    DB_PREFIX "SuSE-release",		"suse"	},
-	/*
-	 * RedHat must be the *last* one to be checked, since
-	 * some distros (like Mandrake) includes a redhat-relase
-	 * file too.
-	 */
-    {    DB_PREFIX "redhat-release",		"rh"	},
-    {    NULL, NULL				        }
-};
-
-#define get_int_val(var)  { \
-		walk_until_inclusive(':'); buf++; \
-		var = atoi(buf); \
-		continue; \
-	}
-
-#define get_str_val(var)  { \
-		walk_until_inclusive(':'); buf++; \
-		var = g_strdup(buf); \
-		continue; \
-	}
-
-#ifdef ARCH_i386
-static struct {
-    char *small, *large;
-} small2large[] = {
-	{    "fpu",	"Floating Point Unit"				},
-	{    "vme",	"Virtual Mode Extension"			},
-	{    "de",	"Debugging Extensions"				},
-	{    "pse",	"Page Size Extensions"				},
-	{    "tsc",	"Time Stamp Counter"				},
-	{    "msr",	"Model Specific Registers"			},
-	{    "pae",	"Physical Address Extensions"			},
-	{    "mce",	"Machine Check Architeture"			},
-	{    "cx8",	"CMPXCHG8 instruction"				},
-	{    "apic",	"Advanced Programmable Interrupt Controller"	},
-	{    "sep",	"Fast System Call"				},
-	{    "mtrr",	"Memory Type Range Registers"			},
-	{    "pge",	"Page Global Enable"				},
-	{    "cmov",	"Conditional Move instruction"			},
-	{    "pat",	"Page Attribute Table"				},
-	{    "pse36",	"36bit Page Size Extensions"			},
-	{    "psn",	"96 bit Processor Serial Number"		},
-	{    "mmx",	"MMX technology"				},
-	{    "fxsr",	"fxsr"						},
-	{    "kni",	"Streaming SIMD instructions"			},
-	{    "xmm",	"Streaming SIMD instructions"			},
-	{    "ht",      "HyperThreading"                                },
-	{    NULL,	NULL						}
+#include <sys/stat.h>
+
+#include <hardinfo.h>
+#include <iconcache.h>
+#include <shell.h>
+
+#include <expr.h>
+
+enum {
+    COMPUTER_SUMMARY,
+    COMPUTER_PROCESSORS,
+    COMPUTER_OPERATING_SYSTEM,
+    COMPUTER_LANGUAGE,
+    COMPUTER_SENSORS,
+    COMPUTER_FILESYSTEMS,
+    COMPUTER_SHARES,
+    COMPUTER_DISPLAY,
+    COMPUTER_NETWORK,
+} Entries;
+
+static ModuleEntry hi_entries[] = {
+    {"Summary",			"summary.png"},
+    {"Processor",		"processor.png"},
+    {"Operating System",	"os.png"},
+    {"Languages",		"language.png"},
+    {"Sensors",			"therm.png"},
+    {"Filesystems",		"dev_removable.png"},
+    {"Shared Directories",	"shares.png"},
+    {"Display",			"monitor.png"},
+    {"Network Interfaces",	"network.png"},
 };
 
-static GtkWidget *get_features_widget(CPUDevice * device)
-{
-    GtkWidget *widget, *scroll;
-    GtkTextBuffer *buffer;
-    GtkTextIter iter;
-    gchar **flags;
-    gint i, j;
-
-    if (!device->flags)
-	return NULL;
-
-    buffer = gtk_text_buffer_new(FALSE);
-    gtk_text_buffer_set_text(buffer, "", -1);
-    gtk_text_buffer_get_iter_at_offset(buffer, &iter, 0);
-
-    flags = g_strsplit(device->flags, " ", G_N_ELEMENTS(small2large));
-    for (i = 0; *(flags + i); i++) {
-	for (j = 0; j < G_N_ELEMENTS(small2large); j++) {
-	    if (small2large[j].small &&
-		!strncmp(small2large[j].small, *(flags + i),
-			 strlen(small2large[j].small))) {
-//		gtk_text_buffer_insert(buffer, &iter, small2large[j].small,
-//				       -1);
-		gtk_text_buffer_insert(buffer, &iter, "● ", -1);
-		gtk_text_buffer_insert(buffer, &iter, small2large[j].large,
-				       -1);
-		gtk_text_buffer_insert(buffer, &iter, "\n", -1);
-		break;
-	    }
-	}
-    }
-    g_strfreev(flags);
-
-    scroll = gtk_scrolled_window_new(NULL, NULL);
-    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
-				   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-    gtk_container_set_border_width(GTK_CONTAINER(scroll), 4);
-    gtk_widget_show(scroll);
-
-    widget = gtk_text_view_new();
-    gtk_text_view_set_buffer(GTK_TEXT_VIEW(widget), buffer);
-    gtk_text_view_set_editable(GTK_TEXT_VIEW(widget), FALSE);
-    gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(widget), FALSE);
-    gtk_text_view_set_indent(GTK_TEXT_VIEW(widget), 5);
-    gtk_widget_show(widget);
-
-    gtk_container_add(GTK_CONTAINER(scroll), widget);
-
-    return scroll;
-}
-#endif
+#include "computer.h"
 
-void hi_show_cpu_info(MainWindow * mainwindow, CPUDevice * device)
+static GHashTable *moreinfo = NULL;
+
+#include <arch/common/languages.h>
+#include <arch/this/alsa.h>
+#include <arch/common/display.h>
+#include <arch/this/loadavg.h>
+#include <arch/this/memory.h>
+#include <arch/this/uptime.h>
+#include <arch/this/processor.h>
+#include <arch/this/os.h>
+#include <arch/this/filesystem.h>
+#include <arch/this/samba.h>
+#include <arch/this/sensors.h>
+#include <arch/this/net.h>
+
+static Computer *
+computer_get_info(void)
 {
-    gchar *buf;
-
-    if (!device)
-	return;
-
-    gtk_window_set_title(GTK_WINDOW(mainwindow->det_window->window),
-			 device->processor);
-    detail_window_set_icon(mainwindow->det_window, IMG_PREFIX "cpu.png");
-    detail_window_set_dev_name(mainwindow->det_window, device->processor);
-    detail_window_set_dev_type(mainwindow->det_window, device->machine);
-
-    detail_window_append_info_int(mainwindow->det_window, _("Number"),
-				  device->procno, FALSE);
-    buf = g_strdup_printf("%dMHz", device->frequency);
-    detail_window_append_info(mainwindow->det_window, _("Frequency"), buf);
-    g_free(buf);
-
-    detail_window_append_separator(mainwindow->det_window);
-#ifdef ARCH_i386
-    detail_window_append_info_int(mainwindow->det_window, _("Family"),
-				  device->family, FALSE);
-    detail_window_append_info_int(mainwindow->det_window, _("Model"),
-				  device->model, FALSE);
-    detail_window_append_info_int(mainwindow->det_window, _("Stepping"),
-				  device->stepping, FALSE);
-    detail_window_append_separator(mainwindow->det_window);
+    Computer *computer;
+
+    computer = g_new0(Computer, 1);
+    
+    if (moreinfo) {
+#ifdef g_hash_table_unref
+	g_hash_table_unref(moreinfo);
+#else
+	g_free(moreinfo);
 #endif
-
-    if (device->cachel2) {
-	buf = g_strdup_printf("%dkB", device->cachel2);
-	detail_window_append_info(mainwindow->det_window, _("Cache L2"),
-				  buf);
-	g_free(buf);
-    }
-
-    buf = g_strdup_printf("%d bogomips", device->bogomips);
-    detail_window_append_info(mainwindow->det_window, _("Bogomips"), buf);
-    g_free(buf);
-
-#ifdef ARCH_i386
-    {
-	GtkWidget *features, *label;
-
-	label = gtk_label_new(_("Features"));
-	gtk_widget_show(label);
-
-	features = get_features_widget(device);
-	gtk_notebook_append_page(GTK_NOTEBOOK
-				 (mainwindow->det_window->notebook),
-				 features, label);
     }
-#endif
 
-}
-
-MemoryInfo *memory_get_info(void)
-{
-    MemoryInfo *mi;
-    FILE *procmem;
-    gchar buffer[128];
-    gint memfree = 0, memused;
+    moreinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
-    mi = g_new0(MemoryInfo, 1);
+    shell_status_update("Getting processor information...");
+    computer->processor = computer_get_processor();
 
-    procmem = fopen("/proc/meminfo", "r");
-    while (fgets(buffer, 128, procmem)) {
-	gchar *buf = buffer;
+    shell_status_update("Getting memory information...");
+    computer->memory = computer_get_memory();
 
-	buf = g_strstrip(buf);
+    shell_status_update("Getting operating system information...");
+    computer->os = computer_get_os();
 
-	if (!strncmp(buf, "MemTotal", 8))
-	    get_int_val(mi->total)
-	else if (!strncmp(buf, "MemFree", 7))
-	    get_int_val(memfree)
-	else if (!strncmp(buf, "Cached", 6))
-	    get_int_val(mi->cached)
-    }
-    fclose(procmem);
+    shell_status_update("Getting display information...");
+    computer->display = computer_get_display();
 
-    mi->used = mi->total - memfree;
+    shell_status_update("Getting sound card information...");
+    computer->alsa = computer_get_alsainfo();
 
-    mi->total  /= 1000;
-    mi->cached /= 1000;
-    mi->used   /= 1000;
-    memfree    /= 1000;
+    shell_status_update("Getting mounted file system information...");
+    scan_filesystems();
 
-    memused = mi->total - mi->used + mi->cached;
+    shell_status_update("Getting shared directories...");
+    scan_shared_directories();
+    
+    shell_status_update("Reading sensors...");
+    read_sensors();
 
-    mi->ratio = 1 - (gdouble) memused / mi->total;
+    shell_status_update("Obtaining network information...");
+    scan_net_interfaces();
 
-    return mi;
+    computer->date_time = "...";
+    return computer;
 }
 
-#if defined(ARCH_i386) || defined(ARCH_x86_64) || defined(ARCH_PARISC)
-#define PARSE_PROC_CPU()					\
-		if(!strncmp(buf, "bogomips", 8))		\
-			get_int_val(ci->bogomips)		\
-		else if(!strncmp(buf, "cpu family", 10))	\
-			get_int_val(ci->family)			\
-		else if(!strncmp(buf, "model name", 10))	\
-			get_str_val(ci->processor)		\
-		else if(!strncmp(buf, "flags", 5))		\
-			get_str_val(ci->flags)			\
-		else if(!strncmp(buf, "vendor_id", 8))		\
-			get_str_val(ci->machine)		\
-		else if(!strncmp(buf, "stepping", 8))		\
-			get_int_val(ci->stepping)		\
-		else if(!strncmp(buf, "cpu MHz", 7))		\
-			get_int_val(ci->frequency)		\
-		else if(!strncmp(buf, "cache size", 10))	\
-			get_int_val(ci->cachel2)		\
-		else if(!strncmp(buf, "model", 5))		\
-			get_int_val(ci->model)
-#endif
-#ifdef ARCH_PPC
-#define PARSE_PROC_CPU()					\
-		if(!strncmp(buf, "bogomips", 8))		\
-			get_int_val(ci->bogomips)		\
-		else if(!strncmp(buf, "cpu", 3))		\
-			get_str_val(ci->processor)		\
-		else if(!strncmp(buf, "machine", 7))		\
-			get_str_val(ci->machine)		\
-		else if(!strncmp(buf, "clock", 5))		\
-			get_int_val(ci->frequency)		\
-		else if(!strncmp(buf, "L2 cache", 8))		\
-			get_int_val(ci->cachel2)
-#endif
-#ifdef ARCH_m68k
-#define	PARSE_PROC_CPU()					\
-		if (!strncmp(buf, "CPU", 3))			\
-			get_str_val(ci->processor)		\
-		else if (!strncmp(buf, "BogoMips", 8))		\
-			get_int_val(ci->bogomips)		\
-		else if (!strncmp(buf, "Clocking", 8))		\
-			get_int_val(ci->frequency)
-#endif
-#ifdef ARCH_MIPS
-#define	PARSE_PROC_CPU()					\
-                if (!strncmp(buf, "cpu model", 9))		\
-                        get_str_val(ci->processor)		\
-                else if (!strncmp(buf, "BogoMIPS", 8))		\
-                        get_int_val(ci->bogomips)		\
-                else if (!strncmp(buf, "system type", 11))	\
-                        get_str_val(ci->machine)		
-#endif
-
-#ifndef PARSE_PROC_CPU
-#error PARSE_PROC_CPU not defined! Maybe your arch is not supported yet;
-#error please send me your /proc/cpuinfo and/or 'uname -a' output to
-#error leandro@linuxmag.com.br; thanks.
-#endif
-
-static void computer_processor_info(ComputerInfo * ci)
+void
+hi_reload(gint entry)
 {
-    FILE *proccpu;
-    gchar buffer[128];
-
-    proccpu = fopen("/proc/cpuinfo", "r");
-    while (fgets(buffer, 128, proccpu)) {
-	gchar *buf = buffer;
-
-	buf = g_strstrip(buf);
-
-	PARSE_PROC_CPU();
-    }
-    fclose(proccpu);
-
-#ifdef ARCH_PPC
-    {
-	gchar *proctemp;
-
-	proctemp = g_strdup_printf("PowerPC %s", ci->processor);
-	g_free(ci->processor);
-	ci->processor = proctemp;
+    switch (entry) {
+    case COMPUTER_FILESYSTEMS:
+	scan_filesystems();
+	break;
+    case COMPUTER_NETWORK:
+	scan_net_interfaces();
+	break;
+    case COMPUTER_SENSORS:
+	read_sensors();
+	break;
     }
-#endif
-#ifdef ARCH_m68k
-    {
-	gchar *proctemp;
-
-	proctemp = g_strdup_printf("Motorola %s", ci->processor);
-	g_free(ci->processor);
-	ci->processor = proctemp;
-    }
-#endif
-
 }
 
-ComputerInfo *computer_get_info(void)
+gchar *
+hi_more_info(gchar * entry)
 {
-    gint i;
-    struct stat st;
-    ComputerInfo *ci;
-    struct utsname utsbuf;
-
-    ci = g_new0(ComputerInfo, 1);
-
-    for (i = 0;; i++) {
-	if (distro_db[i].file == NULL) {
-	    ci->distrocode = g_strdup("unk");
-	    ci->distroinfo = g_strdup(_("Unknown distribution"));
-	    break;
-	}
-
-	if (!stat(distro_db[i].file, &st)) {
-	    FILE *distro_ver;
-	    char buf[128];
-
-	    distro_ver = fopen(distro_db[i].file, "r");
-	    fgets(buf, 128, distro_ver);
-	    fclose(distro_ver);
-
-	    buf[strlen(buf) - 1] = 0;
-
-	    /*
-	     * HACK: Some Debian systems doesn't include
-	     * the distribuition name in /etc/debian_release,
-	     * so add them here. 
-	     */
-	    if (!strncmp(distro_db[i].codename, "deb", 3) &&
-		((buf[0] >= '0' && buf[0] <= '9') || buf[0] != 'D')) {
-			ci->distroinfo = g_strdup_printf
-			    ("Debian GNU/Linux %s", buf);
-	    } else {
-		ci->distroinfo = g_strdup(buf);
-	    }
-
-	    ci->distrocode = g_strdup(distro_db[i].codename);
-
-	    break;
-	}
-    }
-
-    uname(&utsbuf);
-    ci->kernel = g_strdup_printf("%s %s (%s)", utsbuf.sysname,
-				 utsbuf.release, utsbuf.machine);
-
-    ci->hostname = g_strdup(utsbuf.nodename);
+    gchar *info = (gchar *) g_hash_table_lookup(moreinfo, entry);
 
-    computer_processor_info(ci);
+    if (info)
+	return g_strdup(info);
 
-    return ci;
+    return g_strdup_printf("[Empty %s]", entry);
 }
 
-/*
- * Code stolen from GKrellM <http://www.gkrellm.net>
- * Copyright (c) 1999-2002 Bill Wilson <bill@gkrellm.net>
- */
-gboolean uptime_update(gpointer data)
+gchar *
+hi_get_field(gchar * field)
 {
-    MainWindow *mainwindow = (MainWindow *) data;
-    gchar *buf;
-    gint days, hours;
-    FILE *procuptime;
-    gulong minutes = 0;
-
-    if (!mainwindow)
-	return FALSE;
-
-#define plural(a) (a == 1) ? "" : "s"
-
-    if ((procuptime = fopen("/proc/uptime", "r")) != NULL) {
-	fscanf(procuptime, "%lu", &minutes);
-	minutes /= 60;
-	fclose(procuptime);
-    } else
-	return FALSE;
-
-    hours = minutes / 60;
-    minutes %= 60;
-    days = hours / 24;
-    hours %= 24;
-
-    if (days < 1) {
-	buf = g_strdup_printf(_("%d hour%s and %ld minute%s"), hours,
-			      plural(hours), minutes, plural(minutes));
+    gchar *tmp;
+
+    if (!strcmp(field, "Memory")) {
+	MemoryInfo *mi;
+
+	mi = computer_get_memory();
+	tmp = g_strdup_printf("%dMB (%dMB used)", mi->total, mi->used);
+
+	g_free(mi);
+    } else if (!strcmp(field, "Random")) {
+        return g_strdup_printf("%d", rand() % 200);
+    } else if (!strcmp(field, "Uptime")) {
+	tmp = computer_get_formatted_uptime();
+    } else if (!strcmp(field, "Date/Time")) {
+	time_t t = time(NULL);
+
+	tmp = g_new0(gchar, 32);
+	strftime(tmp, 32, "%D / %R", localtime(&t));
+    } else if (!strcmp(field, "Load Average")) {
+	tmp = computer_get_formatted_loadavg();
     } else {
-	buf =
-	    g_strdup_printf(_("%d day%s, %d hour%s and %ld minute%s"),
-			    days, plural(days), hours, plural(hours),
-			    minutes, plural(minutes));
+	tmp = g_strdup("");
     }
 
-    gtk_label_set_text(GTK_LABEL(mainwindow->uptime), buf);
-    g_free(buf);
-
-    return TRUE;
-}
-
-GtkWidget *os_get_widget(MainWindow * mainwindow)
-{
-    GtkWidget *label, *hbox;
-    GtkWidget *table;
-    GtkWidget *pixmap;
-    gchar *buf;
-    ComputerInfo *info;
-
-    if (!mainwindow)
-	return NULL;
-
-    info = computer_get_info();
-
-    hbox = gtk_hbox_new(FALSE, 0);
-    gtk_widget_show(hbox);
-
-    buf =
-	g_strdup_printf("%s/distro/%s.png", IMG_PREFIX, info->distrocode);
-    pixmap = gtk_image_new_from_file(buf);
-    gtk_widget_set_usize(GTK_WIDGET(pixmap), 64, 0);
-    gtk_widget_show(pixmap);
-    gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 0);
-    g_free(buf);
-
-    table = gtk_table_new(4, 2, FALSE);
-    gtk_widget_show(table);
-    gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 0);
-    gtk_container_set_border_width(GTK_CONTAINER(table), 10);
-    gtk_table_set_row_spacings(GTK_TABLE(table), 4);
-    gtk_table_set_col_spacings(GTK_TABLE(table), 4);
-
-    /*
-     * Table headers
-     */
-    label = gtk_label_new(_("<b>Computer name:</b>"));
-    gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-    gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
-    gtk_widget_show(label);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
-    label = gtk_label_new(_("<b>Distribution:</b>"));
-    gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-    gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 1, 2);
-    gtk_widget_show(label);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
-    label = gtk_label_new(_("<b>Kernel:</b>"));
-    gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-    gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);
-    gtk_widget_show(label);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
-    label = gtk_label_new(_("<b>Uptime:</b>"));
-    gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-    gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 3, 4);
-    gtk_widget_show(label);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
-
-    /*
-     * Table content 
-     */
-    label = gtk_label_new(info->hostname);
-    gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 0, 1);
-    gtk_widget_show(label);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
-    label = gtk_label_new(info->distroinfo);
-    gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 1, 2);
-    gtk_widget_show(label);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
-    label = gtk_label_new(info->kernel);
-    gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 2, 3);
-    gtk_widget_show(label);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
-    label = gtk_label_new(_("Updating..."));
-    gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, 3, 4);
-    gtk_widget_show(label);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-    mainwindow->uptime = label;
-
-    uptime_update(mainwindow);
-    gtk_timeout_add(30000, uptime_update, mainwindow);
-
-    g_free(info);
-
-    return hbox;
+    return tmp;
 }
 
-gboolean memory_update(gpointer data)
+gchar *
+hi_info(gint entry)
 {
-    MainWindow *mainwindow = (MainWindow *) data;
-    MemoryInfo *mi;
-
-    if (!mainwindow)
-	return FALSE;
-
-    mi = memory_get_info();
+    static Computer *computer = NULL;
+    static gchar *tmp = NULL;
 
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mainwindow->membar),
-				  mi->ratio);
+    /*if (tmp != NULL) {
+       g_free(tmp);
+       tmp = NULL;
+    } */
 
-    g_free(mi);
+    if (!computer) {
+	computer = computer_get_info();
+    }
 
-    return TRUE;
+    switch (entry) {
+    case COMPUTER_NETWORK:
+        return g_strdup_printf("[$ShellParam$]\n"
+                               "ReloadInterval=3000\n"
+                               "ViewType=1\n"
+                               "%s", network_interfaces);
+    case COMPUTER_SENSORS:
+        return g_strdup_printf("[$ShellParam$]\n"
+                               "ReloadInterval=3000\n"
+                               "%s", sensors);
+    case COMPUTER_SHARES:
+        return g_strdup_printf("[SAMBA]\n"
+                               "%s", shares_list);
+    case COMPUTER_FILESYSTEMS:
+	return g_strdup_printf("[$ShellParam$]\n"
+			       "ViewType=1\n"
+			       "ReloadInterval=5000\n"
+			       "[Mounted File Systems]\n%s\n", fs_list);
+    case COMPUTER_SUMMARY:
+	tmp = computer_get_alsacards(computer);
+	return g_strdup_printf("[$ShellParam$]\n"
+			       "UpdateInterval$Memory=1000\n"
+			       "UpdateInterval$Date/Time=1000\n"
+			       "[Computer]\n"
+			       "Processor=%s\n"
+			       "Memory=...\n"
+			       "Operating System=%s\n"
+			       "User Name=%s\n"
+			       "Date/Time=%s\n"
+			       "[Display]\n"
+			       "Resolution=%dx%d pixels\n"
+			       "OpenGL Renderer=%s\n"
+			       "X11 Vendor=%s\n"
+			       "[Multimedia]\n"
+			       "%s\n"
+			       "#[Storage]\n"
+			       "#IDE Controller=\n"
+			       "#SCSI Controller=\n"
+			       "#Floppy Drive=\n"
+			       "#Disk Drive=\n",
+			       computer->processor->model_name,
+			       computer->os->distro,
+			       computer->os->username,
+			       computer->date_time,
+			       computer->display->width,
+			       computer->display->height,
+			       computer->display->ogl_renderer,
+			       computer->display->vendor,
+			       tmp);
+    case COMPUTER_DISPLAY:
+        return g_strdup_printf("[Display]\n"
+                               "Resolution=%dx%d pixels\n"
+                               "Vendor=%s\n"
+                               "Version=%s\n"
+                               "[Monitors]\n"
+                               "%s"
+                               "[Extensions]\n"
+                               "%s"
+                               "[OpenGL]\n"
+                               "Vendor=%s\n"
+                               "Renderer=%s\n"
+                               "Version=%s\n",
+                               computer->display->width,
+                               computer->display->height,
+                               computer->display->vendor,
+                               computer->display->version,
+                               computer->display->monitors,
+                               computer->display->extensions,
+                               computer->display->ogl_vendor,
+                               computer->display->ogl_renderer,
+                               computer->display->ogl_version);
+    case COMPUTER_OPERATING_SYSTEM:
+	tmp = computer_get_formatted_uptime();
+	return g_strdup_printf("[$ShellParam$]\n"
+			       "UpdateInterval$Uptime=10000\n"
+			       "UpdateInterval$Load Average=1000\n"
+			       "[Version]\n"
+			       "Kernel=%s\n"
+			       "Compiled=%s\n"
+			       "C Library=%s\n"
+			       "Distribution=%s\n"
+			       "[Current Session]\n"
+			       "Computer Name=%s\n"
+			       "User Name=%s\n"
+			       "#Language=%s\n"
+			       "Home Directory=%s\n"
+			       "Desktop Environment=%s\n"
+			       "[Misc]\n"
+			       "Uptime=%s\n"
+			       "Load Average=...",
+			       computer->os->kernel,
+			       computer->os->compiled_date,
+			       computer->os->libc,
+			       computer->os->distro,
+			       computer->os->hostname,
+			       computer->os->username,
+			       computer->os->language,
+			       computer->os->homedir,
+			       computer->os->desktop, tmp);
+    case COMPUTER_LANGUAGE:
+	return g_strdup_printf("[$ShellParam$]\n"
+			       "ViewType=1\n"
+			       "[Available Languages]\n"
+			       "%s", computer->os->languages);
+    case COMPUTER_PROCESSORS:
+        return processor_get_info(computer->processor);
+    default:
+	return g_strdup("[Empty]\nNo info available=");
+    }
 }
 
-GtkWidget *memory_get_widget(MainWindow * mainwindow)
+gint
+hi_n_entries(void)
 {
-    GtkWidget *label, *vbox, *hbox, *hbox2, *progress;
-    GtkWidget *pixmap;
-    MemoryInfo *mi;
-    gchar *buf;
-
-    mi = memory_get_info();
-
-    hbox = gtk_hbox_new(FALSE, 0);
-    gtk_widget_show(hbox);
-
-    buf = g_strdup_printf("%s/mem.png", IMG_PREFIX);
-    pixmap = gtk_image_new_from_file(buf);
-    gtk_widget_set_usize(GTK_WIDGET(pixmap), 64, 0);
-    gtk_widget_show(pixmap);
-    gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 0);
-    g_free(buf);
-
-    vbox = gtk_vbox_new(FALSE, 0);
-    gtk_widget_show(vbox);
-    gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
-    gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
-    gtk_box_set_spacing(GTK_BOX(vbox), 4);
-
-    hbox2 = gtk_hbox_new(FALSE, 5);
-    gtk_widget_show(hbox2);
-    gtk_box_pack_start(GTK_BOX(vbox), hbox2, TRUE, TRUE, 0);
-
-    label = gtk_label_new("0MB");
-    gtk_widget_show(label);
-    gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-
-    buf = g_strdup_printf("%dMB", mi->total);
-    label = gtk_label_new(buf);
-    gtk_widget_show(label);
-    gtk_box_pack_end(GTK_BOX(hbox2), label, FALSE, FALSE, 0);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-    g_free(buf);
-
-    progress = gtk_progress_bar_new();
-    mainwindow->membar = progress;
-    gtk_widget_show(progress);
-    gtk_box_pack_start(GTK_BOX(vbox), progress, TRUE, TRUE, 0);
-
-    memory_update(mainwindow);
-
-    gtk_timeout_add(2000, memory_update, mainwindow);
-
-    g_free(mi);
-    return hbox;
+    return G_N_ELEMENTS(hi_entries) - 1;
 }
 
-GtkWidget *processor_get_widget(void)
+GdkPixbuf *
+hi_icon(gint entry)
 {
-    GtkWidget *label, *vbox, *hbox;
-    GtkWidget *pixmap;
-    ComputerInfo *info;
-    gchar *buf;
-
-    info = computer_get_info();
-
-    hbox = gtk_hbox_new(FALSE, 0);
-    gtk_widget_show(hbox);
-
-    buf = g_strdup_printf("%s/cpu.png", IMG_PREFIX);
-    pixmap = gtk_image_new_from_file(buf);
-    gtk_widget_set_usize(GTK_WIDGET(pixmap), 64, 0);
-    gtk_widget_show(pixmap);
-    gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 0);
-    g_free(buf);
-
-    vbox = gtk_vbox_new(FALSE, 0);
-    gtk_widget_show(vbox);
-    gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
-    gtk_container_set_border_width(GTK_CONTAINER(vbox), 10);
-    gtk_box_set_spacing(GTK_BOX(vbox), 4);
-
-    buf = g_strdup_printf(_("<b>%s</b> at %d MHz"),
-			  info->processor, info->frequency);
-
-    label = gtk_label_new(buf);
-    gtk_widget_show(label);
-    gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
-    gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-    g_free(buf);
-
-#ifdef ARCH_i386
-    buf = g_strdup_printf(_("Family %d, model %d, stepping %d"),
-			  info->family, info->model, info->stepping);
-    label = gtk_label_new(buf);
-    gtk_widget_show(label);
-    gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-    gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-    g_free(buf);
-#endif
-
-    if (info->cachel2) {
-	buf = g_strdup_printf(_("%d KB L2 cache"), info->cachel2);
-	label = gtk_label_new(buf);
-	gtk_widget_show(label);
-
-	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	g_free(buf);
-    }
+    return icon_cache_get_pixbuf(hi_entries[entry].icon);
+}
 
-    g_free(info);
-    return hbox;
+gchar *
+hi_name(gint entry)
+{
+    return hi_entries[entry].name;
 }