mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-18 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename container_sort_workspaces and container_wrap_children

Browse source 
This commit renames container_sort_workspaces to output_sort_workspaces
and moves it to output.c.

This also renames container_wrap_children to workspace_wrap_children and
moves it to workspace.c. This function is only called with workspaces.
This commit is contained in:
Ryan Dwyer 2018-08-18 21:54:09 +10:00
parent cfe205b36f
commit 16c663ed49
12 changed files with 54 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sway/tree/container.c
View file

@ -270,7 +270,7 @@ static struct sway_container *container_output_destroy(
container_destroy(workspace);
}
container_sort_workspaces(new_output);
output_sort_workspaces(new_output);
}
}
}
@ -1305,15 +1305,3 @@ bool container_is_fullscreen_or_child(struct sway_container *container) {
return false;
}
struct sway_container *container_wrap_children(struct sway_container *parent) {
struct sway_container *middle = container_create(C_CONTAINER);
middle->layout = parent->layout;
while (parent->children->length) {
struct sway_container *child = parent->children->items[0];
container_remove_child(child);
container_add_child(middle, child);
}
container_add_child(parent, middle);
return middle;
}

23
sway/tree/layout.c
View file

@ -1,5 +1,4 @@
#define _POSIX_C_SOURCE 200809L
#include <ctype.h>
#include <math.h>
#include <stdbool.h>
#include <stdlib.h>
@ -591,28 +590,6 @@ enum sway_container_layout container_get_default_layout(
}
}
static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
struct sway_container *a = *(void **)_a;
struct sway_container *b = *(void **)_b;
int retval = 0;
if (isdigit(a->name[0]) && isdigit(b->name[0])) {
int a_num = strtol(a->name, NULL, 10);
int b_num = strtol(b->name, NULL, 10);
retval = (a_num < b_num) ? -1 : (a_num > b_num);
} else if (isdigit(a->name[0])) {
retval = -1;
} else if (isdigit(b->name[0])) {
retval = 1;
}
return retval;
}
void container_sort_workspaces(struct sway_container *output) {
list_stable_sort(output->children, sort_workspace_cmp_qsort);
}
/**
* Get swayc in the direction of newly entered output.
*/

23
sway/tree/output.c
View file

@ -1,4 +1,5 @@
#define _POSIX_C_SOURCE 200809L
#include <ctype.h>
#include <string.h>
#include <strings.h>
#include "sway/ipc-server.h"
@ -28,7 +29,7 @@ static void restore_workspaces(struct sway_container *output) {
}
}
container_sort_workspaces(output);
output_sort_workspaces(output);
}
struct sway_container *output_create(
@ -102,3 +103,23 @@ struct sway_container *output_create(
return output;
}
static int sort_workspace_cmp_qsort(const void *_a, const void *_b) {
struct sway_container *a = *(void **)_a;
struct sway_container *b = *(void **)_b;
if (isdigit(a->name[0]) && isdigit(b->name[0])) {
int a_num = strtol(a->name, NULL, 10);
int b_num = strtol(b->name, NULL, 10);
return (a_num < b_num) ? -1 : (a_num > b_num);
} else if (isdigit(a->name[0])) {
return -1;
} else if (isdigit(b->name[0])) {
return 1;
}
return 0;
}
void output_sort_workspaces(struct sway_container *output) {
list_stable_sort(output->children, sort_workspace_cmp_qsort);
}

14
sway/tree/workspace.c
View file

@ -75,7 +75,7 @@ struct sway_container *workspace_create(struct sway_container *output,
workspace_output_add_priority(workspace, output);
container_add_child(output, workspace);
container_sort_workspaces(output);
output_sort_workspaces(output);
container_create_notify(workspace);
return workspace;
@ -537,3 +537,15 @@ void workspace_detect_urgent(struct sway_container *workspace) {
container_damage_whole(workspace);
}
}
struct sway_container *workspace_wrap_children(struct sway_container *ws) {
struct sway_container *middle = container_create(C_CONTAINER);
middle->layout = ws->layout;
while (ws->children->length) {
struct sway_container *child = ws->children->items[0];
container_remove_child(child);
container_add_child(middle, child);
}
container_add_child(ws, middle);
return middle;
}