mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce container_is_scratchpad_hidden 

Just a convenience function that improves readability of the code.

Other things worth noting:

* container_get_siblings and container_sibling_index no longer use the
const keyword
* container_handle_fullscreen_reparent is only ever called after
attaching the container to a workspace, so its con->workspace check has
been changed to an assertion
This commit is contained in:
Ryan Dwyer 2019-01-28 19:06:42 +10:00 committed by emersion
parent 68a28e482f
commit 6b8bf10941
12 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sway/tree/container.h
View File

@ -299,9 +299,9 @@ enum sway_container_layout container_parent_layout(struct sway_container *con);
enum sway_container_layout container_current_parent_layout( enum sway_container_layout container_current_parent_layout(
struct sway_container *con); struct sway_container *con);
list_t *container_get_siblings(const struct sway_container *container); list_t *container_get_siblings(struct sway_container *container);
int container_sibling_index(const struct sway_container *child); int container_sibling_index(struct sway_container *child);
list_t *container_get_current_siblings(struct sway_container *container); list_t *container_get_current_siblings(struct sway_container *container);
@ -354,4 +354,6 @@ void container_update_marks_textures(struct sway_container *container);
void container_raise_floating(struct sway_container *con); void container_raise_floating(struct sway_container *con);
bool container_is_scratchpad_hidden(struct sway_container *con);
#endif #endif

2
sway/commands/focus.c
View File

@ -271,7 +271,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
} }
if (argc == 0 && container) { if (argc == 0 && container) {
if (container->scratchpad && !container->workspace) { if (container_is_scratchpad_hidden(container)) {
root_scratchpad_show(container); root_scratchpad_show(container);
} }
seat_set_focus_container(seat, container); seat_set_focus_container(seat, container);

4
sway/commands/move.c
View File

@ -659,7 +659,7 @@ static struct cmd_results *cmd_move_in_direction(
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,
"Cannot move workspaces in a direction"); "Cannot move workspaces in a direction");
} }
if (container->scratchpad && !container->workspace) { if (container_is_scratchpad_hidden(container)) {
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,
"Cannot move a hidden scratchpad container"); "Cannot move a hidden scratchpad container");
} }
@ -734,7 +734,7 @@ static struct cmd_results *cmd_move_to_position(int argc, char **argv) {
return cmd_results_new(CMD_FAILURE, "Only floating containers " return cmd_results_new(CMD_FAILURE, "Only floating containers "
"can be moved to an absolute position"); "can be moved to an absolute position");
} }
if (container->scratchpad && !container->workspace) { if (container_is_scratchpad_hidden(container)) {
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,
"Cannot move a hidden scratchpad container"); "Cannot move a hidden scratchpad container");
} }

10
sway/commands/resize.c
View File

