semfault/dwl
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

condense getatom and add note about error return

Browse source
This commit is contained in:
Devin J. Pohly 2020-08-03 12:22:02 -05:00
parent c12261d3a9
commit 27bbf9c14f
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dwl.c
View file

@ -765,13 +765,11 @@ Atom
getatom(xcb_connection_t *xc, const char *name) getatom(xcb_connection_t *xc, const char *name)
{ {
Atom atom = 0; Atom atom = 0;
xcb_generic_error_t *error;
xcb_intern_atom_cookie_t cookie; xcb_intern_atom_cookie_t cookie;
xcb_intern_atom_reply_t *reply; xcb_intern_atom_reply_t *reply;
cookie = xcb_intern_atom(xc, 0, strlen(name), name); cookie = xcb_intern_atom(xc, 0, strlen(name), name);
reply = xcb_intern_atom_reply(xc, cookie, &error); if ((reply = xcb_intern_atom_reply(xc, cookie, NULL)))
if (reply != NULL && error == NULL)
atom = reply->atom; atom = reply->atom;
free(reply); free(reply);
@ -1722,7 +1720,8 @@ xwaylandready(struct wl_listener *listener, void *data) {
return; return;
} }
/* collect atoms we are interested in */ /* Collect atoms we are interested in. If getatom returns 0, we will
* not detect that window type. */
netatom[NetWMWindowTypeDialog] = getatom(xc, "_NET_WM_WINDOW_TYPE_DIALOG"); netatom[NetWMWindowTypeDialog] = getatom(xc, "_NET_WM_WINDOW_TYPE_DIALOG");
netatom[NetWMWindowTypeSplash] = getatom(xc, "_NET_WM_WINDOW_TYPE_SPLASH"); netatom[NetWMWindowTypeSplash] = getatom(xc, "_NET_WM_WINDOW_TYPE_SPLASH");
netatom[NetWMWindowTypeUtility] = getatom(xc, "_NET_WM_WINDOW_TYPE_TOOLBAR"); netatom[NetWMWindowTypeUtility] = getatom(xc, "_NET_WM_WINDOW_TYPE_TOOLBAR");