-#undef I3__FILE__
-#define I3__FILE__ "scratchpad.c"
/*
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
- * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009 Michael Stapelberg and contributors (see also: LICENSE)
*
* scratchpad.c: Moving windows to the scratchpad and making them visible again.
*
void scratchpad_move(Con *con) {
if (con->type == CT_WORKSPACE) {
LOG("'move scratchpad' used on a workspace \"%s\". Calling it "
- "recursively on all windows on this workspace.\n", con->name);
+ "recursively on all windows on this workspace.\n",
+ con->name);
Con *current;
current = TAILQ_FIRST(&(con->focus_head));
while (current) {
return;
}
+ /* If the current con is in fullscreen mode, we need to disable that,
+ * as a scratchpad window should never be in fullscreen mode */
+ if (focused && focused->type != CT_WORKSPACE && focused->fullscreen_mode != CF_NONE) {
+ con_toggle_fullscreen(focused, CF_OUTPUT);
+ }
+
/* 1: Ensure the window or any parent is floating. From now on, we deal
* with the CT_FLOATING_CON. We use automatic == false because the user
* made the choice that this window should be a scratchpad (and floating).
/* 2: Send the window to the __i3_scratch workspace, mainting its
* coordinates and not warping the pointer. */
- con_move_to_workspace(con, __i3_scratch, true, true);
+ con_move_to_workspace(con, __i3_scratch, true, true, false);
/* 3: If this is the first time this window is used as a scratchpad, we set
* the scratchpad_state to SCRATCHPAD_FRESH. The window will then be
* adjusted in size according to what the user specifies. */
if (con->scratchpad_state == SCRATCHPAD_NONE) {
DLOG("This window was never used as a scratchpad before.\n");
- con->scratchpad_state = SCRATCHPAD_FRESH;
+ if (con == maybe_floating_con) {
+ DLOG("It was in floating mode before, set scratchpad state to changed.\n");
+ con->scratchpad_state = SCRATCHPAD_CHANGED;
+ } else {
+ DLOG("It was in tiling mode before, set scratchpad state to fresh.\n");
+ con->scratchpad_state = SCRATCHPAD_FRESH;
+ }
}
}
Con *__i3_scratch = workspace_get("__i3_scratch", NULL);
Con *floating;
- /* If the current con or any of its parents are in fullscreen mode, we
- * first need to disable it before showing the scratchpad con. */
- Con *fs = focused;
- while (fs && fs->fullscreen_mode == CF_NONE)
- fs = fs->parent;
-
- if (fs->type != CT_WORKSPACE) {
- con_toggle_fullscreen(focused, CF_OUTPUT);
- }
-
/* If this was 'scratchpad show' without criteria, we check if the
* currently focused window is a scratchpad window and should be hidden
* again. */
return;
}
+ /* If the current con or any of its parents are in fullscreen mode, we
+ * first need to disable it before showing the scratchpad con. */
+ Con *fs = focused;
+ while (fs && fs->fullscreen_mode == CF_NONE)
+ fs = fs->parent;
+
+ if (fs && fs->type != CT_WORKSPACE) {
+ con_toggle_fullscreen(fs, CF_OUTPUT);
+ }
+
/* If this was 'scratchpad show' without criteria, we check if there is a
* unfocused scratchpad on the current workspace and focus it */
Con *walk_con;
if (!con && (floating = con_inside_floating(walk_con)) &&
floating->scratchpad_state != SCRATCHPAD_NONE &&
floating != con_inside_floating(focused)) {
- DLOG("Found an unfocused scratchpad window on this workspace\n");
- DLOG("Focusing it: %p\n", walk_con);
- /* use con_descend_tiling_focused to get the last focused
+ DLOG("Found an unfocused scratchpad window on this workspace\n");
+ DLOG("Focusing it: %p\n", walk_con);
+ /* use con_descend_tiling_focused to get the last focused
* window inside this scratch container in order to
* keep the focus the same within this container */
- con_focus(con_descend_tiling_focused(walk_con));
- return;
- }
+ con_activate(con_descend_tiling_focused(walk_con));
+ return;
+ }
}
/* If this was 'scratchpad show' without criteria, we check if there is a
floating->scratchpad_state != SCRATCHPAD_NONE) {
DLOG("Found a visible scratchpad window on another workspace,\n");
DLOG("moving it to this workspace: con = %p\n", walk_con);
- con_move_to_workspace(walk_con, focused_ws, true, false);
+ con_move_to_workspace(walk_con, focused_ws, true, false, false);
return;
}
}
LOG("Use 'move scratchpad' to move a window to the scratchpad.\n");
return;
}
+ } else {
+ /* We used a criterion, so we need to do what follows (moving,
+ * resizing) on the floating parent. */
+ con = con_inside_floating(con);
}
/* 1: Move the window from __i3_scratch to the current workspace. */
- con_move_to_workspace(con, active, true, false);
+ con_move_to_workspace(con, active, true, false, false);
/* 2: Adjust the size if this window was not adjusted yet. */
if (con->scratchpad_state == SCRATCHPAD_FRESH) {
con->rect.width = output->rect.width * 0.5;
con->rect.height = output->rect.height * 0.75;
floating_check_size(con);
- con->rect.x = output->rect.x +
- ((output->rect.width / 2.0) - (con->rect.width / 2.0));
- con->rect.y = output->rect.y +
- ((output->rect.height / 2.0) - (con->rect.height / 2.0));
+ floating_center(con, con_get_workspace(con)->rect);
}
/* Activate active workspace if window is from another workspace to ensure
workspace_show(active);
}
- con_focus(con_descend_focused(con));
+ con_activate(con_descend_focused(con));
}
/*
projects / i3 / i3 / blobdiff