mirror of
https://github.com/gnif/LookingGlass.git
synced 2024-11-10 08:38:20 +00:00
[client] x11: process clipboard events early
Due to the logic in the event loop property events may get filtered out that were clipboard related. This changes ensures the clipboard event handler code gets to run first avoiding this issue.
This commit is contained in:
parent
9015706fcb
commit
3912d3411c
@ -59,30 +59,30 @@ static void x11CBSelectionIncr(const XPropertyEvent e);
|
||||
static void x11CBSelectionNotify(const XSelectionEvent e);
|
||||
static void x11CBXFixesSelectionNotify(const XFixesSelectionNotifyEvent e);
|
||||
|
||||
void x11CBEventThread(const XEvent xe)
|
||||
bool x11CBEventThread(const XEvent xe)
|
||||
{
|
||||
switch(xe.type)
|
||||
{
|
||||
case SelectionRequest:
|
||||
x11CBSelectionRequest(xe.xselectionrequest);
|
||||
break;
|
||||
return true;
|
||||
|
||||
case SelectionClear:
|
||||
x11CBSelectionClear(xe.xselectionclear);
|
||||
break;
|
||||
return true;
|
||||
|
||||
case SelectionNotify:
|
||||
x11CBSelectionNotify(xe.xselection);
|
||||
break;
|
||||
return true;
|
||||
|
||||
case PropertyNotify:
|
||||
if (xe.xproperty.atom == x11atoms.SEL_DATA)
|
||||
{
|
||||
if (x11cb.lowerBound == 0)
|
||||
break;
|
||||
return true;
|
||||
|
||||
x11CBSelectionIncr(xe.xproperty);
|
||||
break;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -91,9 +91,12 @@ void x11CBEventThread(const XEvent xe)
|
||||
{
|
||||
XFixesSelectionNotifyEvent * sne = (XFixesSelectionNotifyEvent *)&xe;
|
||||
x11CBXFixesSelectionNotify(*sne);
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool x11CBInit()
|
||||
|
@ -25,7 +25,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
#include "interface/displayserver.h"
|
||||
|
||||
void x11CBEventThread(const XEvent xe);
|
||||
bool x11CBEventThread(const XEvent xe);
|
||||
|
||||
bool x11CBInit();
|
||||
void x11CBNotice(LG_ClipboardData type);
|
||||
|
@ -558,6 +558,10 @@ static int x11EventThread(void * unused)
|
||||
XEvent xe;
|
||||
XNextEvent(x11.display, &xe);
|
||||
|
||||
// call the clipboard handling code
|
||||
if (x11CBEventThread(xe))
|
||||
continue;
|
||||
|
||||
switch(xe.type)
|
||||
{
|
||||
case ClientMessage:
|
||||
@ -666,9 +670,6 @@ static int x11EventThread(void * unused)
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
// call the clipboard handling code
|
||||
x11CBEventThread(xe);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user