PolytreeDE
/
picom
mirror of https://github.com/yshui/picom.git
1
0
Fork 0
Code Releases Activity

core: distinguish preprocess failure and no window to render 

paint_process would return NULL for both of these cases, but we should exit in
the failure case, and continue going in the other.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2023-12-17 23:44:56 +00:00
parent 268e1d890a
commit 7366553be2
No known key found for this signature in database
GPG Key ID: D3A4405BE6CC17F4
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/picom.c
View File

@ -769,13 +769,19 @@ static void handle_root_flags(session_t *ps) {
}
}
static struct managed_win *
paint_preprocess(session_t *ps, bool *fade_running, bool *animation) {
/**
* Go through the window stack and calculate some parameters for rendering.
*
* @return whether the operation succeeded
*/
static bool paint_preprocess(session_t *ps, bool *fade_running, bool *animation,
struct managed_win **out_bottom) {
// XXX need better, more general name for `fade_running`. It really
// means if fade is still ongoing after the current frame is rendered
struct managed_win *bottom = NULL;
*fade_running = false;
*animation = false;
*out_bottom = NULL;
// Fading step calculation
long long steps = 0L;
@ -1036,12 +1042,13 @@ paint_preprocess(session_t *ps, bool *fade_running, bool *animation) {
ev_timer_stop(ps->loop, &ps->unredir_timer);
if (!ps->redirected) {
if (!redirect_start(ps)) {
return NULL;
return false;
}
}
}
return bottom;
*out_bottom = bottom;
return true;
}
void root_damaged(session_t *ps) {
@ -1738,14 +1745,14 @@ static void draw_callback_impl(EV_P_ session_t *ps, int revents attr_unused) {
bool fade_running = false;
bool animation = false;
bool was_redirected = ps->redirected;
auto bottom = paint_preprocess(ps, &fade_running, &animation);
ps->tmout_unredir_hit = false;
if (!bottom) {
struct managed_win *bottom = NULL;
if (!paint_preprocess(ps, &fade_running, &animation, &bottom)) {
log_fatal("Pre-render preparation has failed, exiting...");
exit(1);
}
ps->tmout_unredir_hit = false;
if (!was_redirected && ps->redirected) {
// paint_preprocess redirected the screen, which might change the state of
// some of the windows (e.g. the window image might become stale).