more modules updated

This commit is contained in:
Araq 2014-08-28 01:39:45 +02:00
commit 12d2a37519
6 changed files with 71 additions and 71 deletions

View file

@ -46,37 +46,37 @@ type
{.deprecated: [TEventArgs: EventArgs, TEventHandler: EventHandler,
TEventEmitter: EventEmitter, EInvalidEvent: EventError].}
proc initEventHandler*(name: string): TEventHandler =
proc initEventHandler*(name: string): EventHandler =
## Initializes an EventHandler with the specified name and returns it.
result.handlers = @[]
result.name = name
proc addHandler*(handler: var TEventHandler, func: proc(e: TEventArgs) {.closure.}) =
proc addHandler*(handler: var EventHandler, func: proc(e: EventArgs) {.closure.}) =
## Adds the callback to the specified event handler.
handler.handlers.add(func)
proc removeHandler*(handler: var TEventHandler, func: proc(e: TEventArgs) {.closure.}) =
proc removeHandler*(handler: var EventHandler, func: proc(e: EventArgs) {.closure.}) =
## Removes the callback from the specified event handler.
for i in countup(0, len(handler.handlers) -1):
if func == handler.handlers[i]:
handler.handlers.del(i)
break
proc containsHandler*(handler: var TEventHandler, func: proc(e: TEventArgs) {.closure.}): bool =
proc containsHandler*(handler: var EventHandler, func: proc(e: EventArgs) {.closure.}): bool =
## Checks if a callback is registered to this event handler.
return handler.handlers.contains(func)
proc clearHandlers*(handler: var TEventHandler) =
proc clearHandlers*(handler: var EventHandler) =
## Clears all of the callbacks from the event handler.
setLen(handler.handlers, 0)
proc getEventHandler(emitter: var TEventEmitter, event: string): int =
proc getEventHandler(emitter: var EventEmitter, event: string): int =
for k in 0..high(emitter.s):
if emitter.s[k].name == event: return k
return -1
proc on*(emitter: var TEventEmitter, event: string, func: proc(e: TEventArgs) {.closure.}) =
proc on*(emitter: var EventEmitter, event: string, func: proc(e: EventArgs) {.closure.}) =
## Assigns a event handler with the specified callback. If the event
## doesn't exist, it will be created.
var i = getEventHandler(emitter, event)
@ -87,17 +87,17 @@ proc on*(emitter: var TEventEmitter, event: string, func: proc(e: TEventArgs) {.
else:
addHandler(emitter.s[i], func)
proc emit*(emitter: var TEventEmitter, eventhandler: var TEventHandler,
args: TEventArgs) =
proc emit*(emitter: var EventEmitter, eventhandler: var EventHandler,
args: EventArgs) =
## Fires an event handler with specified event arguments.
for func in items(eventhandler.handlers): func(args)
proc emit*(emitter: var TEventEmitter, event: string, args: TEventArgs) =
proc emit*(emitter: var EventEmitter, event: string, args: EventArgs) =
## Fires an event handler with specified event arguments.
var i = getEventHandler(emitter, event)
if i >= 0:
emit(emitter, emitter.s[i], args)
proc initEventEmitter*(): TEventEmitter =
proc initEventEmitter*(): EventEmitter =
## Creates and returns a new EventEmitter.
result.s = @[]