hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-26 14:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #367 from acrisci/bug/dnd-force-cancel

Browse source 
bugfix: dnd force cancel
This commit is contained in:
Drew DeVault 2017-11-01 08:38:39 -04:00 committed by GitHub
commit 03c0d41ca9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/rootston/input.h
View file

@ -68,6 +68,7 @@ struct roots_input_event {
struct roots_drag_icon {
struct wlr_surface *surface;
struct wl_list link; // roots_input::drag_icons
bool mapped;
int32_t sx;
int32_t sy;

2
include/wlr/types/wlr_data_device.h
View file

@ -61,6 +61,8 @@ struct wlr_drag {
struct wlr_surface *focus;
struct wlr_data_source *source;
bool cancelling;
struct wl_listener icon_destroy;
struct wl_listener source_destroy;
struct wl_listener seat_client_unbound;

16
rootston/cursor.c
View file

@ -405,9 +405,6 @@ static void handle_drag_icon_destroy(struct wl_listener *listener, void *data) {
static void handle_drag_icon_commit(struct wl_listener *listener, void *data) {
struct roots_drag_icon *drag_icon =
wl_container_of(listener, drag_icon, surface_commit);
// TODO the spec hints at rules that can determine whether the drag icon is
// mapped here, but it is not completely clear so we need to test more
// toolkits to see how we should interpret the surface state here.
drag_icon->sx += drag_icon->surface->current->sx;
drag_icon->sy += drag_icon->surface->current->sy;
}
@ -431,6 +428,7 @@ static void handle_pointer_grab_begin(struct wl_listener *listener,
struct roots_drag_icon *drag_icon =
calloc(1, sizeof(struct roots_drag_icon));
drag_icon->mapped = true;
drag_icon->surface = drag->icon;
wl_list_insert(&input->drag_icons, &drag_icon->link);
@ -448,6 +446,18 @@ static void handle_pointer_grab_begin(struct wl_listener *listener,
static void handle_pointer_grab_end(struct wl_listener *listener, void *data) {
struct roots_input *input =
wl_container_of(listener, input, pointer_grab_end);
struct wlr_seat_pointer_grab *grab = data;
if (grab->interface == &wlr_data_device_pointer_drag_interface) {
struct wlr_drag *drag = grab->data;
struct roots_drag_icon *icon;
wl_list_for_each(icon, &input->drag_icons, link) {
if (icon->surface == drag->icon) {
icon->mapped = false;
}
}
}
cursor_update_position(input, 0);
}

3
rootston/output.c
View file

@ -152,6 +152,9 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
struct roots_drag_icon *drag_icon = NULL;
wl_list_for_each(drag_icon, &server->input->drag_icons, link) {
if (!drag_icon->mapped) {
continue;
}
struct wlr_surface *icon = drag_icon->surface;
struct wlr_cursor *cursor = server->input->cursor;
double icon_x = cursor->x + drag_icon->sx;

27
types/wlr_data_device.c
View file

@ -432,18 +432,23 @@ static void wlr_drag_set_focus(struct wlr_drag *drag,
}
static void wlr_drag_end(struct wlr_drag *drag) {
if (drag->icon) {
wl_list_remove(&drag->icon_destroy.link);
}
if (!drag->cancelling) {
drag->cancelling = true;
wlr_seat_pointer_end_grab(drag->pointer_grab.seat);
wlr_seat_keyboard_end_grab(drag->keyboard_grab.seat);
if (drag->source) {
wl_list_remove(&drag->source_destroy.link);
}
if (drag->source) {
wl_list_remove(&drag->source_destroy.link);
}
wlr_drag_set_focus(drag, NULL, 0, 0);
wlr_seat_pointer_end_grab(drag->pointer_grab.seat);
wlr_seat_keyboard_end_grab(drag->keyboard_grab.seat);
free(drag);
wlr_drag_set_focus(drag, NULL, 0, 0);
if (drag->icon) {
wl_list_remove(&drag->icon_destroy.link);
}
free(drag);
}
}
static void pointer_drag_enter(struct wlr_seat_pointer_grab *grab,
@ -588,8 +593,6 @@ static bool seat_client_start_drag(struct wlr_seat_client *client,
wlr_seat_keyboard_start_grab(seat, &drag->keyboard_grab);
wlr_seat_pointer_start_grab(seat, &drag->pointer_grab);
// TODO keyboard grab
return true;
}

6
types/wlr_seat.c
View file

@ -547,6 +547,9 @@ void wlr_seat_pointer_end_grab(struct wlr_seat *wlr_seat) {
if (grab != wlr_seat->pointer_state.default_grab) {
wlr_seat->pointer_state.grab = wlr_seat->pointer_state.default_grab;
wl_signal_emit(&wlr_seat->events.pointer_grab_end, grab);
if (grab->interface->cancel) {
grab->interface->cancel(grab);
}
}
}
@ -665,6 +668,9 @@ void wlr_seat_keyboard_end_grab(struct wlr_seat *wlr_seat) {
if (grab != wlr_seat->keyboard_state.default_grab) {
wlr_seat->keyboard_state.grab = wlr_seat->keyboard_state.default_grab;
wl_signal_emit(&wlr_seat->events.keyboard_grab_end, grab);
if (grab->interface->cancel) {
grab->interface->cancel(grab);
}
}
}