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

Merge pull request #2228 from emersion/focus-mode-toggle

Browse source 
Implement `focus mode_toggle`
This commit is contained in:
Drew DeVault 2018-07-09 18:27:54 -07:00 committed by GitHub
parent fbeef1322f 6fd9a2bfd6
commit 5709c5d375
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sway/commands/focus.c
View file

@ -1,10 +1,12 @@
#include <strings.h> #include <strings.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "log.h" #include "log.h"
#include "sway/commands.h"
#include "sway/input/input-manager.h" #include "sway/input/input-manager.h"
#include "sway/input/seat.h" #include "sway/input/seat.h"
#include "sway/tree/arrange.h"
#include "sway/tree/view.h" #include "sway/tree/view.h"
#include "sway/commands.h" #include "sway/tree/workspace.h"
static bool parse_movement_direction(const char *name, static bool parse_movement_direction(const char *name,
enum movement_direction *out) { enum movement_direction *out) {
@ -27,6 +29,21 @@ static bool parse_movement_direction(const char *name,
return true; return true;
} }
static struct cmd_results *focus_mode(struct sway_container *con,
struct sway_seat *seat, bool floating) {
struct sway_container *ws = con->type == C_WORKSPACE ?
con : container_parent(con, C_WORKSPACE);
struct sway_container *new_focus = ws;
if (floating) {
new_focus = ws->sway_workspace->floating;
if (new_focus->children->length == 0) {
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
}
seat_set_focus(seat, seat_get_active_child(seat, new_focus));
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
struct cmd_results *cmd_focus(int argc, char **argv) { struct cmd_results *cmd_focus(int argc, char **argv) {
struct sway_container *con = config->handler_context.current_container; struct sway_container *con = config->handler_context.current_container;
struct sway_seat *seat = config->handler_context.seat; struct sway_seat *seat = config->handler_context.seat;
@ -40,11 +57,20 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
// TODO mode_toggle if (strcmp(argv[0], "floating") == 0) {
return focus_mode(con, seat, true);
} else if (strcmp(argv[0], "tiling") == 0) {
return focus_mode(con, seat, false);
} else if (strcmp(argv[0], "mode_toggle") == 0) {
return focus_mode(con, seat, !container_is_floating(con));
}
// TODO: focus output <direction|name>
enum movement_direction direction = 0; enum movement_direction direction = 0;
if (!parse_movement_direction(argv[0], &direction)) { if (!parse_movement_direction(argv[0], &direction)) {
return cmd_results_new(CMD_INVALID, "focus", return cmd_results_new(CMD_INVALID, "focus",
"Expected 'focus <direction|parent|child|mode_toggle>' or 'focus output <direction|name>'"); "Expected 'focus <direction|parent|child|mode_toggle|floating|tiling>' "
"or 'focus output <direction|name>'");
} }
struct sway_container *next_focus = container_get_in_direction( struct sway_container *next_focus = container_get_in_direction(

6
sway/sway.5.scd
View file

@ -92,6 +92,12 @@ They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
*focus* output <name> *focus* output <name>
Moves focus to the named output. Moves focus to the named output.
*focus tiling*
Sets focus to the last focused tiling container.
*focus floating*
Sets focus to the last focused floating container.
*focus* mode\_toggle *focus* mode\_toggle
Moves focus between the floating and tiled layers. Moves focus between the floating and tiled layers.