comparison src/event-stream.c @ 249:83b3d10dcba9 r20-5b23

Import from CVS: tag r20-5b23
author cvs
date Mon, 13 Aug 2007 10:19:09 +0200
parents 6c0ae1f9357f
children 677f6a0ee643
comparison
equal deleted inserted replaced
248:ad40ac2754d8 249:83b3d10dcba9
2173 switch (XEVENT_TYPE (event)) 2173 switch (XEVENT_TYPE (event))
2174 { 2174 {
2175 default: 2175 default:
2176 goto RETURN; 2176 goto RETURN;
2177 case button_release_event: 2177 case button_release_event:
2178 #ifdef HAVE_OFFIX_DND 2178 #if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
2179 case dnd_drop_event: 2179 case dnd_drop_event:
2180 #endif 2180 #endif
2181 case misc_user_event: 2181 case misc_user_event:
2182 /* don't echo menu accelerator keys */ 2182 /* don't echo menu accelerator keys */
2183 reset_key_echo (command_builder, 1); 2183 reset_key_echo (command_builder, 1);
3967 EVENT_CHAIN_LOOP (event, Vthis_command_keys) 3967 EVENT_CHAIN_LOOP (event, Vthis_command_keys)
3968 { 3968 {
3969 if (EVENTP (event) 3969 if (EVENTP (event)
3970 && (XEVENT_TYPE (event) == button_press_event 3970 && (XEVENT_TYPE (event) == button_press_event
3971 || XEVENT_TYPE (event) == button_release_event 3971 || XEVENT_TYPE (event) == button_release_event
3972 #ifdef HAVE_OFFIX_DND 3972 #if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
3973 || XEVENT_TYPE (event) == dnd_drop_event 3973 || XEVENT_TYPE (event) == dnd_drop_event
3974 #endif 3974 #endif
3975 || XEVENT_TYPE (event) == misc_user_event)) 3975 || XEVENT_TYPE (event) == misc_user_event))
3976 { 3976 {
3977 if (!n) 3977 if (!n)
4001 if (EVENTP (event)) 4001 if (EVENTP (event))
4002 switch (XEVENT_TYPE (event)) 4002 switch (XEVENT_TYPE (event))
4003 { 4003 {
4004 case button_press_event : 4004 case button_press_event :
4005 case button_release_event : 4005 case button_release_event :
4006 #ifdef HAVE_OFFIX_DND 4006 #if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
4007 case dnd_drop_event: 4007 case dnd_drop_event:
4008 #endif 4008 #endif
4009 case misc_user_event : 4009 case misc_user_event :
4010 if (n == 0) 4010 if (n == 0)
4011 return event; 4011 return event;
4107 if (e->event_type == key_press_event) 4107 if (e->event_type == key_press_event)
4108 e->event.key.modifiers |= MOD_META; 4108 e->event.key.modifiers |= MOD_META;
4109 else if (e->event_type == button_press_event 4109 else if (e->event_type == button_press_event
4110 || e->event_type == button_release_event) 4110 || e->event_type == button_release_event)
4111 e->event.button.modifiers |= MOD_META; 4111 e->event.button.modifiers |= MOD_META;
4112 #ifdef HAVE_OFFIX_DND 4112 #if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
4113 else if (e->event_type == dnd_drop_event) 4113 else if (e->event_type == dnd_drop_event)
4114 e->event.dnd_drop.modifiers |= MOD_META; 4114 e->event.dnd_drop.modifiers |= MOD_META;
4115 #endif 4115 #endif
4116 else 4116 else
4117 abort (); 4117 abort ();
4210 case key_press_event: 4210 case key_press_event:
4211 Vcurrent_mouse_event = Qnil; 4211 Vcurrent_mouse_event = Qnil;
4212 break; 4212 break;
4213 case button_press_event: 4213 case button_press_event:
4214 case button_release_event: 4214 case button_release_event:
4215 #ifdef HAVE_OFFIX_DND 4215 #if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
4216 case dnd_drop_event: 4216 case dnd_drop_event:
4217 #endif 4217 #endif
4218 case misc_user_event: 4218 case misc_user_event:
4219 Vcurrent_mouse_event = Fcopy_event (event, Qnil); 4219 Vcurrent_mouse_event = Fcopy_event (event, Qnil);
4220 break; 4220 break;
4440 command_builder = XCOMMAND_BUILDER (XCONSOLE (console)->command_builder); 4440 command_builder = XCOMMAND_BUILDER (XCONSOLE (console)->command_builder);
4441 switch (XEVENT (event)->event_type) 4441 switch (XEVENT (event)->event_type)
4442 { 4442 {
4443 case button_press_event: 4443 case button_press_event:
4444 case button_release_event: 4444 case button_release_event:
4445 #ifdef HAVE_OFFIX_DND 4445 #if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
4446 case dnd_drop_event: 4446 case dnd_drop_event:
4447 #endif 4447 #endif
4448 case key_press_event: 4448 case key_press_event:
4449 { 4449 {
4450 Lisp_Object leaf = lookup_command_event (command_builder, event, 1); 4450 Lisp_Object leaf = lookup_command_event (command_builder, event, 1);