X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-output-window.c;h=af47d3be51079a1e63c344824e74df20e4d5d322;hb=refs%2Ftags%2Fsid-i386-build141;hp=d5e5044af87c7e338966964212b5f6639616c24d;hpb=7bc7a451768f00702e65a25d4a9bdd0b567f82ac;p=pspp-builds.git diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c index d5e5044a..af47d3be 100644 --- a/src/ui/gui/psppire-output-window.c +++ b/src/ui/gui/psppire-output-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008 Free Software Foundation + Copyright (C) 2008, 2009 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,11 @@ #include #include "helper.h" +#include #include +#include +#include +#include #include #include "about.h" @@ -38,7 +42,12 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid - +enum + { + COL_TITLE, /* Table title. */ + COL_Y, /* Y position of top of title. */ + N_COLS + }; static void psppire_output_window_base_finalize (PsppireOutputWindowClass *, gpointer); static void psppire_output_window_base_init (PsppireOutputWindowClass *class); @@ -67,7 +76,7 @@ psppire_output_window_get_type (void) }; psppire_output_window_type = - g_type_register_static (PSPPIRE_WINDOW_TYPE, "PsppireOutputWindow", + g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireOutputWindow", &psppire_output_window_info, 0); } @@ -106,13 +115,110 @@ psppire_output_window_base_finalize (PsppireOutputWindowClass *class, gpointer class_data) { } + +/* Output driver class. */ +struct psppire_output_driver + { + struct output_driver driver; + PsppireOutputWindow *viewer; + struct xr_driver *xr; + }; - +static struct output_driver_class psppire_output_class; + +static struct psppire_output_driver * +psppire_output_cast (struct output_driver *driver) +{ + assert (driver->class == &psppire_output_class); + return UP_CAST (driver, struct psppire_output_driver, driver); +} + +static gboolean +expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data) +{ + struct xr_rendering *r = g_object_get_data (G_OBJECT (widget), "rendering"); + cairo_t *cr; + + cr = gdk_cairo_create (widget->window); + xr_rendering_draw (r, cr); + cairo_destroy (cr); + + return TRUE; +} + +static void +psppire_output_submit (struct output_driver *this, + const struct output_item *item) +{ + struct psppire_output_driver *pod = psppire_output_cast (this); + GtkWidget *drawing_area; + struct xr_rendering *r; + cairo_t *cr; + int tw, th; + + if (pod->viewer == NULL) + { + pod->viewer = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ()); + gtk_widget_show_all (GTK_WIDGET (pod->viewer)); + pod->viewer->driver = pod; + } + + cr = gdk_cairo_create (GTK_WIDGET (pod->viewer)->window); + if (pod->xr == NULL) + pod->xr = xr_create_driver (cr); + + r = xr_rendering_create (pod->xr, item, cr); + if (r == NULL) + goto done; + + xr_rendering_measure (r, &tw, &th); + + drawing_area = gtk_drawing_area_new (); + gtk_widget_modify_bg ( + GTK_WIDGET (drawing_area), GTK_STATE_NORMAL, + >k_widget_get_style (drawing_area)->base[GTK_STATE_NORMAL]); + g_object_set_data (G_OBJECT (drawing_area), "rendering", r); + gtk_widget_set_size_request (drawing_area, tw, th); + gtk_layout_put (pod->viewer->output, drawing_area, 0, pod->viewer->y); + gtk_widget_show (drawing_area); + g_signal_connect (G_OBJECT (drawing_area), "expose_event", + G_CALLBACK (expose_event_callback), NULL); + + if (pod->viewer->max_width < tw) + pod->viewer->max_width = tw; + pod->viewer->y += th; -static PsppireOutputWindow *the_output_viewer = NULL; + gtk_layout_set_size (pod->viewer->output, + pod->viewer->max_width, pod->viewer->y); + gtk_window_set_urgency_hint (GTK_WINDOW (pod->viewer), TRUE); +done: + cairo_destroy (cr); +} + +static struct output_driver_class psppire_output_class = + { + "PSPPIRE", /* name */ + NULL, /* create */ + NULL, /* destroy */ + psppire_output_submit, /* submit */ + NULL, /* flush */ + }; + +void +psppire_output_window_setup (void) +{ + struct psppire_output_driver *pod; + struct output_driver *d; + + pod = xzalloc (sizeof *pod); + d = &pod->driver; + output_driver_init (d, &psppire_output_class, "PSPPIRE", 0); + output_driver_register (d); +} + int viewer_length = 16; int viewer_width = 59; @@ -125,9 +231,7 @@ on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data) gtk_widget_destroy (GTK_WIDGET (ow)); - the_output_viewer = NULL; - - unlink (OUTPUT_FILE_NAME); + ow->driver->viewer = NULL; return FALSE; } @@ -139,118 +243,99 @@ cancel_urgency (GtkWindow *window, gpointer data) { gtk_window_set_urgency_hint (window, FALSE); } -/* Sets width and length according to the new size - of the output window */ + static void -on_textview_resize (GtkWidget *widget, - GtkAllocation *allocation, - gpointer user_data) +on_row_activate (GtkTreeView *overview, + GtkTreePath *path, + GtkTreeViewColumn *column, + PsppireOutputWindow *window) { - PangoContext * context ; - PangoLayout *layout ; - PangoRectangle logical; - GtkStyle *style; - gint right_margin, left_margin; - GtkTextView *text_view = GTK_TEXT_VIEW (widget); - - context = gtk_widget_create_pango_context (widget); - layout = pango_layout_new (context); - - style = gtk_widget_get_style (widget); - - pango_layout_set_font_description (layout, style->font_desc); - - /* Find the width of one character. We can use any character, because - the textview has a monospaced font */ - pango_layout_set_text (layout, "M", 1); - - pango_layout_get_extents (layout, NULL, &logical); - - left_margin = gtk_text_view_get_left_margin (text_view); - right_margin = gtk_text_view_get_right_margin (text_view); - - viewer_length = allocation->height / PANGO_PIXELS (logical.height); - viewer_width = (allocation->width - right_margin - left_margin) - / PANGO_PIXELS (logical.width); - - g_object_unref (G_OBJECT (layout)); - g_object_unref (G_OBJECT (context)); + GtkTreeModel *model; + GtkTreeIter iter; + GtkAdjustment *vadj; + GValue value = {0}; + double y, min, max; + + model = gtk_tree_view_get_model (overview); + if (!gtk_tree_model_get_iter (model, &iter, path)) + return; + + gtk_tree_model_get_value (model, &iter, COL_Y, &value); + y = g_value_get_long (&value); + g_value_unset (&value); + + vadj = gtk_layout_get_vadjustment (window->output); + min = vadj->lower; + max = vadj->upper - vadj->page_size; + if (y < min) + y = min; + else if (y > max) + y = max; + gtk_adjustment_set_value (vadj, y); } - static void psppire_output_window_init (PsppireOutputWindow *window) { - GtkBuilder *xml = builder_new ("output-viewer.ui"); - - GtkWidget *box = gtk_vbox_new (FALSE, 0); - - GtkWidget *sw = get_widget_assert (xml, "scrolledwindow1"); - - GtkWidget *menubar = get_widget_assert (xml, "menubar1"); - - window->textview = get_widget_assert (xml, "output-viewer-textview"); - + GtkTreeViewColumn *column; + GtkCellRenderer *renderer; + GtkBuilder *xml; - gtk_container_add (GTK_CONTAINER (window), box); + xml = builder_new ("output-viewer.ui"); + gtk_widget_reparent (get_widget_assert (xml, "vbox1"), GTK_WIDGET (window)); - g_object_ref (menubar); - gtk_widget_unparent (menubar); + window->output = GTK_LAYOUT (get_widget_assert (xml, "output")); + window->y = 0; - g_object_ref (sw); - gtk_widget_unparent (sw); + window->overview = GTK_TREE_VIEW (get_widget_assert (xml, "overview")); + gtk_tree_view_set_model (window->overview, + GTK_TREE_MODEL (gtk_tree_store_new ( + N_COLS, + G_TYPE_STRING, /* COL_TITLE */ + G_TYPE_LONG))); /* COL_Y */ + window->last_table_num = -1; + column = gtk_tree_view_column_new (); + gtk_tree_view_append_column (GTK_TREE_VIEW (window->overview), column); + renderer = gtk_cell_renderer_text_new (); + gtk_tree_view_column_pack_start (column, renderer, TRUE); + gtk_tree_view_column_add_attribute (column, renderer, "text", COL_TITLE); - gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0); + g_signal_connect (GTK_TREE_VIEW (window->overview), + "row-activated", G_CALLBACK (on_row_activate), window); + gtk_widget_modify_bg (GTK_WIDGET (window->output), GTK_STATE_NORMAL, + >k_widget_get_style (GTK_WIDGET (window->output))->base[GTK_STATE_NORMAL]); - gtk_widget_show_all (box); - - // connect_help (xml); - - window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (window->textview)); + connect_help (xml); g_signal_connect (window, "focus-in-event", G_CALLBACK (cancel_urgency), NULL); - { - /* Output uses ascii characters for tabular material. - So we need a monospaced font otherwise it'll look silly */ - PangoFontDescription *font_desc = - pango_font_description_from_string ("monospace"); - - gtk_widget_modify_font (window->textview, font_desc); - pango_font_description_free (font_desc); - } - - g_signal_connect (window->textview, "size-allocate", - G_CALLBACK (on_textview_resize), NULL); - - window->fp = NULL; - - g_signal_connect (get_object_assert (xml,"help_about"), + g_signal_connect (get_action_assert (xml,"help_about"), "activate", G_CALLBACK (about_new), window); - g_signal_connect (get_object_assert (xml,"help_reference"), + g_signal_connect (get_action_assert (xml,"help_reference"), "activate", G_CALLBACK (reference_manual), NULL); - g_signal_connect (get_object_assert (xml,"windows_minimise-all"), + g_signal_connect (get_action_assert (xml,"windows_minimise-all"), "activate", G_CALLBACK (psppire_window_minimise_all), NULL); - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1")); + { + GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER)); - PSPPIRE_WINDOW (window)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent); + PSPPIRE_WINDOW (window)->menu = + GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar1/windows_menuitem/windows_minimise-all")->parent); + } g_object_unref (xml); @@ -263,112 +348,7 @@ GtkWidget* psppire_output_window_new (void) { return GTK_WIDGET (g_object_new (psppire_output_window_get_type (), - "usage", PSPPIRE_WINDOW_USAGE_OUTPUT, "filename", "Output", + "description", _("Output Viewer"), NULL)); } - -static void reload_viewer (PsppireOutputWindow *ow); - -void -psppire_output_window_reload (void) -{ - struct stat buf; - - /* If there is no output, then don't do anything */ - if (0 != stat (OUTPUT_FILE_NAME, &buf)) - return ; - - if ( NULL == the_output_viewer ) - { - the_output_viewer = PSPPIRE_OUTPUT_WINDOW (psppire_output_window_new ()); - gtk_widget_show (GTK_WIDGET (the_output_viewer)); - } - - reload_viewer (the_output_viewer); - -} - - -static void -reload_viewer (PsppireOutputWindow *ow) -{ - GtkTextIter end_iter; - GtkTextMark *mark ; - - static char *line = NULL; - - gboolean chars_inserted = FALSE; - - gtk_text_buffer_get_end_iter (ow->buffer, &end_iter); - - line = xrealloc (line, sizeof (char) * (viewer_width + 1)); - - mark = gtk_text_buffer_create_mark (ow->buffer, NULL, &end_iter, TRUE); - -#ifdef __CYGWIN__ - /* - Apparently Windoze is not capabale of writing to a file whilst - another (or the same) process is reading from it. Therefore, we - must close the file after reading it, and clear the entire buffer - before writing to it. - This will be slower for large buffers, but should work - (in so far as anything ever works on windows). - */ - { - GtkTextIter start_iter; - FILE *fp = fopen (OUTPUT_FILE_NAME, "r"); - if ( !fp) - { - g_print ("Cannot open %s\n", OUTPUT_FILE_NAME); - return; - } - - /* Delete all the entire buffer */ - gtk_text_buffer_get_start_iter (ov->buffer, &start_iter); - gtk_text_buffer_delete (ov->buffer, &start_iter, &end_iter); - - - gtk_text_buffer_get_start_iter (ov->buffer, &start_iter); - /* Read in the next lot of text */ - while (fgets (line, viewer_width + 1, fp) != NULL) - { - chars_inserted = TRUE; - gtk_text_buffer_insert (ov->buffer, &start_iter, line, -1); - } - - fclose (fp); - } -#else - { - if ( ow->fp == NULL) - { - ow->fp = fopen (OUTPUT_FILE_NAME, "r"); - if ( ow->fp == NULL) - { - g_print ("Cannot open %s\n", OUTPUT_FILE_NAME); - return; - } - } - - /* Read in the next lot of text */ - while (fgets (line, viewer_width + 1, ow->fp) != NULL) - { - chars_inserted = TRUE; - gtk_text_buffer_insert (ow->buffer, &end_iter, line, -1); - } - } -#endif - - /* Scroll to where the start of this lot of text begins */ - gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (ow->textview), - mark, - 0.1, TRUE, 0.0, 0.0); - - - if ( chars_inserted ) - gtk_window_set_urgency_hint ( GTK_WINDOW (ow), TRUE); -} - - -