@ -86,7 +86,8 @@ static void calculate_constraints(int *min_width, int *max_width,
*min_height = config->floating_minimum_height; *min_height = config->floating_minimum_height;
} }
if (config->floating_maximum_width == -1 || !con->workspace) { // no max if (config->floating_maximum_width == -1 ||
container_is_scratchpad_hidden(con)) { // no max
*max_width = INT_MAX; *max_width = INT_MAX;
} else if (config->floating_maximum_width == 0) { // automatic } else if (config->floating_maximum_width == 0) { // automatic
*max_width = con->workspace->width; *max_width = con->workspace->width;
@ -94,7 +95,8 @@ static void calculate_constraints(int *min_width, int *max_width,
*max_width = config->floating_maximum_width; *max_width = config->floating_maximum_width;
} }
if (config->floating_maximum_height == -1 || !con->workspace) { // no max if (config->floating_maximum_height == -1 ||
container_is_scratchpad_hidden(con)) { // no max
*max_height = INT_MAX; *max_height = INT_MAX;
} else if (config->floating_maximum_height == 0) { // automatic } else if (config->floating_maximum_height == 0) { // automatic
*max_height = con->workspace->height; *max_height = con->workspace->height;
@ -386,7 +388,7 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
if (width->amount) { if (width->amount) {
switch (width->unit) { switch (width->unit) {
case RESIZE_UNIT_PPT: case RESIZE_UNIT_PPT:
if (con->scratchpad && !con->workspace) { if (container_is_scratchpad_hidden(con)) {
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,
"Cannot resize a hidden scratchpad container by ppt"); "Cannot resize a hidden scratchpad container by ppt");
} }
@ -410,7 +412,7 @@ static struct cmd_results *resize_set_floating(struct sway_container *con,
if (height->amount) { if (height->amount) {
switch (height->unit) { switch (height->unit) {
case RESIZE_UNIT_PPT: case RESIZE_UNIT_PPT:
if (con->scratchpad && !con->workspace) { if (container_is_scratchpad_hidden(con)) {
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,
"Cannot resize a hidden scratchpad container by ppt"); "Cannot resize a hidden scratchpad container by ppt");
} }

2
sway/commands/split.c
View File

@ -13,7 +13,7 @@ static struct cmd_results *do_split(int layout) {
struct sway_container *con = config->handler_context.container; struct sway_container *con = config->handler_context.container;
struct sway_workspace *ws = config->handler_context.workspace; struct sway_workspace *ws = config->handler_context.workspace;
if (con) { if (con) {
if (con->scratchpad && !con->workspace) { if (container_is_scratchpad_hidden(con)) {
return cmd_results_new(CMD_FAILURE, return cmd_results_new(CMD_FAILURE,
"Cannot split a hidden scratchpad container"); "Cannot split a hidden scratchpad container");
} }

2
sway/commands/sticky.c
View File

@ -25,7 +25,7 @@ struct cmd_results *cmd_sticky(int argc, char **argv) {
container->is_sticky = parse_boolean(argv[0], container->is_sticky); container->is_sticky = parse_boolean(argv[0], container->is_sticky);
if (container->is_sticky && container_is_floating_or_child(container) && if (container->is_sticky && container_is_floating_or_child(container) &&
(!container->scratchpad || container->workspace)) { !container_is_scratchpad_hidden(container)) {
// move container to active workspace // move container to active workspace
struct sway_workspace *active_workspace = struct sway_workspace *active_workspace =
output_get_active_workspace(container->workspace->output); output_get_active_workspace(container->workspace->output);

3
sway/desktop/output.c
View File

@ -252,8 +252,7 @@ static void output_for_each_surface(struct sway_output *output,
struct sway_workspace *workspace = output_get_active_workspace(output); struct sway_workspace *workspace = output_get_active_workspace(output);
struct sway_container *fullscreen_con = root->fullscreen_global; struct sway_container *fullscreen_con = root->fullscreen_global;
if (fullscreen_con && fullscreen_con->scratchpad && if (fullscreen_con && container_is_scratchpad_hidden(fullscreen_con)) {
!fullscreen_con->workspace) {
fullscreen_con = NULL; fullscreen_con = NULL;
} }
if (!fullscreen_con) { if (!fullscreen_con) {

3
sway/desktop/render.c
View File

@ -986,8 +986,7 @@ void output_render(struct sway_output *output, struct timespec *when,
} }
struct sway_container *fullscreen_con = root->fullscreen_global; struct sway_container *fullscreen_con = root->fullscreen_global;
if (fullscreen_con && fullscreen_con->scratchpad && if (fullscreen_con && container_is_scratchpad_hidden(fullscreen_con)) {
!fullscreen_con->workspace) {
fullscreen_con = NULL; fullscreen_con = NULL;
} }
if (!fullscreen_con) { if (!fullscreen_con) {

2
sway/ipc-json.c
View File

@ -282,7 +282,7 @@ static json_object *ipc_json_describe_scratchpad_output(void) {
json_object *floating_array = json_object_new_array(); json_object *floating_array = json_object_new_array();
for (int i = 0; i < root->scratchpad->length; ++i) { for (int i = 0; i < root->scratchpad->length; ++i) {
struct sway_container *container = root->scratchpad->items[i]; struct sway_container *container = root->scratchpad->items[i];
if (!container->workspace) { if (container_is_scratchpad_hidden(container)) {
json_object_array_add(floating_array, json_object_array_add(floating_array,
ipc_json_describe_node_recursive(&container->node)); ipc_json_describe_node_recursive(&container->node));
} }

15
sway/tree/container.c
View File

@ -1156,11 +1156,11 @@ enum sway_container_layout container_current_parent_layout(
return con->current.workspace->current.layout; return con->current.workspace->current.layout;
} }
list_t *container_get_siblings(const struct sway_container *container) { list_t *container_get_siblings(struct sway_container *container) {
if (container->parent) { if (container->parent) {
return container->parent->children; return container->parent->children;
} }
if (!container->workspace) { if (container_is_scratchpad_hidden(container)) {
return NULL; return NULL;
} }
if (list_find(container->workspace->tiling, container) != -1) { if (list_find(container->workspace->tiling, container) != -1) {
@ -1169,7 +1169,7 @@ list_t *container_get_siblings(const struct sway_container *container) {
return container->workspace->floating; return container->workspace->floating;
} }
int container_sibling_index(const struct sway_container *child) { int container_sibling_index(struct sway_container *child) {
return list_find(container_get_siblings(child), child); return list_find(container_get_siblings(child), child);
} }
@ -1181,7 +1181,10 @@ list_t *container_get_current_siblings(struct sway_container *container) {
} }
void container_handle_fullscreen_reparent(struct sway_container *con) { void container_handle_fullscreen_reparent(struct sway_container *con) {
if (con->fullscreen_mode != FULLSCREEN_WORKSPACE || !con->workspace || if (!sway_assert(con->workspace, "Expected con to have a workspace")) {
return;
}
if (con->fullscreen_mode != FULLSCREEN_WORKSPACE ||
con->workspace->fullscreen == con) { con->workspace->fullscreen == con) {
return; return;
} }
@ -1460,3 +1463,7 @@ void container_raise_floating(struct sway_container *con) {
node_set_dirty(&floater->workspace->node); node_set_dirty(&floater->workspace->node);
} }
} }
bool container_is_scratchpad_hidden(struct sway_container *con) {
return con->scratchpad && !con->workspace;
}

7
sway/tree/root.c
View File

@ -310,10 +310,7 @@ void root_for_each_container(void (*f)(struct sway_container *con, void *data),
// Scratchpad // Scratchpad
for (int i = 0; i < root->scratchpad->length; ++i) { for (int i = 0; i < root->scratchpad->length; ++i) {
struct sway_container *container = root->scratchpad->items[i]; struct sway_container *container = root->scratchpad->items[i];
// If the container has a workspace then it's visible on a workspace if (container_is_scratchpad_hidden(container)) {
// and will have been iterated in the previous for loop. So we only
// iterate the hidden scratchpad containers here.
if (!container->workspace) {
f(container, data); f(container, data);
container_for_each_child(container, f, data); container_for_each_child(container, f, data);
} }
@ -362,7 +359,7 @@ struct sway_container *root_find_container(
// Scratchpad // Scratchpad
for (int i = 0; i < root->scratchpad->length; ++i) { for (int i = 0; i < root->scratchpad->length; ++i) {
struct sway_container *container = root->scratchpad->items[i]; struct sway_container *container = root->scratchpad->items[i];
if (!container->workspace) { if (container_is_scratchpad_hidden(container)) {
if (test(container, data)) { if (test(container, data)) {
return container; return container;
} }

5
sway/tree/view.c
View File

@ -197,8 +197,7 @@ static bool gaps_to_edge(struct sway_view *view) {
void view_autoconfigure(struct sway_view *view) { void view_autoconfigure(struct sway_view *view) {
struct sway_container *con = view->container; struct sway_container *con = view->container;
if (!con->workspace) { if (container_is_scratchpad_hidden(con)) {
// Hidden in the scratchpad
return; return;
} }
struct sway_output *output = con->workspace->output; struct sway_output *output = con->workspace->output;
@ -1054,7 +1053,7 @@ void view_set_urgent(struct sway_view *view, bool enable) {
ipc_event_window(view->container, "urgent"); ipc_event_window(view->container, "urgent");
if (view->container->workspace) { if (!container_is_scratchpad_hidden(view->container)) {
workspace_detect_urgent(view->container->workspace); workspace_detect_urgent(view->container->workspace);
} }
} }