comparison src/events.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
1 /* Events: printing them, converting them to and from characters. 1 /* Events: printing them, converting them to and from characters.
2 Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois.
4 Copyright (C) 2001 Ben Wing. 4 Copyright (C) 2001, 2002 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
7 7
8 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
9 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
28 #include "lisp.h" 28 #include "lisp.h"
29 #include "buffer.h" 29 #include "buffer.h"
30 #include "console.h" 30 #include "console.h"
31 #include "console-tty.h" /* for stuff in character_to_event */ 31 #include "console-tty.h" /* for stuff in character_to_event */
32 #include "device.h" 32 #include "device.h"
33 #include "console-x.h" /* for x_event_name prototype */ 33 #include "extents.h"
34 #include "console-gtk.h" /* for gtk_event_name prototype */
35 #include "extents.h" /* Just for the EXTENTP abort check... */
36 #include "events.h" 34 #include "events.h"
37 #include "frame.h" 35 #include "frame.h"
38 #include "glyphs.h" 36 #include "glyphs.h"
39 #include "keymap.h" /* for key_desc_list_to_event() */ 37 #include "keymap.h" /* for key_desc_list_to_event() */
38 #include "lstream.h"
40 #include "redisplay.h" 39 #include "redisplay.h"
41 #include "window.h" 40 #include "window.h"
42 41
43 /* Where old events go when they are explicitly deallocated. 42 /* Where old events go when they are explicitly deallocated.
44 The event chain here is cut loose before GC, so these will be freed 43 The event chain here is cut loose before GC, so these will be freed
266 e2->event.magic_eval.internal_function && 265 e2->event.magic_eval.internal_function &&
267 internal_equal (e1->event.magic_eval.object, 266 internal_equal (e1->event.magic_eval.object,
268 e2->event.magic_eval.object, 0)); 267 e2->event.magic_eval.object, 0));
269 268
270 case magic_event: 269 case magic_event:
271 { 270 return event_stream_compare_magic_event (e1, e2);
272 struct console *con = XCONSOLE (CDFW_CONSOLE (e1->channel));
273
274 #ifdef HAVE_GTK
275 if (CONSOLE_GTK_P (con))
276 return (!memcmp (&e1->event.magic.underlying_gdk_event,
277 &e2->event.magic.underlying_gdk_event,
278 sizeof (GdkEvent)));
279 #endif
280 #ifdef HAVE_X_WINDOWS
281 if (CONSOLE_X_P (con))
282 return (e1->event.magic.underlying_x_event.xany.serial ==
283 e2->event.magic.underlying_x_event.xany.serial);
284 #endif
285 #ifdef HAVE_TTY
286 if (CONSOLE_TTY_P (con))
287 return (e1->event.magic.underlying_tty_event ==
288 e2->event.magic.underlying_tty_event);
289 #endif
290 #ifdef HAVE_MS_WINDOWS
291 if (CONSOLE_MSWINDOWS_P (con))
292 return (!memcmp(&e1->event.magic.underlying_mswindows_event,
293 &e2->event.magic.underlying_mswindows_event,
294 sizeof (union magic_data)));
295 #endif
296 abort ();
297 return 1; /* not reached */
298 }
299 271
300 case empty_event: /* Empty and deallocated events are equal. */ 272 case empty_event: /* Empty and deallocated events are equal. */
301 case dead_event: 273 case dead_event:
302 return 1; 274 return 1;
303 } 275 }
343 return HASH3 (hash, 315 return HASH3 (hash,
344 (Hashcode) e->event.magic_eval.internal_function, 316 (Hashcode) e->event.magic_eval.internal_function,
345 internal_hash (e->event.magic_eval.object, depth + 1)); 317 internal_hash (e->event.magic_eval.object, depth + 1));
346 318
347 case magic_event: 319 case magic_event:
348 { 320 return HASH2 (hash, event_stream_hash_magic_event (e));
349 struct console *con = XCONSOLE (CDFW_CONSOLE (EVENT_CHANNEL (e)));
350 #ifdef HAVE_GTK
351 if (CONSOLE_GTK_P (con))
352 return HASH2 (hash, e->event.magic.underlying_gdk_event.type);
353 #endif
354 #ifdef HAVE_X_WINDOWS
355 if (CONSOLE_X_P (con))
356 return HASH2 (hash, e->event.magic.underlying_x_event.xany.serial);
357 #endif
358 #ifdef HAVE_TTY
359 if (CONSOLE_TTY_P (con))
360 return HASH2 (hash, e->event.magic.underlying_tty_event);
361 #endif
362 #ifdef HAVE_MS_WINDOWS
363 if (CONSOLE_MSWINDOWS_P (con))
364 return HASH2 (hash, e->event.magic.underlying_mswindows_event);
365 #endif
366 abort ();
367 return 0;
368 }
369 321
370 case empty_event: 322 case empty_event:
371 case dead_event: 323 case dead_event:
372 return hash; 324 return hash;
373 325
1306 key = make_char (event->event.button.button + '0'); 1258 key = make_char (event->event.button.button + '0');
1307 break; 1259 break;
1308 } 1260 }
1309 case magic_event: 1261 case magic_event:
1310 { 1262 {
1311 const char *name = NULL; 1263 Lisp_Object stream;
1312 1264 struct gcpro gcpro1;
1313 #ifdef HAVE_GTK 1265 GCPRO1 (stream);
1314 { 1266
1315 Lisp_Object console = CDFW_CONSOLE (EVENT_CHANNEL (event)); 1267 stream = make_resizing_buffer_output_stream ();
1316 if (CONSOLE_GTK_P (XCONSOLE (console))) 1268 event_stream_format_magic_event (event, stream);
1317 name = gtk_event_name (event->event.magic.underlying_gdk_event.type); 1269 Lstream_flush (XLSTREAM (stream));
1318 } 1270 strncpy (buf, resizing_buffer_stream_ptr (XLSTREAM (stream)),
1319 #endif 1271 Lstream_byte_count (XLSTREAM (stream)));
1320 #ifdef HAVE_X_WINDOWS 1272 Lstream_delete (XLSTREAM (stream));
1321 { 1273 UNGCPRO;
1322 Lisp_Object console = CDFW_CONSOLE (EVENT_CHANNEL (event));
1323 if (CONSOLE_X_P (XCONSOLE (console)))
1324 name = x_event_name (event->event.magic.underlying_x_event.type);
1325 }
1326 #endif /* HAVE_X_WINDOWS */
1327 if (name) strcpy (buf, name);
1328 else strcpy (buf, "???");
1329 return; 1274 return;
1330 } 1275 }
1331 case magic_eval_event: strcpy (buf, "magic-eval"); return; 1276 case magic_eval_event: strcpy (buf, "magic-eval"); return;
1332 case pointer_motion_event: strcpy (buf, "motion"); return; 1277 case pointer_motion_event: strcpy (buf, "motion"); return;
1333 case misc_user_event: strcpy (buf, "misc-user"); return; 1278 case misc_user_event: strcpy (buf, "misc-user"); return;