Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it so that the event-removal system in betawidget actually works. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5555 4a71c877-e1ca-e34f-864e-861f7616d084
master
Freddie Witherden 2008-07-14 23:41:53 +00:00
parent 86dd924881
commit 355d0c0760
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/betawidget/widget.c
View File

@ -422,6 +422,8 @@ int widgetAddEventHandlerImpl(widget *self, eventType type, callback handler,
{ {
eventTableEntry *entry = malloc(sizeof(eventTableEntry)); eventTableEntry *entry = malloc(sizeof(eventTableEntry));
// Assign the handler an id which is one higher than the current highest
entry->id = ((eventTableEntry *) vectorHead(self->eventVtbl))->id + 1;
entry->type = type; entry->type = type;
entry->callback = handler; entry->callback = handler;
entry->userData = userData; entry->userData = userData;
@ -438,7 +440,20 @@ int widgetAddEventHandlerImpl(widget *self, eventType type, callback handler,
*/ */
void widgetRemoveEventHandlerImpl(widget *self, int id) void widgetRemoveEventHandlerImpl(widget *self, int id)
{ {
vectorRemoveAt(self->eventVtbl, id); int i;
// Search for the handler with the id
for (i = 0; i < vectorSize(self->eventVtbl); i++)
{
eventTableEntry *handler = vectorAt(self->eventVtbl, i);
// If the handler matches, remove it
if (handler->id == id)
{
vectorRemoveAt(self->eventVtbl, i);
break;
}
}
} }
bool widgetFireCallbacksImpl(widget *self, event *evt) bool widgetFireCallbacksImpl(widget *self, event *evt)
@ -454,7 +469,7 @@ bool widgetFireCallbacksImpl(widget *self, event *evt)
if (handler->type == evt->type) if (handler->type == evt->type)
{ {
// Fire the callback // Fire the callback
ret = handler->callback(self, evt, i, handler->userData); ret = handler->callback(self, evt, handler->id, handler->userData);
// Break if the handler returned false // Break if the handler returned false
if (!ret) if (!ret)

8
lib/betawidget/widget.h
View File

@ -165,8 +165,16 @@ struct _eventMisc
*/ */
struct _eventTableEntry struct _eventTableEntry
{ {
/// The unique id of the event handler
int id;
/// The event for which the handler is registered for
eventType type; eventType type;
/// The method to call
callback callback; callback callback;
/// Pointer to user supplied data to pass to callback
void *userData; void *userData;
}; };