cvsimport

This commit is contained in:
okan
2013-07-10 14:15:58 +00:00
10 changed files with 143 additions and 127 deletions

View File

@@ -291,7 +291,7 @@ xu_ewmh_net_client_list(struct screen_ctx *sc)
if (i == 0)
return;
winlist = xmalloc(i * sizeof(*winlist));
winlist = xcalloc(i, sizeof(*winlist));
TAILQ_FOREACH(cc, &Clientq, entry)
winlist[j++] = cc->win;
XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_CLIENT_LIST].atom,
@@ -382,7 +382,7 @@ xu_ewmh_get_net_wm_state(struct client_ctx *cc, int *n)
(u_char **)&p)) <= 0)
return (NULL);
state = xmalloc(*n * sizeof(Atom));
state = xcalloc(*n, sizeof(Atom));
memcpy(state, p, *n * sizeof(Atom));
XFree((char *)p);
@@ -393,7 +393,7 @@ void
xu_ewmh_handle_net_wm_state_msg(struct client_ctx *cc, int action,
Atom first, Atom second)
{
int i;
u_int i;
static struct handlers {
int atom;
int property;
@@ -449,7 +449,7 @@ xu_ewmh_set_net_wm_state(struct client_ctx *cc)
int n, i, j;
oatoms = xu_ewmh_get_net_wm_state(cc, &n);
atoms = xmalloc((n + _NET_WM_STATES_NITEMS) * sizeof(Atom));
atoms = xcalloc((n + _NET_WM_STATES_NITEMS), sizeof(Atom));
for (i = j = 0; i < n; i++) {
if (oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_HORZ].atom &&
oatoms[i] != ewmh[_NET_WM_STATE_MAXIMIZED_VERT].atom)