X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=49dbfda4a181b18e4b9fccabaa8ed4e6a1c4aa18;hb=e85fb872c00b882b308d51eb943780c7aff7cd3b;hp=1ca0df3e48dfd476fd33c1b5132c240774e50319;hpb=68f08c4bb53fcde16035b622bdb6e9529f9cf3ae;p=pspp-builds.git diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 1ca0df3e..49dbfda4 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -20,28 +20,37 @@ */ #include +#include "psppire-syntax-window.h" + #include #include #include "helper.h" #include "message-dialog.h" +#include #include #include #include +#include #include +#include #include #include #include +#include #include #include +#include #include #include #include "psppire-data-store.h" #include -#include "output-viewer.h" +#include "psppire-output-window.h" + +#include "xalloc.h" #include @@ -86,7 +95,7 @@ text_to_value (const gchar *text, union value *v, } msg_disable (); - ok = data_in (ss_cstr (text), format.type, 0, 0, + ok = data_in (ss_cstr (text), LEGACY_NATIVE, format.type, 0, 0, 0, v, fmt_var_width (&format)); msg_enable (); @@ -94,19 +103,53 @@ text_to_value (const gchar *text, union value *v, } -GtkWidget * -get_widget_assert (GladeXML *xml, const gchar *name) +GtkBuilder * +builder_new_real (const gchar *name) { - GtkWidget *w; - g_assert (xml); + GtkBuilder *builder = gtk_builder_new (); + + GError *err = NULL; + if ( ! gtk_builder_add_from_file (builder, name, &err)) + { + g_critical ("Couldnt open user interface file %s: %s", name, err->message); + g_clear_error (&err); + } + + return builder; +} + + +GObject * +get_object_assert (GtkBuilder *builder, const gchar *name, GType type) +{ + GObject *o = NULL; g_assert (name); - w = glade_xml_get_widget (xml, name); + o = gtk_builder_get_object (builder, name); - if ( !w ) - g_critical ("Widget \"%s\" could not be found\n", name); + if ( !o ) + g_critical ("Object \"%s\" could not be found\n", name); - return w; + if ( ! g_type_is_a (G_OBJECT_TYPE (o), type)) + { + g_critical ("Object \"%s\" was expected to have type %s, but in fact has type %s", + name, g_type_name (type), G_OBJECT_TYPE_NAME (o)); + } + + return o; +} + + +GtkAction * +get_action_assert (GtkBuilder *builder, const gchar *name) +{ + return GTK_ACTION (get_object_assert (builder, name, GTK_TYPE_ACTION)); +} + +GtkWidget * +get_widget_assert (GtkBuilder *builder, const gchar *name) +{ + return GTK_WIDGET (get_object_assert (builder, name, GTK_TYPE_WIDGET)); } /* Converts a string in the pspp locale to utf-8. @@ -124,39 +167,61 @@ pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err) static void give_help (void) { - static struct msg m = { - MSG_GENERAL, - MSG_NOTE, - {0, -1}, - 0, - }; - - if (! m.text) - m.text=g_strdup (_("Sorry. The help system hasn't yet been implemented.")); - - popup_message (&m); + GtkWidget *dialog; + + dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, + _("Sorry. The help system hasn't yet " + "been implemented.")); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); } void -connect_help (GladeXML *xml) +connect_help (GtkBuilder *xml) { - GList *helps = glade_xml_get_widget_prefix (xml, "help_button_"); + GSList *helps = gtk_builder_get_objects (xml); - GList *i; - for ( i = g_list_first (helps); i ; i = g_list_next (i)) - g_signal_connect (GTK_WIDGET (i->data), "clicked", give_help, 0); -} + GSList *i; + for ( i = helps; i ; i = g_slist_next (i)) + { + GObject *o = i->data; + if ( GTK_IS_WIDGET (o) ) + { + gchar *name = NULL; + gchar s[12] = {0}; + g_object_get (o, "name", &name, NULL); + + if ( name) + strncpy (s, name, 11); + s[11] = '\0'; + + + if ( 0 == strcmp ("help_button", s)) + { + g_signal_connect (o, "clicked", give_help, 0); + } + } + } + g_slist_free (helps); +} void reference_manual (GtkMenuItem *menu, gpointer data) { GError *err = NULL; - if ( ! g_spawn_command_line_async ("yelp info:pspp", &err) ) + gchar *cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml")); + + if ( ! g_spawn_command_line_async (cmd, &err) ) { msg (ME, _("Cannot open reference manual: %s"), err->message); } + + g_free (cmd); g_clear_error (&err); } @@ -165,16 +230,46 @@ extern struct dataset *the_dataset; extern struct source_stream *the_source_stream; extern PsppireDataStore *the_data_store; -void +/* Lazy casereader callback function used by execute_syntax. */ +static struct casereader * +create_casereader_from_data_store (void *data_store_) +{ + PsppireDataStore *data_store = data_store_; + return psppire_data_store_get_reader (data_store); +} + +gboolean execute_syntax (struct getl_interface *sss) { struct lexer *lexer; - - struct casereader *reader = psppire_data_store_get_reader (the_data_store); - + gboolean retval = TRUE; + + struct casereader *reader; + size_t value_cnt; + casenumber case_cnt; + unsigned long int lazy_serial; + + /* When the user executes a number of snippets of syntax in a + row, none of which read from the active file, the GUI becomes + progressively less responsive. The reason is that each syntax + execution encapsulates the active file data in another + datasheet layer. The cumulative effect of having a number of + layers of datasheets wastes time and space. + + To solve the problem, we use a "lazy casereader", a wrapper + around the casereader obtained from the data store, that + only actually instantiates that casereader when it is + needed. If the data store casereader is never needed, then + it is reused the next time syntax is run, without wrapping + it in another layer. */ + value_cnt = psppire_data_store_get_value_count (the_data_store); + case_cnt = psppire_data_store_get_case_count (the_data_store); + reader = lazy_casereader_create (value_cnt, case_cnt, + create_casereader_from_data_store, + the_data_store, &lazy_serial); proc_set_active_file_data (the_dataset, reader); - g_return_if_fail (proc_has_active_file (the_dataset)); + g_return_val_if_fail (proc_has_active_file (the_dataset), FALSE); lexer = lex_create (the_source_stream); @@ -182,9 +277,17 @@ execute_syntax (struct getl_interface *sss) for (;;) { - int result = cmd_parse (lexer, the_dataset); + enum cmd_result result = cmd_parse (lexer, the_dataset); + + if ( cmd_result_is_failure (result)) + { + retval = FALSE; + if ( source_stream_current_error_mode (the_source_stream) + == ERRMODE_STOP ) + break; + } - if (result == CMD_EOF || result == CMD_FINISH) + if ( result == CMD_EOF || result == CMD_FINISH) break; } @@ -195,63 +298,69 @@ execute_syntax (struct getl_interface *sss) psppire_dict_replace_dictionary (the_data_store->dict, dataset_dict (the_dataset)); - { - PsppireCaseFile *pcf = psppire_case_file_new (dataset_source (the_dataset)); - - psppire_data_store_set_case_file (the_data_store, pcf); - } - - proc_set_active_file_data (the_dataset, NULL); + reader = proc_extract_active_file_data (the_dataset); + if (!lazy_casereader_destroy (reader, lazy_serial)) + psppire_data_store_set_reader (the_data_store, reader); som_flush (); - reload_the_viewer (); + psppire_output_window_reload (); + + return retval; } -#ifdef G_ENABLE_DEBUG -# define g_marshal_value_peek_int(v) g_value_get_int (v) -#else -# define g_marshal_value_peek_int(v) (v)->data[0].v_int -#endif +/* Create a deep copy of SRC */ +GtkListStore * +clone_list_store (const GtkListStore *src) +{ + GtkTreeIter src_iter; + gboolean ok; + gint i; + const gint n_cols = gtk_tree_model_get_n_columns (GTK_TREE_MODEL (src)); + GType *types = g_malloc (sizeof (*types) * n_cols); + int row = 0; + GtkListStore *dest; -/* VOID:INT,INT,INT */ -void -marshaller_VOID__INT_INT_INT (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__INT_INT_INT) (gpointer data1, - gint arg_1, - gint arg_2, - gint arg_3, - gpointer data2); - register GMarshalFunc_VOID__INT_INT_INT callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 4); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else + for (i = 0 ; i < n_cols; ++i ) + types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i); + + dest = gtk_list_store_newv (n_cols, types); + + for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (src), + &src_iter); + ok; + ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (src), &src_iter)) { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; + GtkTreeIter dest_iter; + gtk_list_store_append (dest, &dest_iter); + + for (i = 0 ; i < n_cols; ++i ) + { + GValue val = {0}; + + gtk_tree_model_get_value (GTK_TREE_MODEL (src), &src_iter, i, &val); + gtk_list_store_set_value (dest, &dest_iter, i, &val); + + g_value_unset (&val); + } + row++; } - callback = (GMarshalFunc_VOID__INT_INT_INT) (marshal_data ? marshal_data : cc->callback); - callback (data1, - g_marshal_value_peek_int (param_values + 1), - g_marshal_value_peek_int (param_values + 2), - g_marshal_value_peek_int (param_values + 3), - data2); + g_free (types); + + return dest; +} + + +void +paste_syntax_in_new_window (const gchar *syntax) +{ + GtkWidget *se = psppire_syntax_window_new (); + + gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1); + + gtk_widget_show (se); }