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

win: remove unused parameter `ignore_state` 

remove unrequired parameter `ignore_state` of
`win_calc_opacity_target()` that was always `false` now.
This commit is contained in:
Bernd Busse 2020-04-05 14:07:06 +02:00 committed by Yuxuan Shui
parent ad8632b017
commit 132332c483
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/win.c
View File

@ -579,18 +579,17 @@ winmode_t win_calc_mode(const struct managed_win *w) {
* *
* @param ps current session * @param ps current session
* @param w struct _win object representing the window * @param w struct _win object representing the window
* @param ignore_state whether window state should be ignored in opacity calculation
* *
* @return target opacity * @return target opacity
*/ */
double win_calc_opacity_target(session_t *ps, const struct managed_win *w, bool ignore_state) { double win_calc_opacity_target(session_t *ps, const struct managed_win *w) {
double opacity = 1; double opacity = 1;
if (w->state == WSTATE_UNMAPPED && !ignore_state) { if (w->state == WSTATE_UNMAPPED) {
// be consistent // be consistent
return 0; return 0;
} }
if ((w->state == WSTATE_UNMAPPING || w->state == WSTATE_DESTROYING) && !ignore_state) { if (w->state == WSTATE_UNMAPPING || w->state == WSTATE_DESTROYING) {
return 0; return 0;
} }
// Try obeying opacity property and window type opacity firstly // Try obeying opacity property and window type opacity firstly
@ -1929,7 +1928,7 @@ void unmap_win_start(session_t *ps, struct managed_win *w) {
w->a.map_state = XCB_MAP_STATE_UNMAPPED; w->a.map_state = XCB_MAP_STATE_UNMAPPED;
w->state = WSTATE_UNMAPPING; w->state = WSTATE_UNMAPPING;
w->opacity_target_old = fmax(w->opacity_target, w->opacity_target_old); w->opacity_target_old = fmax(w->opacity_target, w->opacity_target_old);
w->opacity_target = win_calc_opacity_target(ps, w, false); w->opacity_target = win_calc_opacity_target(ps, w);
// Clear PIXMAP_STALE flag, since the window is unmapped there is no pixmap // Clear PIXMAP_STALE flag, since the window is unmapped there is no pixmap
// available so STALE doesn't make sense. // available so STALE doesn't make sense.
@ -2114,7 +2113,7 @@ void map_win_start(session_t *ps, struct managed_win *w) {
// iff `state` is MAPPED // iff `state` is MAPPED
w->state = WSTATE_MAPPING; w->state = WSTATE_MAPPING;
w->opacity_target_old = 0; w->opacity_target_old = 0;
w->opacity_target = win_calc_opacity_target(ps, w, false); w->opacity_target = win_calc_opacity_target(ps, w);
log_debug("Window %#010x has opacity %f, opacity target is %f", w->base.id, log_debug("Window %#010x has opacity %f, opacity target is %f", w->base.id,
w->opacity, w->opacity_target); w->opacity, w->opacity_target);
@ -2154,7 +2153,7 @@ void map_win_start(session_t *ps, struct managed_win *w) {
*/ */
void win_update_opacity_target(session_t *ps, struct managed_win *w) { void win_update_opacity_target(session_t *ps, struct managed_win *w) {
auto opacity_target_old = w->opacity_target; auto opacity_target_old = w->opacity_target;
w->opacity_target = win_calc_opacity_target(ps, w, false); w->opacity_target = win_calc_opacity_target(ps, w);
if (opacity_target_old == w->opacity_target) { if (opacity_target_old == w->opacity_target) {
return; return;

4
src/win.h
View File

@ -310,12 +310,10 @@ bool win_get_class(session_t *ps, struct managed_win *w);
* *
* @param ps current session * @param ps current session
* @param w struct _win object representing the window * @param w struct _win object representing the window
* @param ignore_state whether window state should be ignored in opacity calculation
* *
* @return target opacity * @return target opacity
*/ */
double attr_pure win_calc_opacity_target(session_t *ps, const struct managed_win *w, double attr_pure win_calc_opacity_target(session_t *ps, const struct managed_win *w);
bool ignore_state);
bool attr_pure win_should_dim(session_t *ps, const struct managed_win *w); bool attr_pure win_should_dim(session_t *ps, const struct managed_win *w);
void win_update_screen(session_t *, struct managed_win *); void win_update_screen(session_t *, struct managed_win *);
/** /**