#include <stdarg.h>
#include <config.h>
-#include "message.h"
+#include <libpspp/message.h>
#include "message-dialog.h"
+#include "progname.h"
#include <gtk/gtk.h>
#include <glade/glade.h>
+#include <glib.h>
#include "helper.h"
#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)
+{
+ 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)
{
- gchar *msg = 0;
- gchar *text = g_strdup_vprintf (fmt, args);
+ 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;
gint message_type;
+ const char *msg;
- switch (klass)
+ switch (m->severity)
{
- case SE:
- case IE:
- case DE:
- case ME:
+ case MSG_ERROR:
message_type = GTK_MESSAGE_ERROR;
break;
- case SW:
- case DW:
- case MW:
+ case MSG_WARNING:
message_type = GTK_MESSAGE_WARNING;
break;
- case SM:
- case IS:
- case MM:
+ case MSG_NOTE:
default:
message_type = GTK_MESSAGE_INFO;
break;
};
- switch (klass)
+ switch (m->category)
{
- case SE:
- case SW:
- case SM:
- msg = g_strdup(_("Script Error"));
- break;
-
- case IE:
- case IS:
- msg = g_strdup(_("Installation Error"));
+ case MSG_SYNTAX:
+ msg = _("Script Error");
break;
- case DE:
- case DW:
- msg = g_strdup(_("Data File Error"));
+ case MSG_DATA:
+ msg = _("Data File Error");
break;
- case ME:
- case MW:
- case MM:
+ case MSG_GENERAL:
default:
- msg = g_strdup(_("PSPP Error"));
+ msg = _("PSPP Error");
break;
};
- GtkWindow *parent = GTK_WINDOW(get_widget_assert(xml, "data_editor"));
-
- GtkWidget *dialog = gtk_message_dialog_new(parent,
- GTK_DIALOG_MODAL,
- message_type,
- GTK_BUTTONS_CLOSE,
- msg);
+ parent = GTK_WINDOW(get_widget_assert(xml, "data_editor"));
+ dialog = gtk_message_dialog_new(parent,
+ GTK_DIALOG_MODAL,
+ message_type,
+ 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(int klass, const char *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- vmsg(klass, fmt, ap);
- va_end(ap);
}
-
-void
-err_vmsg (const struct error *e, const char *format, va_list args)
-{
- vmsg(e->class, format, args);
-}
-
-
-void
-err_assert_fail(const char *expr, const char *file, int line)
-{
- msg(ME, "Assertion failed: %s:%d; (%s)\n",file,line,expr);
-}
-
-/* The GUI is always interactive.
- So this function does nothing */
-void
-err_cond_fail(void)
-{
-}
-
-
-void
-err_failure(void)
-{
- msg(ME, _("Terminating NOW due to fatal error"));
- gtk_main_quit();
-}
-
-
/* 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->filename = 0;
- f->line_number = -1;
+ loc->file_name = 0;
+ loc->line_number = -1;
}