#include <stdarg.h>
#include "all.h"
-#include "cmdparse.tab.h"
/** When the command did not include match criteria (!), we use the currently
* focused command. Do not confuse this case with a command which included
return (a - b) > ( (fabs(a) < fabs(b) ? fabs(b) : fabs(a)) * epsilon);
}
+/*
+ * Returns an 'output' corresponding to one of left/right/down/up or a specific
+ * output name.
+ *
+ */
static Output *get_output_from_string(Output *current_output, const char *output_str) {
Output *output;
return output;
}
-/*******************************************************************************
- * Helper functions for the migration testing. We let the new parser call every
- * function here and save the stack (current_match plus all parameters. Then we
- * let the old parser call every function and actually execute the code. When
- * there are differences between the first and the second invocation (or if
- * there has not been a first invocation at all), we generate an error.
- ******************************************************************************/
-
-static bool migration_test = false;
-typedef struct stackframe {
- Match match;
- int n_args;
- char *args[10];
- TAILQ_ENTRY(stackframe) stackframes;
-} stackframe;
-static TAILQ_HEAD(stackframes_head, stackframe) old_stackframes =
- TAILQ_HEAD_INITIALIZER(old_stackframes);
-static struct stackframes_head new_stackframes =
- TAILQ_HEAD_INITIALIZER(new_stackframes);
-/* We use this char* to uniquely terminate the list of parameters to save. */
-static char *last_parameter = "0";
-
-void cmd_MIGRATION_enable() {
- migration_test = true;
- /* clear the current stack */
- while (!TAILQ_EMPTY(&old_stackframes)) {
- stackframe *current = TAILQ_FIRST(&old_stackframes);
- for (int c = 0; c < current->n_args; c++)
- if (current->args[c])
- free(current->args[c]);
- TAILQ_REMOVE(&old_stackframes, current, stackframes);
- free(current);
- }
- while (!TAILQ_EMPTY(&new_stackframes)) {
- stackframe *current = TAILQ_FIRST(&new_stackframes);
- for (int c = 0; c < current->n_args; c++)
- if (current->args[c])
- free(current->args[c]);
- TAILQ_REMOVE(&new_stackframes, current, stackframes);
- free(current);
- }
-}
-
-void cmd_MIGRATION_disable() {
- migration_test = false;
-}
-
-void cmd_MIGRATION_save_new_parameters(Match *current_match, ...) {
- va_list args;
-
- DLOG("saving parameters.\n");
- stackframe *frame = scalloc(sizeof(stackframe));
- match_copy(&(frame->match), current_match);
-
- /* All parameters are char*s */
- va_start(args, current_match);
- while (true) {
- char *parameter = va_arg(args, char*);
- if (parameter == last_parameter)
- break;
- DLOG("parameter = %s\n", parameter);
- if (parameter)
- frame->args[frame->n_args] = sstrdup(parameter);
- frame->n_args++;
- }
- va_end(args);
-
- TAILQ_INSERT_TAIL(&new_stackframes, frame, stackframes);
-}
-
-void cmd_MIGRATION_save_old_parameters(Match *current_match, ...) {
- va_list args;
-
- DLOG("saving new parameters.\n");
- stackframe *frame = scalloc(sizeof(stackframe));
- match_copy(&(frame->match), current_match);
-
- /* All parameters are char*s */
- va_start(args, current_match);
- while (true) {
- char *parameter = va_arg(args, char*);
- if (parameter == last_parameter)
- break;
- DLOG("parameter = %s\n", parameter);
- if (parameter)
- frame->args[frame->n_args] = sstrdup(parameter);
- frame->n_args++;
- }
- va_end(args);
-
- TAILQ_INSERT_TAIL(&old_stackframes, frame, stackframes);
-}
-
-static bool re_differ(struct regex *new, struct regex *old) {
- return ((new == NULL && old != NULL) ||
- (new != NULL && old == NULL) ||
- (new != NULL && old != NULL &&
- strcmp(new->pattern, old->pattern) != 0));
-}
-
-static bool str_differ(char *new, char *old) {
- return ((new == NULL && old != NULL) ||
- (new != NULL && old == NULL) ||
- (new != NULL && old != NULL &&
- strcmp(new, old) != 0));
-}
-
+// This code is commented out because we might recycle it for popping up error
+// messages on parser errors.
+#if 0
static pid_t migration_pid = -1;
/*
#endif
}
-void cmd_MIGRATION_validate() {
- DLOG("validating the different stacks now\n");
- int old_count = 0;
- int new_count = 0;
- stackframe *current;
- TAILQ_FOREACH(current, &new_stackframes, stackframes)
- new_count++;
- TAILQ_FOREACH(current, &old_stackframes, stackframes)
- old_count++;
- if (new_count != old_count) {
- ELOG("FAILED, new_count == %d != old_count == %d\n", new_count, old_count);
- cmd_MIGRATION_start_nagbar();
- return;
- }
- DLOG("parameter count matching, comparing one by one...\n");
-
- stackframe *new_frame = TAILQ_FIRST(&new_stackframes),
- *old_frame = TAILQ_FIRST(&old_stackframes);
- for (int i = 0; i < new_count; i++) {
- if (new_frame->match.dock != old_frame->match.dock ||
- new_frame->match.id != old_frame->match.id ||
- new_frame->match.con_id != old_frame->match.con_id ||
- new_frame->match.floating != old_frame->match.floating ||
- new_frame->match.insert_where != old_frame->match.insert_where ||
- re_differ(new_frame->match.title, old_frame->match.title) ||
- re_differ(new_frame->match.application, old_frame->match.application) ||
- re_differ(new_frame->match.class, old_frame->match.class) ||
- re_differ(new_frame->match.instance, old_frame->match.instance) ||
- re_differ(new_frame->match.mark, old_frame->match.mark) ||
- re_differ(new_frame->match.role, old_frame->match.role) ) {
- ELOG("FAILED, new_frame->match != old_frame->match (frame %d)\n", i);
- cmd_MIGRATION_start_nagbar();
- return;
- }
- if (new_frame->n_args != old_frame->n_args) {
- ELOG("FAILED, new_frame->n_args == %d != old_frame->n_args == %d (frame %d)\n",
- new_frame->n_args, old_frame->n_args, i);
- cmd_MIGRATION_start_nagbar();
- return;
- }
- for (int j = 0; j < new_frame->n_args; j++) {
- if (str_differ(new_frame->args[j], old_frame->args[j])) {
- ELOG("FAILED, new_frame->args[%d] == %s != old_frame->args[%d] == %s (frame %d)\n",
- j, new_frame->args[j], j, old_frame->args[j], i);
- cmd_MIGRATION_start_nagbar();
- return;
- }
- }
- new_frame = TAILQ_NEXT(new_frame, stackframes);
- old_frame = TAILQ_NEXT(old_frame, stackframes);
- }
- DLOG("OK\n");
-}
-
-#define MIGRATION_init(x, ...) do { \
- if (migration_test) { \
- cmd_MIGRATION_save_new_parameters(current_match, __FUNCTION__, ##__VA_ARGS__ , last_parameter); \
- return NULL; \
- } else { \
- cmd_MIGRATION_save_old_parameters(current_match, __FUNCTION__, ##__VA_ARGS__ , last_parameter); \
- } \
-} while (0)
-
+#endif
/*******************************************************************************
* Criteria functions.
******************************************************************************/
-char *cmd_criteria_init(Match *current_match) {
+/*
+ * Initializes the specified 'Match' data structure and the initial state of
+ * commands.c for matching target windows of a command.
+ *
+ */
+void cmd_criteria_init(I3_CMD) {
+ Con *con;
+ owindow *ow;
+
DLOG("Initializing criteria, current_match = %p\n", current_match);
match_init(current_match);
+ while (!TAILQ_EMPTY(&owindows)) {
+ ow = TAILQ_FIRST(&owindows);
+ TAILQ_REMOVE(&owindows, ow, owindows);
+ free(ow);
+ }
TAILQ_INIT(&owindows);
/* copy all_cons */
- Con *con;
TAILQ_FOREACH(con, &all_cons, all_cons) {
- owindow *ow = smalloc(sizeof(owindow));
+ ow = smalloc(sizeof(owindow));
ow->con = con;
TAILQ_INSERT_TAIL(&owindows, ow, owindows);
}
-
- /* This command is internal and does not generate a JSON reply. */
- return NULL;
}
-char *cmd_criteria_match_windows(Match *current_match) {
+/*
+ * A match specification just finished (the closing square bracket was found),
+ * so we filter the list of owindows.
+ *
+ */
+void cmd_criteria_match_windows(I3_CMD) {
owindow *next, *current;
- /* The same as MIGRATION_init, but doesn’t return */
- if (migration_test) {
- cmd_MIGRATION_save_new_parameters(current_match, __FUNCTION__, last_parameter);
- } else {
- cmd_MIGRATION_save_old_parameters(current_match, __FUNCTION__, last_parameter);
- }
-
DLOG("match specification finished, matching...\n");
/* copy the old list head to iterate through it and start with a fresh
* list which will contain only matching windows */
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
}
-
- /* This command is internal and does not generate a JSON reply. */
- return NULL;
}
-char *cmd_criteria_add(Match *current_match, char *ctype, char *cvalue) {
- /* The same as MIGRATION_init, but doesn’t return */
- if (migration_test) {
- cmd_MIGRATION_save_new_parameters(current_match, __FUNCTION__, last_parameter);
- } else {
- cmd_MIGRATION_save_old_parameters(current_match, __FUNCTION__, last_parameter);
- }
-
+/*
+ * Interprets a ctype=cvalue pair and adds it to the current match
+ * specification.
+ *
+ */
+void cmd_criteria_add(I3_CMD, char *ctype, char *cvalue) {
DLOG("ctype=*%s*, cvalue=*%s*\n", ctype, cvalue);
if (strcmp(ctype, "class") == 0) {
current_match->class = regex_new(cvalue);
- return NULL;
+ return;
}
if (strcmp(ctype, "instance") == 0) {
current_match->instance = regex_new(cvalue);
- return NULL;
+ return;
}
if (strcmp(ctype, "window_role") == 0) {
current_match->role = regex_new(cvalue);
- return NULL;
+ return;
}
if (strcmp(ctype, "con_id") == 0) {
current_match->con_id = (Con*)parsed;
printf("id as int = %p\n", current_match->con_id);
}
- return NULL;
+ return;
}
if (strcmp(ctype, "id") == 0) {
current_match->id = parsed;
printf("window id as int = %d\n", current_match->id);
}
- return NULL;
+ return;
}
if (strcmp(ctype, "con_mark") == 0) {
current_match->mark = regex_new(cvalue);
- return NULL;
+ return;
}
if (strcmp(ctype, "title") == 0) {
current_match->title = regex_new(cvalue);
- return NULL;
+ return;
}
- ELOG("Unknown criterion: %s\n", ctype);
+ if (strcmp(ctype, "urgent") == 0) {
+ if (strcasecmp(cvalue, "latest") == 0 ||
+ strcasecmp(cvalue, "newest") == 0 ||
+ strcasecmp(cvalue, "recent") == 0 ||
+ strcasecmp(cvalue, "last") == 0) {
+ current_match->urgent = U_LATEST;
+ } else if (strcasecmp(cvalue, "oldest") == 0 ||
+ strcasecmp(cvalue, "first") == 0) {
+ current_match->urgent = U_OLDEST;
+ }
+ return;
+ }
- /* This command is internal and does not generate a JSON reply. */
- return NULL;
+ ELOG("Unknown criterion: %s\n", ctype);
}
-char *cmd_move_con_to_workspace(Match *current_match, char *which) {
+/*
+ * Implementation of 'move [window|container] [to] workspace
+ * next|prev|next_on_output|prev_on_output'.
+ *
+ */
+void cmd_move_con_to_workspace(I3_CMD, char *which) {
owindow *current;
- MIGRATION_init(x, which);
-
DLOG("which=%s\n", which);
HANDLE_EMPTY_MATCH;
ws = workspace_prev_on_output();
else {
ELOG("BUG: called with which=%s\n", which);
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
TAILQ_FOREACH(current, &owindows, owindows) {
con_move_to_workspace(current->con, ws, true, false);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_move_con_to_workspace_name(Match *current_match, char *name) {
- MIGRATION_init(x, name);
-
+/*
+ * Implementation of 'move [window|container] [to] workspace <name>'.
+ *
+ */
+void cmd_move_con_to_workspace_name(I3_CMD, char *name) {
if (strncasecmp(name, "__i3_", strlen("__i3_")) == 0) {
LOG("You cannot switch to the i3 internal workspaces.\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
owindow *current;
/* Error out early to not create a non-existing workspace (in
* workspace_get()) if we are not actually able to move anything. */
- if (match_is_empty(current_match) && focused->type == CT_WORKSPACE)
- return sstrdup("{\"sucess\": false}");
+ if (match_is_empty(current_match) && focused->type == CT_WORKSPACE) {
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
+ }
LOG("should move window to workspace %s\n", name);
/* get the workspace */
con_move_to_workspace(current->con, ws, true, false);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_resize(Match *current_match, char *way, char *direction, char *resize_px, char *resize_ppt) {
- MIGRATION_init(x, way, direction, resize_px, resize_ppt);
+/*
+ * Implementation of 'resize grow|shrink <direction> [<px> px] [or <ppt> ppt]'.
+ *
+ */
+void cmd_resize(I3_CMD, char *way, char *direction, char *resize_px, char *resize_ppt) {
/* resize <grow|shrink> <direction> [<px> px] [or <ppt> ppt] */
DLOG("resizing in way %s, direction %s, px %s or ppt %s\n", way, direction, resize_px, resize_ppt);
// TODO: We could either handle this in the parser itself as a separate token (and make the stack typed) or we need a better way to convert a string to a number with error checking
(strcmp(direction, "left") == 0 || strcmp(direction, "right") == 0))) {
LOG("You cannot resize in that direction. Your focus is in a %s split container currently.\n",
(orientation == HORIZ ? "horizontal" : "vertical"));
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
if (strcmp(direction, "up") == 0 || strcmp(direction, "left") == 0) {
}
if (other == TAILQ_END(workspaces)) {
LOG("No other container in this direction found, cannot resize.\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
LOG("other->percent = %f\n", other->percent);
LOG("current->percent before = %f\n", current->percent);
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_border(Match *current_match, char *border_style_str) {
- MIGRATION_init(x, border_style_str);
+/*
+ * Implementation of 'border normal|none|1pixel|toggle'.
+ *
+ */
+void cmd_border(I3_CMD, char *border_style_str) {
DLOG("border style should be changed to %s\n", border_style_str);
owindow *current;
border_style = BS_1PIXEL;
else {
ELOG("BUG: called with border_style=%s\n", border_style_str);
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
}
con_set_border_style(current->con, border_style);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_nop(Match *current_match, char *comment) {
- MIGRATION_init(x, comment);
+/*
+ * Implementation of 'nop <comment>'.
+ *
+ */
+void cmd_nop(I3_CMD, char *comment) {
LOG("-------------------------------------------------\n");
LOG(" NOP: %s\n", comment);
LOG("-------------------------------------------------\n");
-
- return NULL;
}
-char *cmd_append_layout(Match *current_match, char *path) {
- MIGRATION_init(x, path);
+/*
+ * Implementation of 'append_layout <path>'.
+ *
+ */
+void cmd_append_layout(I3_CMD, char *path) {
LOG("Appending layout \"%s\"\n", path);
tree_append_json(path);
- tree_render();
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_workspace(Match *current_match, char *which) {
- MIGRATION_init(x, which);
+/*
+ * Implementation of 'workspace next|prev|next_on_output|prev_on_output'.
+ *
+ */
+void cmd_workspace(I3_CMD, char *which) {
Con *ws;
DLOG("which=%s\n", which);
ws = workspace_prev_on_output();
else {
ELOG("BUG: called with which=%s\n", which);
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
workspace_show(ws);
- tree_render();
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_workspace_back_and_forth(Match *current_match) {
- MIGRATION_init(x);
+/*
+ * Implementation of 'workspace back_and_forth'.
+ *
+ */
+void cmd_workspace_back_and_forth(I3_CMD) {
workspace_back_and_forth();
- tree_render();
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_workspace_name(Match *current_match, char *name) {
- MIGRATION_init(x, name);
+/*
+ * Implementation of 'workspace <name>'
+ *
+ */
+void cmd_workspace_name(I3_CMD, char *name) {
if (strncasecmp(name, "__i3_", strlen("__i3_")) == 0) {
LOG("You cannot switch to the i3 internal workspaces.\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
DLOG("should switch to workspace %s\n", name);
workspace_back_and_forth();
tree_render();
}
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
workspace_show_by_name(name);
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_mark(Match *current_match, char *mark) {
- MIGRATION_init(x, mark);
+/*
+ * Implementation of 'mark <mark>'
+ *
+ */
+void cmd_mark(I3_CMD, char *mark) {
DLOG("Clearing all windows which have that mark first\n");
Con *con;
current->con->mark = sstrdup(mark);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_mode(Match *current_match, char *mode) {
- MIGRATION_init(x, mode);
+/*
+ * Implementation of 'mode <string>'.
+ *
+ */
+void cmd_mode(I3_CMD, char *mode) {
DLOG("mode=%s\n", mode);
switch_mode(mode);
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_move_con_to_output(Match *current_match, char *name) {
- MIGRATION_init(x, name);
+/*
+ * Implementation of 'move [window|container] [to] output <str>'.
+ *
+ */
+void cmd_move_con_to_output(I3_CMD, char *name) {
owindow *current;
DLOG("should move window to output %s\n", name);
if (!output) {
LOG("No such output found.\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
/* get visible workspace on output */
Con *ws = NULL;
GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
- if (!ws)
- return sstrdup("{\"sucess\": false}");
+ if (!ws) {
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
+ }
TAILQ_FOREACH(current, &owindows, owindows) {
DLOG("matching: %p / %s\n", current->con, current->con->name);
con_move_to_workspace(current->con, ws, true, false);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_floating(Match *current_match, char *floating_mode) {
- MIGRATION_init(x, floating_mode);
+/*
+ * Implementation of 'floating enable|disable|toggle'
+ *
+ */
+void cmd_floating(I3_CMD, char *floating_mode) {
owindow *current;
DLOG("floating_mode=%s\n", floating_mode);
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_move_workspace_to_output(Match *current_match, char *name) {
- MIGRATION_init(x, name);
+/*
+ * Implementation of 'move workspace to [output] <str>'.
+ *
+ */
+void cmd_move_workspace_to_output(I3_CMD, char *name) {
DLOG("should move workspace to output %s\n", name);
HANDLE_EMPTY_MATCH;
Output *output = get_output_from_string(current_output, name);
if (!output) {
LOG("No such output\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
Con *content = output_get_content(output->con);
Con *ws = con_get_workspace(current->con);
LOG("should move workspace %p / %s\n", ws, ws->name);
+
if (con_num_children(ws->parent) == 1) {
- LOG("Not moving workspace \"%s\", it is the only workspace on its output.\n", ws->name);
- continue;
+ LOG("Creating a new workspace to replace \"%s\" (last on its output).\n", ws->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) {
+ 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)
+ GREP_FIRST(workspace, output_get_content(out),
+ !strcasecmp(child->name, assignment->name));
+ if (workspace != NULL)
+ continue;
+
+ /* so create the workspace referenced to by this assignment */
+ LOG("Creating workspace from assignment %s.\n", assignment->name);
+ workspace_get(assignment->name, NULL);
+ used_assignment = true;
+ break;
+ }
+
+ /* if we couldn't create the workspace using an assignment, create
+ * it on the output */
+ if (!used_assignment)
+ create_workspace_on_output(current_output, ws->parent);
+
+ /* notify the IPC listeners */
+ ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"init\"}");
}
+
+ /* detach from the old output and attach to the new output */
bool workspace_was_visible = workspace_is_visible(ws);
Con *old_content = ws->parent;
con_detach(ws);
workspace_show(focus_ws);
}
con_attach(ws, content, false);
+
+ /* fix the coordinates of the floating containers */
+ Con *floating_con;
+ 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\"}");
if (workspace_was_visible) {
/* Focus the moved workspace on the destination output. */
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_split(Match *current_match, char *direction) {
- MIGRATION_init(x, direction);
+/*
+ * Implementation of 'split v|h|vertical|horizontal'.
+ *
+ */
+void cmd_split(I3_CMD, char *direction) {
/* TODO: use matches */
LOG("splitting in direction %c\n", direction[0]);
tree_split(focused, (direction[0] == 'v' ? VERT : HORIZ));
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_kill(Match *current_match, char *kill_mode_str) {
+/*
+ * Implementaiton of 'kill [window|client]'.
+ *
+ */
+void cmd_kill(I3_CMD, char *kill_mode_str) {
if (kill_mode_str == NULL)
kill_mode_str = "window";
- MIGRATION_init(x, kill_mode_str);
owindow *current;
DLOG("kill_mode=%s\n", kill_mode_str);
kill_mode = KILL_CLIENT;
else {
ELOG("BUG: called with kill_mode=%s\n", kill_mode_str);
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
/* check if the match is empty, not if the result is empty */
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_exec(Match *current_match, char *nosn, char *command) {
- MIGRATION_init(x, nosn, command);
+/*
+ * Implementation of 'exec [--no-startup-id] <command>'.
+ *
+ */
+void cmd_exec(I3_CMD, char *nosn, char *command) {
bool no_startup_id = (nosn != NULL);
DLOG("should execute %s, no_startup_id = %d\n", command, no_startup_id);
start_application(command, no_startup_id);
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_focus_direction(Match *current_match, char *direction) {
- MIGRATION_init(x, direction);
+/*
+ * Implementation of 'focus left|right|up|down'.
+ *
+ */
+void cmd_focus_direction(I3_CMD, char *direction) {
if (focused &&
focused->type != CT_WORKSPACE &&
focused->fullscreen_mode != CF_NONE) {
LOG("Cannot change focus while in fullscreen mode.\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
DLOG("direction = *%s*\n", direction);
tree_next('n', VERT);
else {
ELOG("Invalid focus direction (%s)\n", direction);
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_focus_window_mode(Match *current_match, char *window_mode) {
- MIGRATION_init(x, window_mode);
+/*
+ * Implementation of 'focus tiling|floating|mode_toggle'.
+ *
+ */
+void cmd_focus_window_mode(I3_CMD, char *window_mode) {
if (focused &&
focused->type != CT_WORKSPACE &&
focused->fullscreen_mode != CF_NONE) {
LOG("Cannot change focus while in fullscreen mode.\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
DLOG("window_mode = %s\n", window_mode);
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_focus_level(Match *current_match, char *level) {
- MIGRATION_init(x, level);
+/*
+ * Implementation of 'focus parent|child'.
+ *
+ */
+void cmd_focus_level(I3_CMD, char *level) {
if (focused &&
focused->type != CT_WORKSPACE &&
focused->fullscreen_mode != CF_NONE) {
LOG("Cannot change focus while in fullscreen mode.\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
DLOG("level = %s\n", level);
level_up();
else level_down();
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_focus(Match *current_match) {
- MIGRATION_init(x);
+/*
+ * Implementation of 'focus'.
+ *
+ */
+void cmd_focus(I3_CMD) {
DLOG("current_match = %p\n", current_match);
if (focused &&
focused->type != CT_WORKSPACE &&
focused->fullscreen_mode != CF_NONE) {
LOG("Cannot change focus while in fullscreen mode.\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
owindow *current;
ELOG("You have to specify which window/container should be focused.\n");
ELOG("Example: [class=\"urxvt\" title=\"irssi\"] focus\n");
- char *json_output;
- sasprintf(&json_output, "{\"success\":false, \"error\":\"You have to "
+ sasprintf(&(cmd_output->json_output),
+ "{\"success\":false, \"error\":\"You have to "
"specify which window/container should be focused\"}");
- return json_output;
+ return;
}
int count = 0;
LOG("WARNING: Your criteria for the focus command matches %d containers, "
"while only exactly one container can be focused at a time.\n", count);
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_fullscreen(Match *current_match, char *fullscreen_mode) {
+/*
+ * Implementation of 'fullscreen [global]'.
+ *
+ */
+void cmd_fullscreen(I3_CMD, char *fullscreen_mode) {
if (fullscreen_mode == NULL)
fullscreen_mode = "output";
- MIGRATION_init(x, fullscreen_mode);
DLOG("toggling fullscreen, mode = %s\n", fullscreen_mode);
owindow *current;
con_toggle_fullscreen(current->con, (strcmp(fullscreen_mode, "global") == 0 ? CF_GLOBAL : CF_OUTPUT));
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_move_direction(Match *current_match, char *direction, char *move_px) {
- MIGRATION_init(x, direction, move_px);
+/*
+ * Implementation of 'move <direction> [<pixels> [px]]'.
+ *
+ */
+void cmd_move_direction(I3_CMD, char *direction, char *move_px) {
// TODO: We could either handle this in the parser itself as a separate token (and make the stack typed) or we need a better way to convert a string to a number with error checking
int px = atoi(move_px);
}
floating_reposition(focused->parent, newrect);
} else {
- tree_move((strcmp(direction, "right") == 0 ? TOK_RIGHT :
- (strcmp(direction, "left") == 0 ? TOK_LEFT :
- (strcmp(direction, "up") == 0 ? TOK_UP :
- TOK_DOWN))));
- tree_render();
+ 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;
}
-
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_layout(Match *current_match, char *layout_str) {
+/*
+ * Implementation of 'layout default|stacked|stacking|tabbed'.
+ *
+ */
+void cmd_layout(I3_CMD, char *layout_str) {
if (strcmp(layout_str, "stacking") == 0)
layout_str = "stacked";
- MIGRATION_init(x, layout_str);
DLOG("changing layout to %s\n", layout_str);
owindow *current;
int layout = (strcmp(layout_str, "default") == 0 ? L_DEFAULT :
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_exit(Match *current_match) {
- MIGRATION_init(x);
+/*
+ * Implementaiton of 'exit'.
+ *
+ */
+void cmd_exit(I3_CMD) {
LOG("Exiting due to user command.\n");
exit(0);
/* unreached */
}
-char *cmd_reload(Match *current_match) {
- MIGRATION_init(x);
+/*
+ * Implementaiton of 'reload'.
+ *
+ */
+void cmd_reload(I3_CMD) {
LOG("reloading\n");
kill_configerror_nagbar(false);
load_configuration(conn, NULL, true);
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"reload\"}");
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_restart(Match *current_match) {
- MIGRATION_init(x);
+/*
+ * Implementaiton of 'restart'.
+ *
+ */
+void cmd_restart(I3_CMD) {
LOG("restarting i3\n");
i3_restart(false);
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_open(Match *current_match) {
- MIGRATION_init(x);
+/*
+ * Implementaiton of 'open'.
+ *
+ */
+void cmd_open(I3_CMD) {
LOG("opening new container\n");
Con *con = tree_open_con(NULL, NULL);
con_focus(con);
- char *json_output;
- sasprintf(&json_output, "{\"success\":true, \"id\":%ld}", (long int)con);
-
- tree_render();
+ sasprintf(&(cmd_output->json_output),
+ "{\"success\":true, \"id\":%ld}", (long int)con);
- return json_output;
+ cmd_output->needs_tree_render = true;
}
-char *cmd_focus_output(Match *current_match, char *name) {
- MIGRATION_init(x, name);
+/*
+ * Implementation of 'focus output <output>'.
+ *
+ */
+void cmd_focus_output(I3_CMD, char *name) {
owindow *current;
DLOG("name = %s\n", name);
if (!output) {
LOG("No such output found.\n");
- return sstrdup("{\"sucess\": false}");
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
}
/* get visible workspace on output */
Con *ws = NULL;
GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
- if (!ws)
- return sstrdup("{\"sucess\": false}");
+ if (!ws) {
+ cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ return;
+ }
workspace_show(ws);
- tree_render();
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_move_scratchpad(Match *current_match) {
- MIGRATION_init(x);
+/*
+ * Implementation of 'move scratchpad'.
+ *
+ */
+void cmd_move_scratchpad(I3_CMD) {
DLOG("should move window to scratchpad\n");
owindow *current;
scratchpad_move(current->con);
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
-char *cmd_scratchpad_show(Match *current_match) {
- MIGRATION_init(x);
+/*
+ * Implementation of 'scratchpad show'.
+ *
+ */
+void cmd_scratchpad_show(I3_CMD) {
DLOG("should show scratchpad window\n");
owindow *current;
}
}
- tree_render();
-
+ cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- return sstrdup("{\"success\": true}");
+ cmd_output->json_output = sstrdup("{\"success\": true}");
}
projects / i3 / i3 / blobdiff