core: Disarm function should take context/user data too Since functions are static and what makes "function for this context" is a context pointer, disarm functions too have to take that.

Changes

7 changed files (+50/-26)

• core/src/App.zig
  • @@ -364,9 +364,9 @@ // TODO: Notify error to caller
    capi.internal.on_server_change.add(OnServerChange.init(cb, userdata)) catch {}; } - pub fn onServerChangeDisarm(capi_ptr: ?*CApi, cb: OnServerChange.Fn) callconv(.C) void { + pub fn onServerChangeDisarm(capi_ptr: ?*CApi, cb: OnServerChange.Fn, userdata: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; - capi.internal.on_server_change.remove(cb); + capi.internal.on_server_change.remove(OnServerChange.init(cb, userdata)); } pub fn onConnectionChange(capi_ptr: ?*CApi, cb: OnConnectionChange.Fn, userdata: callback.UserData) callconv(.C) void {
  • @@ -375,9 +375,9 @@ // TODO: Notify error to caller
    capi.internal.on_connection_change.add(OnConnectionChange.init(cb, userdata)) catch {}; } - pub fn onConnectionChangeDisarm(capi_ptr: ?*CApi, cb: OnConnectionChange.Fn) callconv(.C) void { + pub fn onConnectionChangeDisarm(capi_ptr: ?*CApi, cb: OnConnectionChange.Fn, userdata: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; - capi.internal.on_connection_change.remove(cb); + capi.internal.on_connection_change.remove(OnConnectionChange.init(cb, userdata)); } pub fn onRestoreComplete(capi_ptr: ?*CApi, cb: OnRestoreComplete.Fn, userdata: callback.UserData) callconv(.C) void {
  • @@ -386,9 +386,9 @@ // TODO: Notify error to caller
    capi.internal.on_restore_complete.add(OnRestoreComplete.init(cb, userdata)) catch {}; } - pub fn onRestoreCompleteDisarm(capi_ptr: ?*CApi, cb: OnRestoreComplete.Fn) callconv(.C) void { + pub fn onRestoreCompleteDisarm(capi_ptr: ?*CApi, cb: OnRestoreComplete.Fn, userdata: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; - capi.internal.on_restore_complete.remove(cb); + capi.internal.on_restore_complete.remove(OnRestoreComplete.init(cb, userdata)); } };
• core/src/App/Server.zig
  • @@ -204,9 +204,9 @@ // TODO: Notify error to caller
    capi.internal.on_zone_add.add(OnZoneAdd.init(cb, userdata)) catch {}; } - pub fn onZoneAddDisarm(capi_ptr: ?*CApi, cb: OnZoneAdd.Fn) callconv(.C) void { + pub fn onZoneAddDisarm(capi_ptr: ?*CApi, cb: OnZoneAdd.Fn, userdata: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; - capi.internal.on_zone_add.remove(cb); + capi.internal.on_zone_add.remove(OnZoneAdd.init(cb, userdata)); } pub fn onZoneListLoadingChange(capi_ptr: ?*CApi, cb: OnZoneListLoadingChange.Fn, userdata: callback.UserData) callconv(.C) void {
  • @@ -215,8 +215,8 @@ // TODO: Notify error to caller
    capi.internal.on_zone_list_loading_change.add(OnZoneListLoadingChange.init(cb, userdata)) catch {}; } - pub fn onZoneListLoadingChangeDisarm(capi_ptr: ?*CApi, cb: OnZoneListLoadingChange.Fn) callconv(.C) void { + pub fn onZoneListLoadingChangeDisarm(capi_ptr: ?*CApi, cb: OnZoneListLoadingChange.Fn, userdata: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; - capi.internal.on_zone_list_loading_change.remove(cb); + capi.internal.on_zone_list_loading_change.remove(OnZoneListLoadingChange.init(cb, userdata)); } };
• core/src/App/Server/Zone.zig
  • @@ -95,9 +95,9 @@ // TODO: Notify error to caller
    capi.internal.on_change_callbacks.add(OnChange.init(cb, userdata)) catch {}; } - pub fn onChangeDisarm(capi_ptr: ?*CApi, cb: OnChange.Fn) callconv(.C) void { + pub fn onChangeDisarm(capi_ptr: ?*CApi, cb: OnChange.Fn, userdata: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; - capi.internal.on_change_callbacks.remove(cb); + capi.internal.on_change_callbacks.remove(OnChange.init(cb, userdata)); } pub fn onDelete(capi_ptr: ?*CApi, cb: OnDelete.Fn, userdata: callback.UserData) callconv(.C) void {
  • @@ -106,8 +106,8 @@ // TODO: Notify error to caller
    capi.internal.on_delete_callbacks.add(OnDelete.init(cb, userdata)) catch {}; } - pub fn onDeleteDisarm(capi_ptr: ?*CApi, cb: OnDelete.Fn) callconv(.C) void { + pub fn onDeleteDisarm(capi_ptr: ?*CApi, cb: OnDelete.Fn, userdata: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; - capi.internal.on_delete_callbacks.remove(cb); + capi.internal.on_delete_callbacks.remove(OnDelete.init(cb, userdata)); } };
• core/src/App/ServerSelector.zig
  • @@ -188,8 +188,8 @@ std.log.err("Failed to register callback: {s}", .{@errorName(err)});
    }; } - pub fn onChangeDisarm(capi_ptr: ?*CApi, cb: OnChange.Fn) callconv(.C) void { + pub fn onChangeDisarm(capi_ptr: ?*CApi, cb: OnChange.Fn, userdata: callback.UserData) callconv(.C) void { const capi = capi_ptr orelse return; - capi.internal.on_change_callbacks.remove(cb); + capi.internal.on_change_callbacks.remove(OnChange.init(cb, userdata)); } };
