callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk: Shuffle the situations where a selection is unset

Browse Source 
This should only be explicitly unset (face to the windowing) on
gdk_selection_owner_set() with a NULL window. Other circumstances
(eg. selection being taken over by another client) should just
trigger the SelectionClear event in GDK internally.

Related: https://gitlab.gnome.org/GNOME/mutter/issues/878
This commit is contained in:
Carlos Garnacho
2019-10-21 20:19:06 +02:00
parent da90d37b42
commit 299902b008
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gdk/wayland/gdkselection-wayland.c
View File

@ -1140,10 +1140,6 @@ gdk_wayland_selection_unset_data_source (GdkDisplay *display,
if (selection == atoms[ATOM_CLIPBOARD]) if (selection == atoms[ATOM_CLIPBOARD])
{ {
GdkSeat *seat = gdk_display_get_default_seat (display);
gdk_wayland_seat_set_selection (seat, NULL);
if (wayland_selection->clipboard_source) if (wayland_selection->clipboard_source)
{ {
wl_data_source_destroy (wayland_selection->clipboard_source); wl_data_source_destroy (wayland_selection->clipboard_source);
@ -1152,10 +1148,6 @@ gdk_wayland_selection_unset_data_source (GdkDisplay *display,
} }
else if (selection == atoms[ATOM_PRIMARY]) else if (selection == atoms[ATOM_PRIMARY])
{ {
GdkSeat *seat = gdk_display_get_default_seat (display);
gdk_wayland_seat_set_primary (seat, NULL);
if (wayland_selection->primary_source) if (wayland_selection->primary_source)
{ {
gtk_primary_selection_source_destroy (wayland_selection->primary_source); gtk_primary_selection_source_destroy (wayland_selection->primary_source);
@ -1192,19 +1184,26 @@ _gdk_wayland_display_set_selection_owner (GdkDisplay *display,
gboolean send_event) gboolean send_event)
{ {
GdkWaylandSelection *wayland_selection = gdk_wayland_display_get_selection (display); GdkWaylandSelection *wayland_selection = gdk_wayland_display_get_selection (display);
GdkSeat *seat = gdk_display_get_default_seat (display);
if (selection == atoms[ATOM_CLIPBOARD]) if (selection == atoms[ATOM_CLIPBOARD])
{ {
wayland_selection->clipboard_owner = owner; wayland_selection->clipboard_owner = owner;
if (send_event && !owner) if (send_event && !owner)
{
gdk_wayland_seat_set_selection (seat, NULL);
gdk_wayland_selection_unset_data_source (display, selection); gdk_wayland_selection_unset_data_source (display, selection);
}
return TRUE; return TRUE;
} }
else if (selection == atoms[ATOM_PRIMARY]) else if (selection == atoms[ATOM_PRIMARY])
{ {
wayland_selection->primary_owner = owner; wayland_selection->primary_owner = owner;
if (send_event && !owner) if (send_event && !owner)
{
gdk_wayland_seat_set_primary (seat, NULL);
gdk_wayland_selection_unset_data_source (display, selection); gdk_wayland_selection_unset_data_source (display, selection);
}
return TRUE; return TRUE;
} }
else if (selection == atoms[ATOM_DND]) else if (selection == atoms[ATOM_DND])