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

core: just enable track_focuse

Browse Source 
It's not an intensive task.

Simplifies logic.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui
2019-05-25 00:02:16 +01:00
parent 57f4a99940
commit 7d8a3e09be
9 changed files with 8 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/compton.c
View File

@ -297,8 +297,9 @@ uint32_t determine_evmask(session_t *ps, xcb_window_t wid, win_evmode_t mode) {
if (WIN_EVMODE_FRAME == mode ||
((w = find_managed_win(ps, wid)) && w->a.map_state == XCB_MAP_STATE_VIEWABLE)) {
evmask |= XCB_EVENT_MASK_PROPERTY_CHANGE;
if (ps->o.track_focus && !ps->o.use_ewmh_active_win)
if (!ps->o.use_ewmh_active_win) {
evmask |= XCB_EVENT_MASK_FOCUS_CHANGE;
}
}
// Check if it's a mapped client window
@ -807,36 +808,6 @@ void force_repaint(session_t *ps) {
*/
///@{
/**
* Enable focus tracking.
*/
void opts_init_track_focus(session_t *ps) {
// Already tracking focus
if (ps->o.track_focus)
return;
ps->o.track_focus = true;
if (!ps->o.use_ewmh_active_win) {
// Start listening to FocusChange events
HASH_ITER2(ps->windows, w) {
if (!w->managed) {
continue;
}
auto mw = (struct managed_win *)w;
if (mw->a.map_state == XCB_MAP_STATE_VIEWABLE) {
xcb_change_window_attributes(
ps->c, w->id, XCB_CW_EVENT_MASK,
(const uint32_t[]){
determine_evmask(ps, w->id, WIN_EVMODE_FRAME)});
}
}
}
// Recheck focus
recheck_focus(ps);
}
/**
* Set no_fading_openclose option.
*
@ -1506,7 +1477,6 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
.detect_transient = false,
.detect_client_leader = false,
.track_focus = false,
.track_wdata = false,
.track_leader = false,
},
@ -1991,9 +1961,7 @@ static session_t *session_init(int argc, char **argv, Display *dpy,
}
}
if (ps->o.track_focus) {
recheck_focus(ps);
}
recheck_focus(ps);
e = xcb_request_check(ps->c, xcb_ungrab_server(ps->c));
if (e) {