]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix DND bugs on GTK
authorPo Lu <luangruo@yahoo.com>
Thu, 7 Apr 2022 06:02:34 +0000 (14:02 +0800)
committerPo Lu <luangruo@yahoo.com>
Thu, 7 Apr 2022 06:02:34 +0000 (14:02 +0800)
* src/xterm.c (handle_one_xevent): Don't let some client
messages reach the toolkit.

src/xterm.c

index 58a4fc6117ae7ba7ca34cb44704e90003acfb00c..4e2091a0de993559d06bec7d26aacea1fe45cb5d 100644 (file)
@@ -13540,6 +13540,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                else
                  x_dnd_action = None;
              }
+
+           goto done;
          }
 
        if (event->xclient.message_type == dpyinfo->Xatom_XdndFinished
@@ -13554,6 +13556,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
            if (x_dnd_waiting_for_finish_proto >= 5
                && !(event->xclient.data.l[1] & 1))
              x_dnd_action = None;
+
+           goto done;
          }
 
        if ((event->xclient.message_type
@@ -13579,7 +13583,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                    && operation != XM_DRAG_LINK)
                  {
                    x_dnd_waiting_for_finish = false;
-                   goto OTHER;
+                   goto done;
                  }
 
                if (status != XM_DROP_SITE_VALID
@@ -13587,7 +13591,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                        || action == XM_DROP_ACTION_DROP_HELP))
                  {
                    x_dnd_waiting_for_finish = false;
-                   goto OTHER;
+                   goto done;
                  }
 
                switch (operation)
@@ -13606,7 +13610,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                  }
 
                x_dnd_waiting_for_motif_finish = 2;
-               goto OTHER;
+               goto done;
              }
          }