X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmessage-dialog.c;h=e5b2756290ab0cc66533eb4d30d02ec535d006da;hb=945fd370f9fb880b310fb88f868ad47c2ae84533;hp=0af7693694b21b4f33fec8c8cd197fbf8b9d80a4;hpb=9c8c1170e3b3cb59f9bf8fe6b27ecba7067b8cfa;p=pspp-builds.git

diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c
index 0af76936..e5b27562 100644
--- a/src/ui/gui/message-dialog.c
+++ b/src/ui/gui/message-dialog.c
@@ -31,6 +31,7 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+#include <glib.h>
 
 #include "helper.h"
 
@@ -38,19 +39,71 @@ extern GladeXML *xml;
 
 #define _(A) A
 
+static void handle_msg(const struct msg *);
+static void enqueue_msg(const struct msg *m);
 
-void 
-vmsg(int klass, const char *fmt, va_list args)
+
+static GQueue *message_queue;
+
+void
+message_dialog_init (void) 
+{
+  message_queue = g_queue_new();
+  msg_init(enqueue_msg);
+}
+
+
+void
+message_dialog_done (void)
+{
+  msg_done();
+  g_queue_free(message_queue);
+}
+
+static gboolean 
+dequeue_message(gpointer data)
 {
-  gchar *msg = 0;
-  gchar *text = g_strdup_vprintf (fmt, args);
+  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 ) 
+    {
+      handle_msg(m);
+      msg_destroy(m);
+      return TRUE;
+    }
+  
+  return FALSE;
+}
+
+static void
+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);
+}
+
+static void
+handle_msg(const struct msg *m)
+{
+  GtkWindow *parent;
+  GtkWidget *dialog;
 
-  GtkWindow *parent ;
-  GtkWidget *dialog ;
-		    
   gint message_type;
+  const char *msg;
 
-  switch (msg_class_to_severity (klass))
+  switch (m->severity)
     {
     case MSG_ERROR:
       message_type = GTK_MESSAGE_ERROR;
@@ -64,19 +117,19 @@ vmsg(int klass, const char *fmt, va_list args)
       break;
     };
   
-  switch (msg_class_to_category (klass)) 
+  switch (m->category) 
     {
     case MSG_SYNTAX:
-      msg = g_strdup(_("Script Error"));
+      msg = _("Script Error");
       break;
 
     case MSG_DATA:
-      msg = g_strdup(_("Data File Error"));
+      msg = _("Data File Error");
       break;
 
     case MSG_GENERAL:
     default:
-      msg = g_strdup(_("PSPP Error"));
+      msg = _("PSPP Error");
       break;
     };
   
@@ -88,59 +141,23 @@ vmsg(int klass, const char *fmt, va_list args)
 				  GTK_BUTTONS_CLOSE,
 				  msg);
   
-  gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), text);
-
-  g_free(text);
-  g_free(msg);
+  gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
+                                           "%s", m->text);
     
   gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
 
   gtk_dialog_run(GTK_DIALOG(dialog));
 
   gtk_widget_destroy (dialog);
-
-}
-
-
-void 
-msg(enum msg_class klass, const char *fmt, ...)
-{
-  va_list ap;
-  va_start(ap, fmt);
-  vmsg(klass, fmt, ap);
-  va_end(ap);
-}
-
-
-void
-err_msg (const struct error *e)
-{
-  vmsg(msg_class_from_category_and_severity (e->category, e->severity),
-       "%s", e->text);
-}
-
-
-void 
-err_assert_fail(const char *expr, const char *file, int line)
-{
-  msg(ME, "Assertion failed: %s:%d; (%s)\n",file,line,expr);
-}
-
-/* Writes MESSAGE formatted with printf, to stderr, if the
-   verbosity level is at least LEVEL. */
-void
-verbose_msg (int level, const char *format, ...)
-{
-  /* Do nothing for now. */
 }
 
 /* FIXME: This is a stub .
  * A temporary workaround until getl.c is rearranged
  */
 void
-err_location (struct file_locator *f)
+msg_location (struct msg_locator *loc)
 {
-	f->file_name = 0;
-	f->line_number = -1;
+	loc->file_name = 0;
+	loc->line_number = -1;
 }