diff --git a/keybinding.c b/keybinding.c index 25e21fa..054f638 100644 --- a/keybinding.c +++ b/keybinding.c @@ -826,11 +826,11 @@ keybinding_move_view_to_workspace(struct cg_server *server, uint32_t ws) { } void -keybinding_configure_output(struct cg_server *server, struct cg_output_config *cfg) { - struct cg_output_config *it,*tmp; - wl_list_for_each_safe(it, tmp, &server->output_config, - link) { - if(strcmp(cfg->output_name,it->output_name) == 0) { +keybinding_configure_output(struct cg_server *server, + struct cg_output_config *cfg) { + struct cg_output_config *it, *tmp; + wl_list_for_each_safe(it, tmp, &server->output_config, link) { + if(strcmp(cfg->output_name, it->output_name) == 0) { wl_list_remove(&it->link); free(it->output_name); } diff --git a/keybinding.h b/keybinding.h index b0d99fd..cd48840 100644 --- a/keybinding.h +++ b/keybinding.h @@ -18,10 +18,11 @@ enum keybinding_action { KEYBINDING_SPLIT_HORIZONTAL, KEYBINDING_CHANGE_TTY, // data.u is the desired tty KEYBINDING_LAYOUT_FULLSCREEN, - KEYBINDING_CYCLE_VIEWS, // data.b is 0 if forward, 1 if reverse - KEYBINDING_CYCLE_TILES, // data.b is 0 if forward, 1 if reverse - KEYBINDING_CYCLE_OUTPUT, // data.b is 0 if forward, 1 if reverse - KEYBINDING_CONFIGURE_OUTPUT, // data.o_cfg is the desired output configuration + KEYBINDING_CYCLE_VIEWS, // data.b is 0 if forward, 1 if reverse + KEYBINDING_CYCLE_TILES, // data.b is 0 if forward, 1 if reverse + KEYBINDING_CYCLE_OUTPUT, // data.b is 0 if forward, 1 if reverse + KEYBINDING_CONFIGURE_OUTPUT, // data.o_cfg is the desired output + // configuration KEYBINDING_QUIT, KEYBINDING_NOOP, KEYBINDING_SWITCH_WORKSPACE, // data.u is the desired workspace diff --git a/man/cagebreak-config.5.md b/man/cagebreak-config.5.md index c063dc5..969f56d 100644 --- a/man/cagebreak-config.5.md +++ b/man/cagebreak-config.5.md @@ -1,4 +1,4 @@ -% CAGEBREAK-CONFIG(1) Version 1.3.2 | Cagebreak Manual +% CAGEBREAK-CONFIG(1) Version 1.3.3 | Cagebreak Manual # NAME diff --git a/man/cagebreak.1.md b/man/cagebreak.1.md index 3445932..0ae8733 100644 --- a/man/cagebreak.1.md +++ b/man/cagebreak.1.md @@ -1,4 +1,4 @@ -% CAGEBREAK(1) Version 1.3.2 | Cagebreak Manual +% CAGEBREAK(1) Version 1.3.3 | Cagebreak Manual # NAME diff --git a/meson.build b/meson.build index decd4b7..39876e0 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('cagebreak', 'c', - version: '1.3.2', + version: '1.3.3', license: 'MIT', default_options: [ 'c_std=c11', diff --git a/parse.c b/parse.c index 59663e9..ff1f8c0 100644 --- a/parse.c +++ b/parse.c @@ -537,7 +537,7 @@ parse_command(struct cg_server *server, struct keybinding *keybinding, } } else if(strcmp(action, "output") == 0) { keybinding->action = KEYBINDING_CONFIGURE_OUTPUT; - keybinding->data.o_cfg=parse_output_config(&saveptr,errstr); + keybinding->data.o_cfg = parse_output_config(&saveptr, errstr); if(keybinding->data.o_cfg == NULL) { return -1; } diff --git a/view.c b/view.c index d1483c4..167ed7e 100644 --- a/view.c +++ b/view.c @@ -56,7 +56,7 @@ view_child_handle_commit(struct wl_listener *listener, void *_data) { struct cg_view_child *child = wl_container_of(listener, child, commit); int x, y; child->get_coords(child, &x, &y); - view_damage_child(child, x+child->view->ox, y+child->view->oy, false); + view_damage_child(child, x + child->view->ox, y + child->view->oy, false); } static void @@ -120,7 +120,7 @@ subsurface_handle_destroy(struct wl_listener *listener, void *_data) { static void subsurface_get_coords(struct cg_view_child *child, int *x, int *y) { struct wlr_surface *surface = child->wlr_surface; - *x=*y=0; + *x = *y = 0; if(child->parent && child->parent->get_coords) { int sx, sy; diff --git a/xdg_shell.c b/xdg_shell.c index 1cd349d..a6d850c 100644 --- a/xdg_shell.c +++ b/xdg_shell.c @@ -61,8 +61,8 @@ xdg_popup_destroy(struct cg_view_child *child) { int x, y; child->get_coords(child, &x, &y); - view_damage_child(child, x+child->view->ox, y+child->view->oy, true); -struct cg_xdg_popup *popup = (struct cg_xdg_popup *)child; + view_damage_child(child, x + child->view->ox, y + child->view->oy, true); + struct cg_xdg_popup *popup = (struct cg_xdg_popup *)child; wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->map.link); wl_list_remove(&popup->unmap.link);