[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/12] ui/vdagent: use qemu_clipboard_info helper
From: |
marcandre . lureau |
Subject: |
[PATCH 09/12] ui/vdagent: use qemu_clipboard_info helper |
Date: |
Mon, 19 Jul 2021 11:26:51 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
ui/vdagent.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/ui/vdagent.c b/ui/vdagent.c
index f716f2d8c3..65c9663e0d 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);
}
}
}
@@ -489,6 +488,7 @@ static void vdagent_clipboard_recv_request(VDAgentChardev
*vd, uint8_t s, uint32
static void vdagent_clipboard_recv_data(VDAgentChardev *vd, uint8_t s,
uint32_t size, void *data)
{
QemuClipboardType type;
+ QemuClipboardInfo *info;
if (size < sizeof(uint32_t)) {
return;
@@ -502,14 +502,20 @@ 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);
+
+ info = qemu_clipboard_info(s);
+ if (info->owner == &vd->cbpeer) {
+ qemu_clipboard_set_data(&vd->cbpeer, info, type, size, data, true);
+ }
}
static void vdagent_clipboard_recv_release(VDAgentChardev *vd, uint8_t s)
{
+ QemuClipboardInfo *cur;
g_autoptr(QemuClipboardInfo) info = NULL;
- if (vd->cbinfo[s] && vd->cbinfo[s]->owner == &vd->cbpeer) {
+ cur = qemu_clipboard_info(s);
+ if (cur && cur->owner == &vd->cbpeer) {
/* set empty clipboard info */
info = qemu_clipboard_info_new(NULL, s);
qemu_clipboard_update(info);
--
2.32.0.93.g670b81a890
- [PATCH 01/12] ui/vdagent: fix leak on error path, (continued)
- [PATCH 01/12] ui/vdagent: fix leak on error path, marcandre . lureau, 2021/07/19
- [PATCH 02/12] ui/vdagent: remove copy-pasta comment, marcandre . lureau, 2021/07/19
- [PATCH 03/12] ui/gtk-clipboard: use existing macros, marcandre . lureau, 2021/07/19
- [PATCH 04/12] ui/gtk-clipboard: fix clipboard enum typo, marcandre . lureau, 2021/07/19
- [PATCH 05/12] ui/clipboard: add helper to retrieve current clipboard, marcandre . lureau, 2021/07/19
- [PATCH 06/12] ui/clipboard: release owned grabs on unregister, marcandre . lureau, 2021/07/19
- [PATCH 07/12] ui/vdagent: unregister clipboard peer on finalize, marcandre . lureau, 2021/07/19
- [PATCH 08/12] ui/vdagent: split clipboard recv message handling, marcandre . lureau, 2021/07/19
- [PATCH 09/12] ui/vdagent: use qemu_clipboard_info helper,
marcandre . lureau <=
- [PATCH 10/12] ui/gtk-clipboard: use qemu_clipboard_info helper, marcandre . lureau, 2021/07/19
- [PATCH 11/12] ui/vdagent: send release when no clipboard owner, marcandre . lureau, 2021/07/19
- [PATCH 12/12] ui/gtk-clipboard: emit release clipboard events, marcandre . lureau, 2021/07/19