aboutsummaryrefslogtreecommitdiff
path: root/sway/input/seat.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r--sway/input/seat.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 09927a1a..23b7ef76 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -18,6 +18,7 @@
#include "sway/output.h"
#include "sway/tree/container.h"
#include "sway/tree/view.h"
+#include "sway/tree/workspace.h"
#include "log.h"
static void seat_device_destroy(struct sway_seat_device *seat_device) {
@@ -448,6 +449,21 @@ void seat_set_focus_warp(struct sway_seat *seat,
return;
}
+ struct sway_container *last_workspace = last_focus;
+ if (last_workspace && last_workspace->type != C_WORKSPACE) {
+ last_workspace = container_parent(last_workspace, C_WORKSPACE);
+ }
+ struct sway_container *new_workspace = container;
+ if (new_workspace && new_workspace->type != C_WORKSPACE) {
+ new_workspace = container_parent(new_workspace, C_WORKSPACE);
+ }
+
+ if (last_workspace == new_workspace
+ && last_workspace->sway_workspace->fullscreen
+ && !container->sway_view->is_fullscreen) {
+ return;
+ }
+
struct sway_container *last_output = last_focus;
if (last_output && last_output->type != C_OUTPUT) {
last_output = container_parent(last_output, C_OUTPUT);