diff src/events.h @ 4780:2fd201d73a92

Call character_to_event on characters received from XIM, event-Xt.c src/ChangeLog addition: 2009-12-17 Aidan Kehoe <kehoea@parhasard.net> * events.h (character_to_event_meta_behavior): New enumeration, describing what character_to_event should do with characters in the range ?\x80-?\xFF, and passed as the third argument to character_to_event instead of the binary use_console_meta_flag. * events.c (character_to_event, Fcharacter_to_event): * event-unixoid.c (read_event_from_tty_or_stream_desc): * event-stream.c (maybe_kbd_translate, maybe_kbd_translate): * event-msw.c (mswindows_need_event): Use the new enumeration. * event-Xt.c (x_to_emacs_keysym): Call character_to_event when we receive XLookupChars events, passing latin_1_maps_to_itself as the meta_behavior flag, addressing the problem FKtPp sees in 87bpi9mwpu.fsf@yahoo.com.cn
author Aidan Kehoe <kehoea@parhasard.net>
date Thu, 17 Dec 2009 17:51:38 +0000
parents a75979634ce3
children 6ef8256a020a e0db3c197671
line wrap: on
line diff
--- a/src/events.h	Thu Dec 17 17:29:32 2009 +0000
+++ b/src/events.h	Thu Dec 17 17:51:38 2009 +0000
@@ -951,13 +951,20 @@
 /* Maybe this should be trickier */
 #define KEYSYM(x) (intern (x))
 
+typedef enum character_to_event_meta_behavior
+{
+  high_bit_is_meta,
+  use_console_meta_flag,
+  latin_1_maps_to_itself
+} character_to_event_meta_behavior;
+
 /* from events.c */
 void format_event_object (Eistring *buf, Lisp_Object event, int brief);
 /*void format_event_data_object (Eistring *buf, Lisp_Object data, int brief);*/
-void character_to_event (Ichar c, Lisp_Event *event,
-                         struct console *con,
-                         int use_console_meta_flag,
+void character_to_event (Ichar, Lisp_Event *, struct console *,
+                         character_to_event_meta_behavior meta_flag,
                          int do_backspace_mapping);
+
 void zero_event (Lisp_Event *e);
 
 #define MECR_DEALLOCATE_EVENT 1