A bit more xcb conversion

None -> XCB_NONE
Window -> xcb_window_t
Atom -> xcb_atom_t

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui
2018-12-27 20:45:38 +00:00
parent 86e744345e
commit 51d03132bf
11 changed files with 203 additions and 201 deletions

View File

@ -84,7 +84,7 @@ struct win {
// Core members
/// ID of the top-level frame window.
Window id;
xcb_window_t id;
/// Window attributes.
xcb_get_window_attributes_reply_t a;
xcb_get_geometry_reply_t g;
@ -146,7 +146,7 @@ struct win {
// Client window related members
/// ID of the top-level client window of the window.
Window client_win;
xcb_window_t client_win;
/// Type of the window.
wintype_t window_type;
/// Whether it looks like a WM window. We consider a window WM window if
@ -154,9 +154,9 @@ struct win {
/// redirected itself.
bool wmwin;
/// Leader window ID of the window.
Window leader;
xcb_window_t leader;
/// Cached topmost window ID of the window.
Window cache_leader;
xcb_window_t cache_leader;
// Focus-related members
/// Whether the window is to be considered focused.
@ -281,10 +281,10 @@ void win_on_factor_change(session_t *ps, win *w);
void calc_win_size(session_t *ps, win *w);
void calc_shadow_geometry(session_t *ps, win *w);
void win_upd_wintype(session_t *ps, win *w);
void win_mark_client(session_t *ps, win *w, Window client);
void win_mark_client(session_t *ps, win *w, xcb_window_t client);
void win_unmark_client(session_t *ps, win *w);
void win_recheck_client(session_t *ps, win *w);
Window win_get_leader_raw(session_t *ps, win *w, int recursions);
xcb_window_t win_get_leader_raw(session_t *ps, win *w, int recursions);
bool win_get_class(session_t *ps, win *w);
void win_calc_opacity(session_t *ps, win *w);
void win_calc_dim(session_t *ps, win *w);
@ -332,8 +332,8 @@ region_t win_get_region_noframe_local_by_val(win *w);
* Retrieve frame extents from a window.
*/
void
win_update_frame_extents(session_t *ps, win *w, Window client);
bool add_win(session_t *ps, Window id, Window prev);
win_update_frame_extents(session_t *ps, win *w, xcb_window_t client);
bool add_win(session_t *ps, xcb_window_t id, xcb_window_t prev);
/**
* Set fade callback of a window, and possibly execute the previous
@ -361,7 +361,7 @@ void win_ev_stop(session_t *ps, win *w);
*
* This function updates w->cache_leader if necessary.
*/
static inline Window
static inline xcb_window_t
win_get_leader(session_t *ps, win *w) {
return win_get_leader_raw(ps, w, 0);
}