X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmessage-dialog.c;h=866f8c6d91f1065762ba0a636291c255bd05c67a;hb=df63b7b8aec3bd284ba2c4e62f1fc30924fe2c5b;hp=fca13956b1f600fb8ea141ed54df6a02e1979c8f;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git diff --git a/src/ui/gui/message-dialog.c b/src/ui/gui/message-dialog.c index fca13956..866f8c6d 100644 --- a/src/ui/gui/message-dialog.c +++ b/src/ui/gui/message-dialog.c @@ -24,59 +24,125 @@ #define N_(msgid) msgid #include +#include #include #include "message-dialog.h" #include "progname.h" #include -#include #include #include "helper.h" static void enqueue_msg (const struct msg *m); +static gboolean popup_messages (gpointer); +#define MAX_EARLY_MESSAGES 100 +static GQueue *early_queue; -static GQueue *message_queue; +static unsigned long dropped_messages; +#define MAX_LATE_MESSAGES 10 +static GQueue *late_queue; + +static int error_cnt, warning_cnt, note_cnt; + +static GtkBuilder *message_xml; +static GtkWidget *message_dialog; void message_dialog_init (struct source_stream *ss) { - message_queue = g_queue_new (); + early_queue = g_queue_new (); + dropped_messages = 0; + late_queue = g_queue_new (); + error_cnt = warning_cnt = note_cnt = 0; msg_init (ss, enqueue_msg); + message_xml = builder_new ("message-dialog.ui"); + message_dialog = get_widget_assert (message_xml, "message-dialog"); } void message_dialog_done (void) { msg_done (); - g_queue_free (message_queue); + g_queue_free (early_queue); + dropped_messages = 0; + g_queue_free (late_queue); + gtk_widget_destroy (message_dialog); + g_object_unref (message_xml); } -static gboolean -dequeue_message (gpointer data) +static void +format_message (struct msg *m, struct string *msg) { - struct msg * m ; + const char *label; - /* 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; + if (m->where.file_name) + ds_put_format (msg, "%s:", m->where.file_name); + if (m->where.line_number != -1) + ds_put_format (msg, "%d:", m->where.line_number); + if (m->where.file_name || m->where.line_number != -1) + ds_put_char (msg, ' '); - m = g_queue_pop_tail (message_queue); - - if ( m ) + switch (m->severity) { - popup_message (m); - msg_destroy (m); - return TRUE; + case MSG_ERROR: + switch (m->category) + { + case MSG_SYNTAX: + label = _("syntax error"); + break; + + case MSG_DATA: + label = _("data file error"); + break; + + case MSG_GENERAL: + default: + label = _("PSPP error"); + break; + } + break; + case MSG_WARNING: + switch (m->category) + { + case MSG_SYNTAX: + label = _("syntax warning"); + break; + + case MSG_DATA: + label = _("data file warning"); + break; + + case MSG_GENERAL: + default: + label = _("PSPP warning"); + break; + } + break; + case MSG_NOTE: + default: + switch (m->category) + { + case MSG_SYNTAX: + label = _("syntax information"); + break; + + case MSG_DATA: + label = _("data file information"); + break; + + case MSG_GENERAL: + default: + label = _("PSPP information"); + break; + } + break; } - - return FALSE; + ds_put_format (msg, "%s: %s\n", label, m->text); + msg_destroy (m); } static void @@ -84,77 +150,130 @@ 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) -{ - GtkWidget *dialog; - gchar *location = NULL; - - gint message_type; - const char *msg; - switch (m->severity) { case MSG_ERROR: - message_type = GTK_MESSAGE_ERROR; + error_cnt++; break; case MSG_WARNING: - message_type = GTK_MESSAGE_WARNING; + warning_cnt++; break; case MSG_NOTE: - default: - message_type = GTK_MESSAGE_INFO; + note_cnt++; break; - }; + } - switch (m->category) + if (g_queue_get_length (early_queue) < MAX_EARLY_MESSAGES) { - case MSG_SYNTAX: - msg = _("Script Error"); - break; + if (g_queue_is_empty (early_queue)) + g_idle_add (popup_messages, NULL); + g_queue_push_tail (early_queue, m); + } + else + { + if (g_queue_get_length (late_queue) >= MAX_LATE_MESSAGES) + { + struct msg *m = g_queue_pop_head (late_queue); + msg_destroy (m); + dropped_messages++; + } + g_queue_push_tail (late_queue, m); + } +} - case MSG_DATA: - msg = _("Data File Error"); - break; +static gboolean +popup_messages (gpointer unused UNUSED) +{ + GtkTextBuffer *text_buffer; + GtkTextIter end; + GtkTextView *text_view; + GtkLabel *label; + struct string lead = DS_EMPTY_INITIALIZER; + struct string msg = DS_EMPTY_INITIALIZER; + int message_cnt; + + /* Set up the dialog. */ + if (message_xml == NULL || message_dialog == NULL) + goto use_fallback; - case MSG_GENERAL: - default: - msg = _("PSPP Error"); - break; - }; - - dialog = gtk_message_dialog_new ( NULL, - GTK_DIALOG_MODAL, - message_type, - GTK_BUTTONS_CLOSE, - msg); - if ( m->where.line_number != -1) + /* 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_display_pointer_is_grabbed (gtk_widget_get_display (message_dialog))) { - location = g_strdup_printf (_("%s (line %d)"), - m->where.file_name ? m->where.file_name : "", - m->where.line_number); + ds_destroy (&lead); + ds_destroy (&msg); + return TRUE; } + + /* Compose the lead-in. */ + message_cnt = error_cnt + warning_cnt + note_cnt; + if (dropped_messages == 0) + ds_put_format ( + &lead, + ngettext ("The PSPP processing engine reported the following message:", + "The PSPP processing engine reported the following messages:", + message_cnt)); else { - location = g_strdup_printf (_("%s"), - m->where.file_name ? m->where.file_name : ""); } + ds_put_format ( + &lead, + ngettext ("The PSPP processing engine reported %d message.", + "The PSPP processing engine reported %d messages.", + message_cnt), + message_cnt); + ds_put_cstr (&lead, " "); + ds_put_format ( + &lead, + ngettext ("%d of these messages are displayed below.", + "%d of these messages are displayed below.", + MAX_EARLY_MESSAGES + MAX_LATE_MESSAGES), + MAX_EARLY_MESSAGES + MAX_LATE_MESSAGES); + } + + + /* Compose the messages. */ + while (!g_queue_is_empty (early_queue)) + format_message (g_queue_pop_head (early_queue), &msg); + if (dropped_messages) + { + ds_put_format (&msg, "...\nOmitting %lu messages\n...\n", + dropped_messages); + dropped_messages = 0; + } + while (!g_queue_is_empty (late_queue)) + format_message (g_queue_pop_head (late_queue), &msg); + + text_buffer = gtk_text_buffer_new (NULL); + gtk_text_buffer_get_end_iter (text_buffer, &end); + gtk_text_buffer_insert (text_buffer, &end, ds_data (&msg), ds_length (&msg)); + + label = GTK_LABEL (get_widget_assert (message_xml, "lead-in")); + if (label == NULL) + goto use_fallback; + gtk_label_set_text (label, ds_cstr (&lead)); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("%s %s"), - location, - m->text); - g_free (location); + text_view = GTK_TEXT_VIEW (get_widget_assert (message_xml, "message")); + if (text_view == NULL) + goto use_fallback; + gtk_text_view_set_buffer (text_view, text_buffer); - gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE); + gtk_widget_grab_focus (get_widget_assert (message_xml, "close-button")); + gtk_dialog_run ( GTK_DIALOG (message_dialog)); + gtk_widget_hide (message_dialog); - gtk_dialog_run (GTK_DIALOG (dialog)); + ds_destroy (&lead); + ds_destroy (&msg); - gtk_widget_destroy (dialog); + return FALSE; + +use_fallback: + g_warning ("Could not create message dialog. " + "Is PSPPIRE properly installed?"); + fputs (ds_cstr (&msg), stderr); + ds_destroy (&lead); + ds_destroy (&msg); + return FALSE; }