Mercurial > hg > xemacs-beta
comparison src/event-stream.c @ 169:15872534500d r20-3b11
Import from CVS: tag r20-3b11
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:46:53 +0200 |
parents | 25f70ba0133c |
children | 8eaf7971accc |
comparison
equal
deleted
inserted
replaced
168:9851d5c6556e | 169:15872534500d |
---|---|
1217 event_stream_remove_timeout (timeout->interval_id); | 1217 event_stream_remove_timeout (timeout->interval_id); |
1218 free_managed_opaque (Vtimeout_free_list, op); | 1218 free_managed_opaque (Vtimeout_free_list, op); |
1219 } | 1219 } |
1220 } | 1220 } |
1221 | 1221 |
1222 int | 1222 static int |
1223 event_stream_wakeup_pending_p (int id, int async_p) | 1223 event_stream_wakeup_pending_p (int id, int async_p) |
1224 { | 1224 { |
1225 struct timeout *timeout; | 1225 struct timeout *timeout; |
1226 Lisp_Object rest = Qnil; | 1226 Lisp_Object rest = Qnil; |
1227 Lisp_Object timeout_list; | 1227 Lisp_Object timeout_list; |
3148 Emchar c; | 3148 Emchar c; |
3149 if ((key->modifiers & MOD_SHIFT) | 3149 if ((key->modifiers & MOD_SHIFT) |
3150 || (CHAR_OR_CHAR_INTP (key->keysym) | 3150 || (CHAR_OR_CHAR_INTP (key->keysym) |
3151 && ((c = XCHAR_OR_CHAR_INT (key->keysym)), c >= 'A' && c <= 'Z'))) | 3151 && ((c = XCHAR_OR_CHAR_INT (key->keysym)), c >= 'A' && c <= 'Z'))) |
3152 { | 3152 { |
3153 struct Lisp_Event terminal_copy; | 3153 struct Lisp_Event terminal_copy = *XEVENT (terminal); |
3154 terminal_copy = *XEVENT (terminal); | |
3155 | 3154 |
3156 if (key->modifiers & MOD_SHIFT) | 3155 if (key->modifiers & MOD_SHIFT) |
3157 key->modifiers &= (~ MOD_SHIFT); | 3156 key->modifiers &= (~ MOD_SHIFT); |
3158 else | 3157 else |
3159 key->keysym = make_char (c + 'a' - 'A'); | 3158 key->keysym = make_char (c + 'a' - 'A'); |
3160 | 3159 |
3161 result = command_builder_find_leaf (builder, allow_misc_user_events_p); | 3160 result = command_builder_find_leaf (builder, allow_misc_user_events_p); |
3162 if (!NILP (result)) | 3161 if (!NILP (result)) |
3163 return (result); | 3162 return result; |
3164 /* If there was no match with the lower-case version either, | 3163 /* If there was no match with the lower-case version either, |
3165 then put back the upper-case event for the error | 3164 then put back the upper-case event for the error |
3166 message. But make sure that function-key-map didn't | 3165 message. But make sure that function-key-map didn't |
3167 change things out from under us. */ | 3166 change things out from under us. */ |
3168 if (EQ (terminal, builder->most_current_event)) | 3167 if (EQ (terminal, builder->most_current_event)) |