diff options
| -rw-r--r-- | ewmh/ewmh.c.m4 | 30 | ||||
| -rw-r--r-- | ewmh/xcb_ewmh.h.m4 | 8 |
2 files changed, 19 insertions, 19 deletions
diff --git a/ewmh/ewmh.c.m4 b/ewmh/ewmh.c.m4 index 8b7747c..7192ee6 100644 --- a/ewmh/ewmh.c.m4 +++ b/ewmh/ewmh.c.m4 @@ -1,5 +1,5 @@ /* - * Copyright © 2009 Arnaud Fontaine <arnau@mini-dweeb.org> + * Copyright © 2009-2011 Arnaud Fontaine <arnau@debian.org> * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -545,8 +545,8 @@ xcb_ewmh_init_atoms(xcb_connection_t *c, /* First, send InternAtom request for all Atoms except _NET_WM_CM_Sn */ for(atom_nbr = 0; atom_nbr < NB_EWMH_ATOMS; atom_nbr++) ewmh_cookies[atom_nbr] = xcb_intern_atom(ewmh->connection, 0, - ewmh_atoms[atom_nbr].name_len, - ewmh_atoms[atom_nbr].name); + ewmh_atoms[atom_nbr].name_len, + ewmh_atoms[atom_nbr].name); /* Then, send InternAtom requests for _NET_WM_CM_Sn and compute _NET_WM_CM_Sn according to the screen number 'n' */ @@ -555,13 +555,13 @@ xcb_ewmh_init_atoms(xcb_connection_t *c, char wm_cm_sn[32]; const int wm_cm_sn_len = snprintf(wm_cm_sn, 32, "_NET_WM_CM_S%d", - screen_nbr); + screen_nbr); assert(wm_cm_sn_len > 0 && wm_cm_sn_len < 32); ewmh_cookies[atom_nbr++] = xcb_intern_atom(ewmh->connection, 0, - wm_cm_sn_len, - wm_cm_sn); + wm_cm_sn_len, + wm_cm_sn); } return ewmh_cookies; @@ -580,15 +580,15 @@ xcb_ewmh_init_atoms_replies(xcb_ewmh_connection_t *ewmh, for(atom_nbr = 0; atom_nbr < NB_EWMH_ATOMS + ewmh->nb_screens; atom_nbr++) if((reply = xcb_intern_atom_reply(ewmh->connection, ewmh_cookies[atom_nbr], e))) { - if(ret) - { - if(atom_nbr < NB_EWMH_ATOMS) - *((xcb_atom_t *) (((char *) ewmh) + ewmh_atoms[atom_nbr].m_offset)) = reply->atom; - else - ewmh->_NET_WM_CM_Sn[screen_nbr++] = reply->atom; - } - - free(reply); + if(ret) + { + if(atom_nbr < NB_EWMH_ATOMS) + *((xcb_atom_t *) (((char *) ewmh) + ewmh_atoms[atom_nbr].m_offset)) = reply->atom; + else + ewmh->_NET_WM_CM_Sn[screen_nbr++] = reply->atom; + } + + free(reply); } else ret = 0; diff --git a/ewmh/xcb_ewmh.h.m4 b/ewmh/xcb_ewmh.h.m4 index bb85797..676e700 100644 --- a/ewmh/xcb_ewmh.h.m4 +++ b/ewmh/xcb_ewmh.h.m4 @@ -2,7 +2,7 @@ #define __XCB_EWMH_H__ /* - * Copyright (C) 2009 Arnaud Fontaine <arnau@mini-dweeb.org> + * Copyright (C) 2009-2011 Arnaud Fontaine <arnau@debian.org> * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -864,7 +864,7 @@ xcb_ewmh_get_number_of_desktops_reply(xcb_ewmh_connection_t *ewmh, static inline xcb_void_cookie_t xcb_ewmh_request_change_number_of_desktops(xcb_ewmh_connection_t *ewmh, - int screen_nbr, + int screen_nbr, uint32_t new_number_of_desktops) { return xcb_ewmh_send_client_message(ewmh->connection, XCB_NONE, @@ -1684,11 +1684,11 @@ xcb_void_cookie_t xcb_ewmh_request_restack_window(xcb_ewmh_connection_t *ewmh, static inline xcb_void_cookie_t xcb_ewmh_request_frame_extents(xcb_ewmh_connection_t *ewmh, - int screen_nbr, + int screen_nbr, xcb_window_t client_window) { return xcb_ewmh_send_client_message(ewmh->connection, client_window, - ewmh->screens[screen_nbr]->root, + ewmh->screens[screen_nbr]->root, ewmh->_NET_REQUEST_FRAME_EXTENTS, 0, NULL); } |