e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Trivial stuff (function renaming, avoid referencing ewin list, eliminate unnecessary casts). 

SVN revision: 15582
This commit is contained in:
Kim Woelders 2005-06-30 12:50:47 +00:00
parent f44983f8b5
commit cabad80399
26 changed files with 135 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/E.h
View File

@ -1721,9 +1721,12 @@ void fword(char *s, int num, char *wd);
int findLocalizedFile(char *fname);
/* finders.c */
EWin *FindEwinByBase(Window win);
EWin *FindEwinByChildren(Window win);
EWin *FindEwinByPartial(const char *win, int type);
EWin *EwinFindByPtr(const EWin * ewin);
EWin *EwinFindByFrame(Window win);
EWin *EwinFindByClient(Window win);
EWin *EwinFindByChildren(Window win);
EWin *EwinFindByString(const char *win, int type);
Button *FindButton(Window win);
ActionClass *FindActionClass(Window win);
Group **ListWinGroups(EWin * ewin, char group_select, int *num);
@ -1731,7 +1734,6 @@ EWin **ListWinGroupMembersForEwin(EWin * ewin, int action,
char nogroup, int *num);
EWin **EwinListTransients(EWin * ewin, int *num, int group);
EWin **EwinListTransientFor(EWin * ewin, int *num);
EWin **ListGroupMembers(Window win, int *num);
/* focus.c */
#define FOCUS_NOP 0
@ -1917,13 +1919,13 @@ void EstrInt2EncFree(const char *str, int want_utf8);
/* lists.c */
void ListsInit(int num);
void *FindItem(const char *name, int id, int find_by, int type);
void *FindItem(const void *name, int id, int find_by, int type);
void AddItem(const void *item, const char *name, int id,
int type);
void AddItemEnd(const void *item, const char *name, int id,
int type);
void *RemoveItem(const char *name, int id, int find_by, int type);
void *RemoveItemByPtr(const void *ptritem, int type);
void *RemoveItem(const void *name, int id, int find_by, int type);
void *RemoveItemByPtr(const void *item, int type);
void **ListItemType(int *num, int type);
char **ListItems(int *num, int type);
void **ListItemTypeID(int *num, int type, int id);

14
src/aclass.c
View File

@ -720,8 +720,7 @@ AclassConfigSave(void)
if (!Mode.keybinds_changed)
return;
ac = (ActionClass *) FindItem("KEYBINDINGS", 0, LIST_FINDBY_NAME,
LIST_TYPE_ACLASS_GLOBAL);
ac = FindItem("KEYBINDINGS", 0, LIST_FINDBY_NAME, LIST_TYPE_ACLASS_GLOBAL);
if (!ac || ac->num <= 0)
return;
@ -1092,8 +1091,7 @@ IPC_KeybindingsGet(const char *params __UNUSED__, Client * c __UNUSED__)
Action *aa;
int i, mod;
ac = (ActionClass *) FindItem("KEYBINDINGS", 0, LIST_FINDBY_NAME,
LIST_TYPE_ACLASS_GLOBAL);
ac = FindItem("KEYBINDINGS", 0, LIST_FINDBY_NAME, LIST_TYPE_ACLASS_GLOBAL);
if (!ac)
return;
@ -1295,9 +1293,7 @@ GrabButtonGrabs(EWin * ewin)
Action *aa;
unsigned int mod, button, mask;
ac = (ActionClass *) FindItem("BUTTONBINDINGS", 0, LIST_FINDBY_NAME,
LIST_TYPE_ACLASS);
ac = FindItem("BUTTONBINDINGS", 0, LIST_FINDBY_NAME, LIST_TYPE_ACLASS);
if (!ac)
return;
@ -1349,9 +1345,7 @@ UnGrabButtonGrabs(EWin * ewin)
Action *aa;
unsigned int mod, button;
ac = (ActionClass *) FindItem("BUTTONBINDINGS", 0, LIST_FINDBY_NAME,
LIST_TYPE_ACLASS);
ac = FindItem("BUTTONBINDINGS", 0, LIST_FINDBY_NAME, LIST_TYPE_ACLASS);
if (!ac)
return;

19
src/backgrounds.c
View File

