trace-graph: Move windowing into trace-graph-main.c

In order to be able to use the trace-graph in other applications
we separate out the creation of the graph from the windowing.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

4 files changed, 162 insertions, 145 deletions

diff --git a/Makefile b/Makefile
index 022d0a4..0d81f17 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,8 @@ trace-view.o::		$(HEADERS) trace-view-store.h trace-view.h
 trace-view-store.o::    $(HEADERS) trace-view-store.h trace-view.h
 trace-view-main.o::     $(HEADERS) trace-view-store.h trace-view.h
 trace-filter.o::        $(HEADERS)
-trace-graph.o::         $(HEADERS)
+trace-graph.o::         $(HEADERS) trace-graph.h
+trace-graph-main.o::    $(HEADERS) trace-graph.h
 
 trace-cmd:: trace-cmd.o trace-read.o
         $(CC) $^ -rdynamic -o $@ $(LIBS)
@@ -44,7 +45,7 @@ trace-cmd:: trace-cmd.o trace-read.o
 trace-view:: trace-view-main.o trace-view.o trace-view-store.o trace-filter.o
         $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS)
 
-trace-graph:: trace-graph.o trace-compat.o
+trace-graph:: trace-graph-main.o trace-graph.o trace-compat.o
         $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS)
 
 .PHONY: gtk_depends
diff --git a/trace-graph-main.c b/trace-graph-main.c
new file mode 100644
index 0000000..d192f63
--- /dev/null
+++ b/trace-graph-main.c
@@ -0,0 +1,147 @@
+#include <gtk/gtk.h>
+
+#include "trace-cmd.h"
+#include "trace-graph.h"
+
+#define version "0.1.1"
+
+#define TRACE_WIDTH     800
+#define TRACE_HEIGHT    600
+#define input_file "trace.dat"
+
+
+/* Callback for the clicked signal of the Exit button */
+static void
+exit_clicked (GtkWidget *widget, gpointer data)
+{
+        gtk_widget_destroy (GTK_WIDGET (data)); /* the user data points to the main window */
+        gtk_main_quit ();
+}
+
+/* Callback for the delete_event signal of the main application window */
+static gint
+delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+        gtk_widget_destroy (widget); /* destroy the main window */
+        gtk_main_quit ();
+        return TRUE;
+}
+
+void trace_graph(int argc, char **argv)
+{
+        struct tracecmd_input *handle;
+        struct graph_info *ginfo;
+        GtkWidget *window;
+        GtkWidget *vbox;
+        GtkWidget *hbox;
+        GtkWidget *menu_bar;
+        GtkWidget *menu;
+        GtkWidget *menu_item;
+        GtkWidget *sub_item;
+        GtkWidget *scrollwin;
+        GtkWidget *draw;
+
+        handle = tracecmd_open(input_file);
+
+        if (!handle)
+                die("error reading header");
+
+        if (tracecmd_read_headers(handle) < 0)
+                return;
+
+        if (tracecmd_init_data(handle) < 0)
+                die("failed to init data");
+
+        gtk_init(&argc, &argv);
+
+        /* --- Main window --- */
+
+        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+        /* --- Top Level Vbox --- */
+
+        vbox = gtk_vbox_new(FALSE, 0);
+        gtk_container_add(GTK_CONTAINER (window), vbox);
+        gtk_widget_show(vbox);
+
+        /* --- Menu Bar --- */
+
+        menu_bar = gtk_menu_bar_new();
+        gtk_box_pack_start(GTK_BOX (vbox), menu_bar, FALSE, FALSE, 0);
+        gtk_widget_show(menu_bar);
+
+        /* --- File Option --- */
+
+        menu_item = gtk_menu_item_new_with_label("File");
+        gtk_widget_show(menu_item);
+
+        gtk_menu_bar_append(GTK_MENU_BAR (menu_bar), menu_item);
+
+        menu = gtk_menu_new();    /* Don't need to show menus */
+
+
+        /* --- File - Quit Option --- */
+
+        sub_item = gtk_menu_item_new_with_label("Quit");
+
+        /* Add them to the menu */
+        gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
+
+        /* We can attach the Quit menu item to our exit function */
+        g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
+                                  G_CALLBACK (exit_clicked),
+                                  (gpointer) window);
+
+        /* We do need to show menu items */
+        gtk_widget_show(sub_item);
+
+        gtk_menu_item_set_submenu(GTK_MENU_ITEM (menu_item), menu);
+
+        /* --- end File options --- */
+
+
+        /* --- Top Level Hbox --- */
+
+        hbox = gtk_hbox_new(FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+        gtk_widget_show(hbox);
+
+        /* --- Scroll Window --- */
+        scrollwin = gtk_scrolled_window_new(NULL, NULL);
+        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
+                                       GTK_POLICY_AUTOMATIC,
+                                       GTK_POLICY_AUTOMATIC);
+        gtk_box_pack_start(GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0);
+        gtk_widget_show(scrollwin);
+
+        /* --- Set up Drawing --- */
+
+        ginfo = trace_graph_create(handle, GTK_SCROLLED_WINDOW(scrollwin));
+        draw = trace_graph_get_draw(ginfo);
+
+        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollwin),
+                                              draw);
+        gtk_widget_show(draw);
+
+
+        /**********************************************
+         *   Main Window
+         **********************************************/
+
+        /* Connect to the delete_event signal and Run the application */
+
+        gtk_signal_connect (GTK_OBJECT (window), "delete_event",
+                            (GtkSignalFunc) delete_event,
+                            NULL);
+
+        gtk_widget_set_size_request(window, TRACE_WIDTH, TRACE_HEIGHT);
+
+        gtk_widget_show (window);
+        gtk_main ();
+}
+
+int main(int argc, char **argv)
+{
+        trace_graph(argc, argv);
+        return 0;
+}
diff --git a/trace-graph.c b/trace-graph.c
index b92cf5b..e4e50b2 100644
--- a/trace-graph.c
+++ b/trace-graph.c
@@ -30,13 +30,7 @@
 #include "trace-local.h"
 #include "trace-graph.h"
 
