-#undef I3__FILE__
-#define I3__FILE__ "move.c"
/*
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
*
* move.c: Moving containers into some direction.
*
*/
static void move_to_output_directed(Con *con, direction_t direction) {
Con *old_ws = con_get_workspace(con);
- Con *current_output_con = con_get_output(con);
- Output *current_output = get_output_by_name(current_output_con->name);
+ Output *current_output = get_output_for_con(con);
Output *output = get_output_next(direction, current_output, CLOSEST_OUTPUT);
if (!output) {
attach_to_workspace(con, ws, direction);
/* fix the focus stack */
- con_focus(con);
+ con_activate(con);
/* force re-painting the indicators */
FREE(con->deco_render_params);
tree_flatten(croot);
- ipc_send_workspace_focus_event(ws, old_ws);
+ ipc_send_workspace_event("focus", ws, old_ws);
}
/*
DLOG("Swapped.\n");
ipc_send_window_event("move", con);
+ ewmh_update_wm_desktop();
return;
}
* try to move it to a workspace on a different output */
move_to_output_directed(con, direction);
ipc_send_window_event("move", con);
+ ewmh_update_wm_desktop();
return;
}
? AFTER
: BEFORE);
insert_con_into(con, target, position);
+ } else if (!next &&
+ con->parent->parent->type == CT_WORKSPACE &&
+ con->parent->layout != L_DEFAULT &&
+ con_num_children(con->parent) == 1) {
+ /* Con is the lone child of a non-default layout container at the edge
+ * of the workspace. Treat it as though the workspace is its parent
+ * and move it to the next output. */
+ DLOG("Grandparent is workspace\n");
+ move_to_output_directed(con, direction);
} else {
DLOG("Moving into container above\n");
position = (direction == D_UP || direction == D_LEFT ? BEFORE : AFTER);
tree_flatten(croot);
ipc_send_window_event("move", con);
+ ewmh_update_wm_desktop();
}