interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

And changed unusedIDs to use uiprivArray. Now we can transplant this into testing.

This commit is contained in:
Pietro Gagliardi 2019-05-19 15:46:09 -04:00
parent 02b61c0156
commit 8e5a12b869
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/events.c
View File

@ -28,9 +28,7 @@ static int handlerCmp(const void *a, const void *b)
struct uiEvent { struct uiEvent {
uiEventOptions opts; uiEventOptions opts;
uiprivArray handlers; uiprivArray handlers;
int *unusedIDs; uiprivArray unusedIDs;
size_t unusedIDsLen;
size_t unusedIDsCap;
bool firing; bool firing;
}; };
@ -49,6 +47,7 @@ uiEvent *uiNewEvent(const uiEventOptions *options)
e = (uiEvent *) uiprivAlloc(sizeof (uiEvent), "uiEvent"); e = (uiEvent *) uiprivAlloc(sizeof (uiEvent), "uiEvent");
e->opts = *options; e->opts = *options;
uiprivArrayInit(e->handlers, struct handler, 32, "uiEvent handlers"); uiprivArrayInit(e->handlers, struct handler, 32, "uiEvent handlers");
uiprivArrayInit(e->unusedIDs, int, 32, "uiEvent handler unused IDs");
return e; return e;
} }
@ -89,9 +88,12 @@ int uiEventAddHandler(uiEvent *e, uiEventHandler handler, void *sender, void *da
return 0; return 0;
id = 0; id = 0;
if (e->unusedIDsLen > 0) { if (e->unusedIDs.len > 0) {
id = e->unusedIDs[e->unusedIDsLen - 1]; int *p;
e->unusedIDsLen--;
p = uiprivArrayAt(e->unusedIDs, int, e->unusedIDs.len - 1);
id = *p;
uiprivArrayDeleteItem(&(e->unusedIDs), p, 1);
} else if (e->handlers.len != 0) } else if (e->handlers.len != 0)
id = uiprivArrayAt(e->handlers, struct handler, e->handlers.len - 1)->id + 1; id = uiprivArrayAt(e->handlers, struct handler, e->handlers.len - 1)->id + 1;
@ -128,16 +130,7 @@ void uiEventDeleteHandler(uiEvent *e, int id)
return; return;
uiprivArrayDeleteItem(&(e->handlers), h, 1); uiprivArrayDeleteItem(&(e->handlers), h, 1);
*((int *) uiprivArrayAppend(&(e->unusedIDs), 1)) = id;
if (e->unusedIDsLen >= e->unusedIDsCap) {
e->unusedIDs = (int *) uiprivRealloc(e->unusedIDs,
e->unusedIDsCap * sizeof (int),
(e->unusedIDsCap + 32) * sizeof (int),
"uiEvent handler unused IDs");
e->unusedIDsCap += 32;
}
e->unusedIDs[e->unusedIDsLen] = id;
e->unusedIDsLen++;
} }
void uiEventFire(uiEvent *e, void *sender, void *args) void uiEventFire(uiEvent *e, void *sender, void *args)