From d270894f08bc79177cbb4a20ab681881203510b2 Mon Sep 17 00:00:00 2001 From: allusive-dev Date: Sat, 4 Nov 2023 08:14:28 +1100 Subject: Fixes for #18 and #23 --- src/win.c | 56 +++++++++++--------------------------------------------- 1 file changed, 11 insertions(+), 45 deletions(-) (limited to 'src/win.c') diff --git a/src/win.c b/src/win.c index 0741ed8..1d50313 100644 --- a/src/win.c +++ b/src/win.c @@ -1160,54 +1160,12 @@ double win_calc_opacity_target(session_t *ps, const struct managed_win *w) { // Respect active_opacity only when the window is physically // focused if (win_is_focused_raw(ps, w)) { - // if (c2_match(ps, w, ps->o.active_opacity_blacklist, NULL)) { - // opacity = 1.0; - // } else { opacity = ps->o.active_opacity; - // } } else if (!w->focused) { - // Respect inactive_opacity in some cases - // if (c2_match(ps, w, ps->o.inactive_opacity_blacklist, NULL)) { - // if (c2_match(ps, w, ps->o.active_opacity_blacklist, NULL)) { - // opacity = 1.0; - // } else { - // opacity = ps->o.active_opacity; - // } - // } else { opacity = ps->o.inactive_opacity; - // } } } - // // Respect inactive opacity, with support for DWM. - // if (ps->o.support_for_wm == WM_SUPPORT_DWM) { - // if (ps->o.inactive_opacity_override && !win_is_focused_raw(ps, w)) { - // // if (c2_match(ps, w, ps->o.inactive_opacity_blacklist, NULL)) { - // // if (c2_match(ps, w, ps->o.active_opacity_blacklist, NULL)) { - // // opacity = 1.0; - // // } else { - // // opacity = ps->o.active_opacity; - // // } - // // } else { - // opacity = ps->o.inactive_opacity; - // // } - // } else if (!ps->o.inactive_opacity_override && !win_is_focused_raw(ps, w)) { - // // if (c2_match(ps, w, ps->o.inactive_opacity_blacklist, NULL)) { - // // if (c2_match(ps, w, ps->o.active_opacity_blacklist, NULL)) { - // // opacity = 1.0; - // // } else { - // // opacity = ps->o.active_opacity; - // // } - // // } else { - // opacity = ps->o.inactive_opacity; - // // } - // } - // } else { - // if (ps->o.inactive_opacity_override && !w->focused) { - // opacity = ps->o.inactive_opacity; - // } - // } - return opacity; } @@ -1220,10 +1178,18 @@ bool win_should_dim(session_t *ps, const struct managed_win *w) { return false; } - if (ps->o.inactive_dim > 0 && !(w->focused)) { - return true; + if (ps->o.support_for_wm == WM_SUPPORT_DWM) { + if (ps->o.inactive_dim > 0 && !win_is_focused_raw(ps, w)) { + return true; + } else { + return false; + } } else { - return false; + if (ps->o.inactive_dim > 0 && !w->focused) { + return true; + } else { + return false; + } } } -- cgit v1.2.3