#endif
#include <gtk/gtk.h>
+#include <gdk/gdk.h>
#include <glib.h>
#include <string.h>
#include <stdlib.h>
gpointer user_data)
{
gchar *a_name;
- guint a_pid, a_ppid, a_cpu;
+ gchar *a_brand;
+ guint a_pid, a_tgid, a_ppid, a_cpu;
gulong a_birth_s, a_birth_ns;
gulong a_trace;
gchar *b_name;
- guint b_pid, b_ppid, b_cpu;
+ gchar *b_brand;
+ guint b_pid, b_tgid, b_ppid, b_cpu;
gulong b_birth_s, b_birth_ns;
gulong b_trace;
gtk_tree_model_get(model,
it_a,
- 0, &a_name,
- 1, &a_pid,
- 2, &a_ppid,
- 3, &a_cpu,
- 4, &a_birth_s,
- 5, &a_birth_ns,
- 6, &a_trace,
+ PROCESS_COLUMN, &a_name,
+ BRAND_COLUMN, &a_brand,
+ PID_COLUMN, &a_pid,
+ TGID_COLUMN, &a_tgid,
+ PPID_COLUMN, &a_ppid,
+ CPU_COLUMN, &a_cpu,
+ BIRTH_S_COLUMN, &a_birth_s,
+ BIRTH_NS_COLUMN, &a_birth_ns,
+ TRACE_COLUMN, &a_trace,
-1);
gtk_tree_model_get(model,
it_b,
- 0, &b_name,
- 1, &b_pid,
- 2, &b_ppid,
- 3, &b_cpu,
- 4, &b_birth_s,
- 5, &b_birth_ns,
- 6, &b_trace,
+ PROCESS_COLUMN, &b_name,
+ BRAND_COLUMN, &b_brand,
+ PID_COLUMN, &b_pid,
+ TGID_COLUMN, &b_tgid,
+ PPID_COLUMN, &b_ppid,
+ CPU_COLUMN, &b_cpu,
+ BIRTH_S_COLUMN, &b_birth_s,
+ BIRTH_NS_COLUMN, &b_birth_ns,
+ TRACE_COLUMN, &b_trace,
-1);
void destroy_hash_data(gpointer data);
+gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event, gpointer data)
+{
+ ControlFlowData *control_flow_data =
+ (ControlFlowData*)g_object_get_data(
+ G_OBJECT(widget),
+ "control_flow_data");
+ Drawing_t *drawing = control_flow_data->drawing;
+ unsigned int cell_height =
+ get_cell_height(GTK_TREE_VIEW(control_flow_data->process_list->process_list_widget));
+
+ switch(event->direction) {
+ case GDK_SCROLL_UP:
+ gtk_adjustment_set_value(control_flow_data->v_adjust,
+ gtk_adjustment_get_value(control_flow_data->v_adjust) - cell_height);
+ break;
+ case GDK_SCROLL_DOWN:
+ gtk_adjustment_set_value(control_flow_data->v_adjust,
+ gtk_adjustment_get_value(control_flow_data->v_adjust) + cell_height);
+ break;
+ default:
+ g_error("should only scroll up and down.");
+ }
+ return TRUE;
+}
+
+
static void update_index_to_pixmap_each(ProcessInfo *key,
HashedProcessData *value,
ProcessList *process_list)
g_assert(i<process_list->index_to_pixmap->len);
/* Render the pixmap to the screen */
GdkPixmap *pixmap =
- (GdkPixmap*)g_ptr_array_index(process_list->index_to_pixmap, i);
+ //(GdkPixmap*)g_ptr_array_index(process_list->index_to_pixmap, i);
+ GDK_PIXMAP(g_ptr_array_index(process_list->index_to_pixmap, i));
gdk_draw_drawable (dest,
gc,
/* Create the Process list */
process_list->list_store = gtk_list_store_new ( N_COLUMNS,
+ G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_UINT,
G_TYPE_UINT,
G_TYPE_UINT,
+ G_TYPE_UINT,
G_TYPE_ULONG,
G_TYPE_ULONG,
G_TYPE_ULONG);
renderer = gtk_cell_renderer_text_new ();
process_list->renderer = renderer;
+ gint vertical_separator;
+ gtk_widget_style_get (GTK_WIDGET (process_list->process_list_widget),
+ "vertical-separator", &vertical_separator,
+ NULL);
gtk_cell_renderer_get_size(renderer,
GTK_WIDGET(process_list->process_list_widget),
NULL,
NULL,
NULL,
&process_list->cell_height);
-
+
+#if GTK_CHECK_VERSION(2,4,15)
guint ypad;
g_object_get(G_OBJECT(renderer), "ypad", &ypad, NULL);
process_list->cell_height += ypad;
-
+#endif
+ process_list->cell_height += vertical_separator;
+
+
column = gtk_tree_view_column_new_with_attributes ( "Process",
renderer,
"text",
GTK_TREE_VIEW (process_list->process_list_widget), column);
process_list->button = column->button;
-
+
+ column = gtk_tree_view_column_new_with_attributes ( "Brand",
+ renderer,
+ "text",
+ BRAND_COLUMN,
+ NULL);
+ gtk_tree_view_column_set_alignment (column, 0.0);
+ gtk_tree_view_column_set_fixed_width (column, 45);
+ gtk_tree_view_append_column (
+ GTK_TREE_VIEW (process_list->process_list_widget), column);
+
column = gtk_tree_view_column_new_with_attributes ( "PID",
renderer,
"text",
gtk_tree_view_append_column (
GTK_TREE_VIEW (process_list->process_list_widget), column);
+ column = gtk_tree_view_column_new_with_attributes ( "TGID",
+ renderer,
+ "text",
+ TGID_COLUMN,
+ NULL);
+ gtk_tree_view_append_column (
+ GTK_TREE_VIEW (process_list->process_list_widget), column);
+
column = gtk_tree_view_column_new_with_attributes ( "PPID",
renderer,
"text",
-1);
}
+void processlist_set_brand(ProcessList *process_list,
+ GQuark brand,
+ HashedProcessData *hashed_process_data)
+{
+ gtk_list_store_set ( process_list->list_store, &hashed_process_data->y_iter,
+ BRAND_COLUMN, g_quark_to_string(brand),
+ -1);
+}
+
+void processlist_set_tgid(ProcessList *process_list,
+ guint tgid,
+ HashedProcessData *hashed_process_data)
+{
+ gtk_list_store_set ( process_list->list_store, &hashed_process_data->y_iter,
+ TGID_COLUMN, tgid,
+ -1);
+}
+
+void processlist_set_ppid(ProcessList *process_list,
+ guint ppid,
+ HashedProcessData *hashed_process_data)
+{
+ gtk_list_store_set ( process_list->list_store, &hashed_process_data->y_iter,
+ PPID_COLUMN, ppid,
+ -1);
+}
+
+
int processlist_add( ProcessList *process_list,
Drawing_t *drawing,
guint pid,
+ guint tgid,
guint cpu,
guint ppid,
LttTime *birth,
guint trace_num,
GQuark name,
+ GQuark brand,
guint *height,
ProcessInfo **pm_process_info,
HashedProcessData **pm_hashed_process_data)
*pm_process_info = Process_Info;
Process_Info->pid = pid;
+ Process_Info->tgid = tgid;
if(pid == 0)
Process_Info->cpu = cpu;
else
gtk_list_store_set ( process_list->list_store, &hashed_process_data->y_iter,
PROCESS_COLUMN, g_quark_to_string(name),
+ BRAND_COLUMN, g_quark_to_string(brand),
PID_COLUMN, pid,
+ TGID_COLUMN, tgid,
PPID_COLUMN, ppid,
CPU_COLUMN, cpu,
BIRTH_S_COLUMN, birth->tv_sec,