Mercurial > hg > xemacs-beta

comparison src/event-stream.c @ 197:acd284d43ca1 r20-3b25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b25
author cvs
date Mon, 13 Aug 2007 10:00:02 +0200
parents a2f645c6b9f8
children 41ff10fd062f
comparison
equal deleted inserted replaced
196:58e0786448ca 197:acd284d43ca1
2163 switch (XEVENT_TYPE (event)) 2163 switch (XEVENT_TYPE (event))
2164 { 2164 {
2165 default: 2165 default:
2166 goto RETURN; 2166 goto RETURN;
2167 case button_release_event: 2167 case button_release_event:
2168 #ifdef HAVE_OFFIX_DND
2169 case dnd_drop_event:
2170 #endif
2168 case misc_user_event: 2171 case misc_user_event:
2169 /* don't echo menu accelerator keys */ 2172 /* don't echo menu accelerator keys */
2170 reset_key_echo (command_builder, 1); 2173 reset_key_echo (command_builder, 1);
2171 goto EXECUTE_KEY; 2174 goto EXECUTE_KEY;
2172 case button_press_event: /* key or mouse input can trigger prompting */ 2175 case button_press_event: /* key or mouse input can trigger prompting */
3940 EVENT_CHAIN_LOOP (event, Vthis_command_keys) 3943 EVENT_CHAIN_LOOP (event, Vthis_command_keys)
3941 { 3944 {
3942 if (EVENTP (event) 3945 if (EVENTP (event)
3943 && (XEVENT_TYPE (event) == button_press_event 3946 && (XEVENT_TYPE (event) == button_press_event
3944 || XEVENT_TYPE (event) == button_release_event 3947 || XEVENT_TYPE (event) == button_release_event
3948 #ifdef HAVE_OFFIX_DND
3949 || XEVENT_TYPE (event) == dnd_drop_event
3950 #endif
3945 || XEVENT_TYPE (event) == misc_user_event)) 3951 || XEVENT_TYPE (event) == misc_user_event))
3946 { 3952 {
3947 if (!n) 3953 if (!n)
3948 { 3954 {
3949 /* must copy to avoid an abort() in next_event_internal() */ 3955 /* must copy to avoid an abort() in next_event_internal() */
3971 if (EVENTP (event)) 3977 if (EVENTP (event))
3972 switch (XEVENT_TYPE (event)) 3978 switch (XEVENT_TYPE (event))
3973 { 3979 {
3974 case button_press_event : 3980 case button_press_event :
3975 case button_release_event : 3981 case button_release_event :
3982 #ifdef HAVE_OFFIX_DND
3983 case dnd_drop_event:
3984 #endif
3976 case misc_user_event : 3985 case misc_user_event :
3977 if (n == 0) 3986 if (n == 0)
3978 return event; 3987 return event;
3979 n--; 3988 n--;
3980 break; 3989 break;
4074 if (e->event_type == key_press_event) 4083 if (e->event_type == key_press_event)
4075 e->event.key.modifiers |= MOD_META; 4084 e->event.key.modifiers |= MOD_META;
4076 else if (e->event_type == button_press_event 4085 else if (e->event_type == button_press_event
4077 || e->event_type == button_release_event) 4086 || e->event_type == button_release_event)
4078 e->event.button.modifiers |= MOD_META; 4087 e->event.button.modifiers |= MOD_META;
4088 #ifdef HAVE_OFFIX_DND
4089 else if (e->event_type == dnd_drop_event)
4090 e->event.dnd_drop.modifiers |= MOD_META;
4091 #endif
4079 else 4092 else
4080 abort (); 4093 abort ();
4081 4094
4082 { 4095 {
4083 int tckn = event_chain_count (Vthis_command_keys); 4096 int tckn = event_chain_count (Vthis_command_keys);
4173 case key_press_event: 4186 case key_press_event:
4174 Vcurrent_mouse_event = Qnil; 4187 Vcurrent_mouse_event = Qnil;
4175 break; 4188 break;
4176 case button_press_event: 4189 case button_press_event:
4177 case button_release_event: 4190 case button_release_event:
4191 #ifdef HAVE_OFFIX_DND
4192 case dnd_drop_event:
4193 #endif
4178 case misc_user_event: 4194 case misc_user_event:
4179 Vcurrent_mouse_event = Fcopy_event (event, Qnil); 4195 Vcurrent_mouse_event = Fcopy_event (event, Qnil);
4180 break; 4196 break;
4181 default: break; 4197 default: break;
4182 } 4198 }
4400 command_builder = XCOMMAND_BUILDER (XCONSOLE (console)->command_builder); 4416 command_builder = XCOMMAND_BUILDER (XCONSOLE (console)->command_builder);
4401 switch (XEVENT (event)->event_type) 4417 switch (XEVENT (event)->event_type)
4402 { 4418 {
4403 case button_press_event: 4419 case button_press_event:
4404 case button_release_event: 4420 case button_release_event:
4421 #ifdef HAVE_OFFIX_DND
4422 case dnd_drop_event:
4423 #endif
4405 case key_press_event: 4424 case key_press_event:
4406 { 4425 {
4407 Lisp_Object leaf = lookup_command_event (command_builder, event, 1); 4426 Lisp_Object leaf = lookup_command_event (command_builder, event, 1);
4408 4427
4409 if (KEYMAPP (leaf)) 4428 if (KEYMAPP (leaf))