Browse Source

Send ignored keys to *top-most* parent window, fix feedback loop

pull/6/head
falkTX 8 years ago
parent
commit
b48a3437be
2 changed files with 34 additions and 4 deletions
  1. +1
    -0
      dgl/src/pugl/pugl_internal.h
  2. +33
    -4
      dgl/src/pugl/pugl_x11.c

+ 1
- 0
dgl/src/pugl/pugl_internal.h View File

@@ -59,6 +59,7 @@ struct PuglViewImpl {
PuglInternals* impl;

PuglNativeWindow parent;
PuglNativeWindow topparent;
PuglContextType ctx_type;
uintptr_t transient_parent;



+ 33
- 4
dgl/src/pugl/pugl_x11.c View File

@@ -460,9 +460,34 @@ dispatchKey(PuglView* view, XEvent* event, bool press)
}

send_event:
if (view->parent) {
event->xany.window = view->parent;
XSendEvent(view->impl->display, view->parent, True, press ? KeyPressMask : KeyReleaseMask, event);
if (view->parent != 0) {
if (view->topparent == 0) {
uint nchildren;
Window root, newparent, oldparent, *children;

oldparent = view->topparent = view->parent;
while (XQueryTree(view->impl->display, oldparent, &root, &newparent, &children, &nchildren) != 0) {
if (nchildren == 0 || children == NULL) {
break;
}
XFree(children);
if (newparent == 0 || newparent == root) {
break;
}

// FIXME: this needs a proper check for desktop-style window
if (newparent < 0x6000000 &&
XGetTransientForHint(view->impl->display, oldparent, &newparent) == 0) {
break;
}

view->topparent = oldparent = newparent;
}
}

event->xkey.time = 0; // purposefully set an invalid time, used for feedback detection
event->xany.window = view->topparent;
XSendEvent(view->impl->display, view->topparent, False, NoEventMask, event);
}
}

@@ -492,7 +517,11 @@ puglProcessEvents(PuglView* view)
break;
}

if (event.xany.window != view->impl->win) {
if (event.xany.window != view->impl->win &&
(view->parent == 0 || event.xany.window != (Window)view->parent)) {
continue;
}
if ((event.type == KeyPress || event.type == KeyRelease) && event.xkey.time == 0) {
continue;
}



Loading…
Cancel
Save