}
Output *current_output = get_output_for_con(ws);
- if (current_output == NULL) {
- yerror("Cannot get current output. This is a bug in i3.");
- return;
- }
-
Output *target_output = get_output_from_string(current_output, name);
if (!target_output) {
yerror("Could not get output from string \"%s\"", name);
return;
}
- bool success = workspace_move_to_output(ws, target_output);
- if (!success) {
- yerror("Failed to move workspace to output.");
- return;
- }
+ workspace_move_to_output(ws, target_output);
}
cmd_output->needs_tree_render = true;
LOG("reloading\n");
kill_nagbar(&config_error_nagbar_pid, false);
kill_nagbar(&command_error_nagbar_pid, false);
- load_configuration(conn, NULL, true);
+ load_configuration(NULL, true);
x_set_i3_atoms();
/* Send an IPC event just in case the ws names have changed */
ipc_send_workspace_event("reload", NULL, NULL);
*
*/
void cmd_focus_output(I3_CMD, const char *name) {
- owindow *current;
-
- DLOG("name = %s\n", name);
-
HANDLE_EMPTY_MATCH;
- /* get the output */
- Output *current_output = NULL;
- Output *output;
-
- TAILQ_FOREACH(current, &owindows, owindows)
- current_output = get_output_for_con(current->con);
- assert(current_output != NULL);
+ if (TAILQ_EMPTY(&owindows)) {
+ ysuccess(true);
+ return;
+ }
- output = get_output_from_string(current_output, name);
+ Output *current_output = get_output_for_con(TAILQ_FIRST(&owindows)->con);
+ Output *output = get_output_from_string(current_output, name);
if (!output) {
- yerror("No such output found.");
+ yerror("Output %s not found.", name);
return;
}
workspace_show(ws);
cmd_output->needs_tree_render = true;
- // XXX: default reply for now, make this a better reply
ysuccess(true);
}