Revert removal of raise_floating directive

This reverts commit b9b1b0e566 and
therefore pull request #2888. The reason being that with some panels
that list windows (such as wf-panel), focusing on a window won't raise
it up front, which is weird.

This pull request also sets the default value for raise_floating to
false, however, to not break existing set ups that expect the old
behavior.
This commit is contained in:
diamondburned 2020-12-24 19:32:15 -08:00
parent d1c4ed1867
commit ddb86d7913
8 changed files with 29 additions and 0 deletions

View file

@ -131,6 +131,7 @@ sway_cmd cmd_floating_modifier;
sway_cmd cmd_floating_scroll; sway_cmd cmd_floating_scroll;
sway_cmd cmd_focus; sway_cmd cmd_focus;
sway_cmd cmd_focus_follows_mouse; sway_cmd cmd_focus_follows_mouse;
sway_cmd cmd_raise_floating;
sway_cmd cmd_focus_on_window_activation; sway_cmd cmd_focus_on_window_activation;
sway_cmd cmd_focus_wrapping; sway_cmd cmd_focus_wrapping;
sway_cmd cmd_font; sway_cmd cmd_font;

View file

@ -500,6 +500,7 @@ struct sway_config {
enum focus_follows_mouse_mode focus_follows_mouse; enum focus_follows_mouse_mode focus_follows_mouse;
enum mouse_warping_mode mouse_warping; enum mouse_warping_mode mouse_warping;
enum focus_wrapping_mode focus_wrapping; enum focus_wrapping_mode focus_wrapping;
bool raise_floating;
bool active; bool active;
bool failed; bool failed;
bool reloading; bool reloading;

View file

@ -80,6 +80,7 @@ static struct cmd_handler handlers[] = {
{ "no_focus", cmd_no_focus }, { "no_focus", cmd_no_focus },
{ "output", cmd_output }, { "output", cmd_output },
{ "popup_during_fullscreen", cmd_popup_during_fullscreen }, { "popup_during_fullscreen", cmd_popup_during_fullscreen },
{ "raise_floating", cmd_raise_floating },
{ "seat", cmd_seat }, { "seat", cmd_seat },
{ "set", cmd_set }, { "set", cmd_set },
{ "show_marks", cmd_show_marks }, { "show_marks", cmd_show_marks },

View file

@ -0,0 +1,14 @@
#include <string.h>
#include <strings.h>
#include "sway/commands.h"
#include "util.h"
struct cmd_results *cmd_raise_floating(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "raise_floating", EXPECTED_EQUAL_TO, 1))) {
return error;
}
config->raise_floating =
parse_boolean(argv[0], config->raise_floating);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

View file

@ -254,6 +254,7 @@ static void config_defaults(struct sway_config *config) {
// Flags // Flags
config->focus_follows_mouse = FOLLOWS_YES; config->focus_follows_mouse = FOLLOWS_YES;
config->raise_floating = false;
config->mouse_warping = WARP_OUTPUT; config->mouse_warping = WARP_OUTPUT;
config->focus_wrapping = WRAP_YES; config->focus_wrapping = WRAP_YES;
config->validating = false; config->validating = false;

View file

@ -1184,6 +1184,11 @@ void seat_set_focus(struct sway_seat *seat, struct sway_node *node) {
} }
} }
// If we've focused a floating container, bring it to the front.
if (container && config->raise_floating) {
container_raise_floating(container);
}
if (new_output_last_ws) { if (new_output_last_ws) {
workspace_consider_destroy(new_output_last_ws); workspace_consider_destroy(new_output_last_ws);
} }

View file

@ -56,6 +56,7 @@ sway_sources = files(
'commands/floating_modifier.c', 'commands/floating_modifier.c',
'commands/focus.c', 'commands/focus.c',
'commands/focus_follows_mouse.c', 'commands/focus_follows_mouse.c',
'commands/raise_floating.c',
'commands/focus_on_window_activation.c', 'commands/focus_on_window_activation.c',
'commands/focus_wrapping.c', 'commands/focus_wrapping.c',
'commands/font.c', 'commands/font.c',

View file

@ -678,6 +678,11 @@ The default colors are:
devices. A list of input device names may be obtained via *swaymsg -t devices. A list of input device names may be obtained via *swaymsg -t
get_inputs*. get_inputs*.
*raise\_floating* yes|no
Controls the behaviour of floating windows. A _yes_ (the default) will
raise windows on gaining focus. A _no_ will only raise floating windows
by clicking anywhere in the window.
*seat* <seat> <seat-subcommands...> *seat* <seat> <seat-subcommands...>
For details on seat subcommands, see *sway-input*(5). For details on seat subcommands, see *sway-input*(5).