nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

root_atom_contents: handle CARDINAL atoms such as I3_PID

This commit is contained in:
Michael Stapelberg 2012-08-12 14:10:48 +02:00
parent 394b395455
commit b8e782c983
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libi3/root_atom_contents.c
View File

@ -28,7 +28,7 @@ char *root_atom_contents(const char *atomname) {
xcb_intern_atom_cookie_t atom_cookie; xcb_intern_atom_cookie_t atom_cookie;
xcb_intern_atom_reply_t *atom_reply; xcb_intern_atom_reply_t *atom_reply;
int screen; int screen;
char *socket_path; char *content;
if ((conn = xcb_connect(NULL, &screen)) == NULL || if ((conn = xcb_connect(NULL, &screen)) == NULL ||
xcb_connection_has_error(conn)) xcb_connection_has_error(conn))
@ -50,10 +50,17 @@ char *root_atom_contents(const char *atomname) {
prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL); prop_reply = xcb_get_property_reply(conn, prop_cookie, NULL);
if (prop_reply == NULL || xcb_get_property_value_length(prop_reply) == 0) if (prop_reply == NULL || xcb_get_property_value_length(prop_reply) == 0)
return NULL; return NULL;
if (asprintf(&socket_path, "%.*s", xcb_get_property_value_length(prop_reply), if (prop_reply->type == XCB_ATOM_CARDINAL) {
(char*)xcb_get_property_value(prop_reply)) == -1) /* We treat a CARDINAL as a >= 32-bit unsigned int. The only CARDINAL
return NULL; * we query is I3_PID, which is 32-bit. */
if (asprintf(&content, "%u", *((unsigned int*)xcb_get_property_value(prop_reply))) == -1)
return NULL;
} else {
if (asprintf(&content, "%.*s", xcb_get_property_value_length(prop_reply),
(char*)xcb_get_property_value(prop_reply)) == -1)
return NULL;
}
xcb_disconnect(conn); xcb_disconnect(conn);
return socket_path; return content;
} }