FOSS/xfce4-taskmanager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly display the memory usage and fix signal connected on the show_cached_as_free menu item

Browse Source 
(Old svn revision: 4756)
This commit is contained in:
Mike Massonnet
2008-05-09 12:22:59 +00:00
parent 8f6ca38ea2
commit 526fd83c60
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/functions.c
View File

@@ -128,8 +128,9 @@ gboolean refresh_task_list(void)
if ( show_cached_as_free ) if ( show_cached_as_free )
{ {
memory_used-=sys_stat->mem_cached; memory_used-=sys_stat->mem_cached;
memory_used-=sys_stat->mem_buffers;
} }
mem_tooltip = g_strdup_printf (_("%d kB of %d kB used"), memory_used / 1024, sys_stat->mem_total / 1024); mem_tooltip = g_strdup_printf (_("%d MB of %d MB used"), memory_used / 1024, sys_stat->mem_total / 1024);
gtk_tooltips_set_tip (tooltips, mem_usage_progress_bar_box, mem_tooltip, NULL); gtk_tooltips_set_tip (tooltips, mem_usage_progress_bar_box, mem_tooltip, NULL);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (mem_usage_progress_bar), (gdouble)memory_used / sys_stat->mem_total); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (mem_usage_progress_bar), (gdouble)memory_used / sys_stat->mem_total);

2
src/interface.c
View File

@@ -313,7 +313,7 @@ GtkWidget* create_mainmenu (void)
g_signal_connect ((gpointer) show_user_tasks1, "toggled", G_CALLBACK (on_show_tasks_toggled), (void *)own_uid); g_signal_connect ((gpointer) show_user_tasks1, "toggled", G_CALLBACK (on_show_tasks_toggled), (void *)own_uid);
g_signal_connect ((gpointer) show_root_tasks1, "toggled", G_CALLBACK (on_show_tasks_toggled), (void *)0); g_signal_connect ((gpointer) show_root_tasks1, "toggled", G_CALLBACK (on_show_tasks_toggled), (void *)0);
g_signal_connect ((gpointer) show_other_tasks1, "toggled", G_CALLBACK (on_show_tasks_toggled), (void *)-1); g_signal_connect ((gpointer) show_other_tasks1, "toggled", G_CALLBACK (on_show_tasks_toggled), (void *)-1);
g_signal_connect ((gpointer) show_other_tasks1, "toggled", G_CALLBACK (on_show_cached_as_free_toggled), (void *)0); g_signal_connect ((gpointer) show_cached_as_free1, "toggled", G_CALLBACK (on_show_cached_as_free_toggled), (void *)0);
gtk_menu_set_accel_group (GTK_MENU (mainmenu), accel_group); gtk_menu_set_accel_group (GTK_MENU (mainmenu), accel_group);

1
src/types.h
View File

@@ -47,6 +47,7 @@ typedef struct
guint mem_total; guint mem_total;
guint mem_free; guint mem_free;
guint mem_cached; guint mem_cached;
guint mem_buffers;
guint cpu_count; guint cpu_count;
guint cpu_idle; guint cpu_idle;
guint cpu_user; guint cpu_user;

1
src/xfce-taskmanager-linux.c
View File

@@ -248,6 +248,7 @@ gboolean get_system_status (system_status *sys_stat)
sscanf (buffer, "MemTotal:\t%u kB", &sys_stat->mem_total); sscanf (buffer, "MemTotal:\t%u kB", &sys_stat->mem_total);
sscanf (buffer, "MemFree:\t%u kB", &sys_stat->mem_free); sscanf (buffer, "MemFree:\t%u kB", &sys_stat->mem_free);
sscanf (buffer, "Cached:\t%u kB", &sys_stat->mem_cached); sscanf (buffer, "Cached:\t%u kB", &sys_stat->mem_cached);
sscanf (buffer, "Buffers:\t%u kB", &sys_stat->mem_buffers);
} }
fclose (file); fclose (file);
} }