Mercurial > hg > xemacs-beta
comparison src/menubar-x.c @ 853:2b6fa2618f76
[xemacs-hg @ 2002-05-28 08:44:22 by ben]
merge my stderr-proc ws
make-docfile.c: Fix places where we forget to check for EOF.
code-init.el: Don't use CRLF conversion by default on process output. CMD.EXE and
friends work both ways but Cygwin programs don't like the CRs.
code-process.el, multicast.el, process.el: Removed.
Improvements to call-process-internal:
-- allows a buffer to be specified for input and stderr output
-- use it on all systems
-- implement C-g as documented
-- clean up and comment
call-process-region uses new call-process facilities; no temp file.
remove duplicate funs in process.el.
comment exactly how coding systems work and fix various problems.
open-multicast-group now does similar coding-system frobbing to
open-network-stream.
dumped-lisp.el, faces.el, msw-faces.el: Fix some hidden errors due to code not being defined at the right time.
xemacs.mak: Add -DSTRICT.
================================================================
ALLOW SEPARATION OF STDOUT AND STDERR IN PROCESSES
================================================================
Standard output and standard error can be processed separately in
a process. Each can have its own buffer, its own mark in that buffer,
and its filter function. You can specify a separate buffer for stderr
in `start-process' to get things started, or use the new primitives:
set-process-stderr-buffer
process-stderr-buffer
process-stderr-mark
set-process-stderr-filter
process-stderr-filter
Also, process-send-region takes a 4th optional arg, a buffer.
Currently always uses a pipe() under Unix to read the error output.
(#### Would a PTY be better?)
sysdep.h, sysproc.h, unexfreebsd.c, unexsunos4.c, nt.c, emacs.c, callproc.c, symsinit.h, sysdep.c, Makefile.in.in, process-unix.c: Delete callproc.c. Move child_setup() to process-unix.c.
wait_for_termination() now only needed on a few really old systems.
console-msw.h, event-Xt.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.h, process-nt.c, process-unix.c, process.c, process.h, procimpl.h: Rewrite the process methods to handle a separate channel for
error input. Create Lstreams for reading in the error channel.
Many process methods need change. In general the changes are
fairly clear as they involve duplicating what's used for reading
the normal stdout and changing for stderr -- although tedious,
as such changes are required throughout the entire process code.
Rewrote the code that reads process output to do two loops, one
for stdout and one for stderr.
gpmevent.c, tooltalk.c: set_process_filter takes an argument for stderr.
================================================================
NEW ERROR-TRAPPING MECHANISM
================================================================
Totally rewrite error trapping code to be unified and support more
features. Basic function is call_trapping_problems(), which lets
you specify, by means of flags, what sorts of problems you want
trapped. these can include
-- quit
-- errors
-- throws past the function
-- creation of "display objects" (e.g. buffers)
-- deletion of already-existing "display objects" (e.g. buffers)
-- modification of already-existing buffers
-- entering the debugger
-- gc
-- errors->warnings (ala suspended errors)
etc. All other error funs rewritten in terms of this one.
Various older mechanisms removed or rewritten.
window.c, insdel.c, console.c, buffer.c, device.c, frame.c: When creating a display object, added call to
note_object_created(), for use with trapping_problems mechanism.
When deleting, call check_allowed_operation() and note_object
deleted().
The trapping-problems code records the objects created since the
call-trapping-problems began. Those objects can be deleted, but
none others (i.e. previously existing ones).
bytecode.c, cmdloop.c: internal_catch takes another arg.
eval.c: Add long comments describing the "five lists" used to maintain
state (backtrace, gcpro, specbind, etc.) in the Lisp engine.
backtrace.h, eval.c: Implement trapping-problems mechanism, eliminate old mechanisms or
redo in terms of new one.
frame.c, gutter.c: Flush out the concept of "critical display section", defined by
the in_display() var. Use an internal_bind() to get it reset,
rather than just doing it at end, because there may be a non-local
exit.
event-msw.c, event-stream.c, console-msw.h, device.c, dialog-msw.c, frame.c, frame.h, intl.c, toolbar.c, menubar-msw.c, redisplay.c, alloc.c, menubar-x.c: Make use of new trapping-errors stuff and rewrite code based on
old mechanisms.
glyphs-widget.c, redisplay.h: Protect calling Lisp in redisplay.
insdel.c: Protect hooks against deleting existing buffers.
frame-msw.c: Use EQ, not EQUAL in hash tables whose keys are just numbers.
Otherwise we run into stickiness in redisplay because
internal_equal() can QUIT.
================================================================
SIGNAL, C-G CHANGES
================================================================
Here we change the way that C-g interacts with event reading. The
idea is that a C-g occurring while we're reading a user event
should be read as C-g, but elsewhere should be a QUIT. The former
code did all sorts of bizarreness -- requiring that no QUIT occurs
anywhere in event-reading code (impossible to enforce given the
stuff called or Lisp code invoked), and having some weird system
involving enqueue/dequeue of a C-g and interaction with Vquit_flag
-- and it didn't work.
Now, we simply enclose all code where we want C-g read as an event
with {begin/end}_dont_check_for_quit(). This completely turns off
the mechanism that checks (and may remove or alter) C-g in the
read-ahead queues, so we just get the C-g normal.
Signal.c documents this very carefully.
cmdloop.c: Correct use of dont_check_for_quit to new scheme, remove old
out-of-date comments.
event-stream.c: Fix C-g handling to actually work.
device-x.c: Disable quit checking when err out.
signal.c: Cleanup. Add large descriptive comment.
process-unix.c, process-nt.c, sysdep.c: Use QUIT instead of REALLY_QUIT.
It's not necessary to use REALLY_QUIT and just confuses the issue.
lisp.h: Comment quit handlers.
================================================================
CONS CHANGES
================================================================
free_cons() now takes a Lisp_Object not the result of XCONS().
car and cdr have been renamed so that they don't get used directly;
go through XCAR(), XCDR() instead.
alloc.c, dired.c, editfns.c, emodules.c, fns.c, glyphs-msw.c, glyphs-x.c, glyphs.c, keymap.c, minibuf.c, search.c, eval.c, lread.c, lisp.h: Correct free_cons calling convention: now takes Lisp_Object,
not Lisp_Cons
chartab.c: Eliminate direct use of ->car, ->cdr, should be black box.
callint.c: Rewrote using EXTERNAL_LIST_LOOP to avoid use of Lisp_Cons.
================================================================
USE INTERNAL-BIND-*
================================================================
eval.c: Cleanups of these funs.
alloc.c, fileio.c, undo.c, specifier.c, text.c, profile.c, lread.c, redisplay.c, menubar-x.c, macros.c: Rewrote to use internal_bind_int() and internal_bind_lisp_object()
in place of whatever varied and cumbersome mechanisms were
formerly there.
================================================================
SPECBIND SANITY
================================================================
backtrace.h: - Improved comments
backtrace.h, bytecode.c, eval.c: Add new mechanism check_specbind_stack_sanity() for sanity
checking code each time the catchlist or specbind stack change.
Removed older prototype of same mechanism.
================================================================
MISC
================================================================
lisp.h, insdel.c, window.c, device.c, console.c, buffer.c: Fleshed out authorship.
device-msw.c: Correct bad Unicode-ization.
print.c: Be more careful when not initialized or in fatal error handling.
search.c: Eliminate running_asynch_code, an FSF holdover.
alloc.c: Added comments about gc-cons-threshold.
dialog-x.c: Use begin_gc_forbidden() around code to build up a widget value
tree, like in menubar-x.c.
gui.c: Use Qunbound not Qnil as the default for
gethash.
lisp-disunion.h, lisp-union.h: Added warnings on use of VOID_TO_LISP().
lisp.h: Use ERROR_CHECK_STRUCTURES to turn on
ERROR_CHECK_TRAPPING_PROBLEMS and ERROR_CHECK_TYPECHECK
lisp.h: Add assert_with_message.
lisp.h: Add macros for gcproing entire arrays. (You could do this before
but it required manual twiddling the gcpro structure.)
lisp.h: Add prototypes for new functions defined elsewhere.
author | ben |
---|---|
date | Tue, 28 May 2002 08:45:36 +0000 |
parents | 6728e641994e |
children | 804517e16990 |
comparison
equal
deleted
inserted
replaced
852:d83885ef293b | 853:2b6fa2618f76 |
---|---|
217 { | 217 { |
218 #if defined LWLIB_MENUBARS_LUCID || defined LWLIB_MENUBARS_MOTIF | 218 #if defined LWLIB_MENUBARS_LUCID || defined LWLIB_MENUBARS_MOTIF |
219 if (filter_p || depth == 0) | 219 if (filter_p || depth == 0) |
220 { | 220 { |
221 #endif | 221 #endif |
222 desc = call1_trapping_errors ("Error in menubar filter", | 222 desc = call1 (hook_fn, desc); |
223 hook_fn, desc); | |
224 if (UNBOUNDP (desc)) | 223 if (UNBOUNDP (desc)) |
225 desc = Qnil; | 224 desc = Qnil; |
226 #if defined LWLIB_MENUBARS_LUCID || defined LWLIB_MENUBARS_MOTIF | 225 #if defined LWLIB_MENUBARS_LUCID || defined LWLIB_MENUBARS_MOTIF |
227 } | 226 } |
228 else | 227 else |
356 filter_p, 0); | 355 filter_p, 0); |
357 unbind_to (count); | 356 unbind_to (count); |
358 return wv; | 357 return wv; |
359 } | 358 } |
360 | 359 |
361 | 360 struct menu_item_descriptor_to_widget_value |
362 #if defined LWLIB_MENUBARS_LUCID || defined LWLIB_MENUBARS_MOTIF | 361 { |
362 Lisp_Object desc; | |
363 int menu_type, deep_p, filter_p; | |
364 widget_value *wv; | |
365 }; | |
366 | |
367 static Lisp_Object | |
368 protected_menu_item_descriptor_to_widget_value_1 (void *gack) | |
369 { | |
370 struct menu_item_descriptor_to_widget_value *midtwv = | |
371 (struct menu_item_descriptor_to_widget_value *) gack; | |
372 | |
373 midtwv->wv = menu_item_descriptor_to_widget_value (midtwv->desc, | |
374 midtwv->menu_type, | |
375 midtwv->deep_p, | |
376 midtwv->filter_p); | |
377 return Qnil; | |
378 } | |
379 | |
380 /* Inside of the pre_activate_callback, we absolutely need to protect | |
381 against errors, esp. but not exclusively in the filter code. (We do | |
382 other evalling, too.) We also need to reenable quit checking, which | |
383 was disabled by next_event_internal() so as to read C-g as an | |
384 event. */ | |
385 | |
386 static widget_value * | |
387 protected_menu_item_descriptor_to_widget_value (Lisp_Object desc, | |
388 int menu_type, int deep_p, | |
389 int filter_p) | |
390 { | |
391 struct menu_item_descriptor_to_widget_value midtwv; | |
392 | |
393 midtwv.desc = desc; | |
394 midtwv.menu_type = menu_type; | |
395 midtwv.deep_p = deep_p; | |
396 midtwv.filter_p = filter_p; | |
397 | |
398 if (UNBOUNDP | |
399 (call_trapping_problems | |
400 (Qmenubar, "Error during menu callback", UNINHIBIT_QUIT, 0, | |
401 protected_menu_item_descriptor_to_widget_value_1, &midtwv))) | |
402 return 0; | |
403 | |
404 return midtwv.wv; | |
405 } | |
406 | |
407 #if defined (LWLIB_MENUBARS_LUCID) || (defined LWLIB_MENUBARS_MOTIF) | |
363 int in_menu_callback; | 408 int in_menu_callback; |
364 | |
365 static Lisp_Object | |
366 restore_in_menu_callback (Lisp_Object val) | |
367 { | |
368 in_menu_callback = XINT (val); | |
369 return Qnil; | |
370 } | |
371 #endif /* LWLIB_MENUBARS_LUCID || LWLIB_MENUBARS_MOTIF */ | |
372 | |
373 #if 0 | |
374 /* #### Sort of a hack needed to process Vactivate_menubar_hook | |
375 correctly wrt buffer-local values. A correct solution would | |
376 involve adding a callback mechanism to run_hook(). This function | |
377 is currently unused. */ | |
378 static int | |
379 my_run_hook (Lisp_Object hooksym, int allow_global_p) | |
380 { | |
381 /* This function can GC */ | |
382 Lisp_Object tail; | |
383 Lisp_Object value = Fsymbol_value (hooksym); | |
384 int changes = 0; | |
385 | |
386 if (!NILP (value) && (!CONSP (value) || EQ (XCAR (value), Qlambda))) | |
387 return !EQ (call0 (value), Qt); | |
388 | |
389 EXTERNAL_LIST_LOOP (tail, value) | |
390 { | |
391 if (allow_global_p && EQ (XCAR (tail), Qt)) | |
392 changes |= my_run_hook (Fdefault_value (hooksym), 0); | |
393 if (!EQ (call0 (XCAR (tail)), Qt)) | |
394 changes = 1; | |
395 } | |
396 return changes; | |
397 } | |
398 #endif | 409 #endif |
399 | |
400 | 410 |
401 /* The order in which callbacks are run is funny to say the least. | 411 /* The order in which callbacks are run is funny to say the least. |
402 It's sometimes tricky to avoid running a callback twice, and to | 412 It's sometimes tricky to avoid running a callback twice, and to |
403 avoid returning prematurely. So, this function returns true | 413 avoid returning prematurely. So, this function returns true |
404 if the menu's callbacks are no longer gc protected. So long | 414 if the menu's callbacks are no longer gc protected. So long |
455 * | 465 * |
456 * Protect against reentering the menu code otherwise we will | 466 * Protect against reentering the menu code otherwise we will |
457 * crash later when the code gets confused at the state | 467 * crash later when the code gets confused at the state |
458 * changes. | 468 * changes. |
459 */ | 469 */ |
460 count = specpdl_depth (); | 470 count = internal_bind_int (&in_menu_callback, 1); |
461 record_unwind_protect (restore_in_menu_callback, | 471 wv = (protected_menu_item_descriptor_to_widget_value |
462 make_int (in_menu_callback)); | 472 (submenu_desc, SUBMENU_TYPE, 1, 0)); |
463 in_menu_callback = 1; | |
464 wv = menu_item_descriptor_to_widget_value (submenu_desc, SUBMENU_TYPE, | |
465 1, 0); | |
466 unbind_to (count); | 473 unbind_to (count); |
467 | 474 |
468 if (!wv) | 475 if (!wv) |
469 { | 476 { |
470 wv = xmalloc_widget_value (); | 477 wv = xmalloc_widget_value (); |
483 } | 490 } |
484 else if (!POPUP_DATAP (FRAME_MENUBAR_DATA (f))) | 491 else if (!POPUP_DATAP (FRAME_MENUBAR_DATA (f))) |
485 return; | 492 return; |
486 else | 493 else |
487 { | 494 { |
488 #if 0 /* Unused, see comment below. */ | |
489 int any_changes; | |
490 | |
491 /* #### - this menubar update mechanism is expensively anti-social and | |
492 the activate-menubar-hook is now mostly obsolete. */ | |
493 any_changes = my_run_hook (Qactivate_menubar_hook, 1); | |
494 | |
495 /* #### - It is necessary to *ALWAYS* call set_frame_menubar() now that | 495 /* #### - It is necessary to *ALWAYS* call set_frame_menubar() now that |
496 incremental menus are implemented. If a subtree of a menu has been | 496 incremental menus are implemented. If a subtree of a menu has been |
497 updated incrementally (a destructive operation), then that subtree | 497 updated incrementally (a destructive operation), then that subtree |
498 must somehow be wiped. | 498 must somehow be wiped. |
499 | 499 |
500 It is difficult to undo the destructive operation in lwlib because | 500 It is difficult to undo the destructive operation in lwlib because |
501 a pointer back to lisp data needs to be hidden away somewhere. So | 501 a pointer back to lisp data needs to be hidden away somewhere. So |
502 that an INCREMENTAL_TYPE widget_value can be recreated... Hmmmmm. */ | 502 that an INCREMENTAL_TYPE widget_value can be recreated... Hmmmmm. */ |
503 if (any_changes || | 503 run_hook_trapping_problems |
504 !XFRAME_MENUBAR_DATA (f)->menubar_contents_up_to_date) | 504 ("Error in activate-menubar-hook", Qactivate_menubar_hook, |
505 set_frame_menubar (f, 1, 0); | 505 INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION); |
506 #else | |
507 run_hook (Qactivate_menubar_hook); | |
508 set_frame_menubar (f, 1, 0); | 506 set_frame_menubar (f, 1, 0); |
509 #endif | |
510 DEVICE_X_MOUSE_TIMESTAMP (XDEVICE (FRAME_DEVICE (f))) = | 507 DEVICE_X_MOUSE_TIMESTAMP (XDEVICE (FRAME_DEVICE (f))) = |
511 DEVICE_X_GLOBAL_MOUSE_TIMESTAMP (XDEVICE (FRAME_DEVICE (f))) = | 508 DEVICE_X_GLOBAL_MOUSE_TIMESTAMP (XDEVICE (FRAME_DEVICE (f))) = |
512 x_focus_timestamp_really_sucks_fix_me_better; | 509 x_focus_timestamp_really_sucks_fix_me_better; |
513 } | 510 } |
514 } | 511 } |