comparison src/event-stream.c @ 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 1d61580e0cf7
children 8b63e21b0436 e0db3c197671
comparison
equal deleted inserted replaced
4779:fd98353950a4 4780:2fd201d73a92
3187 but that can eradicate timestamps and other such stuff. 3187 but that can eradicate timestamps and other such stuff.
3188 This way is safer. */ 3188 This way is safer. */
3189 Lisp_Object ev2 = Fmake_event (Qnil, Qnil); 3189 Lisp_Object ev2 = Fmake_event (Qnil, Qnil);
3190 3190
3191 character_to_event (XCHAR (traduit), XEVENT (ev2), 3191 character_to_event (XCHAR (traduit), XEVENT (ev2),
3192 XCONSOLE (XEVENT_CHANNEL (event)), 0, 1); 3192 XCONSOLE (XEVENT_CHANNEL (event)),
3193 high_bit_is_meta, 1);
3193 XSET_EVENT_KEY_KEYSYM (event, XEVENT_KEY_KEYSYM (ev2)); 3194 XSET_EVENT_KEY_KEYSYM (event, XEVENT_KEY_KEYSYM (ev2));
3194 XSET_EVENT_KEY_MODIFIERS (event, XEVENT_KEY_MODIFIERS (ev2)); 3195 XSET_EVENT_KEY_MODIFIERS (event, XEVENT_KEY_MODIFIERS (ev2));
3195 Fdeallocate_event (ev2); 3196 Fdeallocate_event (ev2);
3196 did_translate = 1; 3197 did_translate = 1;
3197 } 3198 }
3212 but that can eradicate timestamps and other such stuff. 3213 but that can eradicate timestamps and other such stuff.
3213 This way is safer. */ 3214 This way is safer. */
3214 Lisp_Object ev2 = Fmake_event (Qnil, Qnil); 3215 Lisp_Object ev2 = Fmake_event (Qnil, Qnil);
3215 3216
3216 character_to_event (XCHAR (traduit), XEVENT (ev2), 3217 character_to_event (XCHAR (traduit), XEVENT (ev2),
3217 XCONSOLE (XEVENT_CHANNEL (event)), 0, 1); 3218 XCONSOLE (XEVENT_CHANNEL (event)),
3219 high_bit_is_meta, 1);
3218 XSET_EVENT_KEY_KEYSYM (event, XEVENT_KEY_KEYSYM (ev2)); 3220 XSET_EVENT_KEY_KEYSYM (event, XEVENT_KEY_KEYSYM (ev2));
3219 XSET_EVENT_KEY_MODIFIERS (event, 3221 XSET_EVENT_KEY_MODIFIERS (event,
3220 XEVENT_KEY_MODIFIERS (event) | 3222 XEVENT_KEY_MODIFIERS (event) |
3221 XEVENT_KEY_MODIFIERS (ev2)); 3223 XEVENT_KEY_MODIFIERS (ev2));
3222 3224