AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for the clipboard manager when looping due to app quiting

Browse Source 
One can be extremely unlucky and on session logout get this:
 * All apps are going down
 * A Qt app checks if the clipboard manager is there to yield its clipboard contents
   * The clipboard manager is still there
 * Then just after that check, the clipboard manager finishes because of the session end
 * This means the Qt app will loop for 5 seconds trying to yield its clipboard contents
   to a clipboard manager that is not there anymore

Change-Id: Ia89670d4deb72f12e660a0d7aa5b2d212955d6fe
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Albert Astals Cid 2012-01-05 11:11:27 +01:00 committed by Qt by Nokia
parent 848f53a268
commit 689c4009fb
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/platforms/xcb/qxcbclipboard.cpp
View File

@ -208,7 +208,7 @@ QXcbClipboard::~QXcbClipboard()
connection()->sync(); connection()->sync();
// waiting until the clipboard manager fetches the content. // waiting until the clipboard manager fetches the content.
if (!waitForClipboardEvent(m_owner, XCB_SELECTION_NOTIFY, 5000)) { if (!waitForClipboardEvent(m_owner, XCB_SELECTION_NOTIFY, 5000, true)) {
qWarning("QClipboard: Unable to receive an event from the " qWarning("QClipboard: Unable to receive an event from the "
"clipboard manager in a reasonable time"); "clipboard manager in a reasonable time");
} }
@ -726,7 +726,7 @@ namespace
}; };
} }
xcb_generic_event_t *QXcbClipboard::waitForClipboardEvent(xcb_window_t win, int type, int timeout) xcb_generic_event_t *QXcbClipboard::waitForClipboardEvent(xcb_window_t win, int type, int timeout, bool checkManager)
{ {
QElapsedTimer timer; QElapsedTimer timer;
timer.start(); timer.start();
@ -736,6 +736,16 @@ xcb_generic_event_t *QXcbClipboard::waitForClipboardEvent(xcb_window_t win, int
if (e) if (e)
return e; return e;
if (checkManager) {
xcb_get_selection_owner_cookie_t cookie = xcb_get_selection_owner(xcb_connection(), atom(QXcbAtom::CLIPBOARD_MANAGER));
xcb_get_selection_owner_reply_t *reply = xcb_get_selection_owner_reply(xcb_connection(), cookie, 0);
if (!reply || reply->owner == XCB_NONE) {
free(reply);
return 0;
}
free(reply);
}
// process other clipboard events, since someone is probably requesting data from us // process other clipboard events, since someone is probably requesting data from us
ClipboardEvent clipboard(connection()); ClipboardEvent clipboard(connection());
e = connection()->checkEvent(clipboard); e = connection()->checkEvent(clipboard);

2
src/plugins/platforms/xcb/qxcbclipboard.h
View File

@ -85,7 +85,7 @@ public:
QByteArray getSelection(xcb_atom_t selection, xcb_atom_t target, xcb_atom_t property); QByteArray getSelection(xcb_atom_t selection, xcb_atom_t target, xcb_atom_t property);
private: private:
xcb_generic_event_t *waitForClipboardEvent(xcb_window_t win, int type, int timeout); xcb_generic_event_t *waitForClipboardEvent(xcb_window_t win, int type, int timeout, bool needsManager = false);
xcb_atom_t sendTargetsSelection(QMimeData *d, xcb_window_t window, xcb_atom_t property); xcb_atom_t sendTargetsSelection(QMimeData *d, xcb_window_t window, xcb_atom_t property);
xcb_atom_t sendSelection(QMimeData *d, xcb_atom_t target, xcb_window_t window, xcb_atom_t property); xcb_atom_t sendSelection(QMimeData *d, xcb_atom_t target, xcb_window_t window, xcb_atom_t property);