From 59a798b3f0bd91e6112c080a8c80c22998e8ee3e Mon Sep 17 00:00:00 2001 From: Po Lu Date: Thu, 7 Jul 2022 20:16:43 +0800 Subject: [PATCH] Fix GTK build * src/xterm.c (x_dnd_begin_drag_and_drop): Update GTK quitting code for last change too. Reported by Norbert Koch . --- src/xterm.c | 47 +---------------------------------------------- 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 98a5beed178..d057bbf06c2 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -11889,55 +11889,10 @@ x_dnd_begin_drag_and_drop (struct frame *f, Time time, Atom xaction, if (xg_pending_quit_event.kind != NO_EVENT) { xg_pending_quit_event.kind = NO_EVENT; - - if (x_dnd_in_progress) - { - if (x_dnd_last_seen_window != None - && x_dnd_last_protocol_version != -1) - x_dnd_send_leave (f, x_dnd_last_seen_window); - else if (x_dnd_last_seen_window != None - && !XM_DRAG_STYLE_IS_DROP_ONLY (x_dnd_last_motif_style) - && x_dnd_last_motif_style != XM_DRAG_STYLE_NONE - && x_dnd_motif_setup_p) - { - dmsg.reason = XM_DRAG_REASON (XM_DRAG_ORIGINATOR_INITIATOR, - XM_DRAG_REASON_DROP_START); - dmsg.byte_order = XM_BYTE_ORDER_CUR_FIRST; - dmsg.timestamp = xg_pending_quit_event.timestamp; - dmsg.side_effects - = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (FRAME_DISPLAY_INFO (f), - x_dnd_wanted_action), - XM_DROP_SITE_VALID, x_dnd_motif_operations, - XM_DROP_ACTION_DROP_CANCEL); - dmsg.x = 0; - dmsg.y = 0; - dmsg.index_atom = x_dnd_motif_atom; - dmsg.source_window = FRAME_X_WINDOW (f); - - x_dnd_send_xm_leave_for_drop (FRAME_DISPLAY_INFO (f), f, - x_dnd_last_seen_window, - xg_pending_quit_event.timestamp); - xm_send_drop_message (FRAME_DISPLAY_INFO (f), FRAME_X_WINDOW (f), - x_dnd_last_seen_window, &dmsg); - } - - x_dnd_end_window = x_dnd_last_seen_window; - x_dnd_last_seen_window = None; - x_dnd_last_seen_toplevel = None; - x_dnd_in_progress = false; - x_dnd_frame = NULL; - } - - x_dnd_waiting_for_finish = false; - x_dnd_return_frame_object = NULL; - x_dnd_movement_frame = NULL; - - FRAME_DISPLAY_INFO (f)->grabbed = 0; current_hold_quit = NULL; - /* Restore the old event mask. */ + x_dnd_process_quit (f, FRAME_DISPLAY_INFO (f)->last_user_time); x_restore_events_after_dnd (f, &root_window_attrs); - quit (); } #else -- 2.39.5