X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=1d4ae02729348d495ed79a3ac9938cd44f3939de;hb=deb4fd96c0c171fc8eb64f7f1e7f5c2af4931416;hp=0203999d653b38f6b0a343c82750cea1382f0f61;hpb=020c7feaeb2f56ae271c51381798f90c71a7e922;p=pspp-builds.git diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 0203999d..1d4ae027 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,14 +103,35 @@ text_to_value (const gchar *text, union value *v, } +GtkBuilder * +builder_new_real (const gchar *name) +{ + 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; +} + + + GtkWidget * -get_widget_assert (GladeXML *xml, const gchar *name) +get_widget_assert (gpointer x, const gchar *name) { - GtkWidget *w; - g_assert (xml); + GObject *obj = G_OBJECT (x); + GtkWidget *w = NULL; g_assert (name); - w = glade_xml_get_widget (xml, name); + if (GTK_IS_BUILDER (obj)) + w = GTK_WIDGET (gtk_builder_get_object (GTK_BUILDER (obj), name)); + + if (GLADE_IS_XML (obj)) + w = glade_xml_get_widget (GLADE_XML (obj), name); if ( !w ) g_critical ("Widget \"%s\" could not be found\n", name); @@ -124,17 +154,16 @@ 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 @@ -145,6 +174,8 @@ connect_help (GladeXML *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); + + g_list_free (helps); } @@ -165,14 +196,43 @@ extern struct dataset *the_dataset; extern struct source_stream *the_source_stream; extern PsppireDataStore *the_data_store; +/* 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; gboolean retval = TRUE; - struct casereader *reader = psppire_data_store_get_reader (the_data_store); - + 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_val_if_fail (proc_has_active_file (the_dataset), FALSE); @@ -204,65 +264,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); }