Cleaned up GUI, by objectifying the data editor. Removed a number of global variables.

[pspp-builds.git] / src / ui / gui / message-dialog.c

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index cf1fb851c9af322a77b77b8b0d4dcda57c50cb1a..f550e8fce853c1abd2ea6e297e2974c9a5764c26 100644 (file)
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -1,7 +1,6 @@
 /* 
    PSPPIRE --- A Graphical User Interface for PSPP
    Copyright (C) 2004,2005  Free Software Foundation
-   Written by John Darrington
 
    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
@@ -24,30 +23,79 @@
 #include <stdarg.h>
 
 #include <config.h>
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
 #include <libpspp/message.h>
+#include <libpspp/msg-locator.h>
 #include "message-dialog.h"
 #include "progname.h"
 
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+#include <glib.h>
 
 #include "helper.h"
 
-extern GladeXML *xml;
+static void enqueue_msg (const struct msg *m);
+
 
-#define _(A) A
+static GQueue *message_queue;
 
-static void handle_msg(const struct msg *);
 
 void
-message_dialog_init (void) 
+message_dialog_init (struct source_stream *ss) 
+{
+  message_queue = g_queue_new();
+  msg_init (ss, enqueue_msg);
+}
+
+void
+message_dialog_done (void)
+{
+  msg_done();
+  g_queue_free(message_queue);
+}
+
+static gboolean 
+dequeue_message(gpointer data)
 {
-  msg_init(handle_msg);
+  struct msg * m ;
+
+  /* If a pointer grab is in effect, then the combination of that, and
+     a modal dialog box, will cause an impossible situation. 
+     So don't pop it up just yet.
+  */ 
+  if ( gdk_pointer_is_grabbed())
+    return TRUE;
+
+  m = g_queue_pop_tail(message_queue);
+
+  if ( m ) 
+    {
+      popup_message(m);
+      msg_destroy(m);
+      return TRUE;
+    }
+  
+  return FALSE;
 }
 
 static void
-handle_msg(const struct msg *m)
+enqueue_msg(const struct msg *msg)
+{
+  struct msg *m = msg_dup(msg);
+
+  g_queue_push_head(message_queue, m);
+
+  g_idle_add(dequeue_message, 0);
+}
+
+
+void 
+popup_message(const struct msg *m)
 {
   GtkWindow *parent;
   GtkWidget *dialog;
@@ -84,32 +132,23 @@ handle_msg(const struct msg *m)
       msg = _("PSPP Error");
       break;
     };
-  
-  parent = GTK_WINDOW(get_widget_assert(xml, "data_editor"));
 
-  dialog = gtk_message_dialog_new(parent,
+  dialog = gtk_message_dialog_new ( NULL,
                                  GTK_DIALOG_MODAL,
                                  message_type,
                                  GTK_BUTTONS_CLOSE,
                                  msg);
-  
+
   gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-                                           "%s", m->text);
-    
-  gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
+                                           _("%s (line %d) %s"),
+                                          m->where.file_name,
+                                          m->where.line_number,
+                                          m->text);
+
+  gtk_window_set_keep_above (GTK_WINDOW(dialog), TRUE);
 
   gtk_dialog_run(GTK_DIALOG(dialog));
 
   gtk_widget_destroy (dialog);
 }
 
-/* FIXME: This is a stub .
- * A temporary workaround until getl.c is rearranged
- */
-void
-msg_location (struct msg_locator *loc)
-{
-       loc->file_name = 0;
-       loc->line_number = -1;
-}
-