gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

wmaker: Use the macro 'wlengthof' to get the number of element in an array

Browse Source 
The new macro 'wlengthof' from WUtil makes code easier to read than the
previous [sizeof() / sizeof([0]) ] construct.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2013-11-08 21:18:21 +01:00
committed by Carlos R. Mafra
parent a3b6b62049
commit be022d9623
5 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/wmspec.c
View File

@@ -198,8 +198,6 @@ static atomitem_t atomNames[] = {
{"UTF8_STRING", &utf8_string},
};
#define atomNr (sizeof(atomNames)/sizeof(atomNames[0]))
#define _NET_WM_STATE_REMOVE 0
#define _NET_WM_STATE_ADD 1
#define _NET_WM_STATE_TOGGLE 2
@@ -235,7 +233,7 @@ typedef struct NetData {
static void setSupportedHints(WScreen *scr)
{
Atom atom[atomNr];
Atom atom[wlengthof(atomNames)];
int i = 0;
/* set supported hints list */
@@ -534,19 +532,19 @@ void wNETWMInitStuff(WScreen *scr)
#ifdef HAVE_XINTERNATOMS
{
Atom atoms[atomNr];
char *names[atomNr];
Atom atoms[wlengthof(atomNames)];
char *names[wlengthof(atomNames)];
for (i = 0; i < atomNr; ++i)
for (i = 0; i < wlengthof(atomNames); ++i)
names[i] = atomNames[i].name;
XInternAtoms(dpy, &names[0], atomNr, False, atoms);
for (i = 0; i < atomNr; ++i)
XInternAtoms(dpy, &names[0], wlengthof(atomNames), False, atoms);
for (i = 0; i < wlengthof(atomNames); ++i)
*atomNames[i].atom = atoms[i];
}
#else
for (i = 0; i < atomNr; i++)
for (i = 0; i < wlengthof(atomNames); i++)
*atomNames[i].atom = XInternAtom(dpy, atomNames[i].name, False);
#endif
@@ -585,7 +583,7 @@ void wNETWMCleanup(WScreen *scr)
{
int i;
for (i = 0; i < atomNr; i++)
for (i = 0; i < wlengthof(atomNames); i++)
XDeleteProperty(dpy, scr->root_win, *atomNames[i].atom);
}