Use x11 event loop with XPending instead of XCheckTypedWindowEvent
This commit is contained in:
parent
beeb9a57aa
commit
b6227c07f2
@ -278,32 +278,55 @@ static void gsr_capture_xcomposite_cuda_tick(gsr_capture *cap, AVCodecContext *v
|
|||||||
|
|
||||||
cap_xcomp->egl.glClear(GL_COLOR_BUFFER_BIT);
|
cap_xcomp->egl.glClear(GL_COLOR_BUFFER_BIT);
|
||||||
|
|
||||||
if(!cap_xcomp->params.follow_focused && XCheckTypedWindowEvent(cap_xcomp->dpy, cap_xcomp->window, DestroyNotify, &cap_xcomp->xev)) {
|
bool init_new_window = false;
|
||||||
cap_xcomp->should_stop = true;
|
while(XPending(cap_xcomp->dpy)) {
|
||||||
cap_xcomp->stop_is_error = false;
|
XNextEvent(cap_xcomp->dpy, &cap_xcomp->xev);
|
||||||
}
|
|
||||||
|
|
||||||
if(XCheckTypedWindowEvent(cap_xcomp->dpy, cap_xcomp->window, Expose, &cap_xcomp->xev) && cap_xcomp->xev.xexpose.count == 0) {
|
switch(cap_xcomp->xev.type) {
|
||||||
cap_xcomp->window_resize_timer = clock_get_monotonic_seconds();
|
case DestroyNotify: {
|
||||||
cap_xcomp->window_resized = true;
|
/* Window died (when not following focused window), so we stop recording */
|
||||||
}
|
if(!cap_xcomp->params.follow_focused && cap_xcomp->xev.xdestroywindow.window == cap_xcomp->window) {
|
||||||
|
cap_xcomp->should_stop = true;
|
||||||
if(XCheckTypedWindowEvent(cap_xcomp->dpy, cap_xcomp->window, ConfigureNotify, &cap_xcomp->xev) && cap_xcomp->xev.xconfigure.window == cap_xcomp->window) {
|
cap_xcomp->stop_is_error = false;
|
||||||
while(XCheckTypedWindowEvent(cap_xcomp->dpy, cap_xcomp->window, ConfigureNotify, &cap_xcomp->xev)) {}
|
}
|
||||||
|
break;
|
||||||
/* Window resize */
|
}
|
||||||
if(cap_xcomp->xev.xconfigure.width != cap_xcomp->window_size.x || cap_xcomp->xev.xconfigure.height != cap_xcomp->window_size.y) {
|
case Expose: {
|
||||||
cap_xcomp->window_size.x = max_int(cap_xcomp->xev.xconfigure.width, 0);
|
/* Requires window texture recreate */
|
||||||
cap_xcomp->window_size.y = max_int(cap_xcomp->xev.xconfigure.height, 0);
|
if(cap_xcomp->xev.xexpose.count == 0 && cap_xcomp->xev.xexpose.window == cap_xcomp->window) {
|
||||||
cap_xcomp->window_resize_timer = clock_get_monotonic_seconds();
|
cap_xcomp->window_resize_timer = clock_get_monotonic_seconds();
|
||||||
cap_xcomp->window_resized = true;
|
cap_xcomp->window_resized = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case ConfigureNotify: {
|
||||||
|
/* Window resized */
|
||||||
|
if(cap_xcomp->xev.xconfigure.window == cap_xcomp->window && (cap_xcomp->xev.xconfigure.width != cap_xcomp->window_size.x || cap_xcomp->xev.xconfigure.height != cap_xcomp->window_size.y)) {
|
||||||
|
cap_xcomp->window_size.x = max_int(cap_xcomp->xev.xconfigure.width, 0);
|
||||||
|
cap_xcomp->window_size.y = max_int(cap_xcomp->xev.xconfigure.height, 0);
|
||||||
|
cap_xcomp->window_resize_timer = clock_get_monotonic_seconds();
|
||||||
|
cap_xcomp->window_resized = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case PropertyNotify: {
|
||||||
|
/* Focused window changed */
|
||||||
|
if(cap_xcomp->params.follow_focused && cap_xcomp->xev.xproperty.atom == cap_xcomp->net_active_window_atom) {
|
||||||
|
init_new_window = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(cap_xcomp->params.follow_focused && (!cap_xcomp->follow_focused_initialized || (XCheckTypedWindowEvent(cap_xcomp->dpy, DefaultRootWindow(cap_xcomp->dpy), PropertyNotify, &cap_xcomp->xev) && cap_xcomp->xev.xproperty.atom == cap_xcomp->net_active_window_atom))) {
|
if(cap_xcomp->params.follow_focused && !cap_xcomp->follow_focused_initialized) {
|
||||||
|
cap_xcomp->follow_focused_initialized = true;
|
||||||
|
init_new_window = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(init_new_window) {
|
||||||
Window focused_window = get_focused_window(cap_xcomp->dpy, cap_xcomp->net_active_window_atom);
|
Window focused_window = get_focused_window(cap_xcomp->dpy, cap_xcomp->net_active_window_atom);
|
||||||
if(focused_window != cap_xcomp->window || !cap_xcomp->follow_focused_initialized) {
|
if(focused_window != cap_xcomp->window) {
|
||||||
cap_xcomp->follow_focused_initialized = true;
|
|
||||||
XSelectInput(cap_xcomp->dpy, cap_xcomp->window, 0);
|
XSelectInput(cap_xcomp->dpy, cap_xcomp->window, 0);
|
||||||
cap_xcomp->window = focused_window;
|
cap_xcomp->window = focused_window;
|
||||||
XSelectInput(cap_xcomp->dpy, cap_xcomp->window, StructureNotifyMask | ExposureMask);
|
XSelectInput(cap_xcomp->dpy, cap_xcomp->window, StructureNotifyMask | ExposureMask);
|
||||||
|
@ -207,32 +207,55 @@ static void gsr_capture_xcomposite_vaapi_tick(gsr_capture *cap, AVCodecContext *
|
|||||||
// TODO:
|
// TODO:
|
||||||
//cap_xcomp->egl.glClear(GL_COLOR_BUFFER_BIT);
|
//cap_xcomp->egl.glClear(GL_COLOR_BUFFER_BIT);
|
||||||
|
|
||||||
if(!cap_xcomp->params.follow_focused && XCheckTypedWindowEvent(cap_xcomp->dpy, cap_xcomp->window, DestroyNotify, &cap_xcomp->xev)) {
|
bool init_new_window = false;
|
||||||
cap_xcomp->should_stop = true;
|
while(XPending(cap_xcomp->dpy)) {
|
||||||
cap_xcomp->stop_is_error = false;
|
XNextEvent(cap_xcomp->dpy, &cap_xcomp->xev);
|
||||||
}
|
|
||||||
|
|
||||||
if(XCheckTypedWindowEvent(cap_xcomp->dpy, cap_xcomp->window, Expose, &cap_xcomp->xev) && cap_xcomp->xev.xexpose.count == 0) {
|
switch(cap_xcomp->xev.type) {
|
||||||
cap_xcomp->window_resize_timer = clock_get_monotonic_seconds();
|
case DestroyNotify: {
|
||||||
cap_xcomp->window_resized = true;
|
/* Window died (when not following focused window), so we stop recording */
|
||||||
}
|
if(!cap_xcomp->params.follow_focused && cap_xcomp->xev.xdestroywindow.window == cap_xcomp->window) {
|
||||||
|
cap_xcomp->should_stop = true;
|
||||||
if(XCheckTypedWindowEvent(cap_xcomp->dpy, cap_xcomp->window, ConfigureNotify, &cap_xcomp->xev) && cap_xcomp->xev.xconfigure.window == cap_xcomp->window) {
|
cap_xcomp->stop_is_error = false;
|
||||||
while(XCheckTypedWindowEvent(cap_xcomp->dpy, cap_xcomp->window, ConfigureNotify, &cap_xcomp->xev)) {}
|
}
|
||||||
|
break;
|
||||||
/* Window resize */
|
}
|
||||||
if(cap_xcomp->xev.xconfigure.width != cap_xcomp->window_size.x || cap_xcomp->xev.xconfigure.height != cap_xcomp->window_size.y) {
|
case Expose: {
|
||||||
cap_xcomp->window_size.x = max_int(cap_xcomp->xev.xconfigure.width, 0);
|
/* Requires window texture recreate */
|
||||||
cap_xcomp->window_size.y = max_int(cap_xcomp->xev.xconfigure.height, 0);
|
if(cap_xcomp->xev.xexpose.count == 0 && cap_xcomp->xev.xexpose.window == cap_xcomp->window) {
|
||||||
cap_xcomp->window_resize_timer = clock_get_monotonic_seconds();
|
cap_xcomp->window_resize_timer = clock_get_monotonic_seconds();
|
||||||
cap_xcomp->window_resized = true;
|
cap_xcomp->window_resized = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case ConfigureNotify: {
|
||||||
|
/* Window resized */
|
||||||
|
if(cap_xcomp->xev.xconfigure.window == cap_xcomp->window && (cap_xcomp->xev.xconfigure.width != cap_xcomp->window_size.x || cap_xcomp->xev.xconfigure.height != cap_xcomp->window_size.y)) {
|
||||||
|
cap_xcomp->window_size.x = max_int(cap_xcomp->xev.xconfigure.width, 0);
|
||||||
|
cap_xcomp->window_size.y = max_int(cap_xcomp->xev.xconfigure.height, 0);
|
||||||
|
cap_xcomp->window_resize_timer = clock_get_monotonic_seconds();
|
||||||
|
cap_xcomp->window_resized = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case PropertyNotify: {
|
||||||
|
/* Focused window changed */
|
||||||
|
if(cap_xcomp->params.follow_focused && cap_xcomp->xev.xproperty.atom == cap_xcomp->net_active_window_atom) {
|
||||||
|
init_new_window = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(cap_xcomp->params.follow_focused && (!cap_xcomp->follow_focused_initialized || (XCheckTypedWindowEvent(cap_xcomp->dpy, DefaultRootWindow(cap_xcomp->dpy), PropertyNotify, &cap_xcomp->xev) && cap_xcomp->xev.xproperty.atom == cap_xcomp->net_active_window_atom))) {
|
if(cap_xcomp->params.follow_focused && !cap_xcomp->follow_focused_initialized) {
|
||||||
|
cap_xcomp->follow_focused_initialized = true;
|
||||||
|
init_new_window = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(init_new_window) {
|
||||||
Window focused_window = get_focused_window(cap_xcomp->dpy, cap_xcomp->net_active_window_atom);
|
Window focused_window = get_focused_window(cap_xcomp->dpy, cap_xcomp->net_active_window_atom);
|
||||||
if(focused_window != cap_xcomp->window || !cap_xcomp->follow_focused_initialized) {
|
if(focused_window != cap_xcomp->window || !cap_xcomp->follow_focused_initialized) {
|
||||||
cap_xcomp->follow_focused_initialized = true;
|
|
||||||
XSelectInput(cap_xcomp->dpy, cap_xcomp->window, 0);
|
XSelectInput(cap_xcomp->dpy, cap_xcomp->window, 0);
|
||||||
cap_xcomp->window = focused_window;
|
cap_xcomp->window = focused_window;
|
||||||
XSelectInput(cap_xcomp->dpy, cap_xcomp->window, StructureNotifyMask | ExposureMask);
|
XSelectInput(cap_xcomp->dpy, cap_xcomp->window, StructureNotifyMask | ExposureMask);
|
||||||
|
Loading…
Reference in New Issue
Block a user