Mercurial > hg > xemacs-beta
view src/dialog-x.c @ 1314:15a91d7ae2d1
[xemacs-hg @ 2003-02-20 08:16:21 by ben]
check in makefile fixes et al
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory into src/. Simplify the dependencies -- everything
in src/ is dependent on the single entry `src' in MAKE_SUBDIRS.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc.
mule/mule-msw-init.el: Removed.
Delete this file.
mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows
native, boys and girls!
bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc
file in a non-Mule XEmacs. Formerly you got the rather cryptic
"The required feature `mule' cannot be provided". Now you get
"Loading this file requires Mule support".
finder.el: Remove dependency on which directory this function is invoked
from.
update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that
Makefile.in.in and xemacs.mak are in sync, both of them use
NEEDTODUMP and the other one isn't used.
dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so
we can have arbitrary forms, not just `when-feature'.
very-early-lisp.el: Nuke this file.
finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp.
msw-glyphs.el: Comment clarification.
xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro
section is now completely in sync with src/Makefile.in.in. Copy
check-features, load-shadows, and rebuilding finder-inf.el from
src/Makefile.in.in. The main build/dump/recompile process is now
synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE'
and `error checking' to `error-checking' TO avoid tripping
faux warnings and errors in the VC++ IDE.
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory from top-level Makefile.in.in to here. Simplify
the dependencies. Rearrange into logical subsections.
Synchronize the main compile/dump/build-elcs section with
xemacs.mak, which is already clean and in good working order.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add
additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS,
TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out
duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so
it doesn't need to ignore the return value from dumping. Add
.NO_PARALLEL since various aspects of building and dumping must be
serialized but do not always have dependencies between them
(this is impossible in some cases). Everything related to src/
now gets built in one pass in this directory by just running
`make' (except the Makefiles themselves and config.h, paths.h,
Emacs.ad.h, and other generated .h files).
console.c: Update list of possibly valid console types.
emacs.c: Rationalize the specifying and handling of the type of the first
frame. This was originally prompted by a workspace in which I got
GTK to compile under C++ and in the process fixed it so it could
coexist with X in the same build -- hence, a combined
TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However,
you can't simultaneously *display* more than one kind of device
connection -- but getting that to work is not that difficult.
Perhaps a project for a bored grad student. I (ben) would do it
but don't see the use.) To make sense of this, I added new
switches that can be used to specifically indicate the window
system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka
--use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka
--use-gnome, same as --use-gtk]. -nw continues as an alias for
-tty. When none have been given, XEmacs checks for other
parameters implying particular device types (-t -> tty, -display
-> x [or should it have same treatment as DISPLAY below?]), and
has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or
gtk? perhaps should check whether gnome is running), else MS
Windows if it exsits, else TTY if it exists, else stream, and you
must be running in batch mode. This also fixes an existing bug
whereby compiling with no x, no mswin, no tty, when running non-
interactively (e.g. to dump) I get "sorry, must have TTY support".
emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even
when occurring extremely early in reinitialization.
emacs.c: Try to make sure that the user can see message output under
Windows (i.e. it doesn't just disappear right away) regardless of
when it occurs, e.g. in the middle of creating the first frame.
emacs.c: Define new function `emacs-run-status', indicating whether XEmacs
is noninteractive or interactive, whether raw,
post-dump/pdump-load or run-temacs, whether we are dumping,
whether pdump is in effect.
event-stream.c: It's "mommas are fat", not "momas are fat".
Fix other typo.
event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS,
because it won't exist on w/o menubar support,
lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here
if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it
blank only for GCC 2.5 through 2.999999999999999.
Declare Vstack_trace_on_error.
profile.c: Need to include "profile.h" to fix warnings.
sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0).
That way we can distinguish between a dumping failing expectedly
(due to lack of stack space, triggering another dump) and unexpectedly,
in which case, we want to stop building. (or go on, if -K is given)
syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong,
and fix warnings thereby.
syntax.h: Fix crash caused by an edge condition in the syntax-cache macros.
text.h: Spacing fixes.
xmotif.h: New file, to get around shadowing warnings.
EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h.
alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC.
config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead.
Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY.
lisp.h: More futile attempts to walk and chew gum at the same time when
dealing with subr's that don't return.
| author | ben |
|---|---|
| date | Thu, 20 Feb 2003 08:16:21 +0000 |
| parents | 79c6ff3eef26 |
| children | 01c57eb70ae9 |
line wrap: on
line source
/* Implements elisp-programmable dialog boxes -- X interface. Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Tinker Systems and INS Engineering Corp. Copyright (C) 2000, 2002 Ben Wing. This file is part of XEmacs. XEmacs 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 2, or (at your option) any later version. XEmacs 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 XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This file Mule-ized by Ben Wing, 7-8-00. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "commands.h" /* zmacs_regions */ #include "events.h" #include "frame-impl.h" #include "gui.h" #include "opaque.h" #include "window.h" #include "console-x-impl.h" #include "gui-x.h" #include "EmacsFrame.h" static void maybe_run_dbox_text_callback (LWLIB_ID id) { widget_value *wv; int got_some; wv = xmalloc_widget_value (); wv->name = xstrdup ("value"); got_some = lw_get_some_values (id, wv); if (got_some) { Lisp_Object text_field_callback; Extbyte *text_field_value = wv->value; text_field_callback = VOID_TO_LISP (wv->call_data); text_field_callback = XCAR (XCDR (text_field_callback)); if (text_field_value) { void *tmp = LISP_TO_VOID (cons3 (Qnil, list2 (text_field_callback, build_ext_string (text_field_value, Qlwlib_encoding)), Qnil)); popup_selection_callback (0, id, (XtPointer) tmp); } } /* This code tried to optimize, newing/freeing. This is generally unsafe so we will always strdup and always use free_widget_value_tree. */ free_widget_value_tree (wv); } static void dbox_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data) { /* This is called with client_data == -1 when WM_DELETE_WINDOW is sent instead of a button being selected. */ struct device *d = get_device_from_display (XtDisplay (widget)); struct frame *f = 0; Widget cur_widget = widget; /* The parent which is actually connected to our EmacsFrame may be a ways up the tree. */ while (!f && cur_widget) { f = x_any_window_to_frame (d, XtWindow (cur_widget)); cur_widget = XtParent (cur_widget); } if (popup_handled_p (id)) return; assert (popup_up_p != 0); ungcpro_popup_callbacks (id); popup_up_p--; maybe_run_dbox_text_callback (id); popup_selection_callback (widget, id, client_data); /* #### need to error-protect! will do so when i merge in my working ws */ va_run_hook_with_args (Qdelete_dialog_box_hook, 1, make_int (id)); lw_destroy_all_widgets (id); /* The Motif dialog box sets the keyboard focus to itself. When it goes away we have to take care of getting the focus back ourselves. */ #ifdef EXTERNAL_WIDGET /* #### Not sure if this special case is necessary. */ if (!FRAME_X_EXTERNAL_WINDOW_P (f) && f) #else if (f) #endif lw_set_keyboard_focus (FRAME_X_SHELL_WIDGET (f), FRAME_X_TEXT_WIDGET (f)); } static const Extbyte * const button_names [] = { "button1", "button2", "button3", "button4", "button5", "button6", "button7", "button8", "button9", "button10" }; static widget_value * dbox_descriptor_to_widget_value (Lisp_Object keys) { /* This function can GC */ int lbuttons = 0, rbuttons = 0; int partition_seen = 0; int text_field_p = 0; int allow_text_p = 1; widget_value *prev = 0, *kids = 0; int n = 0; int count; Lisp_Object wv_closure, gui_item; Lisp_Object question = Qnil; Lisp_Object title = Qnil; /* #### currently unused */ Lisp_Object buttons = Qnil; { EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys) { if (EQ (key, Q_question)) { CHECK_STRING (value); question = value; } else if (EQ (key, Q_title)) { CHECK_STRING (value); title = value; } else if (EQ (key, Q_buttons)) { CHECK_LIST (value); buttons = value; } else invalid_constant ("Unrecognized question-dialog keyword", key); } } if (NILP (question)) sferror ("Dialog descriptor provides no question", keys); /* Inhibit GC during this conversion. The reasons for this are the same as in menu_item_descriptor_to_widget_value(); see the large comment above that function. */ count = begin_gc_forbidden (); kids = prev = xmalloc_widget_value (); /* Also make sure that we free the partially-created widget_value tree on Lisp error. */ wv_closure = make_opaque_ptr (kids); record_unwind_protect (widget_value_unwind, wv_closure); prev->name = xstrdup ("message"); LISP_STRING_TO_EXTERNAL_MALLOC (question, prev->value, Qlwlib_encoding); prev->enabled = 1; { EXTERNAL_LIST_LOOP_2 (button, buttons) { widget_value *wv; if (NILP (button)) { if (partition_seen) sferror ("More than one partition (nil) seen in dbox spec", keys); partition_seen = 1; continue; } CHECK_VECTOR (button); wv = xmalloc_widget_value (); gui_item = gui_parse_item_keywords (button); if (!button_item_to_widget_value (Qdialog, gui_item, wv, allow_text_p, 1, 0, 1)) { free_widget_value_tree (wv); continue; } if (wv->type == TEXT_TYPE) { text_field_p = 1; allow_text_p = 0; /* only allow one */ } else /* it's a button */ { allow_text_p = 0; /* only allow text field at the front */ if (wv->value) xfree (wv->value); wv->value = wv->name; /* what a mess... */ wv->name = xstrdup (button_names [n]); if (partition_seen) rbuttons++; else lbuttons++; n++; if (lbuttons > 9 || rbuttons > 9) sferror ("Too many buttons (9)", keys); /* #### this leaks */ } prev->next = wv; prev = wv; } } if (n == 0) sferror ("Dialog boxes must have some buttons", keys); { Extbyte type = (text_field_p ? 'P' : 'Q'); static Extbyte tmp_dbox_name [255]; widget_value *dbox; sprintf (tmp_dbox_name, "%c%dBR%d", type, lbuttons + rbuttons, rbuttons); dbox = xmalloc_widget_value (); dbox->name = xstrdup (tmp_dbox_name); dbox->contents = kids; /* No more need to free the half-filled-in structures. */ set_opaque_ptr (wv_closure, 0); unbind_to (count); return dbox; } } static Lisp_Object x_make_dialog_box_internal (struct frame* f, Lisp_Object type, Lisp_Object keys) { int dbox_id; widget_value *data; Widget parent, dbox; if (!EQ (type, Qquestion)) signal_error (Qunimplemented, "Dialog box type", type); data = dbox_descriptor_to_widget_value (keys); parent = FRAME_X_SHELL_WIDGET (f); dbox_id = new_lwlib_id (); dbox = lw_create_widget (data->name, "dialog", dbox_id, data, parent, 1, 0, dbox_selection_callback, 0); lw_modify_all_widgets (dbox_id, data, True); lw_modify_all_widgets (dbox_id, data->contents, True); free_popup_widget_value_tree (data); gcpro_popup_callbacks (dbox_id); /* Setting zmacs-region-stays is necessary here because executing a command from a dialog is really a two-command process: the first command (bound to the button-click) simply pops up the dialog, and returns. This causes a sequence of magic-events (destined for the dialog widget) to begin. Eventually, a dialog item is selected, and a misc-user-event blip is pushed onto the end of the input stream, which is then executed by the event loop. So there are two command-events, with a bunch of magic-events between them. We don't want the *first* command event to alter the state of the region, so that the region can be available as an argument for the second command. */ if (zmacs_regions) zmacs_region_stays = 1; popup_up_p++; lw_pop_up_all_widgets (dbox_id); /* #### this could (theoretically) cause problems if we are up for a REALLY REALLY long time -- too big to fit into lisp integer. */ return make_int (dbox_id); } void syms_of_dialog_x (void) { } void console_type_create_dialog_x (void) { CONSOLE_HAS_METHOD (x, make_dialog_box_internal); } void vars_of_dialog_x (void) { #if defined (LWLIB_DIALOGS_LUCID) Fprovide (intern ("lucid-dialogs")); #elif defined (LWLIB_DIALOGS_MOTIF) Fprovide (intern ("motif-dialogs")); #elif defined (LWLIB_DIALOGS_ATHENA) Fprovide (intern ("athena-dialogs")); #endif }
