BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure map_win initialize win::win_data 

Previously it is initialized by win_update_bounding_shape, so
configure_win is called when win_data == NULL and state ==
WSTATE_MAPPING, which is an invalid state for a `win` to be in.

Now map_win explicitly calls backend->prepare_win. This is not very
efficient since win_update_bounding_shape will reinit it.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-02-21 14:53:41 +00:00
parent e82bc0ca23
commit f120f9b754
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/win.c
View File

@ -617,11 +617,7 @@ void win_on_win_size_change(session_t *ps, win *w) {
w->flags |= WFLAG_SIZE_CHANGE; w->flags |= WFLAG_SIZE_CHANGE;
// Invalidate the shadow we built // Invalidate the shadow we built
if (ps->o.experimental_backends) { if (ps->o.experimental_backends) {
if (w->state != WSTATE_UNMAPPED && w->state != WSTATE_MAPPED) { win_skip_fading(ps, &w);
// wrapping up fading
w->opacity = w->opacity_tgt;
win_check_fade_finished(ps, &w);
}
if (!w) { if (!w) {
return; return;
} }
@ -1240,13 +1236,14 @@ void win_update_bounding_shape(session_t *ps, win *w) {
if (ps->o.experimental_backends) { if (ps->o.experimental_backends) {
//log_trace("free out dated pict"); //log_trace("free out dated pict");
// Window shape changed, we should free win_data // Window shape changed, we should free win_data
if (ps->redirected && w->state == WSTATE_MAPPED) { if (ps->redirected && w->state != WSTATE_UNMAPPED) {
// Note we only do this when screen is redirected, because // Note we only do this when screen is redirected, because
// otherwise win_data is not valid // otherwise win_data is not valid
backend_info_t *bi = backend_list[ps->o.backend]; backend_info_t *bi = backend_list[ps->o.backend];
bi->release_win(ps->backend_data, ps, w, w->win_data); bi->release_win(ps->backend_data, ps, w, w->win_data);
w->win_data = bi->prepare_win(ps->backend_data, ps, w); if (w->state != WSTATE_UNMAPPING && w->state != WSTATE_DESTROYING) {
//log_trace("free out dated pict"); w->win_data = bi->prepare_win(ps->backend_data, ps, w);
}
} }
} else { } else {
free_paint(ps, &w->paint); free_paint(ps, &w->paint);
@ -1620,6 +1617,12 @@ void map_win(session_t *ps, win *w) {
// iff `state` is MAPPED // iff `state` is MAPPED
w->state = WSTATE_MAPPING; w->state = WSTATE_MAPPING;
w->opacity_tgt = win_calc_opacity_target(ps, w); w->opacity_tgt = win_calc_opacity_target(ps, w);
// TODO win_update_bounding_shape below will immediately
// reinit w->win_data, not very efficient
if (ps->redirected) {
w->win_data = backend_list[ps->o.backend]->prepare_win(ps->backend_data, ps, w);
}
log_debug("Window %#010x has opacity %f, opacity target is %f", w->id, w->opacity, w->opacity_tgt); log_debug("Window %#010x has opacity %f, opacity target is %f", w->id, w->opacity, w->opacity_tgt);
win_determine_blur_background(ps, w); win_determine_blur_background(ps, w);