Mercurial > hg > xemacs-beta

diff src/events.c @ 788:026c5bf9c134

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
line wrap: on
line diff
--- a/src/events.c	Wed Mar 20 10:21:23 2002 +0000
+++ b/src/events.c	Thu Mar 21 07:31:30 2002 +0000
@@ -1,7 +1,7 @@
 /* Events: printing them, converting them to and from characters.
    Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
    Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
-   Copyright (C) 2001 Ben Wing.
+   Copyright (C) 2001, 2002 Ben Wing.
 
 This file is part of XEmacs.
 
@@ -30,13 +30,12 @@
 #include "console.h"
 #include "console-tty.h" /* for stuff in character_to_event */
 #include "device.h"
-#include "console-x.h"	/* for x_event_name prototype */
-#include "console-gtk.h" /* for gtk_event_name prototype */
-#include "extents.h"	/* Just for the EXTENTP abort check... */
+#include "extents.h"
 #include "events.h"
 #include "frame.h"
 #include "glyphs.h"
 #include "keymap.h" /* for key_desc_list_to_event() */
+#include "lstream.h"
 #include "redisplay.h"
 #include "window.h"
 
@@ -268,34 +267,7 @@
 			      e2->event.magic_eval.object, 0));
 
     case magic_event:
-      {
-	struct console *con = XCONSOLE (CDFW_CONSOLE (e1->channel));
-
-#ifdef HAVE_GTK
- 	if (CONSOLE_GTK_P (con))
-	  return (!memcmp (&e1->event.magic.underlying_gdk_event,
-			   &e2->event.magic.underlying_gdk_event,
-			   sizeof (GdkEvent)));
-#endif
-#ifdef HAVE_X_WINDOWS
-	if (CONSOLE_X_P (con))
-	  return (e1->event.magic.underlying_x_event.xany.serial ==
-		  e2->event.magic.underlying_x_event.xany.serial);
-#endif
-#ifdef HAVE_TTY
-	if (CONSOLE_TTY_P (con))
-	  return (e1->event.magic.underlying_tty_event ==
-		  e2->event.magic.underlying_tty_event);
-#endif
-#ifdef HAVE_MS_WINDOWS
-	if (CONSOLE_MSWINDOWS_P (con))
-	  return (!memcmp(&e1->event.magic.underlying_mswindows_event,
-			  &e2->event.magic.underlying_mswindows_event,
-			  sizeof (union magic_data)));
-#endif
-	abort ();
-	return 1; /* not reached */
-      }
+      return event_stream_compare_magic_event (e1, e2);
 
     case empty_event:      /* Empty and deallocated events are equal. */
     case dead_event:
@@ -345,27 +317,7 @@
 		    internal_hash (e->event.magic_eval.object, depth + 1));
 
     case magic_event:
-      {
-	struct console *con = XCONSOLE (CDFW_CONSOLE (EVENT_CHANNEL (e)));
-#ifdef HAVE_GTK
- 	if (CONSOLE_GTK_P (con))
- 	  return HASH2 (hash, e->event.magic.underlying_gdk_event.type);
-#endif
-#ifdef HAVE_X_WINDOWS
-	if (CONSOLE_X_P (con))
-	  return HASH2 (hash, e->event.magic.underlying_x_event.xany.serial);
-#endif
-#ifdef HAVE_TTY
-	if (CONSOLE_TTY_P (con))
-	  return HASH2 (hash, e->event.magic.underlying_tty_event);
-#endif
-#ifdef HAVE_MS_WINDOWS
-	if (CONSOLE_MSWINDOWS_P (con))
-	  return HASH2 (hash, e->event.magic.underlying_mswindows_event);
-#endif
-	abort ();
-	return 0;
-      }
+      return HASH2 (hash, event_stream_hash_magic_event (e));
 
     case empty_event:
     case dead_event:
@@ -1308,24 +1260,17 @@
       }
     case magic_event:
       {
-        const char *name = NULL;
+	Lisp_Object stream;
+	struct gcpro gcpro1;
+	GCPRO1 (stream);
 
-#ifdef HAVE_GTK
- 	{
- 	  Lisp_Object console = CDFW_CONSOLE (EVENT_CHANNEL (event));
- 	  if (CONSOLE_GTK_P (XCONSOLE (console)))
- 	    name = gtk_event_name (event->event.magic.underlying_gdk_event.type);
- 	}
-#endif
-#ifdef HAVE_X_WINDOWS
-	{
-	  Lisp_Object console = CDFW_CONSOLE (EVENT_CHANNEL (event));
-	  if (CONSOLE_X_P (XCONSOLE (console)))
-	    name = x_event_name (event->event.magic.underlying_x_event.type);
-	}
-#endif /* HAVE_X_WINDOWS */
-	if (name) strcpy (buf, name);
-	else strcpy (buf, "???");
+	stream = make_resizing_buffer_output_stream ();
+	event_stream_format_magic_event (event, stream);
+	Lstream_flush (XLSTREAM (stream));
+	strncpy (buf, resizing_buffer_stream_ptr (XLSTREAM (stream)),
+		 Lstream_byte_count (XLSTREAM (stream)));
+	Lstream_delete (XLSTREAM (stream));
+	UNGCPRO;
 	return;
       }
     case magic_eval_event:	strcpy (buf, "magic-eval"); return;