[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/18] ui/vdagent: use qemu_clipboard_info helper
From: |
marcandre . lureau |
Subject: |
[PULL 13/18] ui/vdagent: use qemu_clipboard_info helper |
Date: |
Tue, 31 Aug 2021 17:31:27 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The clipboard unit now tracks the current clipboard grab, no need to
duplicate this work.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210805135715.857938-14-marcandre.lureau@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vdagent.c | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/ui/vdagent.c b/ui/vdagent.c
index 99ba34646f..cd07937a4b 100644
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -47,7 +47,6 @@ struct VDAgentChardev {
/* clipboard */
QemuClipboardPeer cbpeer;
- QemuClipboardInfo *cbinfo[QEMU_CLIPBOARD_SELECTION__COUNT];
uint32_t cbpending[QEMU_CLIPBOARD_SELECTION__COUNT];
};
typedef struct VDAgentChardev VDAgentChardev;
@@ -384,9 +383,7 @@ static void vdagent_clipboard_notify(Notifier *notifier,
void *data)
QemuClipboardType type;
bool self_update = info->owner == &vd->cbpeer;
- if (info != vd->cbinfo[s]) {
- qemu_clipboard_info_unref(vd->cbinfo[s]);
- vd->cbinfo[s] = qemu_clipboard_info_ref(info);
+ if (info != qemu_clipboard_info(s)) {
vd->cbpending[s] = 0;
if (!self_update) {
vdagent_send_clipboard_grab(vd, info);
@@ -464,6 +461,7 @@ static void vdagent_clipboard_recv_grab(VDAgentChardev *vd,
uint8_t s, uint32_t
static void vdagent_clipboard_recv_request(VDAgentChardev *vd, uint8_t s,
uint32_t size, void *data)
{
QemuClipboardType type;
+ QemuClipboardInfo *info;
if (size < sizeof(uint32_t)) {
return;
@@ -475,13 +473,14 @@ static void vdagent_clipboard_recv_request(VDAgentChardev
*vd, uint8_t s, uint32
default:
return;
}
- if (vd->cbinfo[s] && vd->cbinfo[s]->types[type].available &&
- vd->cbinfo[s]->owner != &vd->cbpeer) {
- if (vd->cbinfo[s]->types[type].data) {
- vdagent_send_clipboard_data(vd, vd->cbinfo[s], type);
+
+ info = qemu_clipboard_info(s);
+ if (info && info->types[type].available && info->owner != &vd->cbpeer) {
+ if (info->types[type].data) {
+ vdagent_send_clipboard_data(vd, info, type);
} else {
vd->cbpending[s] |= (1 << type);
- qemu_clipboard_request(vd->cbinfo[s], type);
+ qemu_clipboard_request(info, type);
}
}
}
@@ -502,7 +501,11 @@ static void vdagent_clipboard_recv_data(VDAgentChardev
*vd, uint8_t s, uint32_t
}
data += 4;
size -= 4;
- qemu_clipboard_set_data(&vd->cbpeer, vd->cbinfo[s], type, size, data,
true);
+
+ if (qemu_clipboard_peer_owns(&vd->cbpeer, s)) {
+ qemu_clipboard_set_data(&vd->cbpeer, qemu_clipboard_info(s),
+ type, size, data, true);
+ }
}
static void vdagent_clipboard_recv_release(VDAgentChardev *vd, uint8_t s)
--
2.33.0.rc2
- [PULL 03/18] ui/gtk-clipboard: use existing macros, (continued)
- [PULL 03/18] ui/gtk-clipboard: use existing macros, marcandre . lureau, 2021/08/31
- [PULL 04/18] ui/gtk-clipboard: fix clipboard enum typo, marcandre . lureau, 2021/08/31
- [PULL 05/18] ui/clipboard: add helper to retrieve current clipboard, marcandre . lureau, 2021/08/31
- [PULL 06/18] ui/clipboard: add qemu_clipboard_peer_owns() helper, marcandre . lureau, 2021/08/31
- [PULL 07/18] ui/clipboard: add qemu_clipboard_peer_release() helper, marcandre . lureau, 2021/08/31
- [PULL 08/18] ui/clipboard: release owned grabs on unregister, marcandre . lureau, 2021/08/31
- [PULL 09/18] ui/vdagent: disconnect handlers and reset state on finalize, marcandre . lureau, 2021/08/31
- [PULL 10/18] ui/vdagent: reset outbuf on disconnect, marcandre . lureau, 2021/08/31
- [PULL 11/18] ui/vdagent: split clipboard recv message handling, marcandre . lureau, 2021/08/31
- [PULL 12/18] ui/vdagent: use qemu_clipboard_peer_release helper, marcandre . lureau, 2021/08/31
- [PULL 13/18] ui/vdagent: use qemu_clipboard_info helper,
marcandre . lureau <=
- [PULL 14/18] ui/vdagent: send empty clipboard when unhandled, marcandre . lureau, 2021/08/31
- [PULL 15/18] ui/gtk-clipboard: use qemu_clipboard_info helper, marcandre . lureau, 2021/08/31
- [PULL 16/18] ui/vdagent: send release when no clipboard owner, marcandre . lureau, 2021/08/31
- [PULL 17/18] ui/gtk-clipboard: emit release clipboard events, marcandre . lureau, 2021/08/31
- [PULL 18/18] ui/vdagent: add a migration blocker, marcandre . lureau, 2021/08/31
- Re: [PULL 00/18] UI/clipboard fixes, Peter Maydell, 2021/08/31