Give windows pointer focus immediately when they are switched to

Fixes #2401 (aka #2558)

Previously, when switching windows, pointer focus was not changed until the pointer was moved. This makes the pointer enter happen immediately, without the side effects of other attempted fixes.

1 files changed, 7 insertions, 0 deletions

diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 668a0c7b..d63077e6 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -3,6 +3,7 @@
 #include "log.h"
 #include "sway/commands.h"
 #include "sway/input/input-manager.h"
+#include "sway/input/cursor.h"
 #include "sway/input/seat.h"
 #include "sway/output.h"
 #include "sway/tree/arrange.h"
@@ -180,6 +181,7 @@ static struct cmd_results *focus_mode(struct sway_workspace *ws,
         }
         if (new_focus) {
                 seat_set_focus_container(seat, new_focus);
+                cursor_send_pointer_motion(seat->cursor, 0, true);
         } else {
                 return cmd_results_new(CMD_FAILURE, "focus",
                                 "Failed to find a %s container in workspace",
@@ -212,6 +214,7 @@ static struct cmd_results *focus_output(struct sway_seat *seat,
         free(identifier);
         if (output) {
                 seat_set_focus(seat, seat_get_focus_inactive(seat, &output->node));
+                cursor_send_pointer_motion(seat->cursor, 0, true);
         }
 
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);
@@ -232,6 +235,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
 
         if (argc == 0 && container) {
                 seat_set_focus_container(seat, container);
+                cursor_send_pointer_motion(seat->cursor, 0, true);
                 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
         }
 
@@ -260,6 +264,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                 struct sway_node *focus = seat_get_active_child(seat, node);
                 if (focus) {
                         seat_set_focus(seat, focus);
+                        cursor_send_pointer_motion(seat->cursor, 0, true);
                 }
                 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
         }
@@ -279,6 +284,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                 struct sway_node *node =
                         get_node_in_output_direction(new_output, direction);
                 seat_set_focus(seat, node);
+                cursor_send_pointer_motion(seat->cursor, 0, true);
                 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
         }
 
@@ -286,6 +292,7 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
                 node_get_in_direction(container, seat, direction);
         if (next_focus) {
                 seat_set_focus(seat, next_focus);
+                cursor_send_pointer_motion(seat->cursor, 0, true);
         }
 
         return cmd_results_new(CMD_SUCCESS, NULL, NULL);