From 3175045a216cd69ee32e3aae465e360c3c290833 Mon Sep 17 00:00:00 2001 From: Leandro Pereira Date: Wed, 29 Oct 2008 16:12:01 -0200 Subject: Add devices::getProcessorFrequency() --- hardinfo2/arch/linux/alpha/processor.h | 3 ++- hardinfo2/arch/linux/armv4l/processor.h | 4 +++- hardinfo2/arch/linux/ia64/processor.h | 4 +++- hardinfo2/arch/linux/s390/processor.h | 4 +++- hardinfo2/arch/linux/sparc/processor.h | 3 +++ 5 files changed, 14 insertions(+), 4 deletions(-) (limited to 'hardinfo2/arch/linux') diff --git a/hardinfo2/arch/linux/alpha/processor.h b/hardinfo2/arch/linux/alpha/processor.h index e6013103..1e5b014c 100644 --- a/hardinfo2/arch/linux/alpha/processor.h +++ b/hardinfo2/arch/linux/alpha/processor.h @@ -18,7 +18,7 @@ struct _Processor { gchar *model_name; - gfloat bogomips; + gfloat bogomips, cpu_mhz; gchar *strmodel; }; @@ -52,6 +52,7 @@ __scan_processors(void) gchar *tmp = g_strconcat("Alpha ", processor->model_name, NULL); g_free(processor->model_name); processor->model_name = tmp; + processor->cpu_mhz = 0.0f; fclose(cpuinfo); diff --git a/hardinfo2/arch/linux/armv4l/processor.h b/hardinfo2/arch/linux/armv4l/processor.h index b64fd5eb..82b6be04 100644 --- a/hardinfo2/arch/linux/armv4l/processor.h +++ b/hardinfo2/arch/linux/armv4l/processor.h @@ -19,7 +19,7 @@ struct _Processor { gchar *model_name; gchar *flags; - gfloat bogomips; + gfloat bogomips, cpu_mhz; gchar *has_fpu; }; @@ -53,6 +53,8 @@ __scan_processors(void) g_strfreev(tmp); } + processor->cpu_mhz = 0.0f; + fclose(cpuinfo); return g_slist_append(NULL, processor); diff --git a/hardinfo2/arch/linux/ia64/processor.h b/hardinfo2/arch/linux/ia64/processor.h index d5e01776..d3d41519 100644 --- a/hardinfo2/arch/linux/ia64/processor.h +++ b/hardinfo2/arch/linux/ia64/processor.h @@ -19,7 +19,7 @@ struct _Processor { gchar *model_name; gchar *vendor_id; - gfloat bogomips; + gfloat bogomips, cpu_mhz; gchar *strmodel; }; @@ -50,6 +50,8 @@ __scan_processors(void) } g_strfreev(tmp); } + + processor->cpu_mhz = 0.0f; fclose(cpuinfo); diff --git a/hardinfo2/arch/linux/s390/processor.h b/hardinfo2/arch/linux/s390/processor.h index 1550d239..25dab8ca 100644 --- a/hardinfo2/arch/linux/s390/processor.h +++ b/hardinfo2/arch/linux/s390/processor.h @@ -19,7 +19,7 @@ struct _Processor { gchar *vendor_id, *model_name; gint cache_size; - gfloat bogomips; + gfloat bogomips, cpu_mhz; }; static GSList * @@ -48,6 +48,8 @@ __scan_processors(void) } g_strfreev(tmp); } + + processor->cpu_mhz = 0.0f; processor->model_name = g_strconcat("S390 ", processor->vendor_id, NULL); g_free(processor->vendor_id); diff --git a/hardinfo2/arch/linux/sparc/processor.h b/hardinfo2/arch/linux/sparc/processor.h index 3bbea922..0272c963 100644 --- a/hardinfo2/arch/linux/sparc/processor.h +++ b/hardinfo2/arch/linux/sparc/processor.h @@ -19,6 +19,7 @@ struct _Processor { gchar *model_name; gchar *has_fpu; + gfloat cpu_mhz; }; static GSList * @@ -48,6 +49,8 @@ __scan_processors(void) fclose(cpuinfo); + processor->cpu_mhz = 0.0f; + return g_slist_append(NULL, processor); } -- cgit v1.2.3 From 437e43308bc69e6d40d8252bd932276e2ba68a8e Mon Sep 17 00:00:00 2001 From: 05356787 <05356787@localhost.localdomain> Date: Thu, 30 Oct 2008 08:48:41 -0200 Subject: Allow adding more information per column --- hardinfo2/arch/linux/common/net.h | 10 ++++------ hardinfo2/benchmark.c | 2 +- hardinfo2/computer.c | 3 ++- hardinfo2/shell.c | 28 +++++++++++++++++++++++----- 4 files changed, 30 insertions(+), 13 deletions(-) (limited to 'hardinfo2/arch/linux') diff --git a/hardinfo2/arch/linux/common/net.h b/hardinfo2/arch/linux/common/net.h index de978ee1..23cfa9da 100644 --- a/hardinfo2/arch/linux/common/net.h +++ b/hardinfo2/arch/linux/common/net.h @@ -314,7 +314,7 @@ static void scan_net_interfaces_24(void) gint trash; gchar ifacename[16]; gchar *buf = buffer; - gchar *iface_type, *iface_icon, *ip; + gchar *iface_type, *iface_icon; gint i; buf = g_strstrip(buf); @@ -340,13 +340,11 @@ static void scan_net_interfaces_24(void) devid = g_strdup_printf("NET%s", ifacename); - ip = g_strdup_printf(" (%s)", ni.ip); network_interfaces = h_strdup_cprintf - ("$%s$%s=Sent %.2lfMiB, received %.2lfMiB%s\n", - network_interfaces, devid, ifacename, trans_mb, recv_mb, - ni.ip[0] ? ip : ""); - g_free(ip); + ("$%s$%s=%s|Sent %.2lfMiB, received %.2lfMiB|%s\n", + network_interfaces, devid, ifacename, ni.ip[0] ? ni.ip : "", + trans_mb, recv_mb); net_get_iface_type(ifacename, &iface_type, &iface_icon, &ni); diff --git a/hardinfo2/benchmark.c b/hardinfo2/benchmark.c index f9d7926b..b1438fce 100644 --- a/hardinfo2/benchmark.c +++ b/hardinfo2/benchmark.c @@ -190,7 +190,7 @@ static gchar *__benchmark_include_results(gdouble result, "ColumnTitle$TextValue=CPU\n" "ShowColumnHeaders=true\n" "[%s]\n" - "This Machine=%.3f\n" + "This Machine=%.3f|extra1|extra2\n" "%s", order_type, benchmark, result, results); } diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c index 84e87610..379a091c 100644 --- a/hardinfo2/computer.c +++ b/hardinfo2/computer.c @@ -363,7 +363,8 @@ gchar *callback_network() "ReloadInterval=3000\n" "ViewType=1\n" "ColumnTitle$TextValue=Device\n" - "ColumnTitle$Value=Statistics\n" + "ColumnTitle$Value=IP Address\n" + "ColumnTitle$Extra1=Statistics\n" "ShowColumnHeaders=true\n" "%s", network_interfaces, network_icons); } diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c index 7487bf13..01b56fa5 100644 --- a/hardinfo2/shell.c +++ b/hardinfo2/shell.c @@ -907,16 +907,28 @@ group_handle_normal(GKeyFile * key_file, ShellModuleEntry * entry, value = entry->fieldfunc(key); } - if ((key && value) && - g_utf8_validate(key, -1, NULL) - && g_utf8_validate(value, -1, NULL)) { + if ((key && value) && g_utf8_validate(key, -1, NULL) && g_utf8_validate(value, -1, NULL)) { if (ngroups == 1) { gtk_tree_store_append(store, &child, NULL); } else { gtk_tree_store_append(store, &child, &parent); } - gtk_tree_store_set(store, &child, INFO_TREE_COL_VALUE, value, - -1); + + if (strchr(value, '|')) { + gchar **columns = g_strsplit(value, "|", 0); + + gtk_tree_store_set(store, &child, INFO_TREE_COL_VALUE, columns[0], -1); + if (columns[1]) { + gtk_tree_store_set(store, &child, INFO_TREE_COL_EXTRA1, columns[1], -1); + if (columns[2]) { + gtk_tree_store_set(store, &child, INFO_TREE_COL_EXTRA2, columns[2], -1); + } + } + + g_strfreev(columns); + } else { + gtk_tree_store_set(store, &child, INFO_TREE_COL_VALUE, value, -1); + } strend(key, '#'); @@ -1094,6 +1106,10 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) } store = GTK_TREE_STORE(shell->info->model); + + g_object_ref(shell->info->model); + gtk_tree_view_set_model(GTK_TREE_VIEW(shell->info->view), NULL); + gtk_tree_store_clear(store); g_key_file_load_from_data(key_file, key_data, strlen(key_data), 0, @@ -1117,6 +1133,8 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) g_strfreev(keys); } + g_object_unref(shell->info->model); + gtk_tree_view_set_model(GTK_TREE_VIEW(shell->info->view), shell->info->model); gtk_tree_view_expand_all(GTK_TREE_VIEW(shell->info->view)); if (shell->view_type == SHELL_VIEW_PROGRESS) { -- cgit v1.2.3 From ff03a5d1bf53392f324e4653764b3079bd94c4bf Mon Sep 17 00:00:00 2001 From: 05356787 <05356787@localhost.localdomain> Date: Thu, 30 Oct 2008 09:17:45 -0200 Subject: Cleanups --- hardinfo2/arch/linux/common/filesystem.h | 4 ++-- hardinfo2/arch/linux/common/net.h | 5 ++--- hardinfo2/computer.c | 3 ++- hardinfo2/shell.c | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'hardinfo2/arch/linux') diff --git a/hardinfo2/arch/linux/common/filesystem.h b/hardinfo2/arch/linux/common/filesystem.h index 3581ccbb..b3008387 100644 --- a/hardinfo2/arch/linux/common/filesystem.h +++ b/hardinfo2/arch/linux/common/filesystem.h @@ -81,9 +81,9 @@ scan_filesystems(void) stravail); g_hash_table_insert(moreinfo, g_strdup_printf("FS%d", ++count), strhash); - fs_list = h_strdup_cprintf("$FS%d$%s=%s total, %s free\n", + fs_list = h_strdup_cprintf("$FS%d$%s=%s|%s\n", fs_list, - count, tmp[0], strsize, stravail); + count, tmp[0], stravail, strsize); g_free(strsize); g_free(stravail); diff --git a/hardinfo2/arch/linux/common/net.h b/hardinfo2/arch/linux/common/net.h index 23cfa9da..8c083a9e 100644 --- a/hardinfo2/arch/linux/common/net.h +++ b/hardinfo2/arch/linux/common/net.h @@ -342,12 +342,11 @@ static void scan_net_interfaces_24(void) network_interfaces = h_strdup_cprintf - ("$%s$%s=%s|Sent %.2lfMiB, received %.2lfMiB|%s\n", + ("$%s$%s=%s|Sent %.2lfMiB, received %.2lfMiB\n", network_interfaces, devid, ifacename, ni.ip[0] ? ni.ip : "", trans_mb, recv_mb); - net_get_iface_type(ifacename, &iface_type, &iface_icon, &ni); - + network_icons = h_strdup_cprintf("Icon$%s$%s=%s.png\n", network_icons, devid, ifacename, iface_icon); diff --git a/hardinfo2/computer.c b/hardinfo2/computer.c index 379a091c..74244762 100644 --- a/hardinfo2/computer.c +++ b/hardinfo2/computer.c @@ -316,7 +316,8 @@ gchar *callback_fs() "ViewType=1\n" "ReloadInterval=5000\n" "ColumnTitle$TextValue=Mount Point\n" - "ColumnTitle$Value=Total / Free Space\n" + "ColumnTitle$Value=Free\n" + "ColumnTitle$Extra1=Total\n" "ShowColumnHeaders=true\n" "[Mounted File Systems]\n%s\n", fs_list); } diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c index 01b56fa5..2a61246b 100644 --- a/hardinfo2/shell.c +++ b/hardinfo2/shell.c @@ -1109,6 +1109,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) g_object_ref(shell->info->model); gtk_tree_view_set_model(GTK_TREE_VIEW(shell->info->view), NULL); + gdk_window_freeze_updates(shell->window->window); gtk_tree_store_clear(store); @@ -1141,6 +1142,7 @@ module_selected_show_info(ShellModuleEntry * entry, gboolean reload) update_progress(); } + gdk_window_thaw_updates(shell->window->window); shell_set_note_from_entry(entry); g_strfreev(groups); -- cgit v1.2.3