1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
From 95f60222e75486336b6569afa8f34d60b51c94ad Mon Sep 17 00:00:00 2001
From: Jan-Marek Glogowski <glogow@fbihome.de>
Date: Thu, 21 Nov 2013 12:40:57 +0100
Subject: [PATCH] fdo#67011: Run Display::Yield through KDEXLib::Yield.
Drag'n'Drop is handled in a second thread, which tries to "yield
the display" while the main Qt thread probably is already
yielding. Both need the YieldMutex, which freezes the application
until the D'n'D thread times out.
Trying to yield the display throught the application yield
results in a recursive loop.
So this catches and breaks the recursion, but just inside the Qt
thread, so other processes can "yield on the display", instead
of simply disabling the Display::Yield.
Change-Id: Ifba91aa89fe5b0a89cc94820935dc996a065112f
Reviewed-on: https://gerrit.libreoffice.org/6750
Tested-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
---
vcl/unx/kde4/KDESalDisplay.cxx | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
index 21440fc..ee330e7 100644
--- a/vcl/unx/kde4/KDESalDisplay.cxx
+++ b/vcl/unx/kde4/KDESalDisplay.cxx
@@ -25,6 +25,8 @@
#include <assert.h>
#include <unx/saldata.hxx>
+#include <qthread.h>
+
SalKDEDisplay* SalKDEDisplay::selfptr = NULL;
SalKDEDisplay::SalKDEDisplay( Display* pDisp )
@@ -48,18 +50,26 @@ SalKDEDisplay::~SalKDEDisplay()
void SalKDEDisplay::Yield()
{
- if( DispatchInternalEvent() )
+ // We yield the display throught the main Qt thread.
+ // Actually this Yield may call the Display::Yield, which results in an
+ // unlimited cycle.
+ static bool break_cyclic_yield_recursion = false;
+ bool is_qt_gui_thread = ( qApp->thread() == QThread::currentThread() );
+
+ if( DispatchInternalEvent() || break_cyclic_yield_recursion )
return;
+ if( is_qt_gui_thread )
+ break_cyclic_yield_recursion = true;
+
DBG_ASSERT( static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId() ==
osl::Thread::getCurrentIdentifier(),
"will crash soon since solar mutex not locked in SalKDEDisplay::Yield" );
- XEvent event;
- XNextEvent( pDisp_, &event );
- if( checkDirectInputEvent( &event ))
- return;
- qApp->x11ProcessEvent( &event );
+ static_cast<KDEXLib*>(GetXLib())->Yield( true, false );
+
+ if( is_qt_gui_thread )
+ break_cyclic_yield_recursion = false;
}
// HACK: When using Qt event loop, input methods (japanese, etc.) will get broken because
--
1.8.5.1
|
