X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fdata%2Fsettings.c;h=13512cc03242f7b7d7d78e6ebf2d0369bb9f13c3;hb=d1d36e7a9553b6effe6e6839128a05ef82b59466;hp=b98a1351ac0eee0855222b9c341c1f04ec0da54f;hpb=215d1d014dbbf25c74c40ffd1155bc83cc752aaa;p=pspp
diff --git a/src/data/settings.c b/src/data/settings.c
index b98a1351ac..13512cc032 100644
--- a/src/data/settings.c
+++ b/src/data/settings.c
@@ -15,26 +15,27 @@
along with this program. If not, see . */
#include
-#include "settings.h"
+
+#include "data/settings.h"
+
#include
#include
#include
-#include "format.h"
-#include "value.h"
-#include "xalloc.h"
-#include
-#include
-#include
-#include
-#include "error.h"
-#include "minmax.h"
+#include "data/case.h"
+#include "data/format.h"
+#include "data/value.h"
+#include "libpspp/i18n.h"
+#include "libpspp/integer-format.h"
+#include "libpspp/message.h"
+
+#include "gl/error.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-static int global_algorithm = ENHANCED;
-
struct settings
{
/* Integer format used for IB and PIB input. */
@@ -49,8 +50,8 @@ struct settings
/* Format of reals in output (SET WRB). */
enum float_format output_float_format;
- int *viewlength;
- int *viewwidth;
+ int viewlength;
+ int viewwidth;
bool safer_mode;
bool include;
int epoch;
@@ -70,7 +71,7 @@ struct settings
bool testing_mode;
int cmd_algorithm;
- int *algorithm;
+ int global_algorithm;
int syntax;
struct fmt_settings *styles;
@@ -83,8 +84,8 @@ static struct settings the_settings = {
FLOAT_NATIVE_DOUBLE, /* input_float_format */
INTEGER_NATIVE, /* output_integer_format */
FLOAT_NATIVE_DOUBLE, /* output_float_format */
- NULL, /* viewlength */
- NULL, /* viewwidth */
+ 24, /* viewlength */
+ 79, /* viewwidth */
false, /* safer_mode */
true, /* include */
-1, /* epoch */
@@ -110,7 +111,7 @@ static struct settings the_settings = {
{FMT_F, 8, 2}, /* default_format */
false, /* testing_mode */
ENHANCED, /* cmd_algorithm */
- &global_algorithm, /* algorithm */
+ ENHANCED, /* global_algorithm */
ENHANCED, /* syntax */
NULL, /* styles */
@@ -121,22 +122,58 @@ static struct settings the_settings = {
SETTINGS_DEVICE_LISTING | SETTINGS_DEVICE_TERMINAL}
};
-static void init_viewport ( int *, int *);
-
+/* Initializes the settings module. */
void
-settings_init (int *width, int *length)
+settings_init (void)
{
- init_viewport (width, length);
settings_set_epoch (-1);
the_settings.styles = fmt_settings_create ();
settings_set_decimal_char (get_system_decimal ());
}
+/* Cleans up the settings module. */
void
settings_done (void)
{
- fmt_settings_destroy (the_settings.styles);
+ settings_destroy (&the_settings);
+}
+
+static void
+settings_copy (struct settings *dst, const struct settings *src)
+{
+ *dst = *src;
+ dst->styles = fmt_settings_clone (src->styles);
+}
+
+/* Returns a copy of the current settings. */
+struct settings *
+settings_get (void)
+{
+ struct settings *s = xmalloc (sizeof *s);
+ settings_copy (s, &the_settings);
+ return s;
+}
+
+/* Replaces the current settings by those in S. The caller retains ownership
+ of S. */
+void
+settings_set (const struct settings *s)
+{
+ settings_destroy (&the_settings);
+ settings_copy (&the_settings, s);
+}
+
+/* Destroys S. */
+void
+settings_destroy (struct settings *s)
+{
+ if (s != NULL)
+ {
+ fmt_settings_destroy (s->styles);
+ if (s != &the_settings)
+ free (s);
+ }
}
/* Returns the floating-point format used for RB and RBHEX
@@ -203,35 +240,28 @@ settings_set_output_float_format ( enum float_format float_format)
int
settings_get_viewlength (void)
{
- return *the_settings.viewlength;
+ return the_settings.viewlength;
}
/* Sets the view length. */
void
settings_set_viewlength ( int viewlength_)
{
- *the_settings.viewlength = viewlength_;
+ the_settings.viewlength = viewlength_;
}
/* Screen width. */
int
settings_get_viewwidth(void)
{
- return *the_settings.viewwidth;
+ return the_settings.viewwidth;
}
/* Sets the screen width. */
void
settings_set_viewwidth ( int viewwidth_)
{
- *the_settings.viewwidth = viewwidth_;
-}
-
-static void
-init_viewport ( int *width, int *length)
-{
- the_settings.viewwidth = width;
- the_settings.viewlength = length;
+ the_settings.viewwidth = viewwidth_;
}
/* Whether PSPP can erase and overwrite files. */
@@ -488,14 +518,14 @@ settings_set_testing_mode ( bool testing_mode)
enum behavior_mode
settings_get_algorithm (void)
{
- return *the_settings.algorithm;
+ return the_settings.cmd_algorithm;
}
/* Set the algorithm option globally. */
void
settings_set_algorithm (enum behavior_mode mode)
{
- global_algorithm = mode;
+ the_settings.global_algorithm = the_settings.cmd_algorithm = mode;
}
/* Set the algorithm option for this command only */
@@ -503,14 +533,13 @@ void
settings_set_cmd_algorithm ( enum behavior_mode mode)
{
the_settings.cmd_algorithm = mode;
- the_settings.algorithm = &the_settings.cmd_algorithm;
}
/* Unset the algorithm option for this command */
void
unset_cmd_algorithm (void)
{
- the_settings.algorithm = &global_algorithm;
+ the_settings.cmd_algorithm = the_settings.global_algorithm;
}
/* Get the current syntax setting */