#include "systime.h"
#ifdef PDUMP
-#include "dump-id.h"
#include "dumper.h"
#endif
void r_alloc_reinit (void);
# endif
+#ifdef HAVE_GTK
+void console_type_create_select_gtk(void);
+#endif
+
/* Variable whose value is symbol giving operating system type. */
Lisp_Object Vsystem_type;
Lisp_Object Vexec_path;
Lisp_Object Vexec_directory, Vconfigure_exec_directory;
Lisp_Object Vlisp_directory, Vconfigure_lisp_directory;
+Lisp_Object Vmule_lisp_directory, Vconfigure_mule_lisp_directory;
Lisp_Object Vmodule_directory, Vconfigure_module_directory;
Lisp_Object Vsite_module_directory, Vconfigure_site_module_directory;
Lisp_Object Vconfigure_package_path;
/* If nonzero, set XEmacs to run at this priority. This is also used
in child_setup and sys_suspend to make sure subshells run at normal
priority. */
-int emacs_priority;
+Fixnum emacs_priority;
/* Some FSF junk with running_asynch_code, to preserve the match
data. Not necessary because we don't call process filters
Some LISP-visible command-line options are set by XEmacs _before_ the
data is dumped in building a --pdump XEmacs, but used _after_ it is
- restored in normal operation. Thus the restored values overwrite the
- values XEmacs is getting at run-time. Such variables must be saved
+ restored in normal operation. Thus the dump-time values overwrite the
+ values XEmacs is getting at runtime. Such variables must be saved
before loading the dumpfile, and restored afterward.
- This is done immediately before and after pdump_load() in main_1().
- See that function for the current list of protected variables.
+ Therefore these variables may not be initialized in vars_of_emacs().
+
+ The save/restore is done immediately before and after pdump_load() in
+ main_1(). See that function for the current list of protected variables.
- Note that if the variable is never DEFVAR'd, saving/restoring is not
- needed.
+ Note that saving/restoring is only necessary for a few variables that are
+ o command line arguments effective at runtime (as opposed to dump-time),
+ o parsed before pdump_load, and
+ o exported to Lisp via a DEFVAR.
*/
/* Nonzero means running XEmacs without interactive terminal. */
int debug_paths;
/* Save argv and argc. */
-static Extbyte **initial_argv;
-static int initial_argc;
+static Extbyte **initial_argv; /* #### currently unused */
+static int initial_argc; /* #### currently unused */
static void sort_args (int argc, char **argv);
static int run_temacs_argc;
static char **run_temacs_argv;
static char *run_temacs_args;
-static size_t run_temacs_argv_size;
-static size_t run_temacs_args_size;
+static EMACS_INT run_temacs_argv_size;
+static EMACS_INT run_temacs_args_size;
static void shut_down_emacs (int sig, Lisp_Object stuff, int no_auto_save);
return 1;
}
arglen = (valptr != NULL && (p = strchr (arg, '=')) != NULL
- ? p - arg : strlen (arg));
+ ? p - arg : (int) strlen (arg));
if (lstr == 0 || arglen < minlen || strncmp (arg, lstr, arglen) != 0)
return 0;
else if (valptr == NULL)
#define main_1 STACK_TRACE_EYE_CATCHER
/* This function is not static, so that the compiler is less likely to
- inline it, which would make it not show up in stack traces. */
+ inline it, which would make it not show up in stack traces.
+
+ The restart argument is a flag that indicates that main_1 is now
+ being called for the second time in this invocation of xemacs; this can
+ only happen in an xemacs that is not loaded with dumped data (temacs
+ with the conventional dumper or xemacs -nd with the pdumper). See
+ Frun_emacs_from_temacs().
+
+ restart interacts with initialized as follows (per Olivier Galibert):
+
+ It's perverted.
+
+ initialized==0 => temacs
+ initialized!=0 && restart!=0 => run-temacs
+ initialized!=0 && restart==0 => xemacs/post pdump_load()
+*/
DECLARE_DOESNT_RETURN (main_1 (int, char **, char **, int));
DOESNT_RETURN
main_1 (int argc, char **argv, char **envp, int restart)
#ifdef PDUMP
printf ("%08x\n", dump_id);
#else
- printf ("*ERROR**\n");
+ printf ("Portable dumper not configured; -sd just forces exit.\n");
#endif
exit (0);
}
display_use = "x";
#endif /* HAVE_X_WINDOWS */
+#ifdef HAVE_GTK
+ {
+ char *dpy = getenv ("DISPLAY");
+ if (dpy && dpy[0])
+ display_use = "gtk";
+ }
+#endif
#ifdef HAVE_MS_WINDOWS
if (strcmp(display_use, "x") != 0)
display_use = "mswindows";
so we can be fairly accurate. */
init_intl_very_early (); /* set up the locale and domain for gettext and
such. */
+#ifdef HAVE_MS_WINDOWS
+ init_mswindows_very_early (); /* Some things - like dde need to be
+ initialized early so that the
+ client doesn't give up waiting. */
+#endif
/* Now initialize the Lisp engine and the like. Done only during
dumping. No dependence on anything that may be in the user's
Boy, this is ugly, but how else to do it?
*/
- /* noninteractive1 is protected by noninteractive, which is not
- LISP-visible */
+ /* noninteractive1 is saved in noninteractive, which isn't LISP-visible */
int inhibit_early_packages_save = inhibit_early_packages;
int inhibit_autoloads_save = inhibit_autoloads;
int debug_paths_save = debug_paths;
-#ifdef INHIBIT_SITE_LISP
- int inhibit_site_lisp_save = inhibit_site_lisp;
-#endif
-#ifdef INHIBIT_SITE_MODULES
+ /* #### Give inhibit-site-lisp a command switch? If so, uncomment: */
+ /* int inhibit_site_lisp_save = inhibit_site_lisp; */
int inhibit_site_modules_save = inhibit_site_modules;
-#endif
initialized = pdump_load (argv[0]);
inhibit_early_packages = inhibit_early_packages_save;
inhibit_autoloads = inhibit_autoloads_save;
debug_paths = debug_paths_save;
-#ifdef INHIBIT_SITE_LISP
- inhibit_site_lisp = inhibit_site_lisp_save;
-#endif
-#ifdef INHIBIT_SITE_MODULES
+ /* #### Give inhibit-site-lisp a command switch? If so, uncomment: */
+ /* inhibit_site_lisp = inhibit_site_lisp_save; */
inhibit_site_modules = inhibit_site_modules_save;
-#endif
if (initialized)
run_temacs_argc = -1;
#ifdef HAVE_X_WINDOWS
syms_of_event_Xt ();
#endif
+#ifdef HAVE_GTK
+ syms_of_event_gtk ();
+#endif
#ifdef HAVE_DRAGNDROP
syms_of_dragdrop ();
#endif
syms_of_objects_tty ();
#endif
+#ifdef HAVE_GTK
+ syms_of_device_gtk ();
+ syms_of_frame_gtk ();
+ syms_of_glyphs_gtk ();
+ syms_of_objects_gtk ();
+ syms_of_ui_gtk ();
+ syms_of_select_gtk ();
+#ifdef HAVE_DIALOGS
+ syms_of_dialog_gtk ();
+#endif
+#ifdef HAVE_MENUBARS
+ syms_of_menubar_gtk ();
+#endif
+ syms_of_select_gtk ();
+
+#if defined (HAVE_MENUBARS) || defined(HAVE_SCROLLBARS) || defined(HAVE_DIALOGS) || defined(HAVE_TOOLBARS)
+ syms_of_gui_gtk ();
+#endif
+#endif /* HAVE_GTK */
+
#ifdef HAVE_X_WINDOWS
#ifdef HAVE_BALLOON_HELP
syms_of_balloon_x ();
console_type_create_redisplay_tty ();
#endif
+#ifdef HAVE_GTK
+ console_type_create_gtk ();
+ console_type_create_select_gtk ();
+ console_type_create_device_gtk ();
+ console_type_create_frame_gtk ();
+ console_type_create_objects_gtk ();
+ console_type_create_glyphs_gtk ();
+ console_type_create_redisplay_gtk ();
+#ifdef HAVE_MENUBARS
+ console_type_create_menubar_gtk ();
+#endif
+#ifdef HAVE_SCROLLBARS
+ console_type_create_scrollbar_gtk ();
+#endif
+#ifdef HAVE_TOOLBARS
+ console_type_create_toolbar_gtk ();
+#endif
+#ifdef HAVE_DIALOGS
+ console_type_create_dialog_gtk ();
+#endif
+#endif /* HAVE_GTK */
+
#ifdef HAVE_X_WINDOWS
console_type_create_x ();
console_type_create_device_x ();
#ifdef HAVE_MS_WINDOWS
image_instantiator_format_create_glyphs_mswindows ();
#endif /* HAVE_MSWINDOWS_WINDOWS */
+#ifdef HAVE_GTK
+ image_instantiator_format_create_glyphs_gtk ();
+#endif
/* Now initialize the lstream types and associated symbols.
Other than the first function below, the functions may
make_opaque_ptr()
perhaps a few others.
+
+ NB: Initialization or assignment should not be done here to certain
+ variables settable from the command line. See the comment above
+ the call to pdump_load() in main_1(). This caveat should only
+ apply to vars_of_emacs().
*/
/* Now allow Fprovide() statements to be made. */
vars_of_extents ();
vars_of_faces ();
vars_of_fileio ();
+#ifdef CLASH_DETECTION
+ vars_of_filelock ();
+#endif
vars_of_floatfns ();
vars_of_font_lock ();
vars_of_frame ();
vars_of_objects_tty ();
#endif
+#ifdef HAVE_GTK
+ vars_of_device_gtk ();
+#ifdef HAVE_DIALOGS
+ vars_of_dialog_gtk ();
+#endif
+ vars_of_event_gtk ();
+ vars_of_frame_gtk ();
+ vars_of_glyphs_gtk ();
+ vars_of_ui_gtk ();
+#ifdef HAVE_MENUBARS
+ vars_of_menubar_gtk ();
+#endif
+ vars_of_objects_gtk ();
+ vars_of_select_gtk ();
+#ifdef HAVE_SCROLLBARS
+ vars_of_scrollbar_gtk ();
+#endif
+#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_DIALOGS) || defined (HAVE_TOOLBARS)
+ vars_of_gui_gtk ();
+#endif
+#endif /* HAVE_GTK */
+
#ifdef HAVE_X_WINDOWS
#ifdef HAVE_BALLOON_HELP
vars_of_balloon_x ();
#endif
#endif /* HAVE_X_WINDOWS */
+
#ifdef HAVE_MS_WINDOWS
vars_of_device_mswindows ();
vars_of_console_mswindows ();
*/
specifier_vars_of_glyphs ();
+ specifier_vars_of_glyphs_widget ();
specifier_vars_of_gutter ();
#ifdef HAVE_MENUBARS
specifier_vars_of_menubar ();
/* These rely on the glyphs just created in the previous function,
and call Fadd_spec_to_specifier(), which relies on various
variables initialized above. */
+#ifdef HAVE_GTK
+ complex_vars_of_glyphs_gtk ();
+#endif
#ifdef HAVE_X_WINDOWS
complex_vars_of_glyphs_x ();
#endif
}
#endif
#ifdef PDUMP
- } else if (!restart) {
+ } else if (!restart) { /* after successful pdump_load() */
reinit_alloc_once_early ();
reinit_symbols_once_early ();
reinit_opaque_once_early ();
#ifdef HAVE_MS_WINDOWS
reinit_console_type_create_mswindows ();
#endif
+#ifdef HAVE_GTK
+ reinit_console_type_create_gtk ();
+#endif
reinit_specifier_type_create ();
reinit_specifier_type_create_image ();
#ifdef HAVE_X_WINDOWS
reinit_vars_of_event_Xt ();
#endif
+#ifdef HAVE_GTK
+ reinit_vars_of_event_gtk ();
+#endif
#if defined(HAVE_TTY) && (defined (DEBUG_TTY_EVENT_STREAM) || !defined (HAVE_X_WINDOWS))
reinit_vars_of_event_tty ();
#endif
reinit_vars_of_frame_mswindows ();
#endif
+#ifdef HAVE_GTK
+ reinit_vars_of_menubar_gtk ();
+#endif
+
#ifdef HAVE_X_WINDOWS
reinit_vars_of_device_x ();
#ifdef HAVE_SCROLLBARS
if (initialized)
{
- /* Stuff that needs to be reset at run time. Order below should
- not matter. */
+ /* Stuff that should not be done at dump time, including stuff that
+ needs to be reset at run time. Order below should not matter.
+
+ Many initializations taken from the environment should go here. */
reinit_alloc ();
reinit_eval ();
#ifdef MULE_REGEXP
reinit_mule_category ();
#endif
+#ifdef HAVE_POSTGRESQL
+ init_postgresql_from_environment();
+#endif
}
/* Now do further initialization/setup of stuff that is not needed by the
#endif /* _SCO_DS */
vol_envp = environ;
}
-#ifdef RUN_TIME_REMAP
+#if defined (RUN_TIME_REMAP) && ! defined (PDUMP)
else
/* obviously no-one uses this because where it was before initialized was
*always* true */
#ifdef HAVE_MS_WINDOWS
/* If we displayed a message on the console, then we must allow the
- user to see this message. This may be unnecessary, but can't hurt,
- and we can't necessarily check arg; e.g. xemacs --help kills with
- argument 0. */
- if (mswindows_message_outputted)
+ user to see this message. This may be unnecessary, but can't
+ hurt, and we can't necessarily check arg; e.g. xemacs --help
+ kills with argument 0.
+
+ Don't do this in batch mode, it makes no sense and is more
+ annoying than useful. --andyp */
+ if (mswindows_message_outputted && !noninteractive)
Fmswindows_message_box (build_string ("Messages outputted. XEmacs is exiting."),
Qnil, Qnil);
#endif
("Your files have been auto-saved.\n"
"Use `M-x recover-session' to recover them.\n"
"\n"
- "If you have access to the PROBLEMS file that came with your\n"
- "version of XEmacs, please check to see if your crash is described\n"
- "there, as there may be a workaround available.\n"
+ "Your version of XEmacs was distributed with a PROBLEMS file that may describe\n"
+ "your crash, and with luck a workaround. Please check it first, but do report\n"
+ "the crash anyway. "
#ifdef INFODOCK
- "Otherwise, please report this bug by selecting `Report-Bug'\n"
- "in the InfoDock menu.\n"
+ "\n\nPlease report this bug by selecting `Report-Bug' in the InfoDock menu.\n"
+ "*BE SURE* to include the XEmacs configuration from M-x describe-installation,\n"
+ "or the file Installation in the top directory of the build tree.\n"
#else
- "Otherwise, please report this bug by running the send-pr\n"
- "script included with XEmacs, or selecting `Send Bug Report'\n"
- "from the help menu.\n"
- "As a last resort send ordinary email to `crashes@xemacs.org'.\n"
+ "Please report this bug by invoking M-x report-emacs-bug,\n"
+ "or by selecting `Send Bug Report' from the Help menu. If necessary, send\n"
+ "ordinary email to `crashes@xemacs.org'. *MAKE SURE* to include the XEmacs\n"
+ "configuration from M-x describe-installation, or equivalently the file\n"
+ "Installation in the top of the build tree.\n"
#endif
- "*MAKE SURE* to include the information in the command\n"
- "M-x describe-installation.\n"
#ifndef _MSC_VER
"\n"
- "If at all possible, *please* try to obtain a C stack backtrace;\n"
- "it will help us immensely in determining what went wrong.\n"
- "To do this, locate the core file that was produced as a result\n"
- "of this crash (it's usually called `core' and is located in the\n"
- "directory in which you started the editor, or maybe in your home\n"
- "directory), and type\n"
+ "*Please* try *hard* to obtain a C stack backtrace; without it, we are unlikely\n"
+ "to be able to analyze the problem. Locate the core file produced as a result\n"
+ "of this crash (often called `core' or `core.<process-id>', and located in\n"
+ "the directory in which you started XEmacs or your home directory), and type\n"
"\n"
" gdb "
#endif
stderr_out ("%s%s", dir, name);
}
stderr_out
- (" core\n\n"
- "then type `where' when the debugger prompt comes up.\n"
- "(If you don't have GDB on your system, you might have DBX,\n"
- "or XDB, or SDB. A similar procedure should work for all of\n"
- "these. Ask your system administrator if you need more help.)\n");
+ (" core\n"
+ "\n"
+ "then type `where' at the debugger prompt. No GDB on your system? You may\n"
+ "have DBX, or XDB, or SDB. (Ask your system administrator if you need help.)\n"
+ "If no core file was produced, enable them (often with `ulimit -c unlimited'\n"
+ "in case of future recurrance of the crash.\n");
#endif /* _MSC_VER */
}
if you want the dumped XEmacs to process its command line
and announce itself normally when it is run.
*/
- (intoname, symname))
+ (filename, symfile))
{
/* This function can GC */
struct gcpro gcpro1, gcpro2;
int opurify;
- GCPRO2 (intoname, symname);
+ GCPRO2 (filename, symfile);
#ifdef FREE_CHECKING
Freally_free (Qnil);
disable_free_hook ();
#endif
- CHECK_STRING (intoname);
- intoname = Fexpand_file_name (intoname, Qnil);
- if (!NILP (symname))
+ CHECK_STRING (filename);
+ filename = Fexpand_file_name (filename, Qnil);
+ if (!NILP (symfile))
{
- CHECK_STRING (symname);
- if (XSTRING_LENGTH (symname) > 0)
- symname = Fexpand_file_name (symname, Qnil);
+ CHECK_STRING (symfile);
+ if (XSTRING_LENGTH (symfile) > 0)
+ symfile = Fexpand_file_name (symfile, Qnil);
else
- symname = Qnil;
+ symfile = Qnil;
}
opurify = purify_flag;
UNGCPRO;
{
- char *intoname_ext;
- char *symname_ext;
+ char *filename_ext;
+ char *symfile_ext;
- LISP_STRING_TO_EXTERNAL (intoname, intoname_ext, Qfile_name);
+ LISP_STRING_TO_EXTERNAL (filename, filename_ext, Qfile_name);
- if (STRINGP (symname))
- LISP_STRING_TO_EXTERNAL (symname, symname_ext, Qfile_name);
+ if (STRINGP (symfile))
+ LISP_STRING_TO_EXTERNAL (symfile, symfile_ext, Qfile_name);
else
- symname_ext = 0;
+ symfile_ext = 0;
garbage_collect_1 ();
modify all the unexec routines to ensure that filename
conversion is applied everywhere. Don't worry about memory
leakage because this call only happens once. */
- unexec (intoname_ext, symname_ext, (uintptr_t) my_edata, 0, 0);
+ unexec (filename_ext, symfile_ext, (uintptr_t) my_edata, 0, 0);
#ifdef DOUG_LEA_MALLOC
free (malloc_state_ptr);
#endif
/* Ben thinks this function should not exist or be exported to Lisp.
We use it to define split-path-string in subr.el (not!). */
-DEFUN ("split-string-by-char", Fsplit_string_by_char, 1, 2, 0, /*
+DEFUN ("split-string-by-char", Fsplit_string_by_char, 2, 2, 0, /*
Split STRING into a list of substrings originally separated by SEPCHAR.
*/
(string, sepchar))
DEFVAR_LISP ("emacs-program-version", &Vemacs_program_version /*
*Version of the Emacs variant.
-This typically has the form XX.XX[-bXX].
+This typically has the form NN.NN-bNN.
This is mainly meant for use in path searching.
*/ );
Vemacs_program_version = build_string ((char *) PATH_VERSION);
DEFVAR_LISP ("configure-exec-directory", &Vconfigure_exec_directory /*
For internal use by the build procedure only.
-configure's idea of what EXEC-DIRECTORY will be.
+configure's idea of what `exec-directory' will be.
*/ );
#ifdef PATH_EXEC
Vconfigure_exec_directory = Ffile_name_as_directory
DEFVAR_LISP ("configure-lisp-directory", &Vconfigure_lisp_directory /*
For internal use by the build procedure only.
-configure's idea of what LISP-DIRECTORY will be.
+configure's idea of what `lisp-directory' will be.
*/ );
#ifdef PATH_LOADSEARCH
Vconfigure_lisp_directory = Ffile_name_as_directory
Vconfigure_lisp_directory = Qnil;
#endif
+ DEFVAR_LISP ("mule-lisp-directory", &Vmule_lisp_directory /*
+*Directory of Mule Lisp files that come with XEmacs.
+*/ );
+ Vmule_lisp_directory = Qnil;
+
+ DEFVAR_LISP ("configure-mule-lisp-directory", &Vconfigure_mule_lisp_directory /*
+For internal use by the build procedure only.
+configure's idea of what `mule-lisp-directory' will be.
+*/ );
+#ifdef PATH_MULELOADSEARCH
+ Vconfigure_mule_lisp_directory = Ffile_name_as_directory
+ (build_string ((char *) PATH_MULELOADSEARCH));
+#else
+ Vconfigure_mule_lisp_directory = Qnil;
+#endif
+
DEFVAR_LISP ("module-directory", &Vmodule_directory /*
*Directory of core dynamic modules that come with XEmacs.
*/ );
DEFVAR_LISP ("configure-module-directory", &Vconfigure_module_directory /*
For internal use by the build procedure only.
-configure's idea of what MODULE-DIRECTORY will be.
+configure's idea of what `module-directory' will be.
*/ );
#ifdef PATH_MODULESEARCH
Vconfigure_module_directory = Ffile_name_as_directory
DEFVAR_LISP ("configure-data-directory", &Vconfigure_data_directory /*
For internal use by the build procedure only.
-configure's idea of what DATA-DIRECTORY will be.
+configure's idea of what `data-directory' will be.
*/ );
#ifdef PATH_DATA
Vconfigure_data_directory = Ffile_name_as_directory
DEFVAR_LISP ("configure-site-directory", &Vconfigure_site_directory /*
For internal use by the build procedure only.
-configure's idea of what SITE-DIRECTORY will be.
+configure's idea of what `site-directory' will be.
*/ );
#ifdef PATH_SITE
Vconfigure_site_directory = Ffile_name_as_directory
DEFVAR_LISP ("configure-site-module-directory", &Vconfigure_site_module_directory /*
For internal use by the build procedure only.
-configure's idea of what SITE-DIRECTORY will be.
+configure's idea of what `site-directory' will be.
*/ );
#ifdef PATH_SITE_MODULES
Vconfigure_site_module_directory = Ffile_name_as_directory
DEFVAR_LISP ("doc-directory", &Vdoc_directory /*
*Directory containing the DOC file that comes with XEmacs.
-This is usually the same as exec-directory.
+This is usually the same as `exec-directory'.
*/ );
Vdoc_directory = Qnil;
DEFVAR_LISP ("configure-doc-directory", &Vconfigure_doc_directory /*
For internal use by the build procedure only.
-configure's idea of what DOC-DIRECTORY will be.
+configure's idea of what `doc-directory' will be.
*/ );
#ifdef PATH_DOC
Vconfigure_doc_directory = Ffile_name_as_directory
DEFVAR_LISP ("configure-exec-prefix-directory", &Vconfigure_exec_prefix_directory /*
For internal use by the build procedure only.
-configure's idea of what EXEC-PREFIX-DIRECTORY will be.
+configure's idea of what `exec-prefix-directory' will be.
*/ );
#ifdef PATH_EXEC_PREFIX
Vconfigure_exec_prefix_directory = Ffile_name_as_directory
DEFVAR_LISP ("configure-prefix-directory", &Vconfigure_prefix_directory /*
For internal use by the build procedure only.
-configure's idea of what PREFIX-DIRECTORY will be.
+configure's idea of what `prefix-directory' will be.
*/ );
#ifdef PATH_PREFIX
Vconfigure_prefix_directory = Ffile_name_as_directory
* cores on us when re-started from the dumped executable.
* This will have to go for 21.1 -- OG.
*/
-void __sti__iflPNGFile_c___(void);
-void __sti__iflPNGFile_c___()
+void __sti__iflPNGFile_c___ (void);
+void
+__sti__iflPNGFile_c___ (void)
{
}
projects / chise / xemacs-chise.git.1 / blobdiff