external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-06-16 08:15:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

module: remove module_run_context

Browse source 
Store abort_fd directly in the module struct instead. This then allows
us to pass the module pointer as-is to the modules' run functions.
This commit is contained in:
Daniel Eklöf 2019-01-13 15:34:59 +01:00
parent acdeff3b6e
commit 76d135e257
13 changed files with 57 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/i3.c
View file

@ -367,9 +367,9 @@ handle_workspace_event(struct private *m, const struct json_object *json)
}
static int
run(struct module_run_context *ctx)
run(struct module *mod)
{
struct private *m = ctx->module->private;
struct private *m = mod->private;
struct sockaddr_un addr = {.sun_family = AF_UNIX};
{
@ -410,7 +410,7 @@ run(struct module_run_context *ctx)
while (true) {
struct pollfd fds[] = {
{.fd = ctx->abort_fd, .events = POLLIN},
{.fd = mod->abort_fd, .events = POLLIN},
{.fd = sock, .events = POLLIN}
};
@ -469,7 +469,7 @@ run(struct module_run_context *ctx)
break;
}
mtx_lock(&ctx->module->lock);
mtx_lock(&mod->lock);
switch (hdr->type) {
case I3_IPC_REPLY_TYPE_VERSION:
@ -482,12 +482,12 @@ run(struct module_run_context *ctx)
case I3_IPC_REPLY_TYPE_WORKSPACES:
handle_get_workspaces_reply(m, json);
ctx->module->bar->refresh(ctx->module->bar);
mod->bar->refresh(mod->bar);
break;
case I3_IPC_EVENT_WORKSPACE:
handle_workspace_event(m, json);
ctx->module->bar->refresh(ctx->module->bar);
mod->bar->refresh(mod->bar);
break;
case I3_IPC_EVENT_OUTPUT:
@ -502,7 +502,7 @@ run(struct module_run_context *ctx)
default: assert(false);
}
mtx_unlock(&ctx->module->lock);
mtx_unlock(&mod->lock);
json_object_put(json);
json_tokener_free(tokener);