X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelper.c;h=9b40c08ab5b741f819f416c81d7a34f66a2a849e;hb=e7913c62251710319b06c50702c5db9afb612be5;hp=bd6e2198f4efc7ca276dc2b04cc79645e4338534;hpb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;p=pspp
diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index bd6e2198f4..9b40c08ab5 100644
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -1,186 +1,252 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
+
+
/* This file is a rubbish bin where stuff gets put when it doesn't seem to
belong anywhere else.
*/
#include
+#include
+
#include
#include "helper.h"
-#include "message-dialog.h"
+#include
#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 "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, settings_get_fmt_settings (),
+ 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.
-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 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.
+
+ 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 ();
-
- 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);
+ value_init (val, width);
+ char *err = data_in (ss_cstr (text), UTF8, format->type,
+ settings_get_fmt_settings (), val, width, encoding);
- if ( !w )
- g_warning ("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."));
+ GtkListStore *dest;
- popup_message (&m);
-}
+ for (i = 0 ; i < n_cols; ++i)
+ types[i] = gtk_tree_model_get_column_type (GTK_TREE_MODEL (src), i);
-void
-connect_help (GladeXML *xml)
-{
- GList *helps = glade_xml_get_widget_prefix (xml, "help_button_");
+ dest = gtk_list_store_newv (n_cols, types);
- 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);
-}
+ 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))
+ {
+ 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);
-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_value_unset (&val);
+ }
}
- g_clear_error (&err);
+
+ g_free (types);
+
+ return dest;
}
-extern struct dataset *the_dataset;
-extern struct source_stream *the_source_stream;
-extern PsppireDataStore *the_data_store;
-gboolean
-execute_syntax (struct getl_interface *sss)
+
+static gboolean
+on_delete (GtkWindow *window, GdkEvent *e, GtkWindow **addr)
{
- struct lexer *lexer;
+ *addr = NULL;
- g_return_val_if_fail (proc_has_source (the_dataset), FALSE);
+ return FALSE;
+}
- lexer = lex_create (the_source_stream);
+char *
+paste_syntax_to_window (gchar *syntax)
+{
+ static GtkWidget *the_syntax_pasteboard = NULL;
- getl_append_source (the_source_stream, sss);
+ GtkTextBuffer *buffer = NULL;
- for (;;)
+ if (NULL == the_syntax_pasteboard)
{
- int result = cmd_parse (lexer, the_dataset);
-
- if (result == CMD_EOF || result == CMD_FINISH)
- break;
+ the_syntax_pasteboard = psppire_syntax_window_new (NULL);
+ g_signal_connect (the_syntax_pasteboard, "delete-event", G_CALLBACK (on_delete),
+ &the_syntax_pasteboard);
}
- getl_abort_noninteractive (the_source_stream);
+ buffer = GTK_TEXT_BUFFER (PSPPIRE_SYNTAX_WINDOW (the_syntax_pasteboard)->buffer);
- lex_destroy (lexer);
+ 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);
- /* The GUI must *always* have a data source, even if it's an empty one.
- Therefore, we find that there is none, (for example NEW FILE was the last
- item in the syntax) then we create a new one. */
- if ( ! proc_has_source (the_dataset))
- proc_set_source (the_dataset,
- storage_source_create (the_data_store->case_file->flexifile)
- );
+ gtk_widget_show (the_syntax_pasteboard);
- /* GUI syntax needs this implicit EXECUTE command at the end of
- every script. Otherwise commands like GET could leave the GUI without
- a casefile. */
- return procedure (the_dataset, NULL, NULL);
+ return syntax;
}
+/* Return the width of an upper case M (in pixels) when rendered onto
+ WIDGET with its current style. */
+gdouble
+width_of_m (GtkWidget *widget)
+{
+ PangoContext *context = gtk_widget_create_pango_context (widget);
+ PangoLayout *layout = pango_layout_new (context);
+ PangoRectangle rect;
+
+ pango_layout_set_text (layout, "M", 1);
+ pango_layout_get_extents (layout, NULL, &rect);
+
+ g_object_unref (G_OBJECT (layout));
+ g_object_unref (G_OBJECT (context));
+
+ return rect.width / (gdouble) PANGO_SCALE;
+}
+