1 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
--- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100 |
2 |
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
+++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200 |
3 |
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> |
@@ -255,22 +255,30 @@ struct GPostEventSource |
|
<head> |
|
|
<title>svntogit/packages.git - Git clone of the 'packages' repository |
|
|
</title> |
|
|
<meta name='generator' content='cgit v0.12'/> |
|
|
<meta name='robots' content='index, nofollow'/> |
|
|
<link rel='stylesheet' type='text/css' href='/cgit.css'/> |
|
|
<link rel='shortcut icon' href='/favicon.ico'/> |
|
|
<link rel='alternate' title='Atom feed' href='https://git.archlinux.org/svntogit/packages.git/atom/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4' type='application/atom+xml'/> |
|
|
<link rel='vcs-git' href='https://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
<link rel='vcs-git' href='git://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
<link rel='vcs-git' href='ssh://git.archlinux.org/srv/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> |
|
|
</head> |
|
|
<body> |
|
|
<div id="archnavbar"><!-- Arch Linux global navigation bar --> |
|
|
<div id="archnavbarlogo"> |
|
|
<p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> |
|
|
</div> |
|
|
<div id="archnavbarmenu"> |
|
|
<ul id="archnavbarlist"> |
|
|
<li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> |
|
|
<li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> |
|
|
<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> |
|
|
<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> |
|
|
<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> |
|
|
<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> |
|
|
<li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> |
|
|
</ul> |
|
|
</div> |
|
|
</div><!-- #archnavbar --> |
|
|
<div id='cgit'><table id='header'> |
|
|
<tr> |
|
|
<td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr> |
|
|
<tr><td class='sub'>Git clone of the 'packages' repository |
|
|
</td><td class='sub right'></td></tr></table> |
|
|
<table class='tabs'><tr><td> |
|
|
<a href='/svntogit/packages.git/?h=packages/qt4'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/qt4'>refs</a><a href='/svntogit/packages.git/log/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>tree</a><a href='/svntogit/packages.git/commit/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>commit</a><a href='/svntogit/packages.git/diff/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>diff</a><a href='/svntogit/packages.git/stats/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/l-qclipboard_fix_recursive.patch'> |
|
|
<input type='hidden' name='h' value='packages/qt4'/><select name='qt'> |
|
|
<option value='grep'>log msg</option> |
|
|
<option value='author'>author</option> |
|
|
<option value='committer'>committer</option> |
|
|
<option value='range'>range</option> |
|
|
</select> |
|
|
<input class='txt' type='text' size='10' name='q' value=''/> |
|
|
<input type='submit' value='search'/> |
|
|
</form> |
|
|
</td></tr></table> |
|
|
<div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/qt4'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/qt4'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>l-qclipboard_fix_recursive.patch</a></div><div class='content'>blob: 6d3bf2f2cde25d8de2aca560bcdfd23d1e01817f (<a href='/svntogit/packages.git/plain/trunk/l-qclipboard_fix_recursive.patch?h=packages/qt4'>plain</a>) |
|
|
<table summary='blob content' class='blob'> |
|
|
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> |
|
|
<a id='n2' href='#n2'>2</a> |
|
|
<a id='n3' href='#n3'>3</a> |
|
|
<a id='n4' href='#n4'>4</a> |
|
|
<a id='n5' href='#n5'>5</a> |
|
|
<a id='n6' href='#n6'>6</a> |
|
|
<a id='n7' href='#n7'>7</a> |
|
|
<a id='n8' href='#n8'>8</a> |
|
|
<a id='n9' href='#n9'>9</a> |
|
|
<a id='n10' href='#n10'>10</a> |
|
|
<a id='n11' href='#n11'>11</a> |
|
|
<a id='n12' href='#n12'>12</a> |
|
|
<a id='n13' href='#n13'>13</a> |
|
|
<a id='n14' href='#n14'>14</a> |
|
|
<a id='n15' href='#n15'>15</a> |
|
|
<a id='n16' href='#n16'>16</a> |
|
|
<a id='n17' href='#n17'>17</a> |
|
|
<a id='n18' href='#n18'>18</a> |
|
|
<a id='n19' href='#n19'>19</a> |
|
|
<a id='n20' href='#n20'>20</a> |
|
|
<a id='n21' href='#n21'>21</a> |
|
|
<a id='n22' href='#n22'>22</a> |
|
|
<a id='n23' href='#n23'>23</a> |
|
|
<a id='n24' href='#n24'>24</a> |
|
|
<a id='n25' href='#n25'>25</a> |
|
|
<a id='n26' href='#n26'>26</a> |
|
|
<a id='n27' href='#n27'>27</a> |
|
|
<a id='n28' href='#n28'>28</a> |
|
|
<a id='n29' href='#n29'>29</a> |
|
|
<a id='n30' href='#n30'>30</a> |
|
|
<a id='n31' href='#n31'>31</a> |
|
|
<a id='n32' href='#n32'>32</a> |
|
|
<a id='n33' href='#n33'>33</a> |
|
|
<a id='n34' href='#n34'>34</a> |
|
|
<a id='n35' href='#n35'>35</a> |
|
|
<a id='n36' href='#n36'>36</a> |
|
|
<a id='n37' href='#n37'>37</a> |
|
|
<a id='n38' href='#n38'>38</a> |
|
|
<a id='n39' href='#n39'>39</a> |
|
|
<a id='n40' href='#n40'>40</a> |
|
|
<a id='n41' href='#n41'>41</a> |
|
|
<a id='n42' href='#n42'>42</a> |
|
|
<a id='n43' href='#n43'>43</a> |
|
|
<a id='n44' href='#n44'>44</a> |
|
|
<a id='n45' href='#n45'>45</a> |
|
|
<a id='n46' href='#n46'>46</a> |
|
|
<a id='n47' href='#n47'>47</a> |
|
|
<a id='n48' href='#n48'>48</a> |
|
|
<a id='n49' href='#n49'>49</a> |
|
|
<a id='n50' href='#n50'>50</a> |
|
|
<a id='n51' href='#n51'>51</a> |
|
|
<a id='n52' href='#n52'>52</a> |
|
|
<a id='n53' href='#n53'>53</a> |
|
|
<a id='n54' href='#n54'>54</a> |
|
|
<a id='n55' href='#n55'>55</a> |
|
|
<a id='n56' href='#n56'>56</a> |
|
|
<a id='n57' href='#n57'>57</a> |
|
|
<a id='n58' href='#n58'>58</a> |
|
|
<a id='n59' href='#n59'>59</a> |
|
|
<a id='n60' href='#n60'>60</a> |
|
|
<a id='n61' href='#n61'>61</a> |
|
|
<a id='n62' href='#n62'>62</a> |
|
|
<a id='n63' href='#n63'>63</a> |
|
|
<a id='n64' href='#n64'>64</a> |
|
|
<a id='n65' href='#n65'>65</a> |
|
|
<a id='n66' href='#n66'>66</a> |
|
|
<a id='n67' href='#n67'>67</a> |
|
|
<a id='n68' href='#n68'>68</a> |
|
|
<a id='n69' href='#n69'>69</a> |
|
|
<a id='n70' href='#n70'>70</a> |
|
|
<a id='n71' href='#n71'>71</a> |
|
|
<a id='n72' href='#n72'>72</a> |
|
|
<a id='n73' href='#n73'>73</a> |
|
|
<a id='n74' href='#n74'>74</a> |
|
|
<a id='n75' href='#n75'>75</a> |
|
|
<a id='n76' href='#n76'>76</a> |
|
|
<a id='n77' href='#n77'>77</a> |
|
|
<a id='n78' href='#n78'>78</a> |
|
|
<a id='n79' href='#n79'>79</a> |
|
|
<a id='n80' href='#n80'>80</a> |
|
|
<a id='n81' href='#n81'>81</a> |
|
|
<a id='n82' href='#n82'>82</a> |
|
|
<a id='n83' href='#n83'>83</a> |
|
|
<a id='n84' href='#n84'>84</a> |
|
|
<a id='n85' href='#n85'>85</a> |
|
|
<a id='n86' href='#n86'>86</a> |
|
|
<a id='n87' href='#n87'>87</a> |
|
|
<a id='n88' href='#n88'>88</a> |
|
|
<a id='n89' href='#n89'>89</a> |
|
|
<a id='n90' href='#n90'>90</a> |
|
|
<a id='n91' href='#n91'>91</a> |
|
|
<a id='n92' href='#n92'>92</a> |
|
|
<a id='n93' href='#n93'>93</a> |
|
|
<a id='n94' href='#n94'>94</a> |
|
|
</pre></td> |
|
|
<td class='lines'><pre><code><span class="hl kwb">--- src/corelib/kernel/qeventdispatcher_glib.cpp.sav 2014-03-28 15:26:37.000000000 +0100</span> |
|
|
<span class="hl kwa">+++ src/corelib/kernel/qeventdispatcher_glib.cpp 2014-04-24 09:44:09.358659204 +0200</span> |
|
|
@@ -255,22 +255,30 @@ struct GPostEventSource |
|
4 |
GSource source; |
GSource source; |
5 |
QAtomicInt serialNumber; |
QAtomicInt serialNumber; |
6 |
int lastSerialNumber; |
int lastSerialNumber; |
7 |
<span class="hl kwa">+ QEventLoop::ProcessEventsFlags processEventsFlags;</span> |
+ QEventLoop::ProcessEventsFlags processEventsFlags; |
8 |
QEventDispatcherGlibPrivate *d; |
QEventDispatcherGlibPrivate *d; |
9 |
}; |
}; |
10 |
|
|
11 |
static gboolean postEventSourcePrepare(GSource *s, gint *timeout) |
static gboolean postEventSourcePrepare(GSource *s, gint *timeout) |
12 |
{ |
{ |
13 |
<span class="hl kwa">+ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);</span> |
+ GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); |
14 |
QThreadData *data = QThreadData::current(); |
QThreadData *data = QThreadData::current(); |
15 |
if (!data) |
if (!data) |
16 |
return false; |
return false; |
17 |
|
|
18 |
<span class="hl kwa">+ QEventLoop::ProcessEventsFlags excludeAllFlags</span> |
+ QEventLoop::ProcessEventsFlags excludeAllFlags |
19 |
<span class="hl kwa">+ = QEventLoop::ExcludeUserInputEvents</span> |
+ = QEventLoop::ExcludeUserInputEvents |
20 |
<span class="hl kwa">+ | QEventLoop::ExcludeSocketNotifiers</span> |
+ | QEventLoop::ExcludeSocketNotifiers |
21 |
<span class="hl kwa">+ | QEventLoop::X11ExcludeTimers;</span> |
+ | QEventLoop::X11ExcludeTimers; |
22 |
<span class="hl kwa">+ if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags)</span> |
+ if ((source->processEventsFlags & excludeAllFlags) == excludeAllFlags) |
23 |
<span class="hl kwa">+ return false;</span> |
+ return false; |
24 |
<span class="hl kwa">+</span> |
+ |
25 |
gint dummy; |
gint dummy; |
26 |
if (!timeout) |
if (!timeout) |
27 |
timeout = &dummy; |
timeout = &dummy; |
28 |
const bool canWait = data->canWaitLocked(); |
const bool canWait = data->canWaitLocked(); |
29 |
*timeout = canWait ? -1 : 0; |
*timeout = canWait ? -1 : 0; |
30 |
|
|
31 |
<span class="hl kwb">- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s);</span> |
- GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); |
32 |
return (!canWait |
return (!canWait |
33 |
|| (source->serialNumber != source->lastSerialNumber)); |
|| (source->serialNumber != source->lastSerialNumber)); |
34 |
} |
} |
35 |
@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch( |
@@ -284,8 +292,14 @@ static gboolean postEventSourceDispatch( |
36 |
{ |
{ |
37 |
GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); |
GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); |
38 |
source->lastSerialNumber = source->serialNumber; |
source->lastSerialNumber = source->serialNumber; |
39 |
<span class="hl kwb">- QCoreApplication::sendPostedEvents();</span> |
- QCoreApplication::sendPostedEvents(); |
40 |
<span class="hl kwb">- source->d->runTimersOnceWithNormalPriority();</span> |
- source->d->runTimersOnceWithNormalPriority(); |
41 |
<span class="hl kwa">+ QEventLoop::ProcessEventsFlags excludeAllFlags</span> |
+ QEventLoop::ProcessEventsFlags excludeAllFlags |
42 |
<span class="hl kwa">+ = QEventLoop::ExcludeUserInputEvents</span> |
+ = QEventLoop::ExcludeUserInputEvents |
43 |
<span class="hl kwa">+ | QEventLoop::ExcludeSocketNotifiers</span> |
+ | QEventLoop::ExcludeSocketNotifiers |
44 |
<span class="hl kwa">+ | QEventLoop::X11ExcludeTimers;</span> |
+ | QEventLoop::X11ExcludeTimers; |
45 |
<span class="hl kwa">+ if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) {</span> |
+ if ((source->processEventsFlags & excludeAllFlags) != excludeAllFlags) { |
46 |
<span class="hl kwa">+ QCoreApplication::sendPostedEvents();</span> |
+ QCoreApplication::sendPostedEvents(); |
47 |
<span class="hl kwa">+ source->d->runTimersOnceWithNormalPriority();</span> |
+ source->d->runTimersOnceWithNormalPriority(); |
48 |
<span class="hl kwa">+ }</span> |
+ } |
49 |
return true; // i dunno, george... |
return true; // i dunno, george... |
50 |
} |
} |
51 |
|
|
52 |
@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa |
@@ -329,6 +343,7 @@ QEventDispatcherGlibPrivate::QEventDispa |
53 |
postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs, |
postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs, |
54 |
sizeof(GPostEventSource))); |
sizeof(GPostEventSource))); |
55 |
postEventSource->serialNumber = 1; |
postEventSource->serialNumber = 1; |
56 |
<span class="hl kwa">+ postEventSource->processEventsFlags = QEventLoop::AllEvents;</span> |
+ postEventSource->processEventsFlags = QEventLoop::AllEvents; |
57 |
postEventSource->d = this; |
postEventSource->d = this; |
58 |
g_source_set_can_recurse(&postEventSource->source, true); |
g_source_set_can_recurse(&postEventSource->source, true); |
59 |
g_source_attach(&postEventSource->source, mainContext); |
g_source_attach(&postEventSource->source, mainContext); |
60 |
@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents |
@@ -423,6 +438,7 @@ bool QEventDispatcherGlib::processEvents |
61 |
|
|
62 |
// tell postEventSourcePrepare() and timerSource about any new flags |
// tell postEventSourcePrepare() and timerSource about any new flags |
63 |
QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; |
QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags; |
64 |
<span class="hl kwa">+ d->postEventSource->processEventsFlags = flags;</span> |
+ d->postEventSource->processEventsFlags = flags; |
65 |
d->timerSource->processEventsFlags = flags; |
d->timerSource->processEventsFlags = flags; |
66 |
d->socketNotifierSource->processEventsFlags = flags; |
d->socketNotifierSource->processEventsFlags = flags; |
67 |
|
|
68 |
@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents |
@@ -435,6 +451,7 @@ bool QEventDispatcherGlib::processEvents |
69 |
while (!result && canWait) |
while (!result && canWait) |
70 |
result = g_main_context_iteration(d->mainContext, canWait); |
result = g_main_context_iteration(d->mainContext, canWait); |
71 |
|
|
72 |
<span class="hl kwa">+ d->postEventSource->processEventsFlags = savedFlags;</span> |
+ d->postEventSource->processEventsFlags = savedFlags; |
73 |
d->timerSource->processEventsFlags = savedFlags; |
d->timerSource->processEventsFlags = savedFlags; |
74 |
d->socketNotifierSource->processEventsFlags = savedFlags; |
d->socketNotifierSource->processEventsFlags = savedFlags; |
75 |
|
|
76 |
<span class="hl kwb">--- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200</span> |
--- src/corelib/kernel/qeventdispatcher_unix.cpp.sav 2013-06-07 07:16:52.000000000 +0200 |
77 |
<span class="hl kwa">+++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200</span> |
+++ src/corelib/kernel/qeventdispatcher_unix.cpp 2014-04-24 09:43:06.927589535 +0200 |
78 |
@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents |
@@ -905,7 +905,15 @@ bool QEventDispatcherUNIX::processEvents |
79 |
|
|
80 |
// we are awake, broadcast it |
// we are awake, broadcast it |
81 |
emit awake(); |
emit awake(); |
82 |
<span class="hl kwb">- QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);</span> |
- QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); |
83 |
<span class="hl kwa">+</span> |
+ |
84 |
<span class="hl kwa">+ QEventLoop::ProcessEventsFlags excludeAllFlags</span> |
+ QEventLoop::ProcessEventsFlags excludeAllFlags |
85 |
<span class="hl kwa">+ = QEventLoop::ExcludeUserInputEvents</span> |
+ = QEventLoop::ExcludeUserInputEvents |
86 |
<span class="hl kwa">+ | QEventLoop::ExcludeSocketNotifiers</span> |
+ | QEventLoop::ExcludeSocketNotifiers |
87 |
<span class="hl kwa">+ | QEventLoop::X11ExcludeTimers;</span> |
+ | QEventLoop::X11ExcludeTimers; |
88 |
<span class="hl kwa">+ if ((flags & excludeAllFlags) == excludeAllFlags)</span> |
+ if ((flags & excludeAllFlags) == excludeAllFlags) |
89 |
<span class="hl kwa">+ return false;</span> |
+ return false; |
90 |
<span class="hl kwa">+ if(( flags & excludeAllFlags ) != excludeAllFlags )</span> |
+ if(( flags & excludeAllFlags ) != excludeAllFlags ) |
91 |
<span class="hl kwa">+ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData);</span> |
+ QCoreApplicationPrivate::sendPostedEvents(0, 0, d->threadData); |
92 |
|
|
93 |
int nevents = 0; |
int nevents = 0; |
94 |
const bool canWait = (d->threadData->canWaitLocked() |
const bool canWait = (d->threadData->canWaitLocked() |
|
</code></pre></td></tr></table> |
|
|
</div> <!-- class=content --> |
|
|
<div class="foot" style="padding-left:1em;padding-right:1em;"> |
|
|
<p>Copyright © 2002-2016 <a href="mailto:jvinet@zeroflux.org" |
|
|
title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" |
|
|
title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo |
|
|
are recognized trademarks. Some rights reserved. The registered trademark |
|
|
Linux® is used pursuant to a sublicense from LMI, the exclusive licensee |
|
|
of Linus Torvalds, owner of the mark on a world-wide basis.</p> |
|
|
</div> |
|
|
</div> <!-- id=cgit --> |
|
|
</body> |
|
|
</html> |
|