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

Import from CVS: tag r20-3b25
author cvs
date Mon, 13 Aug 2007 10:00:02 +0200
parents a2f645c6b9f8
children 41ff10fd062f
line wrap: on
line diff
--- a/src/event-stream.c	Mon Aug 13 09:59:07 2007 +0200
+++ b/src/event-stream.c	Mon Aug 13 10:00:02 2007 +0200
@@ -2165,6 +2165,9 @@
     default:
       goto RETURN;
     case button_release_event:
+#ifdef HAVE_OFFIX_DND
+    case dnd_drop_event:
+#endif
     case misc_user_event:
       /* don't echo menu accelerator keys */
       reset_key_echo (command_builder, 1);
@@ -3942,6 +3945,9 @@
       if (EVENTP (event)
 	  && (XEVENT_TYPE (event) == button_press_event
 	      || XEVENT_TYPE (event) == button_release_event
+#ifdef HAVE_OFFIX_DND
+	      || XEVENT_TYPE (event) == dnd_drop_event
+#endif
 	      || XEVENT_TYPE (event) == misc_user_event))
 	{
 	  if (!n)
@@ -3973,6 +3979,9 @@
 	  {
 	  case button_press_event :
 	  case button_release_event :
+#ifdef HAVE_OFFIX_DND
+	  case dnd_drop_event:
+#endif
 	  case misc_user_event :
 	    if (n == 0)
 	      return event;
@@ -4076,6 +4085,10 @@
 	else if (e->event_type == button_press_event
 		 || e->event_type == button_release_event)
 	  e->event.button.modifiers |= MOD_META;
+#ifdef HAVE_OFFIX_DND
+	else if (e->event_type == dnd_drop_event)
+	  e->event.dnd_drop.modifiers |= MOD_META;
+#endif
 	else
 	  abort ();
 
@@ -4175,6 +4188,9 @@
       break;
     case button_press_event:
     case button_release_event:
+#ifdef HAVE_OFFIX_DND
+    case dnd_drop_event:
+#endif
     case misc_user_event:
       Vcurrent_mouse_event = Fcopy_event (event, Qnil);
       break;
@@ -4402,6 +4418,9 @@
     {
     case button_press_event:
     case button_release_event:
+#ifdef HAVE_OFFIX_DND
+    case dnd_drop_event:
+#endif
     case key_press_event:
       {
 	Lisp_Object leaf = lookup_command_event (command_builder, event, 1);