[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 06/36] ui/clipboard: add a clipboard reset serial event
From: |
marcandre . lureau |
Subject: |
[PULL v2 06/36] ui/clipboard: add a clipboard reset serial event |
Date: |
Tue, 21 Dec 2021 10:58:25 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/ui/clipboard.h | 9 +++++++++
ui/clipboard.c | 7 +++++++
ui/gtk-clipboard.c | 3 +++
ui/vdagent.c | 12 ++++++++++++
ui/vnc-clipboard.c | 3 +++
ui/cocoa.m | 3 +++
6 files changed, 37 insertions(+)
diff --git a/include/ui/clipboard.h b/include/ui/clipboard.h
index 2c6488c1eec8..ce76aa451f64 100644
--- a/include/ui/clipboard.h
+++ b/include/ui/clipboard.h
@@ -73,11 +73,13 @@ struct QemuClipboardPeer {
* enum QemuClipboardNotifyType
*
* @QEMU_CLIPBOARD_UPDATE_INFO: clipboard info update
+ * @QEMU_CLIPBOARD_RESET_SERIAL: reset clipboard serial
*
* Clipboard notify type.
*/
enum QemuClipboardNotifyType {
QEMU_CLIPBOARD_UPDATE_INFO,
+ QEMU_CLIPBOARD_RESET_SERIAL,
};
/**
@@ -230,6 +232,13 @@ void qemu_clipboard_info_unref(QemuClipboardInfo *info);
*/
void qemu_clipboard_update(QemuClipboardInfo *info);
+/**
+ * qemu_clipboard_reset_serial
+ *
+ * Reset the clipboard serial.
+ */
+void qemu_clipboard_reset_serial(void);
+
/**
* qemu_clipboard_request
*
diff --git a/ui/clipboard.c b/ui/clipboard.c
index ffbd80e5c60e..82572ea1169b 100644
--- a/ui/clipboard.c
+++ b/ui/clipboard.c
@@ -129,6 +129,13 @@ void qemu_clipboard_request(QemuClipboardInfo *info,
info->owner->request(info, type);
}
+void qemu_clipboard_reset_serial(void)
+{
+ QemuClipboardNotify notify = { .type = QEMU_CLIPBOARD_RESET_SERIAL };
+
+ notifier_list_notify(&clipboard_notifiers, ¬ify);
+}
+
void qemu_clipboard_set_data(QemuClipboardPeer *peer,
QemuClipboardInfo *info,
QemuClipboardType type,
diff --git a/ui/gtk-clipboard.c b/ui/gtk-clipboard.c
index 44ff810234ff..e0b8b283fef8 100644
--- a/ui/gtk-clipboard.c
+++ b/ui/gtk-clipboard.c
@@ -127,6 +127,9 @@ static void gd_clipboard_notify(Notifier *notifier, void
*data)
case QEMU_CLIPBOARD_UPDATE_INFO:
gd_clipboard_update_info(gd, notify->info);
return;
+ case QEMU_CLIPBOARD_RESET_SERIAL:
+ /* ignore */
+ return;
}
}
diff --git a/ui/vdagent.c b/ui/vdagent.c
index b4fdae69177f..7ea4bc5d9a26 100644
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -466,6 +466,15 @@ static void vdagent_clipboard_update_info(VDAgentChardev
*vd,
}
}
+static void vdagent_clipboard_reset_serial(VDAgentChardev *vd)
+{
+ Chardev *chr = CHARDEV(vd);
+
+ /* reopen the agent connection to reset the serial state */
+ qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
+ qemu_chr_be_event(chr, CHR_EVENT_OPENED);
+}
+
static void vdagent_clipboard_notify(Notifier *notifier, void *data)
{
VDAgentChardev *vd =
@@ -476,6 +485,9 @@ static void vdagent_clipboard_notify(Notifier *notifier,
void *data)
case QEMU_CLIPBOARD_UPDATE_INFO:
vdagent_clipboard_update_info(vd, notify->info);
return;
+ case QEMU_CLIPBOARD_RESET_SERIAL:
+ vdagent_clipboard_reset_serial(vd);
+ return;
}
}
diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c
index 6a0b1058840e..d48f75eb1ab4 100644
--- a/ui/vnc-clipboard.c
+++ b/ui/vnc-clipboard.c
@@ -230,6 +230,9 @@ static void vnc_clipboard_notify(Notifier *notifier, void
*data)
case QEMU_CLIPBOARD_UPDATE_INFO:
vnc_clipboard_update_info(vs, notify->info);
return;
+ case QEMU_CLIPBOARD_RESET_SERIAL:
+ /* ignore */
+ return;
}
}
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 6640a2e80ebb..7ca429fa8078 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1837,6 +1837,9 @@ static void cocoa_clipboard_notify(Notifier *notifier,
void *data)
case QEMU_CLIPBOARD_UPDATE_INFO:
cocoa_clipboard_update_info(notify->info);
return;
+ case QEMU_CLIPBOARD_RESET_SERIAL:
+ /* ignore */
+ return;
}
}
--
2.34.1.8.g35151cf07204
- [PULL v2 00/36] ui: D-Bus display backend, marcandre . lureau, 2021/12/21
- [PULL v2 01/36] ui/vdagent: add CHECK_SPICE_PROTOCOL_VERSION, marcandre . lureau, 2021/12/21
- [PULL v2 02/36] ui/vdagent: replace #if 0 with protocol version check, marcandre . lureau, 2021/12/21
- [PULL v2 03/36] ui: generalize clipboard notifier, marcandre . lureau, 2021/12/21
- [PULL v2 04/36] ui/vdagent: add serial capability support, marcandre . lureau, 2021/12/21
- [PULL v2 05/36] ui/clipboard: add qemu_clipboard_check_serial(), marcandre . lureau, 2021/12/21
- [PULL v2 06/36] ui/clipboard: add a clipboard reset serial event,
marcandre . lureau <=
- [PULL v2 07/36] hw/display: report an error if virgl initialization failed, marcandre . lureau, 2021/12/21
- [PULL v2 08/36] virtio-gpu: use VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP, marcandre . lureau, 2021/12/21
- [PULL v2 09/36] ui: do not delay further remote resize, marcandre . lureau, 2021/12/21
- [PULL v2 10/36] ui: factor out qemu_console_set_display_gl_ctx(), marcandre . lureau, 2021/12/21
- [PULL v2 11/36] ui: associate GL context outside of display listener registration, marcandre . lureau, 2021/12/21
- [PULL v2 12/36] ui: make gl_block use a counter, marcandre . lureau, 2021/12/21
- [PULL v2 13/36] ui: add a gl-unblock warning timer, marcandre . lureau, 2021/12/21
- [PULL v2 14/36] ui: simplify gl unblock & flush, marcandre . lureau, 2021/12/21
- [PULL v2 15/36] ui: dispatch GL events to all listeners, marcandre . lureau, 2021/12/21
- [PULL v2 16/36] ui: split the GL context in a different object, marcandre . lureau, 2021/12/21