aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-10-10 21:31:12 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-10-10 21:31:12 +0000
commitabbdf48b1430d2b6e26c74fc0978b7e5566d84d2 (patch)
tree3610fa8688d1e6e84d38f815727cdc8c38c819aa
parentMerge branch 'no-window-decorations' into master (diff)
parentselection: use appropriate check for PRIMARY paste (diff)
Merge branch 'primary-paste-check' into master
-rw-r--r--CHANGELOG.md1
-rw-r--r--selection.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33d5e98d..338ad3dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,6 +76,7 @@
* Crash after either resizing a window or changing the font size if
there were sixels present in the scrollback while doing so.
* _Send Device Attributes_ to only send a response if `Ps == 0`.
+* Paste from primary when clipboard is empty.
### Security
diff --git a/selection.c b/selection.c
index 2a2e8034..7475f229 100644
--- a/selection.c
+++ b/selection.c
@@ -1382,8 +1382,8 @@ selection_from_primary(struct seat *seat, struct terminal *term)
return;
}
- struct wl_clipboard *clipboard = &seat->clipboard;
- if (clipboard->data_offer == NULL)
+ struct wl_primary *primary = &seat->primary;
+ if (primary->data_offer == NULL)
return;
term->is_sending_paste_data = true;