mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-x11: Use ARRAY_LENGTH macro from wayland-util.h

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-12-23 13:33:45 -05:00
parent 03cb5cf9a7
commit 09e2692403
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor-x11.c
+4 -6
View File
@@ -44,8 +44,6 @@
#include "compositor.h" #include "compositor.h"
#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
struct x11_compositor { struct x11_compositor {
struct wlsc_compositor base; struct wlsc_compositor base;
@@ -244,7 +242,7 @@ x11_output_set_wm_protocols(struct x11_output *output)
c->atom.wm_protocols, c->atom.wm_protocols,
XCB_ATOM_ATOM, XCB_ATOM_ATOM,
32, 32,
ARRAY_SIZE(list), ARRAY_LENGTH(list),
list); list);
} }
@@ -700,19 +698,19 @@ x11_compositor_get_resources(struct x11_compositor *c)
{ "CARDINAL", F(atom.cardinal) }, { "CARDINAL", F(atom.cardinal) },
}; };
xcb_intern_atom_cookie_t cookies[ARRAY_SIZE(atoms)]; xcb_intern_atom_cookie_t cookies[ARRAY_LENGTH(atoms)];
xcb_intern_atom_reply_t *reply; xcb_intern_atom_reply_t *reply;
xcb_pixmap_t pixmap; xcb_pixmap_t pixmap;
xcb_gc_t gc; xcb_gc_t gc;
int i; int i;
uint8_t data[] = { 0, 0, 0, 0 }; uint8_t data[] = { 0, 0, 0, 0 };
for (i = 0; i < ARRAY_SIZE(atoms); i++) for (i = 0; i < ARRAY_LENGTH(atoms); i++)
cookies[i] = xcb_intern_atom (c->conn, 0, cookies[i] = xcb_intern_atom (c->conn, 0,
strlen(atoms[i].name), strlen(atoms[i].name),
atoms[i].name); atoms[i].name);
for (i = 0; i < ARRAY_SIZE(atoms); i++) { for (i = 0; i < ARRAY_LENGTH(atoms); i++) {
reply = xcb_intern_atom_reply (c->conn, cookies[i], NULL); reply = xcb_intern_atom_reply (c->conn, cookies[i], NULL);
*(xcb_atom_t *) ((char *) c + atoms[i].offset) = reply->atom; *(xcb_atom_t *) ((char *) c + atoms[i].offset) = reply->atom;
free(reply); free(reply);