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

Honor wintype opacity if set explicitly 

Also normalize wintype opacity value to [0, 1]
This commit is contained in:
Yuxuan Shui 2018-08-11 14:17:04 -04:00
parent 66785aae99
commit 58a0b9ec39
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/compton.c
View File

@ -2380,18 +2380,22 @@ calc_opacity(session_t *ps, win *w) {
if(w->has_opacity_prop) if(w->has_opacity_prop)
opacity = w->opacity_prop; opacity = w->opacity_prop;
else { else {
opacity = ps->o.wintype_opacity[w->window_type] * OPAQUE; if (!isnan(ps->o.wintype_opacity[w->window_type]))
opacity = ps->o.wintype_opacity[w->window_type] * OPAQUE;
// Respect inactive_opacity in some cases else {
if (ps->o.inactive_opacity && false == w->focused // Respect active_opacity only when the window is physically focused
&& (OPAQUE == opacity || ps->o.inactive_opacity_override)) { if (ps->o.active_opacity && win_is_focused_real(ps, w))
opacity = ps->o.inactive_opacity; opacity = ps->o.active_opacity;
else if (ps->o.inactive_opacity && false == w->focused)
// Respect inactive_opacity in some cases
opacity = ps->o.inactive_opacity;
} }
// Respect active_opacity only when the window is physically focused
if (OPAQUE == opacity && ps->o.active_opacity && win_is_focused_real(ps, w))
opacity = ps->o.active_opacity;
} }
// respect inactive override
if (ps->o.inactive_opacity && false == w->focused &&
ps->o.inactive_opacity_override)
opacity = ps->o.inactive_opacity;
} }
w->opacity_tgt = opacity; w->opacity_tgt = opacity;
@ -5656,8 +5660,10 @@ parse_config(session_t *ps, struct options_tmp *pcfgtmp) {
ps->o.wintype_fade[i] = (bool) ival; ps->o.wintype_fade[i] = (bool) ival;
if (config_setting_lookup_bool(setting, "focus", &ival)) if (config_setting_lookup_bool(setting, "focus", &ival))
ps->o.wintype_focus[i] = (bool) ival; ps->o.wintype_focus[i] = (bool) ival;
config_setting_lookup_float(setting, "opacity",
&ps->o.wintype_opacity[i]); double fval;
if (config_setting_lookup_float(setting, "opacity", &fval))
ps->o.wintype_opacity[i] = normalize_d(fval);
} }
} }
} }
@ -5799,7 +5805,7 @@ get_cfg(session_t *ps, int argc, char *const *argv, bool first_pass) {
struct options_tmp cfgtmp = { struct options_tmp cfgtmp = {
.no_dock_shadow = false, .no_dock_shadow = false,
.no_dnd_shadow = false, .no_dnd_shadow = false,
.menu_opacity = 1.0, .menu_opacity = NAN,
}; };
bool shadow_enable = false, fading_enable = false; bool shadow_enable = false, fading_enable = false;
char *lc_numeric_old = mstrcpy(setlocale(LC_NUMERIC, NULL)); char *lc_numeric_old = mstrcpy(setlocale(LC_NUMERIC, NULL));
@ -5807,7 +5813,7 @@ get_cfg(session_t *ps, int argc, char *const *argv, bool first_pass) {
for (i = 0; i < NUM_WINTYPES; ++i) { for (i = 0; i < NUM_WINTYPES; ++i) {
ps->o.wintype_fade[i] = false; ps->o.wintype_fade[i] = false;
ps->o.wintype_shadow[i] = false; ps->o.wintype_shadow[i] = false;
ps->o.wintype_opacity[i] = 1.0; ps->o.wintype_opacity[i] = NAN;
} }
// Enforce LC_NUMERIC locale "C" here to make sure dots are recognized // Enforce LC_NUMERIC locale "C" here to make sure dots are recognized
@ -6066,7 +6072,7 @@ get_cfg(session_t *ps, int argc, char *const *argv, bool first_pass) {
ps->o.wintype_shadow[WINTYPE_DND] = false; ps->o.wintype_shadow[WINTYPE_DND] = false;
if (fading_enable) if (fading_enable)
wintype_arr_enable(ps->o.wintype_fade); wintype_arr_enable(ps->o.wintype_fade);
if (1.0 != cfgtmp.menu_opacity) { if (!isnan(cfgtmp.menu_opacity)) {
ps->o.wintype_opacity[WINTYPE_DROPDOWN_MENU] = cfgtmp.menu_opacity; ps->o.wintype_opacity[WINTYPE_DROPDOWN_MENU] = cfgtmp.menu_opacity;
ps->o.wintype_opacity[WINTYPE_POPUP_MENU] = cfgtmp.menu_opacity; ps->o.wintype_opacity[WINTYPE_POPUP_MENU] = cfgtmp.menu_opacity;
} }
@ -7017,7 +7023,7 @@ session_init(session_t *ps_old, int argc, char **argv) {
.no_fading_destroyed_argb = false, .no_fading_destroyed_argb = false,
.fade_blacklist = NULL, .fade_blacklist = NULL,
.wintype_opacity = { 0.0 }, .wintype_opacity = { NAN },
.inactive_opacity = 0, .inactive_opacity = 0,
.inactive_opacity_override = false, .inactive_opacity_override = false,
.active_opacity = 0, .active_opacity = 0,