PapaTutuWawa/gpu-screen-recorder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix focused window follow failing on vaapi for the first window. Also dont error on fail to focus window

Browse Source
This commit is contained in:
dec05eba 2023-04-21 21:26:47 +02:00 committed by dec05eba
parent 72594e3d45
commit 2021456be0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/capture/xcomposite_cuda.c
View File

@ -320,13 +320,13 @@ static void gsr_capture_xcomposite_cuda_tick(gsr_capture *cap, AVCodecContext *v
} }
if(cap_xcomp->params.follow_focused && !cap_xcomp->follow_focused_initialized) { if(cap_xcomp->params.follow_focused && !cap_xcomp->follow_focused_initialized) {
cap_xcomp->follow_focused_initialized = true;
init_new_window = true; init_new_window = true;
} }
if(init_new_window) { 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) { 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);
@ -364,7 +364,7 @@ static void gsr_capture_xcomposite_cuda_tick(gsr_capture *cap, AVCodecContext *v
fprintf(stderr, "gsr error: gsr_capture_xcomposite_cuda_tick: window_texture_on_resize failed\n"); fprintf(stderr, "gsr error: gsr_capture_xcomposite_cuda_tick: window_texture_on_resize failed\n");
//cap_xcomp->should_stop = true; //cap_xcomp->should_stop = true;
//cap_xcomp->stop_is_error = true; //cap_xcomp->stop_is_error = true;
//return; return;
} }
cap_xcomp->texture_size.x = 0; cap_xcomp->texture_size.x = 0;

4
src/capture/xcomposite_vaapi.c
View File

@ -249,13 +249,13 @@ static void gsr_capture_xcomposite_vaapi_tick(gsr_capture *cap, AVCodecContext *
} }
if(cap_xcomp->params.follow_focused && !cap_xcomp->follow_focused_initialized) { if(cap_xcomp->params.follow_focused && !cap_xcomp->follow_focused_initialized) {
cap_xcomp->follow_focused_initialized = true;
init_new_window = true; init_new_window = true;
} }
if(init_new_window) { 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);
@ -294,7 +294,7 @@ static void gsr_capture_xcomposite_vaapi_tick(gsr_capture *cap, AVCodecContext *
fprintf(stderr, "gsr error: gsr_capture_xcomposite_vaapi_tick: window_texture_on_resize failed\n"); fprintf(stderr, "gsr error: gsr_capture_xcomposite_vaapi_tick: window_texture_on_resize failed\n");
//cap_xcomp->should_stop = true; //cap_xcomp->should_stop = true;
//cap_xcomp->stop_is_error = true; //cap_xcomp->stop_is_error = true;
//return; return;
} }
cap_xcomp->texture_size.x = 0; cap_xcomp->texture_size.x = 0;