X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=d453f2a66593e79548e95e7a8d5b62d478a821d5;hb=55268cdabc9575abb4b8f0fd91692e743bf9cc3f;hp=b1fdb27193df933ab583420693bd6b6b5f8481ec;hpb=4398d3a1a881c6cafaeb0cbd11f56bd51d904c51;p=pspp diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c index b1fdb27193..d453f2a665 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 @@ -20,21 +20,18 @@ */ #include -#include "psppire-syntax-window.h" - #include #include #include "helper.h" -#include "message-dialog.h" #include #include #include #include #include #include - -#include +#include "psppire-syntax-window.h" +#include #include #include @@ -42,44 +39,107 @@ #include #include -#include -#include -#include -#include #include "psppire-data-store.h" -#include -#include "psppire-output-window.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 */ +/* Returns a copy of IN with each underscore doubled. The caller should free + the returned string (with free()) when it is no longer needed. */ +char * +escape_underscores (const char *in) +{ + char *out = xmalloc (2 * strlen (in) + 1); + char *p; + + p = out; + for (; *in != '\0'; in++) + { + if (*in == '_') + *p++ = '_'; + *p++ = *in; + } + *p = '\0'; + + return out; +} + +/* 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; @@ -90,75 +150,42 @@ text_to_value (const gchar *text, union value *v, s++; } - if ( !*s) return FALSE; + if ( !*s) return NULL; } } - msg_disable (); - ok = data_in (ss_cstr (text), LEGACY_NATIVE, format.type, 0, 0, 0, - v, fmt_var_width (&format)); - msg_enable (); + value_init (val, width); + free (data_in (ss_cstr (text), UTF8, format->type, val, width, encoding)); - return ok; + return val; } -GtkBuilder * -builder_new_real (const gchar *name) +/* This function must be used whenever a filename generated by glib, + (eg, from gtk_file_chooser_get_filename) and passed to the C library, + (eg through a pspp syntax string). +*/ +gchar * +convert_glib_filename_to_system_filename (const gchar *fname, GError **err) { - GtkBuilder *builder = gtk_builder_new (); + gchar *output_name; - 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; -} +#ifdef G_OS_WIN32 + const gchar *target_encoding; + gchar *utf8_name = NULL; + g_get_charset (&target_encoding); -GObject * -get_object_assert (GtkBuilder *builder, const gchar *name) -{ - GObject *o = NULL; - g_assert (name); + output_name = g_convert (fname, -1, target_encoding, + "UTF-8", NULL, NULL, err); +#else + output_name = xstrdup (fname); +#endif - o = gtk_builder_get_object (builder, name); - - if ( !o ) - g_critical ("Object \"%s\" could not be found\n", name); - - return o; + return output_name; } -GtkWidget * -get_widget_assert (gpointer x, const gchar *name) -{ - GObject *obj = G_OBJECT (x); - GtkWidget *w = NULL; - g_assert (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); - - return w; -} - -/* 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 @@ -179,8 +206,8 @@ give_help (void) gtk_widget_destroy (dialog); } -static void -connect_help_builder (GtkBuilder *xml) +void +connect_help (GtkBuilder *xml) { GSList *helps = gtk_builder_get_objects (xml); @@ -190,9 +217,8 @@ connect_help_builder (GtkBuilder *xml) GObject *o = i->data; if ( GTK_IS_WIDGET (o) ) { - gchar *name = NULL; + const gchar *name = gtk_buildable_get_name (GTK_BUILDABLE (o)); gchar s[12] = {0}; - g_object_get (o, "name", &name, NULL); if ( name) strncpy (s, name, 11); @@ -201,7 +227,7 @@ connect_help_builder (GtkBuilder *xml) if ( 0 == strcmp ("help_button", s)) { - g_signal_connect (GTK_WIDGET (o), "clicked", give_help, 0); + g_signal_connect (o, "clicked", give_help, 0); } } } @@ -209,132 +235,6 @@ connect_help_builder (GtkBuilder *xml) g_slist_free (helps); } -static void -connect_help_glade (GladeXML *xml) -{ - GList *helps = glade_xml_get_widget_prefix (xml, "help_button_"); - - 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); -} - - -void -connect_help (gpointer xml) -{ - if (GTK_IS_BUILDER (xml)) - connect_help_builder (GTK_BUILDER (xml)); - - else if (GLADE_IS_XML (xml)) - connect_help_glade (GLADE_XML (xml)); - - else - { - g_error ("XML of type %s", G_OBJECT_TYPE_NAME (xml)); - } -} - - - -void -reference_manual (GtkMenuItem *menu, gpointer data) -{ - GError *err = NULL; - if ( ! g_spawn_command_line_async ("yelp info:pspp", &err) ) - { - 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; - -/* 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; - 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); - - lexer = lex_create (the_source_stream); - - getl_append_source (the_source_stream, sss, GETL_BATCH, ERRMODE_CONTINUE); - - for (;;) - { - 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) - break; - } - - getl_abort_noninteractive (the_source_stream); - - lex_destroy (lexer); - - psppire_dict_replace_dictionary (the_data_store->dict, - dataset_dict (the_dataset)); - - 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 (); - - psppire_output_window_reload (); - - return retval; -} - - /* Create a deep copy of SRC */ GtkListStore * @@ -380,12 +280,47 @@ clone_list_store (const GtkListStore *src) } -void -paste_syntax_in_new_window (const gchar *syntax) + + +static gboolean +on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr) { - GtkWidget *se = psppire_syntax_window_new (); + *addr = NULL; - gtk_text_buffer_insert_at_cursor (PSPPIRE_SYNTAX_WINDOW (se)->buffer, syntax, -1); + return FALSE; +} - gtk_widget_show (se); +char * +paste_syntax_to_window (gchar *syntax) +{ + static GtkWidget *the_syntax_pasteboard = NULL; + + GtkTextBuffer *buffer = NULL; + + if ( NULL == the_syntax_pasteboard) + { + the_syntax_pasteboard = psppire_syntax_window_new (NULL); + g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete), + &the_syntax_pasteboard); + } + + 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; +} + + +/* gtk_box_pack_start_defaults is deprecated. + Therefore we roll our own until a better solution is found */ +void +psppire_box_pack_start_defaults (GtkBox *box, GtkWidget *widget) +{ + gtk_box_pack_start (box, widget, TRUE, TRUE, 0); }