diff options
Diffstat (limited to 'x11-toolkits/qt5-gui/files/patch-git_73fc1f93-add_timeout_control_when_reading_incr_property')
-rw-r--r-- | x11-toolkits/qt5-gui/files/patch-git_73fc1f93-add_timeout_control_when_reading_incr_property | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/x11-toolkits/qt5-gui/files/patch-git_73fc1f93-add_timeout_control_when_reading_incr_property b/x11-toolkits/qt5-gui/files/patch-git_73fc1f93-add_timeout_control_when_reading_incr_property deleted file mode 100644 index 6f6dec7d35ec..000000000000 --- a/x11-toolkits/qt5-gui/files/patch-git_73fc1f93-add_timeout_control_when_reading_incr_property +++ /dev/null @@ -1,59 +0,0 @@ -From 73fc1f93e8bea1c493ed16655ad6fd68ae270e38 Mon Sep 17 00:00:00 2001 -From: Liang Qi <liang.qi@qt.io> -Date: Wed, 7 Jul 2021 13:19:14 +0200 -Subject: [PATCH] xcb: add a timeout control when reading INCR property -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -For the first call of QXcbClipboard::clipboardReadProperty() -inside of clipboardReadIncrementalProperty() in getSelection(), -it will get a XCB_NONE reply before the contents arrived via -property change. Then we give a chance to read more. - -Manually tested with following setups: -* examples/widgets/mainwindows/application with gvim(gtk3) -* examples/widgets/widgets/imageviewer with GIMP 2.10.18(based on -gtk2) and GIMP 2.99.6(based on gtk3 via flatpak) - -Fixes: QTBUG-56595 -Done-With: JiDe Zhang <zhangjide@uniontech.com> -Change-Id: Ib45f08464d39ad79137b1da99808c89b7dca2d08 -Reviewed-by: JiDe Zhang <zhangjide@uniontech.com> -Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> -(cherry picked from commit 02248eea5562c1df39ee23f195011afacc6759b0) -Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> ---- - src/plugins/platforms/xcb/qxcbclipboard.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp -index 725c0e4d514..a4940f1c491 100644 ---- src/plugins/platforms/xcb/qxcbclipboard.cpp -+++ src/plugins/platforms/xcb/qxcbclipboard.cpp -@@ -841,6 +841,8 @@ QByteArray QXcbClipboard::clipboardReadIncrementalProperty(xcb_window_t win, xcb - alloc_error = buf.size() != nbytes+1; - } - -+ QElapsedTimer timer; -+ timer.start(); - for (;;) { - connection()->flush(); - xcb_generic_event_t *ge = waitForClipboardEvent(win, XCB_PROPERTY_NOTIFY); -@@ -876,9 +878,11 @@ QByteArray QXcbClipboard::clipboardReadIncrementalProperty(xcb_window_t win, xcb - tmp_buf.resize(0); - offset += length; - } -- } else { -- break; - } -+ -+ const auto elapsed = timer.elapsed(); -+ if (elapsed > clipboard_timeout) -+ break; - } - - // timed out ... create a new requestor window, otherwise the requestor --- -2.16.3 - |