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

WPrefs: 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:22 +01:00
committed by Carlos R. Mafra
parent be022d9623
commit 01c7390be1
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WPrefs.app/Appearance.c
View File

@@ -1111,7 +1111,7 @@ static void previewClick(XEvent * event, void *clientData)
switch (panel->oldTabItem) { switch (panel->oldTabItem) {
case 0: case 0:
for (i = 0; i < sizeof(previewPositions) / sizeof(previewPositions[0]); i++) { for (i = 0; i < wlengthof(previewPositions); i++) {
if (event->xbutton.x >= previewPositions[i].pos.x if (event->xbutton.x >= previewPositions[i].pos.x
&& event->xbutton.y >= previewPositions[i].pos.y && event->xbutton.y >= previewPositions[i].pos.y
&& event->xbutton.x < previewPositions[i].pos.x && event->xbutton.x < previewPositions[i].pos.x

6
WPrefs.app/Expert.c
View File

@@ -115,11 +115,11 @@ static void createPanel(Panel * p)
WMSetScrollViewHasHorizontalScroller(sv, False); WMSetScrollViewHasHorizontalScroller(sv, False);
f = WMCreateFrame(panel->box); f = WMCreateFrame(panel->box);
WMResizeWidget(f, 495, (sizeof(expert_options) / sizeof(expert_options[0])) * 25 + 8); WMResizeWidget(f, 495, wlengthof(expert_options) * 25 + 8);
WMSetFrameRelief(f, WRFlat); WMSetFrameRelief(f, WRFlat);
udb = WMGetStandardUserDefaults(); udb = WMGetStandardUserDefaults();
for (i = 0; i < sizeof(expert_options) / sizeof(expert_options[0]); i++) { for (i = 0; i < wlengthof(expert_options); i++) {
panel->swi[i] = WMCreateSwitchButton(f); panel->swi[i] = WMCreateSwitchButton(f);
WMResizeWidget(panel->swi[i], FRAME_WIDTH - 40, 25); WMResizeWidget(panel->swi[i], FRAME_WIDTH - 40, 25);
WMMoveWidget(panel->swi[i], 5, 5 + i * 25); WMMoveWidget(panel->swi[i], 5, 5 + i * 25);
@@ -152,7 +152,7 @@ static void storeDefaults(_Panel * panel)
WMUserDefaults *udb = WMGetStandardUserDefaults(); WMUserDefaults *udb = WMGetStandardUserDefaults();
int i; int i;
for (i = 0; i < sizeof(expert_options) / sizeof(expert_options[0]); i++) { for (i = 0; i < wlengthof(expert_options); i++) {
switch (expert_options[i].class) { switch (expert_options[i].class) {
case OPTION_WMAKER: case OPTION_WMAKER:
SetBoolForKey(WMGetButtonSelected(panel->swi[i]), expert_options[i].op_name); SetBoolForKey(WMGetButtonSelected(panel->swi[i]), expert_options[i].op_name);

2
WPrefs.app/KeyboardShortcuts.c
View File

@@ -509,7 +509,7 @@ static void createPanel(Panel * p)
WMSetListUserDrawProc(panel->actLs, paintItem); WMSetListUserDrawProc(panel->actLs, paintItem);
WMHangData(panel->actLs, panel); WMHangData(panel->actLs, panel);
for (i = 0; i < sizeof(keyOptions)/sizeof(keyOptions[0]); i++) { for (i = 0; i < wlengthof(keyOptions); i++) {
WMAddListItem(panel->actLs, _(keyOptions[i].title)); WMAddListItem(panel->actLs, _(keyOptions[i].title));
} }
WMSetListAction(panel->actLs, listClick, panel); WMSetListAction(panel->actLs, listClick, panel);

4
WPrefs.app/MouseSettings.c
View File

@@ -613,13 +613,13 @@ static void createPanel(Panel * p)
WMResizeWidget(panel->wheelP, 135, 20); WMResizeWidget(panel->wheelP, 135, 20);
WMMoveWidget(panel->wheelP, 95, 129); WMMoveWidget(panel->wheelP, 95, 129);
for (i = 0; i < sizeof(buttonActions) / sizeof(buttonActions[0]); i++) { for (i = 0; i < wlengthof(buttonActions); i++) {
WMAddPopUpButtonItem(panel->button1P, buttonActions[i]); WMAddPopUpButtonItem(panel->button1P, buttonActions[i]);
WMAddPopUpButtonItem(panel->button2P, buttonActions[i]); WMAddPopUpButtonItem(panel->button2P, buttonActions[i]);
WMAddPopUpButtonItem(panel->button3P, buttonActions[i]); WMAddPopUpButtonItem(panel->button3P, buttonActions[i]);
} }
for (i = 0; i < sizeof(wheelActions) / sizeof(wheelActions[0]); i++) { for (i = 0; i < wlengthof(wheelActions); i++) {
WMAddPopUpButtonItem(panel->wheelP, wheelActions[i]); WMAddPopUpButtonItem(panel->wheelP, wheelActions[i]);
} }

2
WPrefs.app/Workspace.c
View File

@@ -81,7 +81,7 @@ static void showData(_Panel * panel)
str = "center"; str = "center";
idx = 1; /* center */ idx = 1; /* center */
for (i = 0; i < sizeof(WSNamePositions) / sizeof(WSNamePositions[0]); i++) { for (i = 0; i < wlengthof(WSNamePositions); i++) {
if (strcasecmp(WSNamePositions[i], str) == 0) { if (strcasecmp(WSNamePositions[i], str) == 0) {
idx = i; idx = i;
break; break;