format **/*.c with clang-format-3.5
This has multiple effects: 1) The i3 codebase is now consistently formatted. clang-format uncovered plenty of places where inconsistent code made it into our code base. 2) When writing code, you don’t need to think or worry about our coding style. Write it in yours, then run clang-format-3.5 3) When submitting patches, we don’t need to argue about coding style. The basic idea is that we don’t want to care about _how_ we write the code, but _what_ it does :). The coding style that we use is defined in the .clang-format config file and is based on the google style, but adapted in such a way that the number of modifications to the i3 code base is minimal.
This commit is contained in:
Michael Stapelberg
225
src/commands.c
225
src/commands.c
@ -16,48 +16,50 @@
|
||||
#include "shmlog.h"
|
||||
|
||||
// Macros to make the YAJL API a bit easier to use.
|
||||
#define y(x, ...) (cmd_output->json_gen != NULL ? yajl_gen_ ## x (cmd_output->json_gen, ##__VA_ARGS__) : 0)
|
||||
#define ystr(str) (cmd_output->json_gen != NULL ? yajl_gen_string(cmd_output->json_gen, (unsigned char*)str, strlen(str)) : 0)
|
||||
#define ysuccess(success) do { \
|
||||
if (cmd_output->json_gen != NULL) { \
|
||||
y(map_open); \
|
||||
ystr("success"); \
|
||||
y(bool, success); \
|
||||
y(map_close); \
|
||||
} \
|
||||
} while (0)
|
||||
#define yerror(message) do { \
|
||||
if (cmd_output->json_gen != NULL) { \
|
||||
y(map_open); \
|
||||
ystr("success"); \
|
||||
y(bool, false); \
|
||||
ystr("error"); \
|
||||
ystr(message); \
|
||||
y(map_close); \
|
||||
} \
|
||||
} while (0)
|
||||
#define y(x, ...) (cmd_output->json_gen != NULL ? yajl_gen_##x(cmd_output->json_gen, ##__VA_ARGS__) : 0)
|
||||
#define ystr(str) (cmd_output->json_gen != NULL ? yajl_gen_string(cmd_output->json_gen, (unsigned char *)str, strlen(str)) : 0)
|
||||
#define ysuccess(success) \
|
||||
do { \
|
||||
if (cmd_output->json_gen != NULL) { \
|
||||
y(map_open); \
|
||||
ystr("success"); \
|
||||
y(bool, success); \
|
||||
y(map_close); \
|
||||
} \
|
||||
} while (0)
|
||||
#define yerror(message) \
|
||||
do { \
|
||||
if (cmd_output->json_gen != NULL) { \
|
||||
y(map_open); \
|
||||
ystr("success"); \
|
||||
y(bool, false); \
|
||||
ystr("error"); \
|
||||
ystr(message); \
|
||||
y(map_close); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
/** When the command did not include match criteria (!), we use the currently
|
||||
* focused container. Do not confuse this case with a command which included
|
||||
* criteria but which did not match any windows. This macro has to be called in
|
||||
* every command.
|
||||
*/
|
||||
#define HANDLE_EMPTY_MATCH do { \
|
||||
if (match_is_empty(current_match)) { \
|
||||
owindow *ow = smalloc(sizeof(owindow)); \
|
||||
ow->con = focused; \
|
||||
TAILQ_INIT(&owindows); \
|
||||
TAILQ_INSERT_TAIL(&owindows, ow, owindows); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define HANDLE_EMPTY_MATCH \
|
||||
do { \
|
||||
if (match_is_empty(current_match)) { \
|
||||
owindow *ow = smalloc(sizeof(owindow)); \
|
||||
ow->con = focused; \
|
||||
TAILQ_INIT(&owindows); \
|
||||
TAILQ_INSERT_TAIL(&owindows, ow, owindows); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
/*
|
||||
* Returns true if a is definitely greater than b (using the given epsilon)
|
||||
*
|
||||
*/
|
||||
static bool definitelyGreaterThan(float a, float b, float epsilon) {
|
||||
return (a - b) > ( (fabs(a) < fabs(b) ? fabs(b) : fabs(a)) * epsilon);
|
||||
return (a - b) > ((fabs(a) < fabs(b) ? fabs(b) : fabs(a)) * epsilon);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -76,7 +78,8 @@ static Output *get_output_from_string(Output *current_output, const char *output
|
||||
output = get_output_next_wrap(D_UP, current_output);
|
||||
else if (strcasecmp(output_str, "down") == 0)
|
||||
output = get_output_next_wrap(D_DOWN, current_output);
|
||||
else output = get_output_by_name(output_str);
|
||||
else
|
||||
output = get_output_by_name(output_str);
|
||||
|
||||
return output;
|
||||
}
|
||||
@ -270,7 +273,7 @@ void cmd_criteria_init(I3_CMD) {
|
||||
}
|
||||
TAILQ_INIT(&owindows);
|
||||
/* copy all_cons */
|
||||
TAILQ_FOREACH(con, &all_cons, all_cons) {
|
||||
TAILQ_FOREACH (con, &all_cons, all_cons) {
|
||||
ow = smalloc(sizeof(owindow));
|
||||
ow->con = con;
|
||||
TAILQ_INSERT_TAIL(&owindows, ow, owindows);
|
||||
@ -321,7 +324,7 @@ void cmd_criteria_match_windows(I3_CMD) {
|
||||
}
|
||||
}
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
}
|
||||
}
|
||||
@ -358,7 +361,7 @@ void cmd_criteria_add(I3_CMD, char *ctype, char *cvalue) {
|
||||
(end && *end != '\0')) {
|
||||
ELOG("Could not parse con id \"%s\"\n", cvalue);
|
||||
} else {
|
||||
current_match->con_id = (Con*)parsed;
|
||||
current_match->con_id = (Con *)parsed;
|
||||
DLOG("id as int = %p\n", current_match->con_id);
|
||||
}
|
||||
return;
|
||||
@ -420,7 +423,7 @@ void cmd_move_con_to_workspace(I3_CMD, char *which) {
|
||||
* when criteria wasn't specified and we don't have any window focused. */
|
||||
if ((!match_is_empty(current_match) && TAILQ_EMPTY(&owindows)) ||
|
||||
(match_is_empty(current_match) && focused->type == CT_WORKSPACE &&
|
||||
!con_has_children(focused))) {
|
||||
!con_has_children(focused))) {
|
||||
ysuccess(false);
|
||||
return;
|
||||
}
|
||||
@ -445,7 +448,7 @@ void cmd_move_con_to_workspace(I3_CMD, char *which) {
|
||||
return;
|
||||
}
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
con_move_to_workspace(current->con, ws, true, false);
|
||||
}
|
||||
@ -472,7 +475,7 @@ void cmd_move_con_to_workspace_back_and_forth(I3_CMD) {
|
||||
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
con_move_to_workspace(current->con, ws, true, false);
|
||||
}
|
||||
@ -502,9 +505,8 @@ void cmd_move_con_to_workspace_name(I3_CMD, char *name) {
|
||||
ELOG("No windows match your criteria, cannot move.\n");
|
||||
ysuccess(false);
|
||||
return;
|
||||
}
|
||||
else if (match_is_empty(current_match) && focused->type == CT_WORKSPACE &&
|
||||
!con_has_children(focused)) {
|
||||
} else if (match_is_empty(current_match) && focused->type == CT_WORKSPACE &&
|
||||
!con_has_children(focused)) {
|
||||
ysuccess(false);
|
||||
return;
|
||||
}
|
||||
@ -517,7 +519,7 @@ void cmd_move_con_to_workspace_name(I3_CMD, char *name) {
|
||||
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
con_move_to_workspace(current->con, ws, true, false);
|
||||
}
|
||||
@ -539,7 +541,7 @@ void cmd_move_con_to_workspace_number(I3_CMD, char *which) {
|
||||
* when criteria wasn't specified and we don't have any window focused. */
|
||||
if ((!match_is_empty(current_match) && TAILQ_EMPTY(&owindows)) ||
|
||||
(match_is_empty(current_match) && focused->type == CT_WORKSPACE &&
|
||||
!con_has_children(focused))) {
|
||||
!con_has_children(focused))) {
|
||||
ysuccess(false);
|
||||
return;
|
||||
}
|
||||
@ -560,9 +562,9 @@ void cmd_move_con_to_workspace_number(I3_CMD, char *which) {
|
||||
return;
|
||||
}
|
||||
|
||||
TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
|
||||
TAILQ_FOREACH (output, &(croot->nodes_head), nodes)
|
||||
GREP_FIRST(workspace, output_get_content(output),
|
||||
child->num == parsed_num);
|
||||
child->num == parsed_num);
|
||||
|
||||
if (!workspace) {
|
||||
workspace = workspace_get(which, NULL);
|
||||
@ -572,7 +574,7 @@ void cmd_move_con_to_workspace_number(I3_CMD, char *which) {
|
||||
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
con_move_to_workspace(current->con, workspace, true, false);
|
||||
}
|
||||
@ -726,7 +728,7 @@ static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, char *way, char
|
||||
|
||||
/* Ensure all the other children have a percentage set. */
|
||||
Con *child;
|
||||
TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
|
||||
TAILQ_FOREACH (child, &(current->parent->nodes_head), nodes) {
|
||||
LOG("child->percent = %f (child %p)\n", child->percent, child);
|
||||
if (child->percent == 0.0)
|
||||
child->percent = percentage;
|
||||
@ -738,7 +740,7 @@ static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, char *way, char
|
||||
LOG("subtract_percent = %f\n", subtract_percent);
|
||||
/* Ensure that the new percentages are positive and greater than
|
||||
* 0.05 to have a reasonable minimum size. */
|
||||
TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
|
||||
TAILQ_FOREACH (child, &(current->parent->nodes_head), nodes) {
|
||||
if (child == current)
|
||||
continue;
|
||||
if (!definitelyGreaterThan(child->percent - subtract_percent, 0.05, DBL_EPSILON)) {
|
||||
@ -756,7 +758,7 @@ static bool cmd_resize_tiling_width_height(I3_CMD, Con *current, char *way, char
|
||||
current->percent += ((double)ppt / 100.0);
|
||||
LOG("current->percent after = %f\n", current->percent);
|
||||
|
||||
TAILQ_FOREACH(child, &(current->parent->nodes_head), nodes) {
|
||||
TAILQ_FOREACH (child, &(current->parent->nodes_head), nodes) {
|
||||
if (child == current)
|
||||
continue;
|
||||
child->percent -= subtract_percent;
|
||||
@ -784,7 +786,7 @@ void cmd_resize(I3_CMD, char *way, char *direction, char *resize_px, char *resiz
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
owindow *current;
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
/* Don't handle dock windows (issue #1201) */
|
||||
if (current->con->window && current->con->window->dock) {
|
||||
DLOG("This is a dock window. Not resizing (con = %p)\n)", current->con);
|
||||
@ -815,13 +817,13 @@ void cmd_resize(I3_CMD, char *way, char *direction, char *resize_px, char *resiz
|
||||
* Implementation of 'border normal|none|1pixel|toggle|pixel'.
|
||||
*
|
||||
*/
|
||||
void cmd_border(I3_CMD, char *border_style_str, char *border_width ) {
|
||||
void cmd_border(I3_CMD, char *border_style_str, char *border_width) {
|
||||
DLOG("border style should be changed to %s with border width %s\n", border_style_str, border_width);
|
||||
owindow *current;
|
||||
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
int border_style = current->con->border_style;
|
||||
char *end;
|
||||
@ -845,7 +847,7 @@ void cmd_border(I3_CMD, char *border_style_str, char *border_width ) {
|
||||
border_style = BS_NORMAL;
|
||||
else if (strcmp(border_style_str, "pixel") == 0)
|
||||
border_style = BS_PIXEL;
|
||||
else if (strcmp(border_style_str, "1pixel") == 0){
|
||||
else if (strcmp(border_style_str, "1pixel") == 0) {
|
||||
border_style = BS_PIXEL;
|
||||
tmp_border_width = 1;
|
||||
} else if (strcmp(border_style_str, "none") == 0)
|
||||
@ -965,9 +967,9 @@ void cmd_workspace_number(I3_CMD, char *which) {
|
||||
return;
|
||||
}
|
||||
|
||||
TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
|
||||
TAILQ_FOREACH (output, &(croot->nodes_head), nodes)
|
||||
GREP_FIRST(workspace, output_get_content(output),
|
||||
child->num == parsed_num);
|
||||
child->num == parsed_num);
|
||||
|
||||
if (!workspace) {
|
||||
LOG("There is no workspace with number %ld, creating a new one.\n", parsed_num);
|
||||
@ -1010,7 +1012,7 @@ void cmd_workspace_name(I3_CMD, char *name) {
|
||||
|
||||
DLOG("should switch to workspace %s\n", name);
|
||||
if (maybe_back_and_forth(cmd_output, name))
|
||||
return;
|
||||
return;
|
||||
workspace_show_by_name(name);
|
||||
|
||||
cmd_output->needs_tree_render = true;
|
||||
@ -1026,7 +1028,7 @@ void cmd_mark(I3_CMD, char *mark) {
|
||||
DLOG("Clearing all windows which have that mark first\n");
|
||||
|
||||
Con *con;
|
||||
TAILQ_FOREACH(con, &all_cons, all_cons) {
|
||||
TAILQ_FOREACH (con, &all_cons, all_cons) {
|
||||
if (con->mark && strcmp(con->mark, mark) == 0)
|
||||
FREE(con->mark);
|
||||
}
|
||||
@ -1036,7 +1038,7 @@ void cmd_mark(I3_CMD, char *mark) {
|
||||
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
current->con->mark = sstrdup(mark);
|
||||
}
|
||||
@ -1051,19 +1053,19 @@ void cmd_mark(I3_CMD, char *mark) {
|
||||
*
|
||||
*/
|
||||
void cmd_unmark(I3_CMD, char *mark) {
|
||||
if (mark == NULL) {
|
||||
Con *con;
|
||||
TAILQ_FOREACH(con, &all_cons, all_cons) {
|
||||
FREE(con->mark);
|
||||
}
|
||||
DLOG("removed all window marks");
|
||||
} else {
|
||||
Con *con;
|
||||
TAILQ_FOREACH(con, &all_cons, all_cons) {
|
||||
if (con->mark && strcmp(con->mark, mark) == 0)
|
||||
FREE(con->mark);
|
||||
}
|
||||
DLOG("removed window mark %s\n", mark);
|
||||
if (mark == NULL) {
|
||||
Con *con;
|
||||
TAILQ_FOREACH (con, &all_cons, all_cons) {
|
||||
FREE(con->mark);
|
||||
}
|
||||
DLOG("removed all window marks");
|
||||
} else {
|
||||
Con *con;
|
||||
TAILQ_FOREACH (con, &all_cons, all_cons) {
|
||||
if (con->mark && strcmp(con->mark, mark) == 0)
|
||||
FREE(con->mark);
|
||||
}
|
||||
DLOG("removed window mark %s\n", mark);
|
||||
}
|
||||
|
||||
cmd_output->needs_tree_render = true;
|
||||
@ -1099,7 +1101,7 @@ void cmd_move_con_to_output(I3_CMD, char *name) {
|
||||
Output *output;
|
||||
|
||||
// TODO: fix the handling of criteria
|
||||
TAILQ_FOREACH(current, &owindows, owindows)
|
||||
TAILQ_FOREACH (current, &owindows, owindows)
|
||||
current_output = get_output_of_con(current->con);
|
||||
|
||||
assert(current_output != NULL);
|
||||
@ -1130,7 +1132,7 @@ void cmd_move_con_to_output(I3_CMD, char *name) {
|
||||
return;
|
||||
}
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
con_move_to_workspace(current->con, ws, true, false);
|
||||
}
|
||||
@ -1151,7 +1153,7 @@ void cmd_floating(I3_CMD, char *floating_mode) {
|
||||
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
if (strcmp(floating_mode, "toggle") == 0) {
|
||||
DLOG("should toggle mode\n");
|
||||
@ -1181,7 +1183,7 @@ void cmd_move_workspace_to_output(I3_CMD, char *name) {
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
owindow *current;
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
Output *current_output = get_output_of_con(current->con);
|
||||
if (!current_output) {
|
||||
ELOG("Cannot get current output. This is a bug in i3.\n");
|
||||
@ -1211,13 +1213,13 @@ void cmd_move_workspace_to_output(I3_CMD, char *name) {
|
||||
/* check if we can find a workspace assigned to this output */
|
||||
bool used_assignment = false;
|
||||
struct Workspace_Assignment *assignment;
|
||||
TAILQ_FOREACH(assignment, &ws_assignments, ws_assignments) {
|
||||
TAILQ_FOREACH (assignment, &ws_assignments, ws_assignments) {
|
||||
if (strcmp(assignment->output, current_output->name) != 0)
|
||||
continue;
|
||||
|
||||
/* check if this workspace is already attached to the tree */
|
||||
Con *workspace = NULL, *out;
|
||||
TAILQ_FOREACH(out, &(croot->nodes_head), nodes)
|
||||
TAILQ_FOREACH (out, &(croot->nodes_head), nodes)
|
||||
GREP_FIRST(workspace, output_get_content(out),
|
||||
!strcasecmp(child->name, assignment->name));
|
||||
if (workspace != NULL)
|
||||
@ -1254,7 +1256,7 @@ void cmd_move_workspace_to_output(I3_CMD, char *name) {
|
||||
|
||||
/* fix the coordinates of the floating containers */
|
||||
Con *floating_con;
|
||||
TAILQ_FOREACH(floating_con, &(ws->floating_head), floating_windows)
|
||||
TAILQ_FOREACH (floating_con, &(ws->floating_head), floating_windows)
|
||||
floating_fix_coordinates(floating_con, &(old_content->rect), &(content->rect));
|
||||
|
||||
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"move\"}");
|
||||
@ -1268,7 +1270,7 @@ void cmd_move_workspace_to_output(I3_CMD, char *name) {
|
||||
* focus order/number of other workspaces on the output.
|
||||
* Instead, we loop through the available workspaces and only work with
|
||||
* previously_visible_ws if we still find it. */
|
||||
TAILQ_FOREACH(ws, &(content->nodes_head), nodes) {
|
||||
TAILQ_FOREACH (ws, &(content->nodes_head), nodes) {
|
||||
if (ws != previously_visible_ws)
|
||||
continue;
|
||||
|
||||
@ -1296,7 +1298,7 @@ void cmd_split(I3_CMD, char *direction) {
|
||||
if (match_is_empty(current_match))
|
||||
tree_split(focused, (direction[0] == 'v' ? VERT : HORIZ));
|
||||
else {
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
tree_split(current->con, (direction[0] == 'v' ? VERT : HORIZ));
|
||||
}
|
||||
@ -1333,7 +1335,7 @@ void cmd_kill(I3_CMD, char *kill_mode_str) {
|
||||
if (match_is_empty(current_match))
|
||||
tree_close_con(kill_mode);
|
||||
else {
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
tree_close(current->con, kill_mode, false, false);
|
||||
}
|
||||
@ -1398,9 +1400,10 @@ void cmd_focus_window_mode(I3_CMD, char *window_mode) {
|
||||
current = TAILQ_FIRST(&(ws->focus_head));
|
||||
if (current != NULL && current->type == CT_FLOATING_CON)
|
||||
window_mode = "tiling";
|
||||
else window_mode = "floating";
|
||||
else
|
||||
window_mode = "floating";
|
||||
}
|
||||
TAILQ_FOREACH(current, &(ws->focus_head), focused) {
|
||||
TAILQ_FOREACH (current, &(ws->focus_head), focused) {
|
||||
if ((strcmp(window_mode, "floating") == 0 && current->type != CT_FLOATING_CON) ||
|
||||
(strcmp(window_mode, "tiling") == 0 && current->type == CT_FLOATING_CON))
|
||||
continue;
|
||||
@ -1435,7 +1438,8 @@ void cmd_focus_level(I3_CMD, char *level) {
|
||||
}
|
||||
|
||||
/* Focusing a child should always be allowed. */
|
||||
else success = level_down();
|
||||
else
|
||||
success = level_down();
|
||||
|
||||
cmd_output->needs_tree_render = success;
|
||||
// XXX: default reply for now, make this a better reply
|
||||
@ -1461,7 +1465,7 @@ void cmd_focus(I3_CMD) {
|
||||
Con *__i3_scratch = workspace_get("__i3_scratch", NULL);
|
||||
int count = 0;
|
||||
owindow *current;
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
Con *ws = con_get_workspace(current->con);
|
||||
/* If no workspace could be found, this was a dock window.
|
||||
* Just skip it, you cannot focus dock windows. */
|
||||
@ -1510,7 +1514,8 @@ void cmd_focus(I3_CMD) {
|
||||
|
||||
if (count > 1)
|
||||
LOG("WARNING: Your criteria for the focus command matches %d containers, "
|
||||
"while only exactly one container can be focused at a time.\n", count);
|
||||
"while only exactly one container can be focused at a time.\n",
|
||||
count);
|
||||
|
||||
cmd_output->needs_tree_render = true;
|
||||
// XXX: default reply for now, make this a better reply
|
||||
@ -1529,7 +1534,7 @@ void cmd_fullscreen(I3_CMD, char *fullscreen_mode) {
|
||||
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
con_toggle_fullscreen(current->con, (strcmp(fullscreen_mode, "global") == 0 ? CF_GLOBAL : CF_OUTPUT));
|
||||
}
|
||||
@ -1563,10 +1568,7 @@ void cmd_move_direction(I3_CMD, char *direction, char *move_px) {
|
||||
}
|
||||
floating_reposition(focused->parent, newrect);
|
||||
} else {
|
||||
tree_move((strcmp(direction, "right") == 0 ? D_RIGHT :
|
||||
(strcmp(direction, "left") == 0 ? D_LEFT :
|
||||
(strcmp(direction, "up") == 0 ? D_UP :
|
||||
D_DOWN))));
|
||||
tree_move((strcmp(direction, "right") == 0 ? D_RIGHT : (strcmp(direction, "left") == 0 ? D_LEFT : (strcmp(direction, "up") == 0 ? D_UP : D_DOWN))));
|
||||
cmd_output->needs_tree_render = true;
|
||||
}
|
||||
|
||||
@ -1605,7 +1607,7 @@ void cmd_layout(I3_CMD, char *layout_str) {
|
||||
if (match_is_empty(current_match))
|
||||
con_set_layout(focused, layout);
|
||||
else {
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
con_set_layout(current->con, layout);
|
||||
}
|
||||
@ -1632,7 +1634,7 @@ void cmd_layout_toggle(I3_CMD, char *toggle_mode) {
|
||||
if (match_is_empty(current_match))
|
||||
con_toggle_layout(focused, toggle_mode);
|
||||
else {
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
con_toggle_layout(current->con, toggle_mode);
|
||||
}
|
||||
@ -1731,7 +1733,7 @@ void cmd_focus_output(I3_CMD, char *name) {
|
||||
Output *current_output = NULL;
|
||||
Output *output;
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows)
|
||||
TAILQ_FOREACH (current, &owindows, owindows)
|
||||
current_output = get_output_of_con(current->con);
|
||||
assert(current_output != NULL);
|
||||
|
||||
@ -1763,7 +1765,6 @@ void cmd_focus_output(I3_CMD, char *name) {
|
||||
*
|
||||
*/
|
||||
void cmd_move_window_to_position(I3_CMD, char *method, char *cx, char *cy) {
|
||||
|
||||
int x = atoi(cx);
|
||||
int y = atoi(cy);
|
||||
|
||||
@ -1801,7 +1802,6 @@ void cmd_move_window_to_position(I3_CMD, char *method, char *cx, char *cy) {
|
||||
*
|
||||
*/
|
||||
void cmd_move_window_to_center(I3_CMD, char *method) {
|
||||
|
||||
if (!con_is_floating(focused)) {
|
||||
ELOG("Cannot change position. The window/container is not floating\n");
|
||||
yerror("Cannot change position. The window/container is not floating.");
|
||||
@ -1812,8 +1812,8 @@ void cmd_move_window_to_center(I3_CMD, char *method) {
|
||||
Rect *rect = &focused->parent->rect;
|
||||
|
||||
DLOG("moving to absolute center\n");
|
||||
rect->x = croot->rect.width/2 - rect->width/2;
|
||||
rect->y = croot->rect.height/2 - rect->height/2;
|
||||
rect->x = croot->rect.width / 2 - rect->width / 2;
|
||||
rect->y = croot->rect.height / 2 - rect->height / 2;
|
||||
|
||||
floating_maybe_reassign_ws(focused->parent);
|
||||
cmd_output->needs_tree_render = true;
|
||||
@ -1824,8 +1824,8 @@ void cmd_move_window_to_center(I3_CMD, char *method) {
|
||||
Rect newrect = focused->parent->rect;
|
||||
|
||||
DLOG("moving to center\n");
|
||||
newrect.x = wsrect->width/2 - newrect.width/2;
|
||||
newrect.y = wsrect->height/2 - newrect.height/2;
|
||||
newrect.x = wsrect->width / 2 - newrect.width / 2;
|
||||
newrect.y = wsrect->height / 2 - newrect.height / 2;
|
||||
|
||||
floating_reposition(focused->parent, newrect);
|
||||
}
|
||||
@ -1844,7 +1844,7 @@ void cmd_move_scratchpad(I3_CMD) {
|
||||
|
||||
HANDLE_EMPTY_MATCH;
|
||||
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
scratchpad_move(current->con);
|
||||
}
|
||||
@ -1865,7 +1865,7 @@ void cmd_scratchpad_show(I3_CMD) {
|
||||
if (match_is_empty(current_match)) {
|
||||
scratchpad_show(NULL);
|
||||
} else {
|
||||
TAILQ_FOREACH(current, &owindows, owindows) {
|
||||
TAILQ_FOREACH (current, &owindows, owindows) {
|
||||
DLOG("matching: %p / %s\n", current->con, current->con->name);
|
||||
scratchpad_show(current->con);
|
||||
}
|
||||
@ -1894,9 +1894,9 @@ void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
|
||||
|
||||
Con *output, *workspace = NULL;
|
||||
if (old_name) {
|
||||
TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
|
||||
TAILQ_FOREACH (output, &(croot->nodes_head), nodes)
|
||||
GREP_FIRST(workspace, output_get_content(output),
|
||||
!strcasecmp(child->name, old_name));
|
||||
!strcasecmp(child->name, old_name));
|
||||
} else {
|
||||
workspace = con_get_workspace(focused);
|
||||
}
|
||||
@ -1910,9 +1910,9 @@ void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
|
||||
}
|
||||
|
||||
Con *check_dest = NULL;
|
||||
TAILQ_FOREACH(output, &(croot->nodes_head), nodes)
|
||||
TAILQ_FOREACH (output, &(croot->nodes_head), nodes)
|
||||
GREP_FIRST(check_dest, output_get_content(output),
|
||||
!strcasecmp(child->name, new_name));
|
||||
!strcasecmp(child->name, new_name));
|
||||
|
||||
if (check_dest != NULL) {
|
||||
// TODO: we should include the new workspace name here and use yajl for
|
||||
@ -1932,7 +1932,8 @@ void cmd_rename_workspace(I3_CMD, char *old_name, char *new_name) {
|
||||
parsed_num < 0 ||
|
||||
endptr == new_name)
|
||||
workspace->num = -1;
|
||||
else workspace->num = parsed_num;
|
||||
else
|
||||
workspace->num = parsed_num;
|
||||
LOG("num = %d\n", workspace->num);
|
||||
|
||||
/* By re-attaching, the sort order will be correct afterwards. */
|
||||
@ -1971,7 +1972,7 @@ bool cmd_bar_mode(char *bar_mode, char *bar_id) {
|
||||
|
||||
bool changed_sth = false;
|
||||
Barconfig *current = NULL;
|
||||
TAILQ_FOREACH(current, &barconfigs, configs) {
|
||||
TAILQ_FOREACH (current, &barconfigs, configs) {
|
||||
if (bar_id && strcmp(current->id, bar_id) != 0)
|
||||
continue;
|
||||
|
||||
@ -1983,7 +1984,7 @@ bool cmd_bar_mode(char *bar_mode, char *bar_id) {
|
||||
changed_sth = true;
|
||||
|
||||
if (bar_id)
|
||||
break;
|
||||
break;
|
||||
}
|
||||
|
||||
if (bar_id && !changed_sth) {
|
||||
@ -2014,7 +2015,7 @@ bool cmd_bar_hidden_state(char *bar_hidden_state, char *bar_id) {
|
||||
|
||||
bool changed_sth = false;
|
||||
Barconfig *current = NULL;
|
||||
TAILQ_FOREACH(current, &barconfigs, configs) {
|
||||
TAILQ_FOREACH (current, &barconfigs, configs) {
|
||||
if (bar_id && strcmp(current->id, bar_id) != 0)
|
||||
continue;
|
||||
|
||||
@ -2026,7 +2027,7 @@ bool cmd_bar_hidden_state(char *bar_hidden_state, char *bar_id) {
|
||||
changed_sth = true;
|
||||
|
||||
if (bar_id)
|
||||
break;
|
||||
break;
|
||||
}
|
||||
|
||||
if (bar_id && !changed_sth) {
|
||||
@ -2064,7 +2065,7 @@ void cmd_bar(I3_CMD, char *bar_type, char *bar_value, char *bar_id) {
|
||||
*
|
||||
*/
|
||||
void cmd_shmlog(I3_CMD, char *argument) {
|
||||
if (!strcmp(argument,"toggle"))
|
||||
if (!strcmp(argument, "toggle"))
|
||||
/* Toggle shm log, if size is not 0. If it is 0, set it to default. */
|
||||
shmlog_size = shmlog_size ? -shmlog_size : default_shmlog_size;
|
||||
else if (!strcmp(argument, "on"))
|
||||
@ -2096,7 +2097,7 @@ void cmd_shmlog(I3_CMD, char *argument) {
|
||||
*/
|
||||
void cmd_debuglog(I3_CMD, char *argument) {
|
||||
bool logging = get_debug_logging();
|
||||
if (!strcmp(argument,"toggle")) {
|
||||
if (!strcmp(argument, "toggle")) {
|
||||
LOG("%s debug logging\n", logging ? "Disabling" : "Enabling");
|
||||
set_debug_logging(!logging);
|
||||
} else if (!strcmp(argument, "on") && !logging) {
|
||||
|
||||
Reference in New Issue
Block a user