John's original code for patch #6210.

[pspp] / src / ui / gui / output-viewer.c

diff --git a/src/ui/gui/output-viewer.c b/src/ui/gui/output-viewer.c
index d2f46bab59173d6c21459c288c52237703e5c3b0..62dc85f1c2a4147c9cb1cff7b72059c60babf67d 100644 (file)
--- a/src/ui/gui/output-viewer.c
+++ b/src/ui/gui/output-viewer.c
@@ -46,6 +46,8 @@ cancel_urgency (GtkWindow *window,  gpointer data)
 
 static struct output_viewer *the_output_viewer = NULL;
 
+int viewer_length = -1;
+int viewer_width = -1;
 
 /* Callback for the "delete" action (clicking the x on the top right
    hand corner of the window) */
@@ -64,6 +66,46 @@ on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data)
 }
 
 
+/* 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)
+{
+  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));
+}
+
+
+
 /*
   Create a new output viewer
 */
@@ -101,6 +143,9 @@ new_output_viewer (void)
     pango_font_description_free (font_desc);
   }
 
+  g_signal_connect (ov->textview, "size-allocate",
+                   G_CALLBACK (on_textview_resize), NULL);
+
   ov->fp = NULL;
 
   g_signal_connect (get_widget_assert (xml,"help_about"),