X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=cde9d92b8f186a29525a00b24fb55e09b3707771;hb=33cdbdf7e095370cf04240eed21344205a487191;hp=0203999d653b38f6b0a343c82750cea1382f0f61;hpb=020c7feaeb2f56ae271c51381798f90c71a7e922;p=pspp diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index 0203999d65..cde9d92b8f 100644 --- a/src/ui/gui/helper.c +++ b/src/ui/gui/helper.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2007 Free Software Foundation + Copyright (C) 2007, 2009, 2010, 2011, 2012, 2013 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,245 +24,209 @@ #include #include "helper.h" -#include "message-dialog.h" +#include #include #include #include +#include #include - +#include "psppire-syntax-window.h" +#include #include #include #include +#include #include -#include -#include -#include #include "psppire-data-store.h" -#include -#include "output-viewer.h" + +#include "gl/configmake.h" +#include "xalloc.h" #include -/* Formats a value according to FORMAT - The returned string must be freed when no longer required */ +/* Formats a value according to VAR's print format and strips white space + appropriately for VAR's type. That is, if VAR is numeric, strips leading + white space (because numbers are right-justified within their fields), and + if VAR is string, strips trailing white space (because spaces pad out string + values on the right). + + Returns an allocated string. The returned string must be freed when no + longer required. */ +gchar * +value_to_text (union value v, const struct variable *var) +{ + return value_to_text__ (v, var_get_print_format (var), + var_get_encoding (var)); +} + +/* Formats a value with format FORMAT and strips white space appropriately for + FORMATs' type. That is, if FORMAT is numeric, strips leading white space + (because numbers are right-justified within their fields), and if FORMAT is + string, strips trailing white space (because spaces pad out string values on + the right). + + Returns an allocated string. The returned string must be freed when no + longer required. */ gchar * -value_to_text (union value v, struct fmt_spec format) +value_to_text__ (union value v, + const struct fmt_spec *format, const char *encoding) { - gchar *s = 0; + gchar *s; - s = g_new (gchar, format.w + 1); - data_out (&v, &format, s); - s[format.w]='\0'; - g_strchug (s); + s = data_out_stretchy (&v, encoding, format, NULL); + if (fmt_is_numeric (format->type)) + g_strchug (s); + else + g_strchomp (s); return s; } +/* Converts TEXT to a value. + + VAL will be initialised and filled by this function. + It is the caller's responsibility to destroy VAL when no longer needed. + VAR must be the variable with which VAL is associated. + + On success, VAL is returned, NULL otherwise. +*/ +union value * +text_to_value (const gchar *text, + const struct variable *var, + union value *val) +{ + return text_to_value__ (text, var_get_print_format (var), + var_get_encoding (var), val); +} + +/* Converts TEXT, which contains a value in the given FORMAT encoding in + ENCODING, into a value. + VAL will be initialised and filled by this function. + It is the caller's responsibility to destroy VAL when no longer needed. -gboolean -text_to_value (const gchar *text, union value *v, - struct fmt_spec format) + On success, VAL is returned, NULL otherwise. +*/ +union value * +text_to_value__ (const gchar *text, + const struct fmt_spec *format, + const gchar *encoding, + union value *val) { - bool ok; + int width = fmt_var_width (format); - if ( format.type != FMT_A) + if (format->type != FMT_A) { - if ( ! text ) return FALSE; + if (! text) return NULL; { const gchar *s = text; while (*s) { - if ( !isspace (*s)) + if (!isspace (*s)) break; s++; } - if ( !*s) return FALSE; + if (!*s) return NULL; } } - msg_disable (); - ok = data_in (ss_cstr (text), format.type, 0, 0, - v, fmt_var_width (&format)); - msg_enable (); + value_init (val, width); + char *err = data_in (ss_cstr (text), UTF8, format->type, val, width, encoding); - return ok; -} - - -GtkWidget * -get_widget_assert (GladeXML *xml, const gchar *name) -{ - GtkWidget *w; - g_assert (xml); - g_assert (name); - - w = glade_xml_get_widget (xml, name); - - if ( !w ) - g_critical ("Widget \"%s\" could not be found\n", name); + if (err) + { + value_destroy (val, width); + val = NULL; + free (err); + } - return w; + return val; } -/* Converts a string in the pspp locale to utf-8. - The return value must be freed when no longer required*/ -gchar * -pspp_locale_to_utf8 (const gchar *text, gssize len, GError **err) -{ - return recode_string (CONV_PSPP_TO_UTF8, text, len); -} #define _(msgid) gettext (msgid) #define N_(msgid) msgid - -static void -give_help (void) +/* Create a deep copy of SRC */ +GtkListStore * +clone_list_store (const GtkListStore *src) { - static struct msg m = { - MSG_GENERAL, - MSG_NOTE, - {0, -1}, - 0, - }; + 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); - if (! m.text) - m.text=g_strdup (_("Sorry. The help system hasn't yet been implemented.")); + int row = 0; + GtkListStore *dest; - popup_message (&m); -} - -void -connect_help (GladeXML *xml) -{ - GList *helps = glade_xml_get_widget_prefix (xml, "help_button_"); + for (i = 0 ; i < n_cols; ++i) + types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i); - 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); -} + dest = gtk_list_store_newv (n_cols, types); - - -void -reference_manual (GtkMenuItem *menu, gpointer data) -{ - GError *err = NULL; - if ( ! g_spawn_command_line_async ("yelp info:pspp", &err) ) + 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)) { - msg (ME, _("Cannot open reference manual: %s"), err->message); - } - g_clear_error (&err); -} - - -extern struct dataset *the_dataset; -extern struct source_stream *the_source_stream; -extern PsppireDataStore *the_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); - - proc_set_active_file_data (the_dataset, reader); - - g_return_val_if_fail (proc_has_active_file (the_dataset), FALSE); + GtkTreeIter dest_iter; + gtk_list_store_append (dest, &dest_iter); - lexer = lex_create (the_source_stream); - - getl_append_source (the_source_stream, sss, GETL_BATCH, ERRMODE_CONTINUE); + for (i = 0 ; i < n_cols; ++i) + { + GValue val = {0}; - for (;;) - { - enum cmd_result result = cmd_parse (lexer, the_dataset); + gtk_tree_model_get_value (GTK_TREE_MODEL (src), &src_iter, i, &val); + gtk_list_store_set_value (dest, &dest_iter, i, &val); - if ( cmd_result_is_failure (result)) - { - retval = FALSE; - if ( source_stream_current_error_mode (the_source_stream) - == ERRMODE_STOP ) - break; + g_value_unset (&val); } - - if ( result == CMD_EOF || result == CMD_FINISH) - break; + row++; } - getl_abort_noninteractive (the_source_stream); - - lex_destroy (lexer); + g_free (types); - psppire_dict_replace_dictionary (the_data_store->dict, - dataset_dict (the_dataset)); - - { - PsppireCaseFile *pcf = psppire_case_file_new (dataset_source (the_dataset)); + return dest; +} - psppire_data_store_set_case_file (the_data_store, pcf); - } - proc_set_active_file_data (the_dataset, NULL); - som_flush (); - reload_the_viewer (); +static gboolean +on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr) +{ + *addr = NULL; - return retval; + return FALSE; } +char * +paste_syntax_to_window (gchar *syntax) +{ + static GtkWidget *the_syntax_pasteboard = NULL; + GtkTextBuffer *buffer = NULL; -#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 - - -/* 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 + if (NULL == the_syntax_pasteboard) { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; + the_syntax_pasteboard = psppire_syntax_window_new (NULL); + g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete), + &the_syntax_pasteboard); } - 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); + buffer = GTK_TEXT_BUFFER (PSPPIRE_SYNTAX_WINDOW (the_syntax_pasteboard)->buffer); + + gtk_text_buffer_begin_user_action (buffer); + gtk_text_buffer_insert_at_cursor (buffer, syntax, -1); + gtk_text_buffer_insert_at_cursor (buffer, "\n", 1); + gtk_text_buffer_end_user_action (buffer); + + gtk_widget_show (the_syntax_pasteboard); + + return syntax; }