diff options
| author | Po Lu | 2022-07-07 20:16:43 +0800 |
|---|---|---|
| committer | Po Lu | 2022-07-07 20:16:43 +0800 |
| commit | 59a798b3f0bd91e6112c080a8c80c22998e8ee3e (patch) | |
| tree | c337199a8108970d280955d405483f931da6fe60 /src | |
| parent | 7a9f8ed6fba0d6728cbf185696bdc1a95b1acfea (diff) | |
| download | emacs-59a798b3f0bd91e6112c080a8c80c22998e8ee3e.tar.gz emacs-59a798b3f0bd91e6112c080a8c80c22998e8ee3e.zip | |
Fix GTK build
* src/xterm.c (x_dnd_begin_drag_and_drop): Update GTK quitting
code for last change too. Reported by Norbert Koch
<viteno@netic.de>.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xterm.c | 47 |
1 files changed, 1 insertions, 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, | |||
| 11889 | if (xg_pending_quit_event.kind != NO_EVENT) | 11889 | if (xg_pending_quit_event.kind != NO_EVENT) |
| 11890 | { | 11890 | { |
| 11891 | xg_pending_quit_event.kind = NO_EVENT; | 11891 | xg_pending_quit_event.kind = NO_EVENT; |
| 11892 | |||
| 11893 | if (x_dnd_in_progress) | ||
| 11894 | { | ||
| 11895 | if (x_dnd_last_seen_window != None | ||
| 11896 | && x_dnd_last_protocol_version != -1) | ||
| 11897 | x_dnd_send_leave (f, x_dnd_last_seen_window); | ||
| 11898 | else if (x_dnd_last_seen_window != None | ||
| 11899 | && !XM_DRAG_STYLE_IS_DROP_ONLY (x_dnd_last_motif_style) | ||
| 11900 | && x_dnd_last_motif_style != XM_DRAG_STYLE_NONE | ||
| 11901 | && x_dnd_motif_setup_p) | ||
| 11902 | { | ||
| 11903 | dmsg.reason = XM_DRAG_REASON (XM_DRAG_ORIGINATOR_INITIATOR, | ||
| 11904 | XM_DRAG_REASON_DROP_START); | ||
| 11905 | dmsg.byte_order = XM_BYTE_ORDER_CUR_FIRST; | ||
| 11906 | dmsg.timestamp = xg_pending_quit_event.timestamp; | ||
| 11907 | dmsg.side_effects | ||
| 11908 | = XM_DRAG_SIDE_EFFECT (xm_side_effect_from_action (FRAME_DISPLAY_INFO (f), | ||
| 11909 | x_dnd_wanted_action), | ||
| 11910 | XM_DROP_SITE_VALID, x_dnd_motif_operations, | ||
| 11911 | XM_DROP_ACTION_DROP_CANCEL); | ||
| 11912 | dmsg.x = 0; | ||
| 11913 | dmsg.y = 0; | ||
| 11914 | dmsg.index_atom = x_dnd_motif_atom; | ||
| 11915 | dmsg.source_window = FRAME_X_WINDOW (f); | ||
| 11916 | |||
| 11917 | x_dnd_send_xm_leave_for_drop (FRAME_DISPLAY_INFO (f), f, | ||
| 11918 | x_dnd_last_seen_window, | ||
| 11919 | xg_pending_quit_event.timestamp); | ||
| 11920 | xm_send_drop_message (FRAME_DISPLAY_INFO (f), FRAME_X_WINDOW (f), | ||
| 11921 | x_dnd_last_seen_window, &dmsg); | ||
| 11922 | } | ||
| 11923 | |||
| 11924 | x_dnd_end_window = x_dnd_last_seen_window; | ||
| 11925 | x_dnd_last_seen_window = None; | ||
| 11926 | x_dnd_last_seen_toplevel = None; | ||
| 11927 | x_dnd_in_progress = false; | ||
| 11928 | x_dnd_frame = NULL; | ||
| 11929 | } | ||
| 11930 | |||
| 11931 | x_dnd_waiting_for_finish = false; | ||
| 11932 | x_dnd_return_frame_object = NULL; | ||
| 11933 | x_dnd_movement_frame = NULL; | ||
| 11934 | |||
| 11935 | FRAME_DISPLAY_INFO (f)->grabbed = 0; | ||
| 11936 | current_hold_quit = NULL; | 11892 | current_hold_quit = NULL; |
| 11937 | 11893 | ||
| 11938 | /* Restore the old event mask. */ | 11894 | x_dnd_process_quit (f, FRAME_DISPLAY_INFO (f)->last_user_time); |
| 11939 | x_restore_events_after_dnd (f, &root_window_attrs); | 11895 | x_restore_events_after_dnd (f, &root_window_attrs); |
| 11940 | |||
| 11941 | quit (); | 11896 | quit (); |
| 11942 | } | 11897 | } |
| 11943 | #else | 11898 | #else |