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

win: rename find_toplevel_nocache to find_managed_window_or_parent 

My previous understanding of this function is incorrect. Hopefully I got
it right this time.

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2020-04-05 21:20:58 +01:00
parent 71e1a8a06f
commit 68fa49cf59
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/event.c
View File

@ -340,7 +340,7 @@ static inline void ev_reparent_notify(session_t *ps, xcb_reparent_notify_event_t
// Firstly, check if it's a known client window // Firstly, check if it's a known client window
if (!w_top) { if (!w_top) {
// If not, look for its frame window // If not, look for its frame window
auto w_real_top = find_toplevel_nocache(ps, ev->parent); auto w_real_top = find_managed_window_or_parent(ps, ev->parent);
// If found, and the client window has not been determined, or its // If found, and the client window has not been determined, or its
// frame may not have a correct client, continue // frame may not have a correct client, continue
if (w_real_top && (!w_real_top->client_win || if (w_real_top && (!w_real_top->client_win ||
@ -450,7 +450,7 @@ static inline void ev_property_notify(session_t *ps, xcb_property_notify_event_t
(const uint32_t[]){determine_evmask( (const uint32_t[]){determine_evmask(
ps, ev->window, WIN_EVMODE_UNKNOWN)}); ps, ev->window, WIN_EVMODE_UNKNOWN)});
auto w_top = find_toplevel_nocache(ps, ev->window); auto w_top = find_managed_window_or_parent(ps, ev->window);
// Initialize client_win as early as possible // Initialize client_win as early as possible
if (w_top && if (w_top &&
(!w_top->client_win || w_top->client_win == w_top->base.id) && (!w_top->client_win || w_top->client_win == w_top->base.id) &&

2
src/picom.c
View File

@ -180,7 +180,7 @@ static inline struct managed_win *find_win_all(session_t *ps, const xcb_window_t
if (!w) if (!w)
w = find_toplevel(ps, wid); w = find_toplevel(ps, wid);
if (!w) if (!w)
w = find_toplevel_nocache(ps, wid); w = find_managed_window_or_parent(ps, wid);
return w; return w;
} }

4
src/win.c
View File

@ -2189,13 +2189,13 @@ struct managed_win *find_toplevel(session_t *ps, xcb_window_t id) {
} }
/** /**
* Find out the WM frame of a client window by querying X. * Find a managed window that is, or is a parent of `wid`.
* *
* @param ps current session * @param ps current session
* @param wid window ID * @param wid window ID
* @return struct _win object of the found window, NULL if not found * @return struct _win object of the found window, NULL if not found
*/ */
struct managed_win *find_toplevel_nocache(session_t *ps, xcb_window_t wid) { struct managed_win *find_managed_window_or_parent(session_t *ps, xcb_window_t wid) {
// TODO this should probably be an "update tree", then find_toplevel. // TODO this should probably be an "update tree", then find_toplevel.
// current approach is a bit more "racy" // current approach is a bit more "racy"
struct win *w = NULL; struct win *w = NULL;

4
src/win.h
View File

@ -402,13 +402,13 @@ struct managed_win *find_managed_win(session_t *ps, xcb_window_t id);
struct win *find_win(session_t *ps, xcb_window_t id); struct win *find_win(session_t *ps, xcb_window_t id);
struct managed_win *find_toplevel(session_t *ps, xcb_window_t id); struct managed_win *find_toplevel(session_t *ps, xcb_window_t id);
/** /**
* Find out the WM frame of a client window by querying X. * Find a managed window that is, or is a parent of `wid`.
* *
* @param ps current session * @param ps current session
* @param wid window ID * @param wid window ID
* @return struct _win object of the found window, NULL if not found * @return struct _win object of the found window, NULL if not found
*/ */
struct managed_win *find_toplevel_nocache(session_t *ps, xcb_window_t wid); struct managed_win *find_managed_window_or_parent(session_t *ps, xcb_window_t wid);
/** /**
* Check if a window is a fullscreen window. * Check if a window is a fullscreen window.