aboutsummaryrefslogtreecommitdiff
path: root/src/win.c
diff options
context:
space:
mode:
authorallusive-dev <[email protected]>2023-11-04 08:14:28 +1100
committerallusive-dev <[email protected]>2023-11-04 08:14:28 +1100
commitd270894f08bc79177cbb4a20ab681881203510b2 (patch)
tree2be7ce54762db17713d637829ffc3bd1a1b4b3fa /src/win.c
parentupdate 1.2.7 (diff)
downloadcompfy-1.2.9.tar.xz
compfy-1.2.9.zip
Fixes for #18 and #231.2.9
Diffstat (limited to 'src/win.c')
-rw-r--r--src/win.c56
1 files changed, 11 insertions, 45 deletions
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;
+ }
}
}