Mercurial > hg > xemacs-beta
comparison src/event-gtk.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 | 2923009caf47 |
children | 06b73d289047 |
comparison
equal
deleted
inserted
replaced
787:242b62e9fc59 | 788:026c5bf9c134 |
---|---|
1 /* The event_stream interface for X11 with gtk, and/or tty frames. | 1 /* The event_stream interface for X11 with gtk, and/or tty frames. |
2 Copyright (C) 1991-5, 1997 Free Software Foundation, Inc. | 2 Copyright (C) 1991-5, 1997 Free Software Foundation, Inc. |
3 Copyright (C) 1995 Sun Microsystems, Inc. | 3 Copyright (C) 1995 Sun Microsystems, Inc. |
4 Copyright (C) 1996, 2001 Ben Wing. | 4 Copyright (C) 1996, 2001, 2002 Ben Wing. |
5 Copyright (C) 2000 William Perry. | 5 Copyright (C) 2000 William Perry. |
6 | 6 |
7 This file is part of XEmacs. | 7 This file is part of XEmacs. |
8 | 8 |
9 XEmacs is free software; you can redistribute it and/or modify it | 9 XEmacs is free software; you can redistribute it and/or modify it |
204 if (event->client.message_type == gdk_atom_intern ("WM_PROTOCOLS", 0) && | 204 if (event->client.message_type == gdk_atom_intern ("WM_PROTOCOLS", 0) && |
205 (GdkAtom) event->client.data.l[0] == gdk_atom_intern ("WM_TAKE_FOCUS", 0)) | 205 (GdkAtom) event->client.data.l[0] == gdk_atom_intern ("WM_TAKE_FOCUS", 0)) |
206 { | 206 { |
207 handle_focus_event_1 (f, 1); | 207 handle_focus_event_1 (f, 1); |
208 } | 208 } |
209 } | |
210 | |
211 static void | |
212 emacs_gtk_format_magic_event (Lisp_Event *emacs_event, Lisp_Object pstream) | |
213 { | |
214 Lisp_Object console = CDFW_CONSOLE (EVENT_CHANNEL (event)); | |
215 if (CONSOLE_GTK_P (XCONSOLE (console))) | |
216 write_c_string (gtk_event_name (event->event.magic.underlying_gdk_event. | |
217 type)); | |
218 } | |
219 | |
220 static int | |
221 emacs_gtk_compare_magic_event (Lisp_Event *e1, Lisp_Event *e2) | |
222 { | |
223 if (CONSOLE_GTK_P (XCONSOLE (CDFW_CONSOLE (EVENT_CHANNEL (e1)))) && | |
224 CONSOLE_GTK_P (XCONSOLE (CDFW_CONSOLE (EVENT_CHANNEL (e2))))) | |
225 return (!memcmp (&e1->event.magic.underlying_gdk_event, | |
226 &e2->event.magic.underlying_gdk_event, | |
227 sizeof (GdkEvent))); | |
228 if (CONSOLE_GTK_P (XCONSOLE (CDFW_CONSOLE (EVENT_CHANNEL (e1)))) || | |
229 CONSOLE_GTK_P (XCONSOLE (CDFW_CONSOLE (EVENT_CHANNEL (e2))))) | |
230 return 0; | |
231 return 1; | |
232 } | |
233 | |
234 static Hashcode | |
235 emacs_gtk_hash_magic_event (Lisp_Event *e) | |
236 { | |
237 Lisp_Object console = CDFW_CONSOLE (EVENT_CHANNEL (e)); | |
238 if (CONSOLE_GTK_P (XCONSOLE (console))) | |
239 return memory_hash (&e->event.magic.underlying_gdk_event, | |
240 sizeof (GdkEvent)); | |
241 return 0; | |
209 } | 242 } |
210 | 243 |
211 static void | 244 static void |
212 emacs_gtk_handle_magic_event (struct Lisp_Event *emacs_event) | 245 emacs_gtk_handle_magic_event (struct Lisp_Event *emacs_event) |
213 { | 246 { |
1711 { | 1744 { |
1712 gtk_event_stream = xnew (struct event_stream); | 1745 gtk_event_stream = xnew (struct event_stream); |
1713 gtk_event_stream->event_pending_p = emacs_gtk_event_pending_p; | 1746 gtk_event_stream->event_pending_p = emacs_gtk_event_pending_p; |
1714 gtk_event_stream->next_event_cb = emacs_gtk_next_event; | 1747 gtk_event_stream->next_event_cb = emacs_gtk_next_event; |
1715 gtk_event_stream->handle_magic_event_cb= emacs_gtk_handle_magic_event; | 1748 gtk_event_stream->handle_magic_event_cb= emacs_gtk_handle_magic_event; |
1749 gtk_event_stream->format_magic_event_cb= emacs_gtk_format_magic_event; | |
1750 gtk_event_stream->compare_magic_event_cb= emacs_gtk_compare_magic_event; | |
1751 gtk_event_stream->hash_magic_event_cb = emacs_gtk_hash_magic_event; | |
1716 gtk_event_stream->add_timeout_cb = emacs_gtk_add_timeout; | 1752 gtk_event_stream->add_timeout_cb = emacs_gtk_add_timeout; |
1717 gtk_event_stream->remove_timeout_cb = emacs_gtk_remove_timeout; | 1753 gtk_event_stream->remove_timeout_cb = emacs_gtk_remove_timeout; |
1718 gtk_event_stream->select_console_cb = emacs_gtk_select_console; | 1754 gtk_event_stream->select_console_cb = emacs_gtk_select_console; |
1719 gtk_event_stream->unselect_console_cb = emacs_gtk_unselect_console; | 1755 gtk_event_stream->unselect_console_cb = emacs_gtk_unselect_console; |
1720 gtk_event_stream->select_process_cb = emacs_gtk_select_process; | 1756 gtk_event_stream->select_process_cb = emacs_gtk_select_process; |