diff options
| -rw-r--r-- | types/wlr_data_device.c | 8 | ||||
| -rw-r--r-- | xwayland/selection.c | 27 | ||||
| -rw-r--r-- | xwayland/xwm.c | 3 |
3 files changed, 26 insertions, 12 deletions
diff --git a/types/wlr_data_device.c b/types/wlr_data_device.c index 8cc2b0e3..f61ef07e 100644 --- a/types/wlr_data_device.c +++ b/types/wlr_data_device.c @@ -537,9 +537,11 @@ static uint32_t pointer_drag_button(struct wlr_seat_pointer_grab *grab, drag->source->dnd_drop(drag->source); } - drag->source->offer->in_ask = - drag->source->current_dnd_action == - WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK; + if (drag->source->offer != NULL) { + drag->source->offer->in_ask = + drag->source->current_dnd_action == + WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK; + } struct wlr_drag_drop_event event = { .drag = drag, diff --git a/xwayland/selection.c b/xwayland/selection.c index 976b9200..740fac73 100644 --- a/xwayland/selection.c +++ b/xwayland/selection.c @@ -24,7 +24,7 @@ static xcb_atom_t data_device_manager_dnd_action_to_atom( return XCB_ATOM_NONE; } -/*static enum wl_data_device_manager_dnd_action +static enum wl_data_device_manager_dnd_action data_device_manager_dnd_action_from_atom(struct wlr_xwm *xwm, enum atom_name atom) { if (atom == xwm->atoms[DND_ACTION_COPY] || @@ -36,7 +36,7 @@ static xcb_atom_t data_device_manager_dnd_action_to_atom( return WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK; } return WL_DATA_DEVICE_MANAGER_DND_ACTION_NONE; -}*/ +} static void xwm_selection_send_notify(struct wlr_xwm_selection *selection, xcb_atom_t property) { @@ -963,15 +963,25 @@ int xwm_handle_selection_client_message(struct wlr_xwm *xwm, if (ev->type == xwm->atoms[DND_STATUS]) { struct wlr_drag *drag = xwm->drag; if (drag == NULL) { - return 0; + wlr_log(L_DEBUG, "Ignoring XdndStatus client message because " + "there's no current drag"); + return 1; } - // xcb_client_message_data_t *data = &ev->data; - // xcb_window_t target_window = data->data32[0]; - // bool accepted = data->data32[1] & 1; - // xcb_atom_t action = data->data32[4]; + xcb_client_message_data_t *data = &ev->data; + xcb_window_t target_window = data->data32[0]; + bool accepted = data->data32[1] & 1; + xcb_atom_t action_atom = data->data32[4]; + + enum wl_data_device_manager_dnd_action action = + data_device_manager_dnd_action_from_atom(xwm, action_atom); + + drag->source->accepted = accepted; + drag->source->current_dnd_action = action; - // TODO: drag->source->dnd_action(data_device_manager_dnd_action_from_atom(xwm, action)) + // TODO: drag->source->dnd_action() + wlr_log(L_DEBUG, "DND_STATUS window=%d accepted=%d action=%d", + target_window, accepted, action); return 1; } else { return 0; @@ -1150,6 +1160,7 @@ static void seat_handle_drag_drop(struct wl_listener *listener, void *data) { return; // No xwayland surface focused } + wlr_log(L_DEBUG, "Wayland drag dropped over an Xwayland window"); xwm_dnd_send_drop(xwm, event->time); } diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 4b55769e..f6668796 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -559,7 +559,8 @@ static void read_surface_property(struct wlr_xwm *xwm, read_surface_motif_hints(xwm, xsurface, reply); } else { char *prop_name = get_atom_name(xwm, property); - wlr_log(L_DEBUG, "unhandled x11 property %u (%s)", property, prop_name); + wlr_log(L_DEBUG, "unhandled X11 property %u (%s) for window %u", + property, prop_name, xsurface->window_id); free(prop_name); } |