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

Indent cleanups

This commit is contained in:
wil 2017-01-08 14:49:47 +01:00
parent d822150d83
commit 063c79874a
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sway/commands/layout.c
View File

@ -49,8 +49,8 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
} else if (strcasecmp(argv[0], "splitv") == 0) { } else if (strcasecmp(argv[0], "splitv") == 0) {
swayc_change_layout(parent, L_VERT); swayc_change_layout(parent, L_VERT);
} else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) { } else if (strcasecmp(argv[0], "toggle") == 0 && argc == 2 && strcasecmp(argv[1], "split") == 0) {
if (parent->layout == L_HORIZ && (parent->workspace_layout == L_NONE || if (parent->layout == L_HORIZ && (parent->workspace_layout == L_NONE
parent->workspace_layout == L_HORIZ)) { || parent->workspace_layout == L_HORIZ)) {
swayc_change_layout(parent, L_VERT); swayc_change_layout(parent, L_VERT);
} else { } else {
swayc_change_layout(parent, L_HORIZ); swayc_change_layout(parent, L_HORIZ);
@ -66,23 +66,23 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
} else if (strcasecmp(argv[0], "incnmaster") == 0) { } else if (strcasecmp(argv[0], "incnmaster") == 0) {
const char *name = "layout incnmaster"; const char *name = "layout incnmaster";
if ((error = checkarg(argc, name, if ((error = checkarg(argc, name,
EXPECTED_EQUAL_TO, 2))) { EXPECTED_EQUAL_TO, 2))) {
return error; return error;
} }
char *end; char *end;
int inc = (int) strtol(argv[1], &end, 10); int inc = (int) strtol(argv[1], &end, 10);
if (*end) { if (*end) {
return cmd_results_new(CMD_INVALID, name, "Invalid %s command " return cmd_results_new(CMD_INVALID, name, "Invalid %s command "
"(argument must be an integer)", name); "(argument must be an integer)", name);
} }
swayc_t *container = get_focused_view(swayc_active_workspace()); swayc_t *container = get_focused_view(swayc_active_workspace());
if (container && inc && if (container && inc &&
is_auto_layout(container->parent->layout) && is_auto_layout(container->parent->layout) &&
((int)container->parent->nb_master + inc >= 0)) { ((int)container->parent->nb_master + inc >= 0)) {
for (int i = container->parent->nb_master; for (int i = container->parent->nb_master;
i >= 0 && i < container->parent->children->length && i >= 0 && i < container->parent->children->length
i != (int) container->parent->nb_master + inc;) { && i != (int) container->parent->nb_master + inc;) {
((swayc_t *) container->parent->children->items[i])->height = -1; ((swayc_t *) container->parent->children->items[i])->height = -1;
((swayc_t *) container->parent->children->items[i])->width = -1; ((swayc_t *) container->parent->children->items[i])->width = -1;
i += inc > 0 ? 1 : -1; i += inc > 0 ? 1 : -1;
@ -92,19 +92,19 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
} else if ((strcasecmp(argv[0], "incncol") == 0) && argc ==2) { } else if ((strcasecmp(argv[0], "incncol") == 0) && argc ==2) {
const char *name = "layout incncol"; const char *name = "layout incncol";
if ((error = checkarg(argc, name, if ((error = checkarg(argc, name,
EXPECTED_EQUAL_TO, 2))) { EXPECTED_EQUAL_TO, 2))) {
return error; return error;
} }
char *end; char *end;
int inc = (int) strtol(argv[1], &end, 10); int inc = (int) strtol(argv[1], &end, 10);
if (*end) { if (*end) {
return cmd_results_new(CMD_INVALID, name, "Invalid %s command " return cmd_results_new(CMD_INVALID, name, "Invalid %s command "
"(argument must be an integer)", name); "(argument must be an integer)", name);
} }
swayc_t *container = get_focused_view(swayc_active_workspace()); swayc_t *container = get_focused_view(swayc_active_workspace());
if (container && inc && is_auto_layout(container->parent->layout) && if (container && inc && is_auto_layout(container->parent->layout) &&
((int)container->parent->nb_slave_groups + inc >= 1)) { ((int)container->parent->nb_slave_groups + inc >= 1)) {
container->parent->nb_slave_groups += inc; container->parent->nb_slave_groups += inc;
} }
} else if (strcasecmp(argv[0], "auto") == 0) { } else if (strcasecmp(argv[0], "auto") == 0) {
@ -128,7 +128,7 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
} }
} else { } else {
return cmd_results_new(CMD_FAILURE, "layout auto", return cmd_results_new(CMD_FAILURE, "layout auto",
"Must be one of <prev|next>."); "Must be one of <prev|next>.");
} }
swayc_change_layout(parent, layout); swayc_change_layout(parent, layout);
} }

7
sway/container.c
View File

@ -965,10 +965,11 @@ swayc_t *swayc_change_layout(swayc_t *container, enum swayc_layouts layout) {
// if layout change modifies the auto layout's major axis, swap width and height // if layout change modifies the auto layout's major axis, swap width and height
// to preserve current ratios. // to preserve current ratios.
if (is_auto_layout(layout) && is_auto_layout(container->layout)) { if (is_auto_layout(layout) && is_auto_layout(container->layout)) {
enum swayc_layouts prev_major = (container->layout == L_AUTO_LEFT || enum swayc_layouts prev_major =
container->layout == L_AUTO_RIGHT) container->layout == L_AUTO_LEFT || container->layout == L_AUTO_RIGHT
? L_HORIZ : L_VERT; ? L_HORIZ : L_VERT;
enum swayc_layouts new_major = (layout == L_AUTO_LEFT || layout == L_AUTO_RIGHT) enum swayc_layouts new_major =
layout == L_AUTO_LEFT || layout == L_AUTO_RIGHT
? L_HORIZ : L_VERT; ? L_HORIZ : L_VERT;
if (new_major != prev_major) { if (new_major != prev_major) {
for (int i = 0; i < container->children->length; ++i) { for (int i = 0; i < container->children->length; ++i) {

36
sway/layout.c
View File

@ -296,7 +296,7 @@ void move_container(swayc_t *container, enum movement_direction dir) {
sway_log(L_DEBUG, "container:%p, parent:%p, child %p,", sway_log(L_DEBUG, "container:%p, parent:%p, child %p,",
container,parent,child); container,parent,child);
if (parent->layout == layout if (parent->layout == layout
|| layout == L_NONE /* accept any layout for next/prev direction */ || (layout == L_NONE && parent->type == C_CONTAINER) /* accept any layout for next/prev direction */
|| (parent->layout == L_TABBED && layout == L_HORIZ) || (parent->layout == L_TABBED && layout == L_HORIZ)
|| (parent->layout == L_STACKED && layout == L_VERT) || (parent->layout == L_STACKED && layout == L_VERT)
|| is_auto_layout(parent->layout)) { || is_auto_layout(parent->layout)) {
@ -321,16 +321,16 @@ void move_container(swayc_t *container, enum movement_direction dir) {
} }
// if move command makes container change from master to slave // if move command makes container change from master to slave
// (or the contrary), reset its geometry an the one of the replaced item. // (or the contrary), reset its geometry an the one of the replaced item.
if (parent->nb_master && if (parent->nb_master
(size_t) parent->children->length > parent->nb_master) { && (size_t) parent->children->length > parent->nb_master) {
swayc_t *swap_geom = NULL; swayc_t *swap_geom = NULL;
// if child is being promoted/demoted, it will swap geometry // if child is being promoted/demoted, it will swap geometry
// with the sibling being demoted/promoted. // with the sibling being demoted/promoted.
if ((dir == MOVE_NEXT && desired == 0) if ((dir == MOVE_NEXT && desired == 0)
|| (dir == MOVE_PREV && (size_t) desired == parent->nb_master - 1)) { || (dir == MOVE_PREV && (size_t) desired == parent->nb_master - 1)) {
swap_geom = parent->children->items[parent->nb_master - 1]; swap_geom = parent->children->items[parent->nb_master - 1];
} else if ((dir == MOVE_NEXT && (size_t) desired == parent->nb_master) } else if ((dir == MOVE_NEXT && (size_t) desired == parent->nb_master)
|| (dir == MOVE_PREV && desired == parent->children->length - 1)) { || (dir == MOVE_PREV && desired == parent->children->length - 1)) {
swap_geom = parent->children->items[parent->nb_master]; swap_geom = parent->children->items[parent->nb_master];
} }
if (swap_geom) { if (swap_geom) {
@ -837,9 +837,9 @@ static void apply_tabbed_or_stacked_layout(swayc_t *container, double x,
double height); double height);
static void apply_auto_layout(swayc_t *container, const double x, const double y, static void apply_auto_layout(swayc_t *container, const double x, const double y,
const double width, const double height, const double width, const double height,
enum swayc_layouts group_layout, enum swayc_layouts group_layout,
bool master_first); bool master_first);
static void arrange_windows_r(swayc_t *container, double width, double height) { static void arrange_windows_r(swayc_t *container, double width, double height) {
int i; int i;
@ -972,11 +972,11 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
case L_HORIZ: case L_HORIZ:
default: default:
apply_horiz_layout(container, x, y, width, height, 0, apply_horiz_layout(container, x, y, width, height, 0,
container->children->length); container->children->length);
break; break;
case L_VERT: case L_VERT:
apply_vert_layout(container, x, y, width, height, 0, apply_vert_layout(container, x, y, width, height, 0,
container->children->length); container->children->length);
break; break;
case L_TABBED: case L_TABBED:
case L_STACKED: case L_STACKED:
@ -1007,7 +1007,7 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
if (swayc_is_fullscreen(view)) { if (swayc_is_fullscreen(view)) {
wlc_view_bring_to_front(view->handle); wlc_view_bring_to_front(view->handle);
} else if (!container->focused || } else if (!container->focused ||
!swayc_is_fullscreen(container->focused)) { !swayc_is_fullscreen(container->focused)) {
wlc_view_bring_to_front(view->handle); wlc_view_bring_to_front(view->handle);
} }
} }
@ -1068,8 +1068,8 @@ void apply_horiz_layout(swayc_t *container, const double x, const double y,
} }
void apply_vert_layout(swayc_t *container, const double x, const double y, void apply_vert_layout(swayc_t *container, const double x, const double y,
const double width, const double height, const int start, const double width, const double height, const int start,
const int end) { const int end) {
int i; int i;
double scale = 0; double scale = 0;
// Calculate total height // Calculate total height
@ -1121,7 +1121,7 @@ void apply_vert_layout(swayc_t *container, const double x, const double y,
} }
void apply_tabbed_or_stacked_layout(swayc_t *container, double x, double y, void apply_tabbed_or_stacked_layout(swayc_t *container, double x, double y,
double width, double height) { double width, double height) {
int i; int i;
swayc_t *focused = NULL; swayc_t *focused = NULL;
for (i = 0; i < container->children->length; ++i) { for (i = 0; i < container->children->length; ++i) {
@ -1141,9 +1141,9 @@ void apply_tabbed_or_stacked_layout(swayc_t *container, double x, double y,
} }
void apply_auto_layout(swayc_t *container, const double x, const double y, void apply_auto_layout(swayc_t *container, const double x, const double y,
const double width, const double height, const double width, const double height,
enum swayc_layouts group_layout, enum swayc_layouts group_layout,
bool master_first) { bool master_first) {
// Auto layout "container" in width x height @ x, y // Auto layout "container" in width x height @ x, y
// using "group_layout" for each of the groups in the container. // using "group_layout" for each of the groups in the container.
// There is one "master" group, plus container->nb_slave_groups. // There is one "master" group, plus container->nb_slave_groups.
@ -1342,7 +1342,7 @@ swayc_t *get_swayc_in_direction_under(swayc_t *container, enum movement_directio
return NULL; return NULL;
} else { } else {
int desired = (focused_idx + (dir == MOVE_NEXT ? 1 : -1)) % int desired = (focused_idx + (dir == MOVE_NEXT ? 1 : -1)) %
parent->children->length; parent->children->length;
if (desired < 0) { if (desired < 0) {
desired += parent->children->length; desired += parent->children->length;
} }