@ -218,7 +218,7 @@ BackgroundDestroy(Background * bg)
return -1;
}
RemoveItem((char *)bg, 0, LIST_FINDBY_POINTER, LIST_TYPE_BACKGROUND);
RemoveItemByPtr(bg, LIST_TYPE_BACKGROUND);
BackgroundImagesRemove(bg);
if (bg->name)
@ -508,9 +508,8 @@ BackgroundApply(Background * bg, Window win, int setbg)
if (cm)
cm->ref_count--;
else
cm = (ColorModifierClass *) FindItem("BACKGROUND", 0,
LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem("BACKGROUND", 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
if (cm)
{
@ -1893,8 +1892,7 @@ CB_BGSortFile(Dialog * d __UNUSED__, int val __UNUSED__, void *data __UNUSED__)
/* remove them all from the list */
for (i = 0; i < num; i++)
RemoveItem((char *)(bglist[i]), 0, LIST_FINDBY_POINTER,
LIST_TYPE_BACKGROUND);
RemoveItemByPtr(bglist[i], LIST_TYPE_BACKGROUND);
Quicksort((void **)bglist, 0, num - 1,
(int (*)(void *d1, void *d2))BG_SortFileCompare);
for (i = 0; i < num; i++)
@ -1924,8 +1922,7 @@ CB_BGSortAttrib(Dialog * d __UNUSED__, int val __UNUSED__,
/* remove them all from the list */
for (i = 0; i < num; i++)
RemoveItem((char *)(bglist[i]), 0, LIST_FINDBY_POINTER,
LIST_TYPE_BACKGROUND);
RemoveItemByPtr(bglist[i], LIST_TYPE_BACKGROUND);
for (i = 0; i < num; i++)
{
Background *bg;
@ -1967,8 +1964,7 @@ CB_BGSortContent(Dialog * d __UNUSED__, int val __UNUSED__,
{
/* remove them all from the list */
for (i = 0; i < num; i++)
RemoveItem((char *)(bglist[i]), 0, LIST_FINDBY_POINTER,
LIST_TYPE_BACKGROUND);
RemoveItemByPtr(bglist[i], LIST_TYPE_BACKGROUND);
for (i = 0; i < num; i++)
{
Background *bg;
@ -2729,8 +2725,7 @@ IPC_BackgroundColormodifierGet(const char *params, Client * c)
return;
sscanf(params, "%1000s", param1);
bg = (Background *) FindItem(param1, 0, LIST_FINDBY_NAME,
LIST_TYPE_BACKGROUND);
bg = FindItem(param1, 0, LIST_FINDBY_NAME, LIST_TYPE_BACKGROUND);
Esnprintf(buf, sizeof(buf), "(null)");
if ((bg) && (bg->cmclass))
Esnprintf(buf, sizeof(buf), "%s", bg->cmclass->name);

2
src/borders.c
View File

@ -600,7 +600,7 @@ EwinSetBorderByName(EWin * ewin, const char *name)
{
Border *b;
b = (Border *) FindItem(name, 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
b = FindItem(name, 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
EwinSetBorder(ewin, b, 0);
}

25
src/cmclass.c
View File

@ -212,8 +212,7 @@ ColorModifierConfigLoad(FILE * fs)
switch (i1)
{
case CONFIG_CLOSE:
cm = (ColorModifierClass *) FindItem(name, 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem(name, 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
if (cm)
{
ModifyCMClass(name, rnum, rx, ry, gnum, gx, gy, bnum, bx, by);
@ -363,8 +362,7 @@ ModifyCMClass(char *name, int rnum, unsigned char *rpx, unsigned char *rpy,
{
ColorModifierClass *cm;
cm = (ColorModifierClass *) FindItem(name, 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem(name, 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
if (!cm)
return;
@ -462,9 +460,8 @@ IPC_ColorModifierClass(const char *params, Client * c)
{
ColorModifierClass *cm;
cm = (ColorModifierClass *) FindItem(param1, 0,
LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem(param1, 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
if (cm)
FreeCMClass(cm);
}
@ -475,9 +472,8 @@ IPC_ColorModifierClass(const char *params, Client * c)
{
ColorModifierClass *cm;
cm = (ColorModifierClass *) FindItem(param1, 0,
LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem(param1, 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
if (cm)
Esnprintf(buf, sizeof(buf), "%u references remain.",
cm->ref_count);
@ -512,8 +508,7 @@ IPC_ColormodifierDelete(const char *params, Client * c __UNUSED__)
return;
sscanf(params, "%1000s", param1);
cm = (ColorModifierClass *) FindItem(param1, 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem(param1, 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
Esnprintf(buf, sizeof(buf), "(null)");
if (cm)
FreeCMClass(cm);
@ -531,8 +526,7 @@ IPC_ColormodifierGet(const char *params, Client * c)
return;
sscanf(params, "%1000s", param1);
cm = (ColorModifierClass *) FindItem(param1, 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem(param1, 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
Esnprintf(buf, sizeof(buf), "(null)");
if (cm)
{
@ -582,8 +576,7 @@ IPC_ColormodifierSet(const char *params, Client * c __UNUSED__)
return;
sscanf(params, "%1000s", w);
cm = (ColorModifierClass *) FindItem(w, 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem(w, 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
name = Estrdup(w);
i = 2;
word(params, i++, w);

4
src/comms.c
View File

@ -161,7 +161,7 @@ ClientCommsGet(Client ** c, XClientMessageEvent * ev)
for (i = 0; i < 12; i++)
s[i] = ev->data.b[i + 8];
sscanf(s2, "%lx", &win);
cl = (Client *) FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_CLIENT);
cl = FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_CLIENT);
if (!cl)
{
cl = ClientCreate(win);
@ -364,7 +364,7 @@ CommsBroadcast(const char *s)
return;
for (i = 0; i < num; i++)
{
c = (Client *) FindItem(l[i], 0, LIST_FINDBY_NAME, LIST_TYPE_CLIENT);
c = FindItem(l[i], 0, LIST_FINDBY_NAME, LIST_TYPE_CLIENT);
if (c)
CommsSend(c, s);
}

2
src/desktops.c
View File

@ -372,7 +372,7 @@ DeskConfigure(Desk * d)
bg = desks.bg[d->num];
if (bg)
bg = FindItem((char *)bg, 0, LIST_FINDBY_POINTER, LIST_TYPE_BACKGROUND);
bg = FindItem(bg, 0, LIST_FINDBY_POINTER, LIST_TYPE_BACKGROUND);
if (!bg)
{
lst = (Background **) ListItemType(&num, LIST_TYPE_BACKGROUND);

6
src/dock.c
View File

@ -26,7 +26,7 @@
static void
DockappFindEmptySpotFor(EWin * eapp)
{
EWin **lst, *ewin;
EWin *const *lst, *ewin;
int num, i, j, x, y, w, h, done;
int step_right, step_down;
@ -52,7 +52,7 @@ DockappFindEmptySpotFor(EWin * eapp)
step_right = Conf.dock.startx < VRoot.w;
step_down = Conf.dock.starty < VRoot.h;
lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN);
lst = EwinListGetAll(&num);
for (j = 0; j < num; j++)
for (i = 0; i < num; i++)
{
@ -109,8 +109,6 @@ DockappFindEmptySpotFor(EWin * eapp)
}
}
}
if (lst)
Efree(lst);
if (x < 0 || y < 0 || x + w >= VRoot.w || y + h >= VRoot.h)
{

2
src/ewin-ops.c
View File

@ -1713,7 +1713,7 @@ EwinOpSetBorder(EWin * ewin, const char *name)
Border *b;
char shadechange = 0;
b = (Border *) FindItem(name, 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
b = FindItem(name, 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
if (!b)
return;

30
src/ewins.c
View File

@ -197,7 +197,7 @@ EwinDestroy(EWin * ewin)
Eprintf("EwinDestroy %#lx st=%d: %s\n", ewin->client.win, ewin->state,
EwinGetName(ewin));
RemoveItem(NULL, ewin->client.win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
RemoveItemByPtr(ewin, LIST_TYPE_EWIN);
EventCallbackUnregister(EoGetWin(ewin), 0, EwinHandleEventsToplevel, ewin);
EventCallbackUnregister(ewin->win_container, 0, EwinHandleEventsContainer,
ewin);
@ -317,7 +317,7 @@ GetEwinByCurrentPointer(void)
XQueryPointer(disp, DeskGetWin(DesksGetCurrent()), &rt, &ch, &x, &y, &dum,
&dum, &mr);
return FindEwinByBase(ch);
return EwinFindByFrame(ch);
}
EWin *
@ -656,8 +656,7 @@ AddToFamily(EWin * ewin, Window win)
EWin *const *lst2;
if (!ewin2)
ewin2 = FindItem(NULL, ewin->client.group, LIST_FINDBY_ID,
LIST_TYPE_EWIN);
ewin2 = EwinFindByClient(ewin->client.group);
if (!ewin2)
{
@ -955,7 +954,7 @@ EwinEventMapRequest(EWin * ewin, Window win)
else
{
/* Check if we are already managing it */
ewin = FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(win);
/* Some clients MapRequest more than once ?!? */
if (ewin)
@ -1083,7 +1082,7 @@ EwinEventConfigureRequest(EWin * ewin, XEvent * ev)
winrel = ev->xconfigurerequest.above;
if (ev->xconfigurerequest.value_mask & CWStackMode)
{
ewin2 = FindItem(NULL, winrel, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin2 = EwinFindByClient(winrel);
if (ewin2)
winrel = EoGetWin(ewin2);
xwc.sibling = winrel;
@ -1536,7 +1535,7 @@ EwinSlideIn(int val __UNUSED__, void *data)
EWin *ewin = data;
/* May be gone */
if (!FindItem((char *)ewin, 0, LIST_FINDBY_POINTER, LIST_TYPE_EWIN))
if (!EwinFindByPtr(ewin))
goto done;
SlideEwinTo(ewin, EoGetX(ewin), EoGetY(ewin), ewin->req_x, ewin->req_y,
@ -1836,8 +1835,7 @@ EwinHandleEventsRoot(XEvent * ev, void *prm __UNUSED__)
Eprintf("EwinHandleEventsRoot ConfigureRequest %#lx\n",
ev->xconfigurerequest.window);
#endif
ewin = FindItem(NULL, ev->xconfigurerequest.window, LIST_FINDBY_ID,
LIST_TYPE_EWIN);
ewin = EwinFindByClient(ev->xconfigurerequest.window);
EwinEventConfigureRequest(ewin, ev);
break;
case ResizeRequest:
@ -1845,8 +1843,7 @@ EwinHandleEventsRoot(XEvent * ev, void *prm __UNUSED__)
Eprintf("EwinHandleEventsRoot ResizeRequest %#lx\n",
ev->xresizerequest.window);
#endif
ewin = FindItem(NULL, ev->xresizerequest.window, LIST_FINDBY_ID,
LIST_TYPE_EWIN);
ewin = EwinFindByClient(ev->xresizerequest.window);
EwinEventResizeRequest(ewin, ev);
break;
case CirculateRequest:
@ -1859,27 +1856,24 @@ EwinHandleEventsRoot(XEvent * ev, void *prm __UNUSED__)
case UnmapNotify:
/* Catch clients unmapped after MapRequest but before being reparented */
ewin = FindItem(NULL, ev->xunmap.window, LIST_FINDBY_ID,
LIST_TYPE_EWIN);
ewin = EwinFindByClient(ev->xunmap.window);
if (ewin)
EwinEventUnmap(ewin);
break;
case DestroyNotify:
/* Catch clients destroyed after MapRequest but before being reparented */
ewin = FindItem(NULL, ev->xdestroywindow.window, LIST_FINDBY_ID,
LIST_TYPE_EWIN);
ewin = EwinFindByClient(ev->xdestroywindow.window);
#if 0 /* FIXME - Should not be here - Remove? */
if (!ewin)
ewin = FindEwinByBase(ev->xdestroywindow.window);
ewin = EwinFindByFrame(ev->xdestroywindow.window);
#endif
if (ewin)
EwinEventDestroy(ewin);
break;
case ReparentNotify:
ewin = FindItem(NULL, ev->xreparent.window, LIST_FINDBY_ID,
LIST_TYPE_EWIN);
ewin = EwinFindByClient(ev->xreparent.window);
if (ewin)
EwinEventReparent(ewin);
break;

2
src/ewmh.c
View File

@ -813,7 +813,7 @@ EWMH_ProcessClientMessage(XClientMessageEvent * ev)
/*
* The ones that do target an application window
*/
ewin = FindItem(NULL, ev->window, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(ev->window);
if (ewin == NULL)
{
/* Some misbehaving clients go here */

59
src/finders.c
View File

@ -23,7 +23,22 @@
#include "E.h"
EWin *
FindEwinByBase(Window win)
EwinFindByPtr(const EWin * ewin)
{
EWin *const *ewins;
int i, num;
ewins = EwinListGetAll(&num);
for (i = 0; i < num; i++)
{
if (ewin == ewins[i])
return ewins[i];
}
return NULL;
}
EWin *
EwinFindByFrame(Window win)
{
EWin *const *ewins;
int i, num;
@ -38,7 +53,22 @@ FindEwinByBase(Window win)
}
EWin *
FindEwinByChildren(Window win)
EwinFindByClient(Window win)
{
EWin *const *ewins;
int i, num;
ewins = EwinListGetAll(&num);
for (i = 0; i < num; i++)
{
if (win == ewins[i]->client.win)
return ewins[i];
}
return NULL;
}
EWin *
EwinFindByChildren(Window win)
{
EWin *const *ewins;
int i, j, num;
@ -63,7 +93,7 @@ FindEwinByChildren(Window win)
}
EWin *
FindEwinByPartial(const char *match, int type)
EwinFindByString(const char *match, int type)
{
EWin *ewin = NULL;
EWin *const *ewins;
@ -408,26 +438,3 @@ EwinListTransientFor(EWin * ewin, int *num)
*num = j;
return lst;
}
#if 0 /* Not used */
EWin **
ListGroupMembers(Window win, int *num)
{
EWin *const *ewins, **lst = NULL;
int i, j, n;
ewins = EwinListGetAll(&n);
j = 0;
for (i = 0; i < n; i++)
{
if (win == ewins[i]->client.group)
{
j++;
lst = Erealloc(lst, sizeof(EWin *) * j);
lst[j - 1] = ewins[i];
}
}
*num = j;
return lst;
}
#endif

11
src/focus.c
View File

@ -131,7 +131,7 @@ AutoraiseTimeout(int val, void *data __UNUSED__)
if (Conf.focus.mode == MODE_FOCUS_CLICK)
return;
ewin = FindItem("", val, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(val);
if (ewin)
RaiseEwin(ewin);
}
@ -141,7 +141,7 @@ ReverseTimeout(int val, void *data __UNUSED__)
{
EWin *ewin;
ewin = FindItem("", val, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(val);
if (ewin)
EwinListFocusRaise(ewin);
}
@ -325,8 +325,7 @@ doFocusToEwin(EWin * ewin, int why)
{
EWin *ewin2;
ewin2 = FindItem(NULL, ewin->client.transient_for,
LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin2 = EwinFindByClient(ewin->client.transient_for);
if ((ewin2) && (Mode.focuswin == ewin2))
do_focus = 2;
}
@ -570,9 +569,9 @@ FocusHandleClick(EWin * ewin, Window win)
#if 0
EWin *ewin;
ewin = FindEwinByChildren(win);
ewin = EwinFindByChildren(win);
if (!ewin)
ewin = FindEwinByBase(win);
ewin = EwinFindByFrame(win);
if (!ewin)
return;
#endif

4
src/gnome.c
View File

@ -766,7 +766,7 @@ GNOME_ProcessClientMessage(XClientMessageEvent * event)
}
if (event->message_type == a4)
{
ewin = FindItem(NULL, event->window, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(event->window);
if (ewin)
{
unsigned int val;
@ -780,7 +780,7 @@ GNOME_ProcessClientMessage(XClientMessageEvent * event)
}
if (event->message_type == a5)
{
ewin = FindItem(NULL, event->window, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(event->window);
if (!ewin)
return;
if (event->data.l[0] & WIN_STATE_FIXED_POSITION)

20
src/groups.c
View File

@ -221,8 +221,7 @@ RemoveEwinFromGroup(EWin * ewin, Group * g)
Erealloc(g->members, sizeof(EWin *) * g->num_members);
else
{
RemoveItem((char *)g, 0,
LIST_FINDBY_POINTER, LIST_TYPE_GROUP);
RemoveItemByPtr(g, LIST_TYPE_GROUP);
GroupDestroy(g);
}
@ -309,9 +308,8 @@ ShowHideWinGroups(EWin * ewin, Group * g, char onoff)
if (!gwins[i]->border->group_border_name)
continue;
b = (Border *) FindItem(gwins[i]->border->group_border_name,
0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
b = FindItem(gwins[i]->border->group_border_name,
0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
if (b)
gwins[i]->previous_border = gwins[i]->border;
}
@ -327,9 +325,8 @@ ShowHideWinGroups(EWin * ewin, Group * g, char onoff)
if (!gwins[i]->border->group_border_name)
continue;
b = (Border *) FindItem(gwins[i]->border->group_border_name,
0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
b = FindItem(gwins[i]->border->group_border_name,
0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
if (b)
gwins[i]->previous_border = gwins[i]->border;
}
@ -1000,9 +997,8 @@ SettingsDefaultGroupControl(void)
Dialog *d;
DItem *table, *di;
if ((d =
FindItem("CONFIGURE_DEFAULT_GROUP_CONTROL", 0, LIST_FINDBY_NAME,
LIST_TYPE_DIALOG)))
if ((d = FindItem("CONFIGURE_DEFAULT_GROUP_CONTROL", 0, LIST_FINDBY_NAME,
LIST_TYPE_DIALOG)))
{
SoundPlay("SOUND_SETTINGS_ACTIVE");
ShowDialog(d);
@ -1359,7 +1355,7 @@ IPC_GroupOps(const char *params, Client * c __UNUSED__)
if (!strcmp(windowid, "*"))
ewin = GetContextEwin();
else
ewin = FindEwinByChildren(win);
ewin = EwinFindByChildren(win);
if (!ewin)
{
IpcPrintf("Error: no such window: %8x", win);

2
src/icccm.c
View File

@ -48,7 +48,7 @@ ICCCM_ProcessClientMessage(XClientMessageEvent * event)
if (event->message_type == ECORE_X_ATOM_WM_CHANGE_STATE)
{
ewin = FindItem(NULL, event->window, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(event->window);
if (ewin == NULL)
return;

19
src/iclass.c
View File

@ -334,16 +334,14 @@ ImageclassPopulate(ImageClass * ic)
#if ENABLE_COLOR_MODIFIERS
if (!ic->colmod)
{
cm = (ColorModifierClass *) FindItem("ICLASS", 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem("ICLASS", 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
if (!cm)
cm = (ColorModifierClass *) FindItem("DEFAULT", 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm =
FindItem("DEFAULT", 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
ic->colmod = cm;
}
cm = (ColorModifierClass *) FindItem("NORMAL", 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem("NORMAL", 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
if (!cm)
cm = ic->colmod;
@ -352,8 +350,7 @@ ImageclassPopulate(ImageClass * ic)
ISTATE_SET_CM(norm.clicked, cm);
ISTATE_SET_CM(norm.disabled, cm);
cm = (ColorModifierClass *) FindItem("ACTIVE", 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem("ACTIVE", 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
if (!cm)
cm = ic->colmod;
@ -362,8 +359,7 @@ ImageclassPopulate(ImageClass * ic)
ISTATE_SET_CM(active.clicked, cm);
ISTATE_SET_CM(active.disabled, cm);
cm = (ColorModifierClass *) FindItem("STICKY", 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem("STICKY", 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
if (!cm)
cm = ic->colmod;
@ -372,8 +368,7 @@ ImageclassPopulate(ImageClass * ic)
ISTATE_SET_CM(sticky.clicked, cm);
ISTATE_SET_CM(sticky.disabled, cm);
cm = (ColorModifierClass *) FindItem("STICKY_ACTIVE", 0, LIST_FINDBY_NAME,
LIST_TYPE_COLORMODIFIER);
cm = FindItem("STICKY_ACTIVE", 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
if (!cm)
cm = ic->colmod;

2
src/iconify.c
View File

@ -397,7 +397,7 @@ IconboxDestroy(Iconbox * ib, int exiting)
{
int i;
RemoveItem((char *)ib, 0, LIST_FINDBY_POINTER, LIST_TYPE_ICONBOX);
RemoveItemByPtr(ib, LIST_TYPE_ICONBOX);
if (ib->name)
Efree(ib->name);

10
src/ipc.c
View File

@ -79,16 +79,16 @@ IpcFindEwin(const char *windowid)
if (isdigit(windowid[0]))
{
sscanf(windowid, "%x", &win);
return FindEwinByChildren(win);
return EwinFindByChildren(win);
}
if (windowid[0] == '+')
return FindEwinByPartial(windowid + 1, '+');
return EwinFindByString(windowid + 1, '+');
if (windowid[0] == '=')
return FindEwinByPartial(windowid + 1, '=');
return EwinFindByString(windowid + 1, '=');
return FindEwinByPartial(windowid, '=');
return EwinFindByString(windowid, '=');
}
static int
@ -736,7 +736,7 @@ IPC_Remember(const char *params, Client * c __UNUSED__)
window = 0;
sscanf(params, "%x", &window);
ewin = FindItem(NULL, window, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(window);
if (!ewin)
{
IpcPrintf("Error: Window not found: %#x\n", window);

8
src/lists.c
View File

@ -40,7 +40,7 @@ ListsInit(int num)
}
void *
FindItem(const char *name, int id, int find_by, int type)
FindItem(const void *name, int id, int find_by, int type)
{
List *ptr;
@ -76,7 +76,7 @@ FindItem(const char *name, int id, int find_by, int type)
{
while (ptr)
{
if (ptr->item == (void *)name)
if (ptr->item == name)
return ptr->item;
ptr = ptr->next;
}
@ -203,7 +203,7 @@ MoveItemToListBottom(const void *item, int type)
}
void *
RemoveItem(const char *name, int id, int find_by, int type)
RemoveItem(const void *name, int id, int find_by, int type)
{
List *ptr, *pptr;
void *p;
@ -274,7 +274,7 @@ RemoveItem(const char *name, int id, int find_by, int type)
{
while (ptr)
{
if (ptr->item == (void *)name)
if (ptr->item == name)
{
if (pptr)
pptr->next = ptr->next;

2
src/menus-misc.c
View File

@ -336,7 +336,7 @@ FileMenuUpdate(int val __UNUSED__, void *data)
if (!m)
return;
if (!FindItem((char *)m, 0, LIST_FINDBY_POINTER, LIST_TYPE_MENU))
if (!FindItem(m, 0, LIST_FINDBY_POINTER, LIST_TYPE_MENU))
return;
/* if the menu is up dont update */

22
src/menus.c
View File

@ -236,8 +236,7 @@ MenuShow(Menu * m, char noshow)
{
#if 0 /* FIXME - Why? */
if ((Mode.button) &&
FindItem((char *)Mode.button, 0, LIST_FINDBY_POINTER,
LIST_TYPE_BUTTON))
FindItem(Mode.button, 0, LIST_FINDBY_POINTER, LIST_TYPE_BUTTON))
{
ButtonDrawWithState(Mode.button, STATE_NORMAL);
}
@ -261,8 +260,8 @@ MenuShow(Menu * m, char noshow)
{
Border *b;
b = (Border *) FindItem(m->style->border_name, 0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
b = FindItem(m->style->border_name, 0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
if (b)
{
int width;
@ -501,7 +500,7 @@ MenuDestroy(Menu * m)
Esnprintf(s, sizeof(s), "__.%s", m->name);
RemoveTimerEvent(s);
RemoveItem((char *)m, 0, LIST_FINDBY_POINTER, LIST_TYPE_MENU);
RemoveItemByPtr(m, LIST_TYPE_MENU);
if (m->name)
Efree(m->name);
if (m->title)
@ -513,9 +512,8 @@ MenuDestroy(Menu * m)
{
if (m->items[i]->child)
{
if (FindItem
((char *)m->items[i]->child, 0, LIST_FINDBY_POINTER,
LIST_TYPE_MENU))
if (FindItem(m->items[i]->child, 0, LIST_FINDBY_POINTER,
LIST_TYPE_MENU))
MenuDestroy(m->items[i]->child);
}
if (m->items[i]->text)
@ -1536,7 +1534,7 @@ SubmenuShowTimeout(int val __UNUSED__, void *dat)
return;
m = data->m;
ewin = FindItem(NULL, m->win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(m->win);
if (!ewin)
return;
if (!EoIsShown(ewin))
@ -1544,7 +1542,7 @@ SubmenuShowTimeout(int val __UNUSED__, void *dat)
mi = data->mi;
MenuShow(mi->child, 1);
ewin2 = FindItem(NULL, mi->child->win, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin2 = EwinFindByClient(mi->child->win);
if (!ewin2)
return;
@ -1868,8 +1866,8 @@ MenuStyleConfigLoad(FILE * ConfigFile)
ms->border_name = Estrdup(s2);
b = (Border *) FindItem(ms->border_name, 0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
b = FindItem(ms->border_name, 0, LIST_FINDBY_NAME,
LIST_TYPE_BORDER);
if (b)
b->ref_count++;
}

3
src/pager.c
View File

@ -1279,8 +1279,7 @@ PagerHiwinEwin(int check)
if (!check || !phi->ewin)
return phi->ewin;
ewin = FindItem((char *)phi->ewin, 0, LIST_FINDBY_POINTER, LIST_TYPE_EWIN);
ewin = EwinFindByPtr(phi->ewin);
if (!ewin)
phi->ewin = NULL;

3
src/slideout.c
View File

@ -432,8 +432,7 @@ SlideoutsConfigLoad(FILE * fs)
{
Button *b;
b = (Button *) FindItem(s2, 0, LIST_FINDBY_NAME,
LIST_TYPE_BUTTON);
b = FindItem(s2, 0, LIST_FINDBY_NAME, LIST_TYPE_BUTTON);
if (b)
SlideoutAddButton(slideout, b);
}

9
src/snaps.c
View File

@ -71,7 +71,7 @@ static void
SnapshotDestroy(Snapshot * sn)
{
/* Just making sure */
sn = RemoveItem((char *)sn, 0, LIST_FINDBY_POINTER, LIST_TYPE_SNAPSHOT);
sn = RemoveItemByPtr(sn, LIST_TYPE_SNAPSHOT);
if (!sn)
return;
@ -483,7 +483,7 @@ CB_ApplySnap(Dialog * d, int val, void *data __UNUSED__)
if (val >= 2 || !sd)
goto done;
ewin = FindItem("", sd->client, LIST_FINDBY_ID, LIST_TYPE_EWIN);
ewin = EwinFindByClient(sd->client);
if (!ewin)
goto done;
@ -929,7 +929,7 @@ CB_RememberWindowSettings(Dialog * d __UNUSED__, int val __UNUSED__, void *data)
rd = (RememberWinList *) data;
/* Make sure its still there */
sn = FindItem((char *)rd->snap, 0, LIST_FINDBY_POINTER, LIST_TYPE_SNAPSHOT);
sn = FindItem(rd->snap, 0, LIST_FINDBY_POINTER, LIST_TYPE_SNAPSHOT);
if (!sn || !sn->used)
return;
@ -1444,8 +1444,7 @@ SnapshotEwinMatch(EWin * ewin)
{
Group *g;
g = (Group *) FindItem(NULL, sn->groups[i], LIST_FINDBY_ID,
LIST_TYPE_GROUP);
g = FindItem(NULL, sn->groups[i], LIST_FINDBY_ID, LIST_TYPE_GROUP);
if (!g)
{
BuildWindowGroup(&ewin, 1);

6
src/warp.c
View File

@ -151,7 +151,7 @@ WarpFocusShow(EWin * ewin)
{
wl = warplist + i;
if (!FindItem((char *)wl->ewin, 0, LIST_FINDBY_POINTER, LIST_TYPE_EWIN))
if (!EwinFindByPtr(wl->ewin))
wl->ewin = NULL;
if (wl->ewin)
{
@ -278,7 +278,7 @@ WarpFocus(int delta)
warpFocusIndex = (warpFocusIndex + warplist_num + delta) % warplist_num;
ewin = warplist[warpFocusIndex].ewin;
if (!FindItem((char *)ewin, 0, LIST_FINDBY_POINTER, LIST_TYPE_EWIN))
if (!EwinFindByPtr(ewin))
ewin = NULL;
if (!ewin)
return;
@ -303,7 +303,7 @@ WarpFocusClick(int ix)
return;
ewin = warplist[ix].ewin;
if (!FindItem((char *)ewin, 0, LIST_FINDBY_POINTER, LIST_TYPE_EWIN))
if (!EwinFindByPtr(ewin))
return;
RaiseEwin(ewin);