gnome-system-monitor-01-solaris.diff revision 9595
9822N/Adiff -Nrup gnome-system-monitor-2.17.4/src/callbacks.cpp gnome-system-monitor-2.17.4.mod/src/callbacks.cpp
9822N/A--- gnome-system-monitor-2.17.4/src/callbacks.cpp 2006-07-14 03:24:49.000000000 +0800
9822N/A+++ gnome-system-monitor-2.17.4.mod/src/callbacks.cpp 2006-11-13 20:26:32.071084000 +0800
9822N/A@@ -460,7 +460,11 @@
9822N/A return FALSE;
8405N/A }
8405N/A
9822N/A- return TRUE;
8405N/A+ procdata->timeout = g_timeout_add(new_interval,
8405N/A+ cb_timeout,
9370N/A+ procdata);
8405N/A+
8405N/A+ return FALSE;
8405N/A }
8405N/A
8405N/A
8405N/Adiff -Nrup gnome-system-monitor-2.17.2.1/src/callbacks.h gnome-system-monitor-2.17.2.1.mod/src/callbacks.h
8405N/A--- gnome-system-monitor-2.17.2.1/src/callbacks.h 2005-07-13 22:35:04.000000000 +0800
8405N/A+++ gnome-system-monitor-2.17.2.1.mod/src/callbacks.h 2006-11-13 20:26:32.071324000 +0800
8405N/A@@ -26,64 +26,64 @@
8405N/A #include <libgnomevfs/gnome-vfs.h>
8405N/A
8405N/A
8405N/A-void cb_show_memory_maps (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_show_open_files (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_show_lsof(GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_renice (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_end_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_kill_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_hide_process (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_show_hidden_processes (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_edit_preferences (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_help_contents (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_about (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_app_exit (GtkAction *action, gpointer data) G_GNUC_INTERNAL;
8405N/A-gboolean cb_app_delete (GtkWidget *window, GdkEventAny *event, gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_end_process_button_pressed (GtkButton *button, gpointer data) G_GNUC_INTERNAL;
8405N/A-void cb_logout (GtkButton *button, gpointer data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_info_button_pressed (GtkButton *button, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-
8405N/A-void cb_cpu_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
8405N/A-void cb_mem_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
9822N/A-void cb_swap_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
9822N/A-void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
9822N/A-void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
9822N/A-void cb_bg_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
9822N/A-void cb_frame_color_changed (GtkColorButton *widget, gpointer user_data) G_GNUC_INTERNAL;
9822N/A-
9822N/A-void cb_row_selected (GtkTreeSelection *selection, gpointer data) G_GNUC_INTERNAL;
9822N/A-
9822N/A-gboolean cb_tree_popup_menu (GtkWidget *widget, gpointer data) G_GNUC_INTERNAL;
9822N/A-gboolean cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event,
9822N/A- gpointer data) G_GNUC_INTERNAL;
9822N/A-
9822N/A-
9822N/A-void cb_change_current_page (GtkNotebook *nb,
9822N/A- gint num, gpointer data) G_GNUC_INTERNAL;
9822N/A-void cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,
9822N/A- gint num, gpointer data) G_GNUC_INTERNAL;
9822N/A+G_GNUC_INTERNAL void cb_show_memory_maps (GtkAction *action, gpointer data);
9822N/A+G_GNUC_INTERNAL void cb_show_open_files (GtkAction *action, gpointer data);
9822N/A+G_GNUC_INTERNAL void cb_show_lsof(GtkAction *action, gpointer data);
8405N/A+G_GNUC_INTERNAL void cb_renice (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_end_process (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_kill_process (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_hide_process (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_show_hidden_processes (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_edit_preferences (GtkAction *action, gpointer data);
9370N/A+
9370N/A+G_GNUC_INTERNAL void cb_help_contents (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_about (GtkAction *action, gpointer data);
8405N/A+
9370N/A+G_GNUC_INTERNAL void cb_app_exit (GtkAction *action, gpointer data);
9370N/A+G_GNUC_INTERNAL gboolean cb_app_delete (GtkWidget *window, GdkEventAny *event, gpointer data);
8405N/A+
9370N/A+G_GNUC_INTERNAL void cb_end_process_button_pressed (GtkButton *button, gpointer data);
9370N/A+G_GNUC_INTERNAL void cb_logout (GtkButton *button, gpointer data);
8405N/A+
9370N/A+G_GNUC_INTERNAL void cb_info_button_pressed (GtkButton *button, gpointer user_data);
9370N/A+
8405N/A+G_GNUC_INTERNAL void cb_cpu_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+G_GNUC_INTERNAL void cb_mem_color_changed (GtkColorButton *widget, gpointer user_data);
8405N/A+G_GNUC_INTERNAL void cb_swap_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+G_GNUC_INTERNAL void cb_net_in_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+G_GNUC_INTERNAL void cb_net_out_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+G_GNUC_INTERNAL void cb_bg_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+G_GNUC_INTERNAL void cb_frame_color_changed (GtkColorButton *widget, gpointer user_data);
9370N/A+
9370N/A+G_GNUC_INTERNAL void cb_row_selected (GtkTreeSelection *selection, gpointer data);
9370N/A+
8405N/A+G_GNUC_INTERNAL gboolean cb_tree_popup_menu (GtkWidget *widget, gpointer data);
9370N/A+G_GNUC_INTERNAL gboolean cb_tree_button_pressed (GtkWidget *widget, GdkEventButton *event,
9370N/A+ gpointer data);
8405N/A+
9370N/A+
8405N/A+G_GNUC_INTERNAL void cb_change_current_page (GtkNotebook *nb,
8405N/A+ gint num, gpointer data);
8405N/A+G_GNUC_INTERNAL void cb_switch_page (GtkNotebook *nb, GtkNotebookPage *page,
9370N/A+ gint num, gpointer data);
8405N/A
9370N/A-gint cb_update_disks (gpointer data) G_GNUC_INTERNAL;
9822N/A-gint cb_timeout (gpointer data) G_GNUC_INTERNAL;
9370N/A+G_GNUC_INTERNAL gint cb_update_disks (gpointer data);
9799N/A+gint cb_timeout (gpointer data);
9822N/A
8405N/A-void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,
9822N/A+G_GNUC_INTERNAL void cb_volume_mounted_or_unmounted(GnomeVFSVolumeMonitor *vfsvolumemonitor,
9370N/A GnomeVFSVolume *vol,
9822N/A- gpointer procdata) G_GNUC_INTERNAL;
8405N/A+ gpointer procdata);
9822N/A
9370N/A-void cb_radio_processes(GtkAction *action,
9822N/A+G_GNUC_INTERNAL void cb_radio_processes(GtkAction *action,
9822N/A GtkRadioAction *current,
8405N/A- gpointer data) G_GNUC_INTERNAL;
9370N/A+ gpointer data);
9822N/A
8405N/A
9370N/A
9822N/A-void cb_kill_sigstop(GtkAction *action,
8405N/A- gpointer data) G_GNUC_INTERNAL;
9822N/A+G_GNUC_INTERNAL void cb_kill_sigstop(GtkAction *action,
9822N/A+ gpointer data);
9822N/A
9822N/A-void cb_kill_sigcont(GtkAction *action,
8922N/A- gpointer data) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL void cb_kill_sigcont(GtkAction *action,
8922N/A+ gpointer data);
8922N/A
8922N/A #endif /* _PROCMAN_CALLBACKS_H_ */
8922N/Adiff -Nrup gnome-system-monitor-2.16.1/src/favorites.h gnome-system-monitor-2.16.1.mod/src/favorites.h
8922N/A--- gnome-system-monitor-2.16.1/src/favorites.h 2005-03-17 17:23:13.000000000 +0800
8922N/A+++ gnome-system-monitor-2.16.1.mod/src/favorites.h 2006-11-13 20:26:32.076242000 +0800
8922N/A@@ -26,15 +26,15 @@
8922N/A
9822N/A #include "procman.h"
8922N/A
8922N/A-void save_blacklist (ProcData *procdata, GConfClient *client) G_GNUC_INTERNAL;
9822N/A-void add_to_blacklist (ProcData *procdata, gchar *name) G_GNUC_INTERNAL;
8922N/A-void add_selected_to_blacklist (ProcData *procdata) G_GNUC_INTERNAL;
9822N/A-void remove_from_blacklist (ProcData *procdata, gchar *name) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL void save_blacklist (ProcData *procdata, GConfClient *client);
8922N/A+G_GNUC_INTERNAL void add_to_blacklist (ProcData *procdata, gchar *name);
8922N/A+G_GNUC_INTERNAL void add_selected_to_blacklist (ProcData *procdata);
8922N/A+G_GNUC_INTERNAL void remove_from_blacklist (ProcData *procdata, gchar *name);
8922N/A
8922N/A-gboolean is_process_blacklisted (ProcData *procdata, gchar *name) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL gboolean is_process_blacklisted (ProcData *procdata, gchar *name);
9822N/A
8922N/A-void get_blacklist (ProcData *procdata, GConfClient *client) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL void get_blacklist (ProcData *procdata, GConfClient *client);
8922N/A
8922N/A-void create_blacklist_dialog (ProcData *procdata) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL void create_blacklist_dialog (ProcData *procdata);
8922N/A
9822N/A #endif
8922N/Adiff -Nrup gnome-system-monitor-2.17.4/src/interface.cpp gnome-system-monitor-2.17.4.mod/src/interface.cpp
8922N/A--- gnome-system-monitor-2.17.4/src/interface.cpp 2006-08-18 00:50:42.000000000 +0800
8922N/A+++ gnome-system-monitor-2.17.4.mod/src/interface.cpp 2006-11-13 20:26:32.065079000 +0800
8922N/A@@ -250,12 +250,13 @@
8922N/A GtkWidget *cpu_box, *mem_box, *net_box;
8922N/A GtkWidget *cpu_hbox, *mem_hbox, *net_hbox;
8922N/A GtkWidget *cpu_graph_box, *mem_graph_box, *net_graph_box;
8922N/A- GtkWidget *label,*cpu_label, *spacer;
8922N/A+ GtkWidget *label,*label2,*label3, *label4,*label5, *cpu_label, *spacer;
8922N/A GtkWidget *table;
9822N/A GtkWidget *color_picker;
8922N/A GtkSizeGroup *sizegroup;
8922N/A LoadGraph *cpu_graph, *mem_graph, *net_graph;
8922N/A gint i;
9822N/A+ AtkObject *colorWidget, *label1Widget, *label2Widget, *label3Widget, *label4Widget, *label5Widget;
9822N/A
8922N/A
8922N/A vbox = gtk_vbox_new (FALSE, 18);
9822N/A@@ -304,6 +305,7 @@
9822N/A
9595N/A color_picker = gtk_color_button_new_with_color (
8922N/A &load_graph_get_colors(cpu_graph)[2+i]);
8922N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
9595N/A
8922N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
8922N/A G_CALLBACK (cb_cpu_color_changed), GINT_TO_POINTER (i));
9595N/A@@ -316,10 +318,21 @@
8922N/A text = g_strdup_printf (_("CPU%d:"), i+1);
8922N/A }
9822N/A label = gtk_label_new (text);
9595N/A+ /* in order to support accessibility, add the relationship between label and button */
9822N/A+ label1Widget = gtk_widget_get_accessible (label);
9595N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9822N/A+
8922N/A gtk_box_pack_start (GTK_BOX (temp_hbox), label, FALSE, FALSE, 6);
8922N/A g_free (text);
8922N/A
8922N/A cpu_label = gtk_label_new (NULL);
9595N/A+ /* in order to support accessibility, add the relationship between button and cpu_label */
9595N/A+ label2Widget = gtk_widget_get_accessible (cpu_label);
8922N/A+ atk_object_add_relationship (label2Widget, ATK_RELATION_LABEL_FOR, colorWidget);
9595N/A+ /* in order to support accessibility, add the relationship between button and label/cpu_label */
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label1Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label2Widget);
8922N/A+
8922N/A gtk_box_pack_start (GTK_BOX (temp_hbox), cpu_label, FALSE, FALSE, 0);
8922N/A load_graph_get_labels(cpu_graph)->cpu[i] = cpu_label;
8922N/A
8922N/A@@ -360,21 +373,32 @@
8922N/A gtk_box_pack_start (GTK_BOX (mem_graph_box), table,
9822N/A FALSE, FALSE, 0);
8922N/A
8922N/A+/* Draw User usage */
8922N/A color_picker = gtk_color_button_new_with_color (
8922N/A &load_graph_get_colors(mem_graph)[2]);
8922N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
9595N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
9822N/A G_CALLBACK (cb_mem_color_changed), procdata);
9822N/A gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
9822N/A
8922N/A label = gtk_label_new (_("User memory:"));
8922N/A+ label1Widget = gtk_widget_get_accessible (label);
9595N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9595N/A gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
9596N/A-
9822N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memused),
9822N/A+
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label2 = load_graph_get_labels(mem_graph)->memused;
9595N/A+ label2Widget = gtk_widget_get_accessible (label2);
9595N/A+ atk_object_add_relationship (label2Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9595N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memused),*/
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label2),
8922N/A 0.0,
8922N/A 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table),
9799N/A- load_graph_get_labels(mem_graph)->memused,
9799N/A+ /*load_graph_get_labels(mem_graph)->memused,*/
9799N/A+ label2,
9799N/A 2,
9799N/A 3,
9799N/A 0,
9822N/A@@ -384,12 +408,21 @@
8922N/A 0,
8922N/A 0);
8922N/A
9822N/A- label = gtk_label_new (_("of"));
9822N/A- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A- gtk_table_attach (GTK_TABLE (table), label, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
8922N/A+ label3 = gtk_label_new (_("of"));
8922N/A+ label3Widget = gtk_widget_get_accessible (label3);
8922N/A+ atk_object_add_relationship (label3Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9822N/A+ gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5);
8922N/A+ gtk_table_attach (GTK_TABLE (table), label3, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
8922N/A
8922N/A
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memtotal),
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label4 = load_graph_get_labels(mem_graph)->memtotal;
8922N/A+ label4Widget = gtk_widget_get_accessible (label4);
8922N/A+ atk_object_add_relationship (label4Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->memtotal),*/
9822N/A+ gtk_misc_set_alignment (GTK_MISC (label4),
9822N/A 0.0,
9799N/A 0.5);
9799N/A
9822N/A@@ -404,12 +437,19 @@
9799N/A 0,
9799N/A 0);
9799N/A
9799N/A+ /* in order to support accessibility, and to promote performance and readable,
9799N/A+ let's call the load_graph_get_labels() only once here */
9799N/A+ label5 = load_graph_get_labels(mem_graph)->mempercent;
9799N/A+ label5Widget = gtk_widget_get_accessible (label5);
9799N/A+ atk_object_add_relationship (label5Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->mempercent),
9595N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->mempercent),*/
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label5),
8922N/A 1.0,
9595N/A 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table),
8922N/A- load_graph_get_labels(mem_graph)->mempercent,
8922N/A+/* load_graph_get_labels(mem_graph)->mempercent,*/
9595N/A+ label5,
9595N/A 5,
8922N/A 6,
9595N/A 0,
8922N/A@@ -421,20 +461,31 @@
8922N/A
8922N/A color_picker = gtk_color_button_new_with_color (
8922N/A &load_graph_get_colors(mem_graph)[3]);
8922N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
8922N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
9595N/A G_CALLBACK (cb_swap_color_changed), procdata);
9595N/A gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A label = gtk_label_new (_("Used swap:"));
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
8922N/A+ label1Widget = gtk_widget_get_accessible (label);
8922N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swapused ),
9822N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label2 = load_graph_get_labels(mem_graph)->swapused;
8922N/A+ label2Widget = gtk_widget_get_accessible (label2);
8922N/A+ atk_object_add_relationship (label2Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label2),
9595N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swapused ),*/
9822N/A 0.0,
9822N/A 0.5);
9822N/A gtk_table_attach (GTK_TABLE (table),
8922N/A- load_graph_get_labels(mem_graph)->swapused,
8922N/A+/* load_graph_get_labels(mem_graph)->swapused,/*
9595N/A+ label2,
9595N/A 2,
8922N/A 3,
9822N/A 1,
9822N/A@@ -444,16 +495,26 @@
8922N/A 0,
8922N/A 0);
8922N/A
9595N/A- label = gtk_label_new (_("of"));
9595N/A- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A- gtk_table_attach (GTK_TABLE (table), label, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
8922N/A+ label3 = gtk_label_new (_("of"));
8922N/A+ label3Widget = gtk_widget_get_accessible (label3);
8922N/A+ atk_object_add_relationship (label3Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5);
8922N/A+ gtk_table_attach (GTK_TABLE (table), label3, 3, 4, 1, 2, GTK_FILL, 0, 0, 0);
8922N/A
8922N/A
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swaptotal),
9822N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label4 = load_graph_get_labels(mem_graph)->swaptotal;
8922N/A+ label4Widget = gtk_widget_get_accessible (label4);
8922N/A+ atk_object_add_relationship (label4Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label4),
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swaptotal),*/
8922N/A 0.0,
8922N/A 0.5);
9822N/A gtk_table_attach (GTK_TABLE (table),
9822N/A- load_graph_get_labels(mem_graph)->swaptotal,
8922N/A+/* load_graph_get_labels(mem_graph)->swaptotal,*/
8922N/A+ label4,
8922N/A 4,
9595N/A 5,
9595N/A 1,
9595N/A@@ -463,12 +524,19 @@
9595N/A 0,
9595N/A 0);
9822N/A
9822N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label5 = load_graph_get_labels(mem_graph)->swappercent;
9822N/A+ label5Widget = gtk_widget_get_accessible (label5);
8922N/A+ atk_object_add_relationship (label5Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swappercent),
9595N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(mem_graph)->swappercent),*/
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label5),
8922N/A 1.0,
9595N/A 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table),
8922N/A- load_graph_get_labels(mem_graph)->swappercent,
8922N/A+/* load_graph_get_labels(mem_graph)->swappercent,*/
9595N/A+ label5,
9595N/A 5,
8922N/A 6,
9595N/A 1,
8922N/A@@ -478,6 +546,13 @@
9822N/A 0,
9822N/A 0);
8922N/A
8922N/A+ /* in order to support accessibility, add the relationship between button and label */
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label1Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label2Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label3Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label4Widget);
9595N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label5Widget);
9595N/A+
8922N/A procdata->mem_graph = mem_graph;
8922N/A
8922N/A /* The net box */
8922N/A@@ -512,11 +587,15 @@
8922N/A
8922N/A color_picker = gtk_color_button_new_with_color (
8922N/A &load_graph_get_colors(net_graph)[2]);
8922N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
8922N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
8922N/A G_CALLBACK (cb_net_in_color_changed), procdata);
8922N/A gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
9595N/A
8922N/A label = gtk_label_new (_("Received:"));
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
8922N/A+ label1Widget = gtk_widget_get_accessible (label);
9595N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table), label, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A@@ -525,26 +604,43 @@
9595N/A G_CALLBACK (net_size_request), procdata);
9595N/A
8922N/A
9596N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in),
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label2 = load_graph_get_labels(net_graph)->net_in;
8922N/A+ label2Widget = gtk_widget_get_accessible (label2);
9595N/A+ atk_object_add_relationship (label2Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9595N/A+ gtk_misc_set_alignment (GTK_MISC (label2),
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in),*/
8922N/A 0.0,
8922N/A 0.5);
8922N/A gtk_box_pack_start (GTK_BOX (hbox),
8922N/A- load_graph_get_labels(net_graph)->net_in,
8922N/A+/* load_graph_get_labels(net_graph)->net_in,*/
8922N/A+ label2,
8922N/A FALSE,
8922N/A FALSE,
8922N/A 0);
9822N/A
9822N/A gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A- label = gtk_label_new (_("Total:"));
9822N/A- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A- gtk_table_attach (GTK_TABLE (table), label, 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
9595N/A-
9595N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in_total),
9595N/A+ /* in order to support accessibility, add the relationship between label and button */
9595N/A+ label3 = gtk_label_new (_("Total:"));
9822N/A+ label3Widget = gtk_widget_get_accessible (label3);
8922N/A+ atk_object_add_relationship (label3Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5);
9595N/A+ gtk_table_attach (GTK_TABLE (table), label3, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
8922N/A+
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
9595N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label4 = load_graph_get_labels(net_graph)->net_in_total;
8922N/A+ label4Widget = gtk_widget_get_accessible (label4);
8922N/A+ atk_object_add_relationship (label4Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9595N/A+ gtk_misc_set_alignment (GTK_MISC (label4),
9595N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_in_total),*/
8922N/A 0.0,
9595N/A 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table),
9822N/A- load_graph_get_labels(net_graph)->net_in_total,
8922N/A+/* load_graph_get_labels(net_graph)->net_in_total,*/
9822N/A+ label4,
8922N/A 4,
8922N/A 5,
8922N/A 0,
8922N/A@@ -554,13 +650,23 @@
8922N/A 0,
9595N/A 0);
9595N/A
8922N/A+ /* in order to support accessibility, add the relationship between button and label */
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label1Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label2Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label3Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label4Widget);
8922N/A+
8922N/A color_picker = gtk_color_button_new_with_color (
8922N/A &load_graph_get_colors(net_graph)[3]);
8922N/A+ colorWidget = gtk_widget_get_accessible (color_picker);
8922N/A g_signal_connect (G_OBJECT (color_picker), "color_set",
8922N/A G_CALLBACK (cb_net_out_color_changed), procdata);
9595N/A gtk_table_attach (GTK_TABLE (table), color_picker, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
8922N/A label = gtk_label_new (_("Sent:"));
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
9595N/A+ label1Widget = gtk_widget_get_accessible (label);
8922N/A+ atk_object_add_relationship (label1Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
8922N/A gtk_table_attach (GTK_TABLE (table), label, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
8922N/A
9595N/A@@ -568,26 +674,43 @@
9595N/A g_signal_connect (G_OBJECT (hbox), "size_request",
8922N/A G_CALLBACK (net_size_request), procdata);
9596N/A
8922N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out),
8922N/A+ /* in order to support accessibility, and to promote performance and readable,
8922N/A+ let's call the load_graph_get_labels() only once here */
8922N/A+ label2 = load_graph_get_labels(net_graph)->net_out;
9595N/A+ label2Widget = gtk_widget_get_accessible (label2);
9595N/A+ atk_object_add_relationship (label2Widget,ATK_RELATION_LABEL_FOR,colorWidget);
8922N/A+ gtk_misc_set_alignment (GTK_MISC (label2),
8922N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out),*/
8922N/A 0.0,
8922N/A 0.5);
8922N/A gtk_box_pack_start (GTK_BOX (hbox),
8922N/A- load_graph_get_labels(net_graph)->net_out,
8922N/A+/* load_graph_get_labels(net_graph)->net_out,*/
8922N/A+ label2,
8922N/A FALSE,
8922N/A FALSE,
9822N/A 0);
8922N/A
8922N/A gtk_table_attach (GTK_TABLE (table), hbox, 2, 3, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
9595N/A
8922N/A- label = gtk_label_new (_("Total:"));
9595N/A- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
9595N/A- gtk_table_attach (GTK_TABLE (table), label, 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
9595N/A-
9595N/A- gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out_total),
8922N/A+ /* in order to support accessibility, add the relationship between label and button */
8922N/A+ label3 = gtk_label_new (_("Total:"));
8922N/A+ label3Widget = gtk_widget_get_accessible (label3);
9595N/A+ atk_object_add_relationship (label3Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9822N/A+ gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5);
9822N/A+ gtk_table_attach (GTK_TABLE (table), label3, 3, 4, 1, 2, GTK_FILL, 0, 0, 0);
9822N/A+
9595N/A+ /* in order to support accessibility, and to promote performance and readable,
9595N/A+ let's call the load_graph_get_labels() only once here */
8405N/A+ label4 = load_graph_get_labels(net_graph)->net_out_total;
8405N/A+ label4Widget = gtk_widget_get_accessible (label4);
8405N/A+ atk_object_add_relationship (label4Widget,ATK_RELATION_LABEL_FOR,colorWidget);
9370N/A+ gtk_misc_set_alignment (GTK_MISC (label4),
8405N/A+/* gtk_misc_set_alignment (GTK_MISC (load_graph_get_labels(net_graph)->net_out_total),*/
8405N/A 0.0,
9822N/A 0.5);
9822N/A gtk_table_attach (GTK_TABLE (table),
9822N/A- load_graph_get_labels(net_graph)->net_out_total,
9822N/A+/* load_graph_get_labels(net_graph)->net_out_total,*/
8405N/A+ label4,
8405N/A 4,
9822N/A 5,
9822N/A 1,
9822N/A@@ -597,6 +720,12 @@
9822N/A 0,
9822N/A 0);
9311N/A
9311N/A+ /* in order to support accessibility, add the relationship between button and label */
9822N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label1Widget);
9822N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label2Widget);
9822N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label3Widget);
8922N/A+ atk_object_add_relationship (colorWidget, ATK_RELATION_LABELLED_BY ,label4Widget);
8922N/A+
8922N/A procdata->net_graph = net_graph;
8922N/A
8922N/A
8922N/Adiff -Nrup gnome-system-monitor-2.17.4/src/interface.h gnome-system-monitor-2.17.4.mod/src/interface.h
8922N/A--- gnome-system-monitor-2.17.4/src/interface.h 2005-03-17 22:23:42.000000000 +0800
8922N/A+++ gnome-system-monitor-2.17.4.mod/src/interface.h 2006-11-13 20:26:32.065343000 +0800
8922N/A@@ -24,9 +24,9 @@
8922N/A #include <gtk/gtk.h>
8922N/A #include "procman.h"
8922N/A
9311N/A-void create_main_window (ProcData *data) G_GNUC_INTERNAL;
9311N/A-void update_sensitivity (ProcData *data) G_GNUC_INTERNAL;
9311N/A-void do_popup_menu(ProcData *data, GdkEventButton *event) G_GNUC_INTERNAL;
8922N/A-GtkWidget * make_title_label (const char *text) G_GNUC_INTERNAL;
9822N/A+G_GNUC_INTERNAL void create_main_window (ProcData *data);
9822N/A+G_GNUC_INTERNAL void update_sensitivity (ProcData *data);
9822N/A+G_GNUC_INTERNAL void do_popup_menu(ProcData *data, GdkEventButton *event);
9799N/A+G_GNUC_INTERNAL GtkWidget * make_title_label (const char *text);
8405N/A
8405N/A #endif /* _PROCMAN_INTERFACE_H_ */
8405N/Adiff -Nrup gnome-system-monitor-2.16.1/src/load-graph.cpp gnome-system-monitor-2.16.1.mod/src/load-graph.cp
8405N/A--- gnome-system-monitor-2.16.1/src/load-graph.cpp 2006-08-18 00:50:03.000000000 +0800
8405N/A+++ gnome-system-monitor-2.16.1.mod/src/load-graph.cpp 2006-11-13 20:26:32.073407000 +0800
8405N/A@@ -348,6 +348,20 @@ get_net (LoadGraph *g)
9822N/A float din, dout;
8405N/A gchar *text1, *text2;
8405N/A
8405N/A+ /* we have to optimize the performance of libgtop, because in some low level machine,
8405N/A+ to update the information will occupy too much cpu.
8405N/A+
9822N/A+ here I would like to make a little update:set glibtop_netlist.flags=1,so as to let glibtop_get_netlist()
8405N/A+ only return the ones whose first character of name is the same with the first one in their module,
8405N/A+ glibtop_get_netload() just try to find these devices, for example, bge0 and bge...
8405N/A+
8405N/A+ we do the check in glibtop_get_netlist(), I think this will accelerate the transaction lots,
8405N/A+ Also this will not affect the existing codes, because when nobody set glibtop_netlist.flags,
9822N/A+ glibtop_get_netlist() will return all devices with class "net".
8405N/A+ */
8405N/A+
8405N/A+ netlist.flags = 1;
8405N/A+
8405N/A ifnames = glibtop_get_netlist(&netlist);
9822N/A
8405N/A for (i = 0; i < netlist.number; ++i)
8405N/Adiff -Nrup gnome-system-monitor-2.17.4/src/load-graph.h gnome-system-monitor-2.17.4.mod/src/load-graph.h
8405N/A--- gnome-system-monitor-2.17.4/src/load-graph.h 2006-01-02 17:28:58.000000000 +0800
8405N/A+++ gnome-system-monitor-2.17.4.mod/src/load-graph.h 2006-11-13 20:26:32.073549000 +0800
8405N/A@@ -34,34 +34,34 @@
8405N/A
9822N/A
8405N/A /* Create new load graph. */
8405N/A-LoadGraph *
8405N/A-load_graph_new (gint type, ProcData *procdata) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL LoadGraph *
9822N/A+load_graph_new (gint type, ProcData *procdata);
8405N/A
8405N/A /* Force a drawing update */
8405N/A-void
8405N/A-load_graph_draw (LoadGraph *g) G_GNUC_INTERNAL;
9822N/A+G_GNUC_INTERNAL void
8405N/A+load_graph_draw (LoadGraph *g);
8405N/A
8405N/A /* Start load graph. */
8405N/A-void
8405N/A-load_graph_start (LoadGraph *g) G_GNUC_INTERNAL;
9822N/A+G_GNUC_INTERNAL void
8405N/A+load_graph_start (LoadGraph *g);
8405N/A
9822N/A /* Stop load graph. */
9822N/A-void
9822N/A-load_graph_stop (LoadGraph *g) G_GNUC_INTERNAL;
9595N/A+G_GNUC_INTERNAL void
9595N/A+load_graph_stop (LoadGraph *g);
9595N/A
8405N/A /* Change load graph speed and restart it if it has been previously started */
8405N/A-void
9822N/A+G_GNUC_INTERNAL void
8405N/A load_graph_change_speed (LoadGraph *g,
9595N/A- guint new_speed) G_GNUC_INTERNAL;
9822N/A+ guint new_speed);
9822N/A
9822N/A-GdkColor*
9595N/A-load_graph_get_colors (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL GdkColor*
8405N/A+load_graph_get_colors (LoadGraph *g) G_GNUC_CONST;
8405N/A
8405N/A-LoadGraphLabels*
9822N/A-load_graph_get_labels (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;
8405N/A+G_GNUC_INTERNAL LoadGraphLabels*
8405N/A+load_graph_get_labels (LoadGraph *g) G_GNUC_CONST;
9822N/A
9822N/A
9822N/A-GtkWidget*
9822N/A-load_graph_get_widget (LoadGraph *g) G_GNUC_INTERNAL G_GNUC_CONST;
9822N/A+G_GNUC_INTERNAL GtkWidget*
8414N/A+load_graph_get_widget (LoadGraph *g) G_GNUC_CONST;
8414N/A
8414N/A #endif /* _PROCMAN_LOAD_GRAPH_H_ */
8922N/Adiff -Nrup gnome-system-monitor-2.17.4/src/memmaps.h gnome-system-monitor-2.17.4.mod/src/memmaps.h
8922N/A--- gnome-system-monitor-2.17.4/src/memmaps.h 2005-03-17 17:23:13.000000000 +0800
8922N/A+++ gnome-system-monitor-2.17.4.mod/src/memmaps.h 2006-11-13 20:26:32.076831000 +0800
8922N/A@@ -4,6 +4,6 @@
8922N/A #include <glib.h>
8922N/A #include "procman.h"
8922N/A
9822N/A-void create_memmaps_dialog (ProcData *procdata) G_GNUC_INTERNAL;
8414N/A+G_GNUC_INTERNAL void create_memmaps_dialog (ProcData *procdata);
8414N/A
9822N/A #endif /* _PROCMAN_MEMMAPS_H_ */
9822N/Adiff -Nrup gnome-system-monitor-2.16.1/src/openfiles.h gnome-system-monitor-2.16.1.mod/src/openfiles.h
9822N/A--- gnome-system-monitor-2.16.1/src/openfiles.h 2005-03-17 17:23:13.000000000 +0800
8405N/A+++ gnome-system-monitor-2.16.1.mod/src/openfiles.h 2006-11-13 20:26:32.065979000 +0800
8405N/A@@ -5,6 +5,6 @@
8405N/A
8405N/A #include "procman.h"
8405N/A
8405N/A-void create_openfiles_dialog (ProcData *procdata) G_GNUC_INTERNAL;
9822N/A+G_GNUC_INTERNAL void create_openfiles_dialog (ProcData *procdata);
9822N/A
8405N/A #endif
8405N/Adiff -Nrup gnome-system-monitor-2.16.1/src/prettytable.h gnome-system-monitor-2.16.1.mod/src/prettytable.h
8405N/A--- gnome-system-monitor-2.16.1/src/prettytable.h 2005-02-16 23:40:01.000000000 +0800
9822N/A+++ gnome-system-monitor-2.16.1.mod/src/prettytable.h 2006-11-13 20:26:32.066976000 +0800
9822N/A@@ -6,10 +6,10 @@
9822N/A #include "procman.h"
9822N/A
9799N/A
9799N/A-void pretty_table_new (ProcData *procdata) G_GNUC_INTERNAL;
9799N/A+G_GNUC_INTERNAL void pretty_table_new (ProcData *procdata) ;
9799N/A
9799N/A-GdkPixbuf* pretty_table_get_icon (PrettyTable *pretty_table,
9799N/A- const gchar *command, guint pid) G_GNUC_INTERNAL;
9799N/A-void pretty_table_free (PrettyTable *pretty_table) G_GNUC_INTERNAL;
9799N/A+G_GNUC_INTERNAL GdkPixbuf* pretty_table_get_icon (PrettyTable *pretty_table,
9799N/A+ const gchar *command, guint pid) ;
9799N/A+G_GNUC_INTERNAL void pretty_table_free (PrettyTable *pretty_table) ;
9799N/A
9822N/A #endif /* _PROCMAN_PRETTYTABLE_H_ */
9822N/Adiff -Nrup gnome-system-monitor-2.16.1/src/procactions.cpp gnome-system-monitor-2.16.1.mod/src/procactions.cpp
9822N/A--- gnome-system-monitor-2.16.1/src/procactions.cpp 2006-06-25 03:29:03.000000000 +0800
9822N/A+++ gnome-system-monitor-2.16.1.mod/src/procactions.cpp 2006-11-13 20:26:32.068354000 +0800
8405N/A@@ -128,6 +128,14 @@ kill_single_process (GtkTreeModel *model
8405N/A if (!info)
8405N/A return;
8405N/A
8405N/A+ /*
8405N/A+ * If the process 0 is a system process, we can't control it even as root
9822N/A+ */
9822N/A+ if ((args->signal == SIGTERM) || (args->signal == SIGKILL)){
8405N/A+ if (info->pid == 0)
8405N/A+ return;
8405N/A+ }
8405N/A+ /* if it is not a system process, we can kill it now */
8405N/A error = kill (info->pid, args->signal);
9822N/A
9822N/A /* success */
9822N/Adiff -Nrup gnome-system-monitor-2.16.1/src/procactions.h gnome-system-monitor-2.16.1.mod/src/procactions.h
8405N/A--- gnome-system-monitor-2.16.1/src/procactions.h 2005-12-01 21:06:34.000000000 +0800
8405N/A+++ gnome-system-monitor-2.16.1.mod/src/procactions.h 2006-11-13 20:26:32.068652000 +0800
8405N/A@@ -21,8 +21,8 @@
9822N/A
9822N/A #include "procman.h"
9822N/A
9822N/A-void renice (ProcData *procdata, int nice) G_GNUC_INTERNAL;
8922N/A-void kill_process (ProcData *procdata, int sig) G_GNUC_INTERNAL;
8922N/A+G_GNUC_INTERNAL void renice (ProcData *procdata, int nice) ;
8922N/A+G_GNUC_INTERNAL void kill_process (ProcData *procdata, int sig) ;
8922N/A
9370N/A #endif
9370N/A
9370N/Adiff -Nrup gnome-system-monitor-2.16.1/src/procdialogs.cpp gnome-system-monitor-2.16.1.mod/src/procdialogs.cpp
9370N/A--- gnome-system-monitor-2.16.1/src/procdialogs.cpp 2006-08-09 04:56:59.000000000 +0800
8922N/A+++ gnome-system-monitor-2.16.1.mod/src/procdialogs.cpp 2006-11-13 20:26:32.075288000 +0800
8922N/A@@ -333,7 +333,7 @@ smooth_refresh_toggled(GtkToggleButton *
8922N/A
9822N/A gboolean toggled;
8922N/A
8922N/A- toggled = gtk_toggle_button_get_active(button);
8922N/A+ toggled = TRUE; /*gtk_toggle_button_get_active(button);*/
8922N/A
9370N/A gconf_client_set_bool(client, SMOOTH_REFRESH_KEY, toggled, NULL);
8922N/A }
9370N/A@@ -397,7 +397,7 @@ update_graph_update_interval (GtkWidget
9370N/A spin_button = widget;
8922N/A value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin_button));
8922N/A
9370N/A- if (1000 * value == procdata->config.graph_update_interval)
9822N/A+ if ((int)(1000 * value) == procdata->config.graph_update_interval)
9822N/A return FALSE;
9822N/A
9822N/A gconf_client_set_int (client, "/apps/procman/graph_update_interval", value * 1000, NULL);
8405N/A@@ -714,7 +714,10 @@ procdialog_create_preferences_dialog (Pr
8405N/A gtk_box_pack_start (GTK_BOX (hbox2), hbox3, TRUE, TRUE, 0);
8405N/A
8405N/A update = (gfloat) procdata->config.graph_update_interval;
8405N/A- adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25,
8405N/A+ /* The interval is too small, and in some low level machine,
9822N/A+ cause gconf can't work, so set its min value 1 sec*/
9822N/A+ /*adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 0.25,*/
9822N/A+ adjustment = (GtkAdjustment *) gtk_adjustment_new(update / 1000.0, 1,
8405N/A 100.0, 0.25, 1.0, 1.0);
8405N/A spin_button = gtk_spin_button_new (adjustment, 1.0, 2);
8405N/A g_signal_connect (G_OBJECT (spin_button), "focus_out_event",
9822N/Adiff -Nrup gnome-system-monitor-2.16.1/src/procdialogs.h gnome-system-monitor-2.16.1.mod/src/procdialogs.h
9822N/A--- gnome-system-monitor-2.16.1/src/procdialogs.h 2005-12-01 23:46:20.000000000 +0800
9822N/A+++ gnome-system-monitor-2.16.1.mod/src/procdialogs.h 2006-11-13 20:26:32.075559000 +0800
9822N/A@@ -42,14 +42,14 @@ typedef enum
9311N/A } ProcmanActionType;
9311N/A
9311N/A
9822N/A-void procdialog_create_hide_dialog (ProcData *data) G_GNUC_INTERNAL;
9311N/A-void procdialog_create_kill_dialog (ProcData *data, int signal) G_GNUC_INTERNAL;
9311N/A-void procdialog_create_renice_dialog (ProcData *data) G_GNUC_INTERNAL;
9311N/A-gboolean procdialog_create_root_password_dialog (ProcmanActionType type,
9311N/A+G_GNUC_INTERNAL void procdialog_create_hide_dialog (ProcData *data) ;
9311N/A+G_GNUC_INTERNAL void procdialog_create_kill_dialog (ProcData *data, int signal) ;
9311N/A+G_GNUC_INTERNAL void procdialog_create_renice_dialog (ProcData *data) ;
9311N/A+G_GNUC_INTERNAL gboolean procdialog_create_root_password_dialog (ProcmanActionType type,
9311N/A ProcData *procdata,
9311N/A- gint pid, gint extra_value) G_GNUC_INTERNAL;
9311N/A-void procdialog_create_memmaps_dialog (ProcData *data) G_GNUC_INTERNAL;
9311N/A-void procdialog_create_preferences_dialog (ProcData *data) G_GNUC_INTERNAL;
9822N/A+ gint pid, gint extra_value) ;
9311N/A+G_GNUC_INTERNAL void procdialog_create_memmaps_dialog (ProcData *data) ;
9311N/A+G_GNUC_INTERNAL void procdialog_create_preferences_dialog (ProcData *data) ;
9822N/A
9822N/A #endif
9799N/A
9799N/Adiff -Nrup gnome-system-monitor-2.17.2.1/src/procman.cpp gnome-system-monitor-2.17.2.1.mod/src/procman.cpp
9799N/A--- gnome-system-monitor-2.17.2.1/src/procman.cpp 2006-09-17 18:05:19.000000000 +0800
9799N/A+++ gnome-system-monitor-2.17.2.1.mod/src/procman.cpp 2006-11-13 20:26:32.074531000 +0800
9799N/A@@ -107,7 +107,10 @@
9799N/A procdata->config.graph_update_interval = gconf_value_get_int (value);
9799N/A procdata->config.graph_update_interval =
9799N/A MAX (procdata->config.graph_update_interval,
9799N/A- 250);
9822N/A+ /* The interval is too small, and in some low level machine,
9822N/A+ cause gconf can't work, so set its min value 1 sec*/
9822N/A+ /* 250);*/
9822N/A+ 1000);
9822N/A load_graph_change_speed(procdata->cpu_graph,
9822N/A procdata->config.graph_update_interval);
9799N/A load_graph_change_speed(procdata->mem_graph,
9799N/A@@ -356,7 +359,10 @@
9822N/A pd->config.width = CLAMP (pd->config.width, 50, swidth);
9822N/A pd->config.height = CLAMP (pd->config.height, 50, sheight);
9822N/A pd->config.update_interval = MAX (pd->config.update_interval, 1000);
9822N/A- pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);
9822N/A+ /* The interval is too small, and in some low level machine,
9822N/A+ cause gconf can't work, so set its min value 1 sec*/
9822N/A+ /*pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 250);*/
9822N/A+ pd->config.graph_update_interval = MAX (pd->config.graph_update_interval, 1000);
9822N/A pd->config.disks_update_interval = MAX (pd->config.disks_update_interval, 1000);
9799N/A pd->config.whose_process = CLAMP (pd->config.whose_process, 0, 2);
9799N/A pd->config.current_tab = CLAMP(pd->config.current_tab,
9822N/Adiff -Nrup gnome-system-monitor-2.16.1/src/procman.h gnome-system-monitor-2.16.1.mod/src/procman.h
9822N/A--- gnome-system-monitor-2.16.1/src/procman.h 2006-08-18 00:50:43.000000000 +0800
9822N/A+++ gnome-system-monitor-2.16.1.mod/src/procman.h 2006-11-13 20:26:32.074782000 +0800
9799N/A@@ -181,9 +181,9 @@ struct _ProcData
9822N/A SmoothRefresh *smooth_refresh;
9822N/A };
8922N/A
8922N/A-void procman_save_config (ProcData *data) G_GNUC_INTERNAL;
8522N/A-void procman_save_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) G_GNUC_INTERNAL;
8922N/A-gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) G_GNUC_INTERNAL;
9822N/A+G_GNUC_INTERNAL void procman_save_config (ProcData *data);
9822N/A+G_GNUC_INTERNAL void procman_save_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) ;
8922N/A+G_GNUC_INTERNAL gboolean procman_get_tree_state (GConfClient *client, GtkWidget *tree, const gchar *prefix) ;
8922N/A
8922N/A
8922N/A
8922N/Adiff -Nrup gnome-system-monitor-2.16.1/src/proctable.cpp gnome-system-monitor-2.16.1.mod/src/proctable.cpp
8922N/A--- gnome-system-monitor-2.16.1/src/proctable.cpp 2006-08-31 02:11:01.000000000 +0800
8922N/A+++ gnome-system-monitor-2.16.1.mod/src/proctable.cpp 2006-11-13 20:45:40.107468000 +0800
8922N/A@@ -556,6 +556,17 @@ static void get_process_memory_writable(
8922N/A unsigned i;
8922N/A
8922N/A info->memwritable = 0;
8922N/A+ /* we have to optimize the performance of libgtop, because update the information will occupy too much cpu.
8922N/A+
8922N/A+ here I would like to make a little update:set glibtop_proc_map.flags=1,so as to let glibtop_get_proc_map_s()
8922N/A+ only return the ones this function need: memwritable
8922N/A+
8922N/A+ we do the check in glibtop_get_proc_map_s(), don't run the others part which don't need by this function,
8922N/A+ I think this will accelerate the transaction lots,
8922N/A+ Also this will not affect the existing codes, because when nobody set glibtop_proc_map.flags,
8922N/A+ glibtop_get_proc_map() will return all as before. zhua
9822N/A+ */
8522N/A+ buf.flags = 1;
8922N/A
8922N/A maps = glibtop_get_proc_map(&buf, info->pid);
9822N/A
8403N/A@@ -588,6 +599,10 @@ get_process_memory_info(ProcInfo *info)
8922N/A info->memres = procmem.resident;
8922N/A info->memshared = procmem.share;
9822N/A
8922N/A+#ifdef __sun
9822N/A+ info->pcpu = procmem.load;
9822N/A+#endif
8922N/A+
8922N/A info->memxserver = xresources.total_bytes_estimate;
9822N/A
8922N/A get_process_memory_writable(info);
8922N/A@@ -766,6 +781,28 @@ remove_children_from_tree (ProcData *pro
9822N/A } while (gtk_tree_model_iter_next (model, parent));
9822N/A }
9799N/A
9799N/A+/* place the children process to blacklist if the parent is placed into */
9822N/A+static void
9799N/A+blacklist_children_from_tree (ProcData *procdata, GtkTreeModel *model,
9799N/A+ GtkTreeIter *parent)
9822N/A+{
9822N/A+ do {
9822N/A+ ProcInfo *child_info;
8403N/A+ GtkTreeIter child;
8403N/A+
9799N/A+ if (gtk_tree_model_iter_children (model, &child, parent))
9822N/A+ blacklist_children_from_tree (procdata, model, &child);
9822N/A+
9822N/A+ gtk_tree_model_get (model, parent, COL_POINTER, &child_info, -1);
9822N/A+ if (child_info) {
9822N/A+ if (procdata->selected_process == child_info)
9822N/A+ procdata->selected_process = NULL;
9822N/A+ add_to_blacklist (procdata, child_info->name);
9822N/A+ child_info->is_visible = FALSE;
9822N/A+ }
9822N/A+ } while (gtk_tree_model_iter_next (model, parent));
9822N/A+}
9822N/A+
9822N/A
9799N/A void
9799N/A remove_info_from_tree (ProcInfo *info, ProcData *procdata)
9822N/A@@ -781,6 +818,11 @@ remove_info_from_tree (ProcInfo *info, P
9799N/A
9799N/A if (procdata->selected_process == info)
8922N/A procdata->selected_process = NULL;
9799N/A+ /* move all children from tree to blacklist */
9799N/A+ GtkTreeIter child;
9822N/A+ if (gtk_tree_model_iter_children (model, &child, &info->node))
9799N/A+ blacklist_children_from_tree (procdata, model, &child);
9822N/A+
9799N/A
8403N/A gtk_tree_store_remove (GTK_TREE_STORE (model), &info->node);
9799N/A
9799N/A@@ -849,7 +891,7 @@ update_info (ProcData *procdata, ProcInf
9799N/A glibtop_get_proc_uid (&procuid, info->pid);
9799N/A glibtop_get_proc_time (&proctime, info->pid);
9799N/A
9799N/A- get_process_memory_info(info);
9799N/A+/* get_process_memory_info(info); */
9799N/A get_process_user(procdata, info, procstate.uid);
9822N/A
8403N/A info->pcpu = (proctime.rtime - info->cpu_time_last) * 100 / total_time;
9799N/A@@ -859,6 +901,11 @@ update_info (ProcData *procdata, ProcInf
9799N/A info->nice = procuid.nice;
9799N/A
9799N/A
9799N/A+ /* if at Solaris, in get_process_memory_info() info->pcpu will
9822N/A+ get again from glibtop_get_proc_mem() */
9822N/A+ get_process_memory_info(info);
9822N/A+
9799N/A+
9799N/A model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
9799N/A
9799N/A update_info_mutable_cols(GTK_TREE_STORE (model), procdata, info);
9799N/A@@ -1018,8 +1065,8 @@ proctable_update_list (ProcData * const
9799N/A /* FIXME: total cpu time elapsed should be calculated on an individual basis here
9799N/A ** should probably have a total_time_last gint in the ProcInfo structure */
9799N/A glibtop_get_cpu (&cpu);
9799N/A- total_time = MAX(cpu.total - total_time_last, 1);
9822N/A- total_time_last = cpu.total;
9799N/A+ total_time = MAX(cpu.total - total_time_last, 1);
9822N/A+ total_time_last = cpu.total;
9822N/A
9799N/A refresh_list (procdata, pid_list, proclist.number);
9799N/A
9799N/Adiff -Nrup gnome-system-monitor-2.16.1/src/proctable.h gnome-system-monitor-2.16.1.mod/src/proctable.h
9822N/A--- gnome-system-monitor-2.16.1/src/proctable.h 2006-07-06 17:40:24.000000000 +0800
9799N/A+++ gnome-system-monitor-2.16.1.mod/src/proctable.h 2006-11-13 20:26:32.070490000 +0800
8403N/A@@ -26,42 +26,41 @@
8403N/A
9799N/A enum
8403N/A {
9822N/A- COL_NAME = 0,
9822N/A- COL_USER,
9822N/A- COL_STATUS,
8403N/A- COL_VMSIZE,
8403N/A- COL_MEMRES,
8403N/A- COL_MEMWRITABLE,
9822N/A- COL_MEMSHARED,
9822N/A- COL_MEMXSERVER,
9822N/A- COL_CPU,
9822N/A- COL_CPU_TIME,
9822N/A- COL_START_TIME,
8405N/A- COL_NICE,
8405N/A- COL_PID,
9799N/A- COL_SECURITYCONTEXT,
9799N/A- COL_ARGS,
9799N/A- COL_MEM,
9799N/A- COL_PIXBUF,
9799N/A- COL_POINTER,
9799N/A- COL_TOOLTIP,
9799N/A- NUM_COLUMNS
9799N/A+ COL_NAME = 0,
9799N/A+ COL_USER,
9799N/A+ COL_STATUS,
9799N/A+ COL_VMSIZE,
9822N/A+ COL_MEMRES,
9822N/A+ COL_MEMWRITABLE,
9822N/A+ COL_MEMSHARED,
9822N/A+ COL_MEMXSERVER,
9822N/A+ COL_CPU,
9822N/A+ COL_CPU_TIME,
9822N/A+ COL_START_TIME,
9822N/A+ COL_NICE,
9822N/A+ COL_PID,
8405N/A+ COL_SECURITYCONTEXT,
9799N/A+ COL_ARGS,
9799N/A+ COL_MEM,
9822N/A+ COL_PIXBUF,
9822N/A+ COL_POINTER,
8405N/A+ COL_TOOLTIP,
8405N/A+ NUM_COLUMNS
9822N/A };
9799N/A
9799N/A+G_GNUC_INTERNAL GtkWidget* proctable_new (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void proctable_update_table (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void proctable_update_list (ProcData *data) ;
9822N/A+G_GNUC_INTERNAL void insert_info_to_tree (ProcInfo *info, ProcData *procdata) ;
9822N/A+G_GNUC_INTERNAL void remove_info_from_tree (ProcInfo *info, ProcData *procdata) ;
9822N/A+G_GNUC_INTERNAL ProcInfo * proctable_find_process (guint pid, ProcData *procdata) ;
8522N/A+G_GNUC_INTERNAL void proctable_update_all (ProcData *data) ;
8405N/A+G_GNUC_INTERNAL void proctable_clear_tree (ProcData *data) ;
8522N/A+G_GNUC_INTERNAL void proctable_free_table (ProcData *data) ;
8405N/A
8405N/A-GtkWidget* proctable_new (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void proctable_update_table (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void proctable_update_list (ProcData *data) G_GNUC_INTERNAL;
9822N/A-void insert_info_to_tree (ProcInfo *info, ProcData *procdata) G_GNUC_INTERNAL;
8405N/A-void remove_info_from_tree (ProcInfo *info, ProcData *procdata) G_GNUC_INTERNAL;
8405N/A-ProcInfo * proctable_find_process (guint pid, ProcData *procdata) G_GNUC_INTERNAL;
8522N/A-void proctable_update_all (ProcData *data) G_GNUC_INTERNAL;
8405N/A-void proctable_clear_tree (ProcData *data) G_GNUC_INTERNAL;
8922N/A-void proctable_free_table (ProcData *data) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL GSList* proctable_get_columns_order(GtkTreeView *treeview) ;
8522N/A+G_GNUC_INTERNAL void proctable_set_columns_order(GtkTreeView *treeview, GSList *order) ;
9822N/A
9822N/A-GSList* proctable_get_columns_order(GtkTreeView *treeview) G_GNUC_INTERNAL;
9822N/A-void proctable_set_columns_order(GtkTreeView *treeview, GSList *order) G_GNUC_INTERNAL;
9799N/A-
9595N/A-char* make_loadavg_string(void) G_GNUC_INTERNAL;
9595N/A+G_GNUC_INTERNAL char* make_loadavg_string(void) ;
8405N/A
8405N/A #endif /* _PROCMAN_PROCTABLE_H_ */
8405N/Adiff -Nrup gnome-system-monitor-2.16.1/src/selinux.h gnome-system-monitor-2.16.1.mod/src/selinux.h
8405N/A--- gnome-system-monitor-2.16.1/src/selinux.h 2006-07-09 01:24:40.000000000 +0800
8405N/A+++ gnome-system-monitor-2.16.1.mod/src/selinux.h 2006-11-13 20:26:32.069158000 +0800
8405N/A@@ -5,10 +5,10 @@
9822N/A
8405N/A #include "procman.h"
8405N/A
8405N/A-void
8405N/A-get_process_selinux_context (ProcInfo *info) G_GNUC_INTERNAL;
8405N/A+G_GNUC_INTERNAL void
9822N/A+get_process_selinux_context (ProcInfo *info) ;
8522N/A
8522N/A-gboolean
8522N/A-can_show_security_context_column (void) G_GNUC_INTERNAL G_GNUC_CONST;
8522N/A+G_GNUC_INTERNAL gboolean
8522N/A+can_show_security_context_column (void) G_GNUC_CONST;
9822N/A
8522N/A #endif /* PROCMAN_SELINUX_H_20050525 */
8522N/Adiff -Nrup gnome-system-monitor-2.16.1/src/smooth_refresh.cpp gnome-system-monitor-2.16.1.mod/src/smooth_refresh.cpp
8522N/A--- gnome-system-monitor-2.16.1/src/smooth_refresh.cpp 2006-07-12 03:59:32.000000000 +0800
8522N/A+++ gnome-system-monitor-2.16.1.mod/src/smooth_refresh.cpp 2006-11-13 20:26:32.072291000 +0800
8522N/A@@ -183,8 +183,10 @@ smooth_refresh_get(SmoothRefresh *sm, gu
9822N/A gboolean changed;
8522N/A float pcpu;
9595N/A
9595N/A- if (!sm->active)
+ if (!sm->active){
+ *new_interval = sm->interval;
return FALSE;
+ }
pcpu = get_own_cpu_usage(sm);
/*
@@ -242,6 +242,8 @@
sm->interval,
*sm->config_interval);
}
+ else
+ *new_interval = sm->interval;
g_assert(sm->interval == *new_interval);
g_assert(sm->interval >= *sm->config_interval);
diff -Nrup gnome-system-monitor-2.17.4/src/smooth_refresh.h gnome-system-monitor-2.17.4.mod/src/smooth_refresh.h
--- gnome-system-monitor-2.17.4/src/smooth_refresh.h 2005-12-28 00:14:59.000000000 +0800
+++ gnome-system-monitor-2.17.4.mod/src/smooth_refresh.h 2006-11-13 20:26:32.072506000 +0800
@@ -19,8 +19,8 @@
@return : initialized SmoothRefresh
*/
-SmoothRefresh*
-smooth_refresh_new(const guint * config_interval) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL SmoothRefresh*
+smooth_refresh_new(const guint * config_interval);
@@ -31,8 +31,8 @@
*/
-void
-smooth_refresh_reset(SmoothRefresh *sm) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void
+smooth_refresh_reset(SmoothRefresh *sm);
@@ -43,8 +43,8 @@
*/
-void
-smooth_refresh_destroy(SmoothRefresh *sm) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void
+smooth_refresh_destroy(SmoothRefresh *sm);
@@ -60,7 +60,7 @@
is stored in @new_interval. Else FALSE;
*/
-gboolean
-smooth_refresh_get(SmoothRefresh *sm, guint *new_interval) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean
+smooth_refresh_get(SmoothRefresh *sm, guint *new_interval);
#endif /* _PROCMAN_SMOOTH_REFRESH */
diff -Nrup gnome-system-monitor-2.17.4/src/util.h gnome-system-monitor-2.17.4.mod/src/util.h
--- gnome-system-monitor-2.17.4/src/util.h 2006-07-12 03:51:11.000000000 +0800
+++ gnome-system-monitor-2.17.4.mod/src/util.h 2006-11-13 20:26:32.074021000 +0800
@@ -23,22 +23,22 @@
#define PROCMAN_CMP(X, Y) procman_cmp((X), (Y))
#define PROCMAN_RCMP(X, Y) procman_cmp((Y), (X));
-GtkWidget*
+G_GNUC_INTERNAL GtkWidget*
procman_make_label_for_mmaps_or_ofiles(const char *format,
const char *process_name,
- unsigned pid) G_GNUC_INTERNAL;
+ unsigned pid);
-gchar*
-SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gchar*
+SI_gnome_vfs_format_file_size_for_display (GnomeVFSFileSize size);
-gboolean
-load_symbols(const char *module, ...) G_GNUC_INTERNAL G_GNUC_NULL_TERMINATED;
+G_GNUC_INTERNAL gboolean
+load_symbols(const char *module, ...) G_GNUC_NULL_TERMINATED;
-void
-procman_debug(const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
+G_GNUC_INTERNAL void
+procman_debug(const char *format, ...) G_GNUC_PRINTF(1, 2);
inline string make_string(char *c_str)