diff --git a/keybinding.c b/keybinding.c index b82176a..6fba4d0 100644 --- a/keybinding.c +++ b/keybinding.c @@ -225,7 +225,7 @@ swap_tile(struct cg_tile *tile, seat_set_focus(server->seat, swap_tile->view); ipc_send_event( tile->workspace->output->server, - "swap_tile(tile_id:%d,swap_tile_id:%d,workspace:%d,output:%s)", + "{\"event_name\":\"swap_tile\",\"tile_id\":\"%d\",\"swap_tile_id\":\"%d\",\"workspace\":\"%d\",\"output\":\"%s\"}", tile->id, swap_tile->id, tile->workspace->num + 1, tile->workspace->output->wlr_output->name); } @@ -372,8 +372,7 @@ resize(struct cg_tile *tile, const struct cg_tile *parent, int coord_offset, view_maximize(tile->view, tile); } ipc_send_event(tile->workspace->output->server, - "resize_tile(tile_id:%d,old_dims:[%d;%d;%d;%d],new_dims:[%d;" - "%d;%d;%d],workspace:%d,output:%s)", + "{\"event_name\":\"resize_tile\",\"tile_id\":\"%d\",\"old_dims\":\"[%d;%d;%d;%d]\",\"new_dims\":\"[%d;%d;%d;%d]\",\"workspace\":\"%d\",\"output\":\"%s\"}", tile->id, old_x, old_y, old_height, old_width, tile->tile.x, tile->tile.y, tile->tile.height, tile->tile.width, tile->workspace->num + 1, @@ -499,7 +498,7 @@ keybinding_workspace_fullscreen(struct cg_server *server) { seat_set_focus(server->seat, current_view); ipc_send_event(output->server, - "fullscreen(tile_id:%d,workspace:%d,output:%s)", + "{\"event_name\":\"fullscreen\",\"tile_id\":\"%d\",\"workspace\":\"%d\",\"output\":\"%s\"}", output->workspaces[output->curr_workspace]->focused_tile->id, output->workspaces[output->curr_workspace]->num + 1, output->wlr_output->name); @@ -593,7 +592,7 @@ keybinding_split_output(struct cg_output *output, bool vertical) { } ipc_send_event( output->server, - "split(tile_id:%d,new_tile_id:%d,workspace:%d,output:%s,vertical:%d)", + "{\"event_name\":\"split\",\"tile_id\":\"%d\",\"new_tile_id\":\"%d\",\"workspace\":\"%d\",\"output\":\"%s\",\"vertical\":\"%d\"}", curr_workspace->focused_tile->id, new_tile->id, curr_workspace->num + 1, curr_workspace->output->wlr_output->name, vertical); } @@ -609,7 +608,7 @@ keybinding_close_view(struct cg_view *view) { uint32_t ws = view->workspace->num; view->impl->close(view); ipc_send_event(outp->server, - "close(view_id:%d,tile_id:%d,workspace:%d,output:%s)", + "{\"event_name\":\"close\",\"view_id\":\"%d\",\"tile_id\":\"%d\",\"workspace\":\"%d\",\"output\":\"%s\"}", view_id, tile_id, ws + 1, outp->wlr_output->name); } @@ -659,7 +658,7 @@ keybinding_cycle_outputs(struct cg_server *server, bool reverse) { } set_output(server, output); ipc_send_event( - output->server, "cycle_outputs(old_output:%s,new_output:%s,reverse:%d)", + output->server, "{\"event_name\":\"cycle_outputs\",\"old_output\":\"%s\",\"new_output\":\"%s\",\"reverse\":\"%d\"}", old_output->wlr_output->name, output->wlr_output->name, reverse); } @@ -703,8 +702,7 @@ keybinding_cycle_views(struct cg_server *server, bool reverse) { next_view->link.prev, curr_workspace->focused_tile->view, link); seat_set_focus(server->seat, next_view); ipc_send_event(curr_workspace->output->server, - "cycle_views(old_view_id:%d,new_view_id:%d,tile_id:%d," - "workspace:%d,output:%s)", + "{\"event_name\":\"cycle_views\",\"old_view_id\":\"%d\",\"new_view_id\":\"%d\",\"tile_id\":\"%d\",\"workspace\":\"%d\",\"output\":\"%s\"}", current_view->id, next_view->id, next_view->tile->id, curr_workspace->num + 1, curr_workspace->output->wlr_output->name); @@ -725,7 +723,7 @@ keybinding_cycle_tiles(struct cg_server *server, bool reverse) { seat_set_focus(server->seat, next_view); ipc_send_event( output->server, - "cycle_tiles(old_tile_id:%d,new_tile_id:%d,workspace:%d,output:%s)", + "{\"event_name\":\"cycle_tiles\",\"old_tile_id\":\"%d\",\"new_tile_id\":\"%d\",\"workspace\":\"%d\",\"output\":\"%s\"}", old_tile->id, workspace->focused_tile->id, workspace->num + 1, output->wlr_output->name); } @@ -745,7 +743,7 @@ keybinding_switch_ws(struct cg_server *server, uint32_t ws) { server->curr_output->workspaces[ws]->focused_tile->view); message_printf(server->curr_output, "Workspace %d", ws + 1); ipc_send_event(output->server, - "switch_ws(old_workspace:%d,new_workspace:%d,output:%s)", + "{\"event_name\":\"switch_ws\",\"old_workspace\":\"%d\",\"new_workspace\":\"%d\",\"output\":\"%s\"}", old_ws + 1, ws + 1, output->wlr_output->name); return 0; } @@ -1084,7 +1082,7 @@ keybinding_move_view_to_cycle_output(struct cg_server *server, bool reverse) { } ipc_send_event( server, - "move_view_cycle_output(view_id:%d,old_output:%s,new_output:%s)", + "{\"event_name\":\"move_view_cycle_output\",\"view_id\":\"%d\",\"old_output\":\"%s\",\"new_output\":\"%s\"}", view->id, old_outp->wlr_output->name, server->curr_output->wlr_output->name); } @@ -1140,7 +1138,7 @@ keybinding_set_nws(struct cg_server *server, int nws) { server->seat, server->curr_output->workspaces[server->curr_output->curr_workspace] ->focused_tile->view); - ipc_send_event(server, "set_nws(old_nws:%d,new_nws:%d)", old_nws, + ipc_send_event(server, "{\"event_name\":\"set_nws\",\"old_nws\":\"%d\",\"new_nws\":\"%d\"}", old_nws, server->nws); } @@ -1158,19 +1156,19 @@ keybinding_definemode(struct cg_server *server, char *mode) { server->modes[length] = NULL; server->modes[length - 1] = strdup(mode); - ipc_send_event(server, "definemode(mode:%s)", mode); + ipc_send_event(server, "{\"event_name\":\"definemode\",\"mode\":\"%s\"}", mode); } void keybinding_definekey(struct cg_server *server, struct keybinding *kb) { keybinding_list_push(server->keybindings, kb); - ipc_send_event(server, "definekey(modifiers:%d,key:%d,command:%d)", + ipc_send_event(server, "{\"event_name\":\"definekey\",\"modifiers\":\"%d\",\"key\":\"%d\",\"command\":\"%d\"}", kb->modifiers, kb->key, kb->action); } void keybinding_set_background(struct cg_server *server, float *bg) { - ipc_send_event(server, "background(old_bg:[%f,%f,%f],new_bg:[%f,%f,%f])", + ipc_send_event(server, "{\"event_name\":\"background\",\"old_bg\":\"[%f,%f,%f]\",\"new_bg\":\"[%f,%f,%f]\"}", server->bg_color[0], server->bg_color[1], server->bg_color[2], bg[0], bg[1], bg[2]); server->bg_color[0] = bg[0]; @@ -1193,7 +1191,7 @@ keybinding_switch_output(struct cg_server *server, int output) { wl_list_for_each(it, &server->outputs, link) { if(count == output) { set_output(server, it); - ipc_send_event(server, "switch_output(old_output:%s,new_output:%s)", + ipc_send_event(server, "{\"event_name\":\"switch_output\",\"old_output\":\"%s\",\"new_output\":\"%s\"}", old_outp->wlr_output->name, it->wlr_output->name); return; } @@ -1238,8 +1236,7 @@ keybinding_move_view_to_output(struct cg_server *server, int output_num) { view_id = view->id; } ipc_send_event(server, - "move_view_to_output(view_id:%d,old_output:%s,new_output:%s," - "view_title:%s)", + "{\"event_name\":\"move_view_to_output\",\"view_id\":\"%d\",\"old_output\":\"%s\",\"new_output\":\"%s\",\"view_title\":\"%s\"}", view_id, old_outp->wlr_output->name, server->curr_output->wlr_output->name, view_title); } @@ -1273,11 +1270,10 @@ keybinding_move_view_to_workspace(struct cg_server *server, uint32_t ws) { seat_set_focus(server->seat, view); } ipc_send_event(server, - "move_view_to_ws(view_id:%d,old_workspace:%d,new_workspace:%" - "d,output:%s,view_title:%s)", - view->id, old_ws, ws, - view->workspace->output->wlr_output->name, - view->impl->get_title(view)); + "{\"event_name\":\"move_view_to_ws\",\"view_id\":\"%d\",\"old_workspace\":\"%d\",\"new_workspace\":\"%d\",\"output\":\"%s\",\"view_title\":\"%s\"}", + view==NULL?-1:(int)view->id, old_ws, ws, + server->curr_output->wlr_output->name, + view==NULL?"":view->impl->get_title(view)); } void @@ -1326,7 +1322,7 @@ keybinding_configure_output(struct cg_server *server, wl_list_for_each_safe(output, tmp_output, &server->outputs, link) { if(strcmp(config->output_name, output->wlr_output->name) == 0) { output_configure(server, output); - ipc_send_event(output->server, "configure_output(output:%s)", + ipc_send_event(output->server, "{\"event_name\":\"configure_output\",\"output\":\"%s\"}", cfg->output_name); return; } @@ -1334,7 +1330,7 @@ keybinding_configure_output(struct cg_server *server, wl_list_for_each_safe(output, tmp_output, &server->disabled_outputs, link) { if(strcmp(config->output_name, output->wlr_output->name) == 0) { output_configure(server, output); - ipc_send_event(output->server, "configure_output(output:%s)", + ipc_send_event(output->server, "{\"event_name\":\"configure_output\",\"output\":\"%s\"}", cfg->output_name); return; } @@ -1345,7 +1341,7 @@ void keybinding_configure_input(struct cg_server *server, struct cg_input_config *cfg) { cg_input_apply_config(cfg, server); - ipc_send_event(server, "configure_input(input:%s)", cfg->identifier); + ipc_send_event(server, "{\"event_name\":\"configure_input\",\"input\":\"%s\"}", cfg->identifier); } void @@ -1370,7 +1366,7 @@ keybinding_configure_message(struct cg_server *server, server->message_config.fg_color[2] = config->fg_color[2]; server->message_config.fg_color[3] = config->fg_color[3]; } - ipc_send_event(server, "configure_message()"); + ipc_send_event(server, "{\"event_name\":\"configure_message\"}"); } void @@ -1428,7 +1424,7 @@ run_action(enum keybinding_action action, struct cg_server *server, server->seat->mode = data.u; break; case KEYBINDING_SWITCH_DEFAULT_MODE: - ipc_send_event(server, "switch_default_mode(old_mode:%d,mode:%d)", + ipc_send_event(server, "{\"event_name\":\"switch_default_mode\",\"old_mode\":\"%d\",\"mode\":\"%d\"}", server->seat->default_mode, data.u); server->seat->mode = data.u; server->seat->default_mode = data.u; diff --git a/output.c b/output.c index 4e78844..66b644f 100644 --- a/output.c +++ b/output.c @@ -141,7 +141,7 @@ output_destroy(struct cg_output *output) { free(output); if(outp_name != NULL) { - ipc_send_event(server, "new_output(output:%s)", outp_name); + ipc_send_event(server, "{\"event_name\":\"new_output\",\"output\":\"%s\"}", outp_name); free(outp_name); } else { wlr_log(WLR_ERROR, @@ -433,7 +433,7 @@ handle_new_output(struct wl_listener *listener, void *data) { wl_signal_add(&wlr_output->events.commit, &output->commit); output->mode.notify = handle_output_mode; wl_signal_add(&wlr_output->events.mode, &output->mode); - ipc_send_event(server, "new_output(output:%s,priority:%d)", + ipc_send_event(server, "{\"event_name\":\"new_output\",\"output\":\"%s\",\"priority\":\"%d\"}", output->wlr_output->name, output->priority); } #if CG_HAS_FANALYZE diff --git a/view.c b/view.c index e8f63e7..d9bb611 100644 --- a/view.c +++ b/view.c @@ -161,8 +161,7 @@ view_unmap(struct cg_view *view) { view->wlr_surface = NULL; ipc_send_event(view->workspace->server, - "view_unmap(view_id:%d,tile_id:%d,workspace:%d,output:%s," - "view_title:%s)", + "{\"event_name\":\"view_unmap\",\"view_id\":\"%d\",\"tile_id\":\"%d\",\"workspace\":\"%d\",\"output\":\"%s\",\"view_title\":\"%s\"}", id, tile_id, ws + 1, output_name, title); } @@ -204,7 +203,7 @@ view_map(struct cg_view *view, struct wlr_surface *surface, } ipc_send_event( output->server, - "view_map(view_id:%d,tile_id:%d,workspace:%d,output:%s,view_title:%s)", + "{\"event_name\":\"view_map\",\"view_id\":\"%d\",\"tile_id\":\"%d\",\"workspace\":\"%d\",\"output\":\"%s\",\"view_title\":\"%s\"}", view->id, tile_id, view->workspace->num + 1, view->workspace->output->wlr_output->name, view->impl->get_title(view)); }