comparison src/event-stream.c @ 788:026c5bf9c134

[xemacs-hg @ 2002-03-21 07:29:57 by ben] chartab.c: Fix bugs in implementation and doc strings. config.h.in: Add foo_checking_assert_at_line() macros. Not clear whether these are actually useful, though; I'll take them out if not. symsinit.h, emacs.c: Some improvements to the timeline. Rearrange a bit the init calls. Add call for reinit_vars_of_object_mswindows() and declare in symsinit.h. event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, events.h: Introduce new event methods for printing, comparing, and hashing magic events, to avoid event-type-specific stuff that had crept into events.c. (And was crashing, since the channel in MS Windows magic events may be nil.) Implement the methods in event-{tty,gtk,Xt,mswindows}.c. Make wrapping functions event_stream_{compare,hash,format}_magic_event() to check if everything's OK and call the actual callback. Fix events.c to use the new methods. Add a new event-stream-operation EVENT_STREAM_NOTHING -- event stream not actually required to be able to do anything, just be open. (#### This event-stream-operation stuff needs to be rethought.) Fixed describe_event() in event-Xt.c to print its output to a stream, not always to stderr, so it can be used elsewhere. (e.g. in print-event when a magic event is encountered?) lisp.h, lrecord.h: Define new assert_at_line(), for use in asserts inside of inline functions. The assert will report the line and file of the inline function, which is almost certainly not what you want as it's useless. what you want to see is where the pseudo-macro was called from. So, when error-checking is on, we pass in the line and file into the macros, for accurate printout using assert_at_line(). Happens only when error-checking is defined so doesn't slow down non-error-checking builds. Fix XCHAR, XINT, XCHAR_OR_INT, XFOO, and wrap_foo() in this fashion. lstream.c, lstream.h: Add resizing_buffer_to_lisp_string(). objects-gtk.c: Fix typo. objects-msw.c: Implement a smarter way of determining whether a font matches a charset. Formerly we just looked at the "script" element of the font spec, converted it to a code page, and compared it with the code page derived from the charset. Now, as well as doing this, we ask the font for the list of unicode ranges it supports, see what range the charset falls into (#### bogus! need to do this char-by-char), and see if any of the font's supported ranges include the charset's range. also do some caching in Vfont_signature_data of previous inquiries. charset.h, text.c, mule-charset.c: New fun; extracted out of Fmake_char() and declare prototype in charset.h. text.h: introduce assert_by_line() to make REP_BYTES_BY_FIRST_BYTE report the file and line more accurately in an assertion failure. unicode.c: make non-static (used in objects-msw.c), declare in charset.h. mule\mule-category.el: Start implementing a category API compatible with FSF. Not there yet. We need improvements to char-tables. mule\mule-charset.el: Copy translation table code from FSF 21.1 and fix up. Eventually we'll have them in XEmacs. (used in ccl) Not here quite yet, and we need some improvements to char-tables. mule\cyril-util.el, mule\cyrillic.el, mule\devan-util.el, mule\ethio-util.el, mule\korea-util.el, mule\mule-tty-init.el, mule\tibet-util.el, mule\viet-util.el, mule\vietnamese.el: Fix numerous compilation warnings. Fix up code related to translation tables and other types of char-tables. menubar-items.el: Move the frame commands from the View menu to the File menu, to be consistent with how most other programs do things. Move less-used revert/recover items to a submenu. Make "recover" not prompt for a file, but recover the current buffer. TODO.ben-mule-21-5: Create bug list for latest problems.
author ben
date Thu, 21 Mar 2002 07:31:30 +0000
parents 943eaba38521
children e38acbeb1cae
comparison
equal deleted inserted replaced
787:242b62e9fc59 788:026c5bf9c134
466 enum event_stream_operation 466 enum event_stream_operation
467 { 467 {
468 EVENT_STREAM_PROCESS, 468 EVENT_STREAM_PROCESS,
469 EVENT_STREAM_TIMEOUT, 469 EVENT_STREAM_TIMEOUT,
470 EVENT_STREAM_CONSOLE, 470 EVENT_STREAM_CONSOLE,
471 EVENT_STREAM_READ 471 EVENT_STREAM_READ,
472 EVENT_STREAM_NOTHING,
472 }; 473 };
473 474
474 static void 475 static void
475 check_event_stream_ok (enum event_stream_operation op) 476 check_event_stream_ok (enum event_stream_operation op)
476 { 477 {
485 invalid_operation ("Can't add timeouts in -batch mode", Qunbound); 486 invalid_operation ("Can't add timeouts in -batch mode", Qunbound);
486 case EVENT_STREAM_CONSOLE: 487 case EVENT_STREAM_CONSOLE:
487 invalid_operation ("Can't add consoles in -batch mode", Qunbound); 488 invalid_operation ("Can't add consoles in -batch mode", Qunbound);
488 case EVENT_STREAM_READ: 489 case EVENT_STREAM_READ:
489 invalid_operation ("Can't read events in -batch mode", Qunbound); 490 invalid_operation ("Can't read events in -batch mode", Qunbound);
491 case EVENT_STREAM_NOTHING:
492 break;
490 default: 493 default:
491 abort (); 494 abort ();
492 } 495 }
493 } 496 }
494 else if (!event_stream) 497 else if (!event_stream)
578 void 581 void
579 event_stream_handle_magic_event (Lisp_Event *event) 582 event_stream_handle_magic_event (Lisp_Event *event)
580 { 583 {
581 check_event_stream_ok (EVENT_STREAM_READ); 584 check_event_stream_ok (EVENT_STREAM_READ);
582 event_stream->handle_magic_event_cb (event); 585 event_stream->handle_magic_event_cb (event);
586 }
587
588 void
589 event_stream_format_magic_event (Lisp_Event *event, Lisp_Object pstream)
590 {
591 check_event_stream_ok (EVENT_STREAM_NOTHING);
592 event_stream->format_magic_event_cb (event, pstream);
593 }
594
595 int
596 event_stream_compare_magic_event (Lisp_Event *e1, Lisp_Event *e2)
597 {
598 check_event_stream_ok (EVENT_STREAM_NOTHING);
599 return event_stream->compare_magic_event_cb (e1, e2);
600 }
601
602 Hashcode
603 event_stream_hash_magic_event (Lisp_Event *e)
604 {
605 check_event_stream_ok (EVENT_STREAM_NOTHING);
606 return event_stream->hash_magic_event_cb (e);
583 } 607 }
584 608
585 static int 609 static int
586 event_stream_add_timeout (EMACS_TIME timeout) 610 event_stream_add_timeout (EMACS_TIME timeout)
587 { 611 {