mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 19:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2549 from RyanDwyer/border-improvements

Browse source 
Implement deprecated new_window and new_float commands
This commit is contained in:
Drew DeVault 2018-09-01 10:38:02 -04:00 committed by GitHub
parent 4ac67d6408 016d0455f8
commit 692dc55eca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/commands.c
View file

@ -118,6 +118,8 @@ static struct cmd_handler handlers[] = {
{ "input", cmd_input }, { "input", cmd_input },
{ "mode", cmd_mode }, { "mode", cmd_mode },
{ "mouse_warping", cmd_mouse_warping }, { "mouse_warping", cmd_mouse_warping },
{ "new_float", cmd_default_floating_border },
{ "new_window", cmd_default_border },
{ "no_focus", cmd_no_focus }, { "no_focus", cmd_no_focus },
{ "output", cmd_output }, { "output", cmd_output },
{ "seat", cmd_seat }, { "seat", cmd_seat },

6
sway/commands/border.c
View file

@ -27,9 +27,6 @@ struct cmd_results *cmd_border(int argc, char **argv) {
view->border = B_NORMAL; view->border = B_NORMAL;
} else if (strcmp(argv[0], "pixel") == 0) { } else if (strcmp(argv[0], "pixel") == 0) {
view->border = B_PIXEL; view->border = B_PIXEL;
if (argc == 2) {
view->border_thickness = atoi(argv[1]);
}
} else if (strcmp(argv[0], "toggle") == 0) { } else if (strcmp(argv[0], "toggle") == 0) {
view->border = (view->border + 1) % 3; view->border = (view->border + 1) % 3;
} else { } else {
@ -37,6 +34,9 @@ struct cmd_results *cmd_border(int argc, char **argv) {
"Expected 'border <none|normal|pixel|toggle>' " "Expected 'border <none|normal|pixel|toggle>' "
"or 'border pixel <px>'"); "or 'border pixel <px>'");
} }
if (argc == 2) {
view->border_thickness = atoi(argv[1]);
}
if (container_is_floating(view->swayc)) { if (container_is_floating(view->swayc)) {
container_set_geometry_from_floating_view(view->swayc); container_set_geometry_from_floating_view(view->swayc);