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

Bug fix #68: Second attempt to fix client window detection 

- Attempt to fix client window detection when WM_STATE property is not
  yet set when the window is mapped. Thanks to kinclma1 for reporting.

- Apply stricter checks for whether window is mapped in
  determine_evmask() and win_mark_client().
This commit is contained in:
Richard Grenville 2012-12-08 11:10:08 +08:00
parent 812ba93516
commit 7d70f3dc13
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/compton.c
View File

@ -825,14 +825,19 @@ condlst_add(wincond_t **pcondlst, const char *pattern) {
static long static long
determine_evmask(session_t *ps, Window wid, win_evmode_t mode) { determine_evmask(session_t *ps, Window wid, win_evmode_t mode) {
long evmask = NoEventMask; long evmask = NoEventMask;
win *w = NULL;
if (WIN_EVMODE_FRAME == mode || find_win(ps, wid)) { // Check if it's a mapped frame window
if (WIN_EVMODE_FRAME == mode
|| ((w = find_win(ps, wid)) && IsViewable == w->a.map_state)) {
evmask |= PropertyChangeMask; evmask |= PropertyChangeMask;
if (ps->o.track_focus && !ps->o.use_ewmh_active_win) if (ps->o.track_focus && !ps->o.use_ewmh_active_win)
evmask |= FocusChangeMask; evmask |= FocusChangeMask;
} }
if (WIN_EVMODE_CLIENT == mode || find_toplevel(ps, wid)) { // Check if it's a mapped client window
if (WIN_EVMODE_CLIENT == mode
|| ((w = find_toplevel(ps, wid)) && IsViewable == w->a.map_state)) {
if (ps->o.frame_opacity || ps->o.track_wdata if (ps->o.frame_opacity || ps->o.track_wdata
|| ps->o.detect_client_opacity) || ps->o.detect_client_opacity)
evmask |= PropertyChangeMask; evmask |= PropertyChangeMask;
@ -2203,6 +2208,11 @@ static void
win_mark_client(session_t *ps, win *w, Window client) { win_mark_client(session_t *ps, win *w, Window client) {
w->client_win = client; w->client_win = client;
// If the window isn't mapped yet, stop here, as the function will be
// called in map_win()
if (IsViewable != w->a.map_state)
return;
XSelectInput(ps->dpy, client, determine_evmask(ps, client, WIN_EVMODE_CLIENT)); XSelectInput(ps->dpy, client, determine_evmask(ps, client, WIN_EVMODE_CLIENT));
// Make sure the XSelectInput() requests are sent // Make sure the XSelectInput() requests are sent
@ -3090,8 +3100,10 @@ ev_reparent_notify(session_t *ps, XReparentEvent *ev) {
if (!find_toplevel(ps, ev->window)) { if (!find_toplevel(ps, ev->window)) {
// If not, look for its frame window // If not, look for its frame window
win *w_top = find_toplevel2(ps, ev->parent); win *w_top = find_toplevel2(ps, ev->parent);
// If found, and its frame may not have a correct client, continue // If found, and the client window has not been determined, or its
if (w_top && w_top->client_win == w_top->id) { // frame may not have a correct client, continue
if (w_top && (!w_top->client_win
|| w_top->client_win == w_top->id)) {
// If it has WM_STATE, mark it the client window // If it has WM_STATE, mark it the client window
if (wid_has_prop(ps, ev->window, ps->atom_client)) { if (wid_has_prop(ps, ev->window, ps->atom_client)) {
w_top->wmwin = false; w_top->wmwin = false;