#include "all.h"
+// Macros to make the YAJL API a bit easier to use.
+#define y(x, ...) yajl_gen_ ## x (cmd_output->json_gen, ##__VA_ARGS__)
+#define ystr(str) yajl_gen_string(cmd_output->json_gen, (unsigned char*)str, strlen(str))
+#define ysuccess(success) do { \
+ y(map_open); \
+ ystr("success"); \
+ y(bool, success); \
+ y(map_close); \
+} while (0)
+
/** When the command did not include match criteria (!), we use the currently
* focused command. 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
return output;
}
+/*
+ * Checks whether we switched to a new workspace and returns false in that case,
+ * signaling that further workspace switching should be done by the calling function
+ * If not, calls workspace_back_and_forth() if workspace_auto_back_and_forth is set
+ * and return true, signaling that no further workspace switching should occur in the calling function.
+ *
+ */
+static bool maybe_back_and_forth(struct CommandResult *cmd_output, char *name) {
+ Con *ws = con_get_workspace(focused);
+
+ /* If we switched to a different workspace, do nothing */
+ if (strcmp(ws->name, name) != 0)
+ return false;
+
+ DLOG("This workspace is already focused.\n");
+ if (config.workspace_auto_back_and_forth) {
+ workspace_back_and_forth();
+ cmd_output->needs_tree_render = true;
+ }
+ return true;
+}
+
// This code is commented out because we might recycle it for popping up error
// messages on parser errors.
#if 0
ws = workspace_prev_on_output();
else {
ELOG("BUG: called with which=%s\n", which);
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
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");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
/* 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) {
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
/* 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) {
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
parsed_num < 0 ||
*endptr != '\0') {
LOG("Could not parse \"%s\" as a number.\n", which);
- cmd_output->json_output = sstrdup("{\"success\": false, "
- "\"error\": \"Could not parse number\"}");
+ y(map_open);
+ ystr("success");
+ y(bool, false);
+ ystr("error");
+ // TODO: better error message
+ ystr("Could not parse number");
+ y(map_close);
return;
}
child->num == parsed_num);
if (!workspace) {
- cmd_output->json_output = sstrdup("{\"success\": false, "
- "\"error\": \"No such workspace\"}");
+ y(map_open);
+ ystr("success");
+ y(bool, false);
+ ystr("error");
+ // TODO: better error message
+ ystr("No such workspace");
+ y(map_close);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
static void cmd_resize_floating(I3_CMD, char *way, char *direction, Con *floating_con, int px) {
(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"));
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
}
if (other == TAILQ_END(workspaces)) {
LOG("No other container in this direction found, cannot resize.\n");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
LOG("other->percent = %f\n", other->percent);
strcmp(direction, "width") == 0)) {
LOG("You cannot resize in that direction. Your focus is in a %s split container currently.\n",
(orientation == HORIZ ? "horizontal" : "vertical"));
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
if (children == 1) {
LOG("This is the only container, cannot resize.\n");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
continue;
if (!definitelyGreaterThan(child->percent - subtract_percent, 0.05, DBL_EPSILON)) {
LOG("Not resizing, already at minimum size (child %p would end up with a size of %.f\n", child, child->percent - subtract_percent);
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
}
if (!definitelyGreaterThan(new_current_percent, 0.05, DBL_EPSILON)) {
LOG("Not resizing, already at minimum size\n");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
border_style = BS_1PIXEL;
else {
ELOG("BUG: called with border_style=%s\n", border_style_str);
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
ws = workspace_prev_on_output();
else {
ELOG("BUG: called with which=%s\n", which);
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
parsed_num < 0 ||
*endptr != '\0') {
LOG("Could not parse \"%s\" as a number.\n", which);
- cmd_output->json_output = sstrdup("{\"success\": false, "
- "\"error\": \"Could not parse number\"}");
+ y(map_open);
+ ystr("success");
+ y(bool, false);
+ ystr("error");
+ // TODO: better error message
+ ystr("Could not parse number");
+ y(map_close);
+
return;
}
child->num == parsed_num);
if (!workspace) {
- LOG("There is no workspace with number %d.\n", parsed_num);
- cmd_output->json_output = sstrdup("{\"success\": false, "
- "\"error\": \"No such workspace\"}");
+ LOG("There is no workspace with number %d, creating a new one.\n", parsed_num);
+ ysuccess(true);
+ /* terminate the which string after the endposition of the number */
+ *endptr = '\0';
+ if (maybe_back_and_forth(cmd_output, which))
+ return;
+ workspace_show_by_name(which);
+ cmd_output->needs_tree_render = true;
return;
}
-
+ if (maybe_back_and_forth(cmd_output, which))
+ return;
workspace_show(workspace);
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
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");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
DLOG("should switch to workspace %s\n", name);
-
- Con *ws = con_get_workspace(focused);
-
- /* Check if the command wants to switch to the current workspace */
- if (strcmp(ws->name, name) == 0) {
- DLOG("This workspace is already focused.\n");
- if (config.workspace_auto_back_and_forth) {
- workspace_back_and_forth();
- tree_render();
- }
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
- return;
- }
-
+ if (maybe_back_and_forth(cmd_output, name))
+ return;
workspace_show_by_name(name);
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
switch_mode(mode);
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
if (!output) {
LOG("No such output found.\n");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
Con *ws = NULL;
GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
if (!ws) {
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
Output *output = get_output_from_string(current_output, name);
if (!output) {
LOG("No such output\n");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
kill_mode = KILL_CLIENT;
else {
ELOG("BUG: called with kill_mode=%s\n", kill_mode_str);
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
start_application(command, no_startup_id);
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
focused->type != CT_WORKSPACE &&
focused->fullscreen_mode != CF_NONE) {
LOG("Cannot change focus while in fullscreen mode.\n");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
tree_next('n', VERT);
else {
ELOG("Invalid focus direction (%s)\n", direction);
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
focused->type != CT_WORKSPACE &&
focused->fullscreen_mode != CF_NONE) {
LOG("Cannot change focus while in fullscreen mode.\n");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
focused->type != CT_WORKSPACE &&
focused->fullscreen_mode != CF_NONE) {
LOG("Cannot change focus while in fullscreen mode.\n");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
*/
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");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
- return;
- }
-
- owindow *current;
if (match_is_empty(current_match)) {
ELOG("You have to specify which window/container should be focused.\n");
ELOG("Example: [class=\"urxvt\" title=\"irssi\"] focus\n");
- sasprintf(&(cmd_output->json_output),
- "{\"success\":false, \"error\":\"You have to "
- "specify which window/container should be focused\"}");
+ y(map_open);
+ ystr("success");
+ y(bool, false);
+ ystr("error");
+ ystr("You have to specify which window/container should be focused");
+ y(map_close);
+
return;
}
int count = 0;
+ owindow *current;
TAILQ_FOREACH(current, &owindows, owindows) {
Con *ws = con_get_workspace(current->con);
/* If no workspace could be found, this was a dock window.
if (!ws)
continue;
+ /* Check the fullscreen focus constraints. */
+ if (!con_fullscreen_permits_focusing(current->con)) {
+ LOG("Cannot change focus while in fullscreen mode (fullscreen rules).\n");
+ ysuccess(false);
+ return;
+ }
+
/* If the container is not on the current workspace,
* workspace_show() will switch to a different workspace and (if
* enabled) trigger a mouse pointer warp to the currently focused
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
}
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"reload\"}");
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
i3_restart(false);
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
LOG("opening new container\n");
Con *con = tree_open_con(NULL, NULL);
con_focus(con);
- sasprintf(&(cmd_output->json_output),
- "{\"success\":true, \"id\":%ld}", (long int)con);
+
+ y(map_open);
+ ystr("success");
+ y(bool, true);
+ ystr("id");
+ y(integer, (long int)con);
+ y(map_close);
cmd_output->needs_tree_render = true;
}
if (!output) {
LOG("No such output found.\n");
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
Con *ws = NULL;
GREP_FIRST(ws, output_get_content(output->con), workspace_is_visible(child));
if (!ws) {
- cmd_output->json_output = sstrdup("{\"sucess\": false}");
+ ysuccess(false);
return;
}
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
if (!con_is_floating(focused)) {
ELOG("Cannot change position. The window/container is not floating\n");
- sasprintf(&(cmd_output->json_output),
- "{\"success\":false, \"error\":\"Cannot change position. "
- "The window/container is not floating.\"}");
+ y(map_open);
+ ystr("success");
+ y(bool, false);
+ ystr("error");
+ ystr("Cannot change position. The window/container is not floating.");
+ y(map_close);
return;
}
}
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
if (!con_is_floating(focused)) {
ELOG("Cannot change position. The window/container is not floating\n");
- sasprintf(&(cmd_output->json_output),
- "{\"success\":false, \"error\":\"Cannot change position. "
- "The window/container is not floating.\"}");
+ y(map_open);
+ ystr("success");
+ y(bool, false);
+ ystr("error");
+ ystr("Cannot change position. The window/container is not floating.");
+ y(map_close);
}
if (strcmp(method, "absolute") == 0) {
}
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
cmd_output->needs_tree_render = true;
// XXX: default reply for now, make this a better reply
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
}
/*
if (!workspace) {
// TODO: we should include the old workspace name here and use yajl for
// generating the reply.
- cmd_output->json_output = sstrdup("{\"success\": false, "
- "\"error\":\"Old workspace not found\"}");
+ y(map_open);
+ ystr("success");
+ y(bool, false);
+ ystr("error");
+ // TODO: better error message
+ ystr("Old workspace not found");
+ y(map_close);
return;
}
if (check_dest != NULL) {
// TODO: we should include the new workspace name here and use yajl for
// generating the reply.
- cmd_output->json_output = sstrdup("{\"success\": false, "
- "\"error\":\"New workspace already exists\"}");
+ y(map_open);
+ ystr("success");
+ y(bool, false);
+ ystr("error");
+ // TODO: better error message
+ ystr("New workspace already exists");
+ y(map_close);
return;
}
con_focus(previously_focused);
cmd_output->needs_tree_render = true;
- cmd_output->json_output = sstrdup("{\"success\": true}");
+ ysuccess(true);
ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"rename\"}");
}
projects / i3 / i3 / blobdiff