-#define version "0.1.1"
-
-#define TRACE_WIDTH     800
-#define TRACE_HEIGHT    300
-
 #define MAX_WIDTH       10000
-#define input_file "trace.dat"
 
 #define CPU_MIDDLE(cpu) (80 * (cpu) + 80)
 #define CPU_TOP(cpu) (CPU_MIDDLE(cpu) - 10)
@@ -1113,8 +1107,8 @@ destroy_event(GtkWidget *widget, gpointer data)
 }
 
 
-static GtkWidget *
-create_drawing_area(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin)
+struct graph_info *
+trace_graph_create(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin)
 {
         struct graph_info *ginfo;
         unsigned long sec, usec;
@@ -1185,139 +1179,5 @@ create_drawing_area(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin)
                               | GDK_POINTER_MOTION_HINT_MASK);
 
 
-        return ginfo->draw;
-}
-
-/* Callback for the clicked signal of the Exit button */
-static void
-exit_clicked (GtkWidget *widget, gpointer data)
-{
-        gtk_widget_destroy (GTK_WIDGET (data)); /* the user data points to the main window */
-        gtk_main_quit ();
-}
-
-/* Callback for the delete_event signal of the main application window */
-static gint
-delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
-{
-        gtk_widget_destroy (widget); /* destroy the main window */
-        gtk_main_quit ();
-        return TRUE;
-}
-
-void trace_graph(int argc, char **argv)
-{
-        struct tracecmd_input *handle;
-        GtkWidget *window;
-        GtkWidget *vbox;
-        GtkWidget *hbox;
-        GtkWidget *menu_bar;
-        GtkWidget *menu;
-        GtkWidget *menu_item;
-        GtkWidget *sub_item;
-        GtkWidget *scrollwin;
-        GtkWidget *draw;
-
-        handle = tracecmd_open(input_file);
-
-        if (!handle)
-                die("error reading header");
-
-        if (tracecmd_read_headers(handle) < 0)
-                return;
-
-        if (tracecmd_init_data(handle) < 0)
-                die("failed to init data");
-
-        gtk_init(&argc, &argv);
-
-        /* --- Main window --- */
-
-        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
-        /* --- Top Level Vbox --- */
-
-        vbox = gtk_vbox_new(FALSE, 0);
-        gtk_container_add(GTK_CONTAINER (window), vbox);
-        gtk_widget_show(vbox);
-
-        /* --- Menu Bar --- */
-
-        menu_bar = gtk_menu_bar_new();
-        gtk_box_pack_start(GTK_BOX (vbox), menu_bar, FALSE, FALSE, 0);
-        gtk_widget_show(menu_bar);
-
-        /* --- File Option --- */
-
-        menu_item = gtk_menu_item_new_with_label("File");
-        gtk_widget_show(menu_item);
-
-        gtk_menu_bar_append(GTK_MENU_BAR (menu_bar), menu_item);
-
-        menu = gtk_menu_new();    /* Don't need to show menus */
-
-
-        /* --- File - Quit Option --- */
-
-        sub_item = gtk_menu_item_new_with_label("Quit");
-
-        /* Add them to the menu */
-        gtk_menu_shell_append(GTK_MENU_SHELL (menu), sub_item);
-
-        /* We can attach the Quit menu item to our exit function */
-        g_signal_connect_swapped (G_OBJECT (sub_item), "activate",
-                                  G_CALLBACK (exit_clicked),
-                                  (gpointer) window);
-
-        /* We do need to show menu items */
-        gtk_widget_show(sub_item);
-
-        gtk_menu_item_set_submenu(GTK_MENU_ITEM (menu_item), menu);
-
-        /* --- end File options --- */
-
-
-        /* --- Top Level Hbox --- */
-
-        hbox = gtk_hbox_new(FALSE, 0);
-        gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
-        gtk_widget_show(hbox);
-
-        /* --- Scroll Window --- */
-        scrollwin = gtk_scrolled_window_new(NULL, NULL);
-        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin),
-                                       GTK_POLICY_AUTOMATIC,
-                                       GTK_POLICY_AUTOMATIC);
-        gtk_box_pack_start(GTK_BOX (hbox), scrollwin, TRUE, TRUE, 0);
-        gtk_widget_show(scrollwin);
-
-        /* --- Set up Drawing --- */
-
-        draw = create_drawing_area(handle, GTK_SCROLLED_WINDOW(scrollwin));
-
-        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrollwin),
-                                              draw);
-        gtk_widget_show(draw);
-
-
-        /**********************************************
-         *   Main Window
-         **********************************************/
-
-        /* Connect to the delete_event signal and Run the application */
-
-        gtk_signal_connect (GTK_OBJECT (window), "delete_event",
-                            (GtkSignalFunc) delete_event,
-                            NULL);
-
-        gtk_widget_set_size_request(window, TRACE_WIDTH, TRACE_HEIGHT);
-
-        gtk_widget_show (window);
-        gtk_main ();
-}
-
-int main(int argc, char **argv)
-{
-        trace_graph(argc, argv);
-        return 0;
+        return ginfo;
 }
diff --git a/trace-graph.h b/trace-graph.h
index d3bea95..61f5546 100644
--- a/trace-graph.h
+++ b/trace-graph.h
@@ -43,4 +43,13 @@ struct graph_info {
         gchar                   *test;
 };
 
+
+struct graph_info *
+trace_graph_create(struct tracecmd_input *handle, GtkScrolledWindow *scrollwin);
+
+static inline GtkWidget *trace_graph_get_draw(struct graph_info *ginfo)
+{
+        return ginfo->draw;
+}
+
 #endif /* _TRACE_GRAPH_H */