/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation
+ Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+ 2020 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
#include <gtk/gtk.h>
#include <stdlib.h>
+#include <sys/stat.h>
+#if ENABLE_RELOCATABLE && defined(__APPLE__)
+#include <sys/resource.h>
+static const bool apple_relocatable = true;
+#else
+static const bool apple_relocatable = false;
+#if HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#else
+/* Dummy definitions to keep the compiler happy. */
+struct rlimit
+{
+ int rlim_cur;
+ int rlim_max;
+};
+#define RLIMIT_NOFILE 0
+#endif
+#endif
#include "language/lexer/include-path.h"
#include "libpspp/argv-parser.h"
return TRUE;
}
-\f
+\f
gboolean
init_prepare (GSource * source, gint * timeout_)
on_local_options (GApplication * application,
GVariantDict * options, gpointer user_data)
{
- GVariant *b;
-
- b =
- g_variant_dict_lookup_value (options, "no-splash",
- G_VARIANT_TYPE_BOOLEAN);
- if (b)
- {
+ {
+ GVariant *b =
+ g_variant_dict_lookup_value (options, "no-unique",
+ G_VARIANT_TYPE_BOOLEAN);
+ if (b)
+ {
+ GApplicationFlags flags = g_application_get_flags (application);
+ flags |= G_APPLICATION_NON_UNIQUE;
+ g_application_set_flags (application, flags);
+ g_variant_unref (b);
+ }
+ }
+ {
+ GVariant *b =
+ g_variant_dict_lookup_value (options, "no-splash",
+ G_VARIANT_TYPE_BOOLEAN);
+ if (b)
g_variant_unref (b);
- }
- else
- {
+ else
start_time = g_get_monotonic_time ();
- }
+ }
+
return -1;
}
return G_SOURCE_REMOVE;
}
+
static void
-on_activate (GApplication * app, gpointer ud)
+wait_for_splash (GApplication *app, GtkWindow *x)
{
- post_initialise (app);
-
- GtkWindow *x = create_data_window ();
if (wsplash)
{
- gtk_window_set_transient_for (GTK_WINDOW (wsplash), GTK_WINDOW (x));
- gtk_application_add_window (GTK_APPLICATION (app), x);
+ gtk_window_set_transient_for (GTK_WINDOW (wsplash), x);
gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (wsplash));
gtk_window_set_keep_above (GTK_WINDOW (wsplash), TRUE);
gtk_window_present (GTK_WINDOW (wsplash));
}
}
+static void
+on_activate (GApplication * app, gpointer ud)
+{
+ post_initialise (app);
+
+ GtkWindow *x = create_data_window ();
+ gtk_application_add_window (GTK_APPLICATION (app), x);
+
+ wait_for_splash (app, x);
+}
+
+GtkWindow *
+find_empty_data_window (GApplication *app)
+{
+ GList *wl = gtk_application_get_windows (GTK_APPLICATION (app));
+ while (wl)
+ {
+ if (wl->data && PSPPIRE_IS_DATA_WINDOW (GTK_WINDOW (wl->data)) &&
+ psppire_data_window_is_empty (PSPPIRE_DATA_WINDOW (wl->data)))
+ return GTK_WINDOW (wl->data);
+ wl = wl->next;
+ }
+ return NULL;
+}
+
+GtkWindow *
+find_psppire_window (GApplication *app)
+{
+ GList *wl = gtk_application_get_windows (GTK_APPLICATION (app));
+ while (wl)
+ {
+ if (wl->data && PSPPIRE_IS_WINDOW (GTK_WINDOW (wl->data)))
+ return GTK_WINDOW (wl->data);
+ wl = wl->next;
+ }
+ return NULL;
+}
static void
-on_open (GApplication * app, GFile ** files, gint n_files, gchar * hint,
+on_open (GApplication *app, GFile **files, gint n_files, gchar * hint,
gpointer ud)
{
- post_initialise (app);
+ /* If the application is already open and we open another file
+ via xdg-open on GNU/Linux or via the file manager, then open is
+ called. Check if we already have a psppire window. */
+ if (find_psppire_window (app) == NULL)
+ post_initialise (app);
+
+ /* When a new data file is opened, then try to find an empty
+ data window which will then be replaced as in the open file
+ dialog */
+ GtkWindow *victim = find_empty_data_window (app);
gchar *file = g_file_get_parse_name (files[0]);
- psppire_preload_file (file);
+ GtkWindow *x = psppire_preload_file (file, victim);
g_free (file);
+
+ wait_for_splash (app, x);
}
{
GOptionEntry oe[] = {
{"version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
- show_version_and_exit, "Show version information and exit", 0},
+ show_version_and_exit, N_("Show version information and exit"), 0},
{NULL}
};
g_option_context_set_ignore_unknown_options (oc, FALSE);
g_option_context_add_main_entries (oc, oe, NULL);
g_option_context_parse (oc, argc, argv, NULL);
+ g_option_context_free (oc);
}
+static void
+pspp_macos_setenv (const char * progname)
+{
+ /* helper to set environment variables for pspp to be relocatable.
+ * Due to the latest changes it is not recommended to set it in the shell
+ * wrapper anymore.
+ */
+ gchar resolved_path[PATH_MAX];
+ /* on some OSX installations open file limit is 256 and GIMP needs more */
+ struct rlimit limit;
+ limit.rlim_cur = 10000;
+ limit.rlim_max = 10000;
+ setrlimit (RLIMIT_NOFILE, &limit);
+ if (realpath (progname, resolved_path))
+ {
+ gchar tmp[PATH_MAX];
+ gchar *app_dir;
+ gchar res_dir[PATH_MAX];
+ struct stat sb;
+
+ app_dir = g_path_get_dirname (resolved_path);
+ g_snprintf (tmp, sizeof(tmp), "%s/../../Resources", app_dir);
+ if (realpath (tmp, res_dir) && !stat (res_dir,&sb) && S_ISDIR (sb.st_mode))
+ g_print ("pspp is started as MacOS application\n");
+ else
+ return;
+ g_free (app_dir);
+
+ g_snprintf (tmp, sizeof(tmp), "%s/lib/gtk-3.0/3.0.0", res_dir);
+ g_setenv ("GTK_PATH", tmp, TRUE);
+ g_snprintf (tmp, sizeof(tmp), "%s/etc/gtk-3.0/gtk.immodules", res_dir);
+ g_setenv ("GTK_IM_MODULE_FILE", tmp, TRUE);
+ g_snprintf (tmp, sizeof(tmp), "%s/lib/gegl-0.4", res_dir);
+ g_setenv ("GEGL_PATH", tmp, TRUE);
+ g_snprintf (tmp, sizeof(tmp), "%s/lib/babl-0.1", res_dir);
+ g_setenv ("BABL_PATH", tmp, TRUE);
+ g_snprintf (tmp, sizeof(tmp), "%s/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache", res_dir);
+ g_setenv ("GDK_PIXBUF_MODULE_FILE", tmp, TRUE);
+ g_snprintf (tmp, sizeof(tmp), "%s/etc/fonts", res_dir);
+ g_setenv ("FONTCONFIG_PATH", tmp, TRUE);
+ g_snprintf (tmp, sizeof(tmp), "%s/lib/gio/modules", res_dir);
+ g_setenv ("GIO_MODULE_DIR", tmp, TRUE);
+ g_snprintf (tmp, sizeof(tmp), "%s/etc/xdg", res_dir);
+ g_setenv ("XDG_CONFIG_DIRS", tmp, TRUE);
+ g_snprintf (tmp, sizeof(tmp), "%s/share", res_dir);
+ g_setenv ("XDG_DATA_DIRS", tmp, TRUE);
+
+ if (g_getenv ("HOME")!=NULL)
+ {
+ g_snprintf (tmp, sizeof(tmp),
+ "%s/Library/Application Support/pspp/1.3/cache",
+ g_getenv("HOME"));
+ g_setenv ("XDG_CACHE_HOME", tmp, TRUE);
+ }
+ }
+}
int
main (int argc, char *argv[])
{
+ if (apple_relocatable)
+ {
+ /* remove MacOS session identifier from the command line args */
+ gint newargc = 0;
+ for (gint i = 0; i < argc; i++)
+ {
+ if (!g_str_has_prefix (argv[i], "-psn_"))
+ {
+ argv[newargc] = argv[i];
+ newargc++;
+ }
+ }
+ if (argc > newargc)
+ {
+ argv[newargc] = NULL; /* glib expects NULL terminated array */
+ argc = newargc;
+ }
+ pspp_macos_setenv (argv[0]);
+ }
+
+ set_program_name (argv[0]);
+
GtkApplication *app =
gtk_application_new ("gnu.pspp", G_APPLICATION_HANDLES_OPEN);
GOptionEntry oe[] = {
{"no-splash", 'q', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, NULL,
- "Do not display the splash screen", 0},
+ N_("Do not display the splash screen"), 0},
+ {"no-unique", 'n', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, NULL,
+ N_("Do not attempt single instance negotiation"), 0},
{NULL}
};
g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (act_new_data));
}
+ g_object_set (G_OBJECT (app), "register-session", TRUE, NULL);
return g_application_run (G_APPLICATION (app), argc, argv);
}
projects / pspp / blobdiff