• core/src/App/callback.zig
  • @@ -49,9 +49,9 @@ pub fn add(self: *Store, cb: Self) std.mem.Allocator.Error!void {
    try self.cbs.append(cb); } - pub fn remove(self: *Store, f: Fn) void { + pub fn remove(self: *Store, cb: Self) void { for (self.cbs.items.len..0) |i| { - if (self.cbs.items[i].callback == f) { + if (self.cbs.items[i].callback == cb.callback and self.cbs.items[i].userdata == cb.userdata) { _ = self.cbs.orderedRemove(i); } }
• core/src/lib.h
  • @@ -51,11 +51,11 @@ } plac_app_server_zone;
    typedef void (*plac_cb_zone_change)(void*); void plac_app_server_zone_on_change(plac_app_server_zone*, plac_cb_zone_change, void*); - void plac_app_server_zone_on_change_disarm(plac_app_server_zone*, plac_cb_zone_change); + void plac_app_server_zone_on_change_disarm(plac_app_server_zone*, plac_cb_zone_change, void*); typedef void (*plac_cb_zone_remove)(void*); void plac_app_server_zone_on_remove(plac_app_server_zone*, plac_cb_zone_remove, void*); - void plac_app_server_zone_on_remove_disarm(plac_app_server_zone*, plac_cb_zone_remove); + void plac_app_server_zone_on_remove_disarm(plac_app_server_zone*, plac_cb_zone_remove, void*); /* App.Server.ZoneListLoading */
  • @@ -99,11 +99,11 @@ void plac_app_server_load_zones(plac_app_server*);
    typedef void (*plac_cb_zone_add)(plac_app_server_zone*, void*); void plac_app_server_on_zone_add(plac_app_server*, plac_cb_zone_add, void*); - void plac_app_server_on_zone_add_disarm(plac_app_server*, plac_cb_zone_add); + void plac_app_server_on_zone_add_disarm(plac_app_server*, plac_cb_zone_add, void*); typedef void (*plac_cb_zone_list_loading_change)(void*); void plac_app_server_on_zone_list_loading_change(plac_app_server*, plac_cb_zone_list_loading_change, void*); - void plac_app_server_on_zone_list_loading_change_disarm(plac_app_server*, plac_cb_zone_list_loading_change); + void plac_app_server_on_zone_list_loading_change_disarm(plac_app_server*, plac_cb_zone_list_loading_change, void*); /* App.ServerSelector.Entry */
  • @@ -172,7 +172,7 @@ * Appends a callback that will be invoked everytime "plac_app_server_selector" changes.
    */ typedef void (*plac_cb_server_selector_change)(void*); void plac_app_server_selector_on_change(plac_app_server_selector*, plac_cb_server_selector_change, void*); - void plac_app_server_selector_on_change_disarm(plac_app_server_selector*, plac_cb_server_selector_change); + void plac_app_server_selector_on_change_disarm(plac_app_server_selector*, plac_cb_server_selector_change, void*); /* App.ConnectionState */
  • @@ -290,14 +290,14 @@ * Event fired when "server" field changes (connect/disconnect).
    */ typedef void (*plac_cb_server_change)(void*); void plac_app_on_server_change(plac_app*, plac_cb_server_change, void*); - void plac_app_on_server_change_disarm(plac_app*, plac_cb_server_change); + void plac_app_on_server_change_disarm(plac_app*, plac_cb_server_change, void*); /** * Event fired when "connection" field changes. */ typedef void (*plac_cb_connection_change)(void*); void plac_app_on_connection_change(plac_app*, plac_cb_connection_change, void*); - void plac_app_on_connection_change_disarm(plac_app*, plac_cb_connection_change); + void plac_app_on_connection_change_disarm(plac_app*, plac_cb_connection_change, void*); /** * Event fired when `plac_app_restore_state` finished its job, regardless of state
  • @@ -305,6 +305,6 @@ * was restored or not.
    */ typedef void (*plac_cb_restore_complete)(void*); void plac_app_on_restore_complete(plac_app*, plac_cb_restore_complete, void*); - void plac_app_on_restore_complete_disarm(plac_app*, plac_cb_restore_complete); + void plac_app_on_restore_complete_disarm(plac_app*, plac_cb_restore_complete, void*); #endif
• core/src/lib.vapi
  • @@ -45,8 +45,14 @@
    [CCode (cname = "plac_app_server_zone_on_change")] public void on_change (OnChange f); + [CCode (cname = "plac_app_server_zone_on_change_disarm")] + public void on_change_disarm (OnChange f); + [CCode (cname = "plac_app_server_zone_on_remove")] public void on_remove (OnRemove f); + + [CCode (cname = "plac_app_server_zone_on_remove_disarm")] + public void on_remove_disarm (OnRemove f); } [CCode (
  • @@ -88,8 +94,14 @@
    [CCode (cname = "plac_app_server_on_zone_add")] public void on_zone_add (OnZoneAdd f); + [CCode (cname = "plac_app_server_on_zone_add_disarm")] + public void on_zone_add_disarm (OnZoneAdd f); + [CCode (cname = "plac_app_server_on_zone_list_loading_change")] public void on_zone_list_loading_change (OnZoneListLoadingChange f); + + [CCode (cname = "plac_app_server_on_zone_list_loading_change_disarm")] + public void on_zone_list_loading_change_disarm (OnZoneListLoadingChange f); } [CCode (cname = "plac_app_server_selector_entry", free_function = "")]
  • @@ -136,6 +148,9 @@ public void load();
    [CCode (cname = "plac_app_server_selector_on_change")] public void on_change (OnChange f); + + [CCode (cname = "plac_app_server_selector_on_change_disarm")] + public void on_change_disarm (OnChange f); } [CCode (
  • @@ -189,10 +204,19 @@
    [CCode (cname = "plac_app_on_server_change")] public void on_server_change (OnServerChange f); + [CCode (cname = "plac_app_on_server_change_disarm")] + public void on_server_change_disarm (OnServerChange f); + [CCode (cname = "plac_app_on_connection_change")] public void on_connection_change (OnConnectionChange f); + [CCode (cname = "plac_app_on_connection_change_disarm")] + public void on_connection_change_disarm (OnConnectionChange f); + [CCode (cname = "plac_app_on_restore_complete")] public void on_restore_complete (OnRestoreComplete f); + + [CCode (cname = "plac_app_on_restore_complete_disarm")] + public void on_restore_complete_disarm (OnRestoreComplete f); } }