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

WMaker: rationalised the use of flags for window icons in the switchpanel

Browse Source 
The flags were stored as 'char' but it is more logical to use int which is
"the natural size for integer on the host" and may help future evolution
if new flags are added;

The array is created with an initial size consistent with the number of
element we feed it with in 'makeWindowFlagsArray', this avoids a bunch
of realloc;

Fixed the type conversion that was not right, as pointed by clang.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-05-09 21:29:10 +02:00
committed by Carlos R. Mafra
parent 51ad8b7dc1
commit 9f8363dc14
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/switchpanel.c
View File

@@ -109,8 +109,8 @@ static void changeImage(WSwitchPanel *panel, int idecks, int selected, Bool dim,
{
WMFrame *icon = NULL;
RImage *image = NULL;
char flags = 0;
char desired = 0;
int flags;
int desired = 0;
/* This whole function is a no-op if we aren't drawing the panel */
if (!wPreferences.swtileImage)
@@ -118,7 +118,7 @@ static void changeImage(WSwitchPanel *panel, int idecks, int selected, Bool dim,
icon = WMGetFromArray(panel->icons, idecks);
image = WMGetFromArray(panel->images, idecks);
flags = (char) (uintptr_t) WMGetFromArray(panel->flags, idecks);
flags = (int) (uintptr_t) WMGetFromArray(panel->flags, idecks);
if (selected)
desired |= ICON_SELECTED;
@@ -227,7 +227,7 @@ static void scrollIcons(WSwitchPanel *panel, int delta)
for (i = panel->firstVisible; i < panel->firstVisible + panel->visibleCount; i++) {
if (i == panel->current)
continue;
dim = ((char) (uintptr_t) WMGetFromArray(panel->flags, i) & ICON_DIM);
dim = ((int) (uintptr_t) WMGetFromArray(panel->flags, i) & ICON_DIM);
changeImage(panel, i, 0, dim, True);
}
}
@@ -403,11 +403,11 @@ static WMArray *makeWindowListArray(WWindow *curwin, int include_unmapped, Bool
static WMArray *makeWindowFlagsArray(int count)
{
WMArray *flags = WMCreateArray(1);
WMArray *flags = WMCreateArray(count);
int i;
for (i = 0; i < count; i++)
WMAddToArray(flags, (char) 0);
WMAddToArray(flags, (void *) 0);
return flags;
}