Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-27 21:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2617 from wmww/cursor-enter-on-focus-change

Browse source 
Give windows pointer focus immediately
This commit is contained in:
Drew DeVault 2018-09-10 21:00:39 -04:00 committed by GitHub
commit 822b45f483
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/commands/focus.c
View file

@ -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);

4
sway/tree/container.c
View file

@ -218,7 +218,7 @@ static struct sway_container *container_at_tabbed(struct sway_node *parent,
// Surfaces
struct sway_node *current = seat_get_active_child(seat, parent);
return tiling_container_at(current, lx, ly, surface, sx, sy);
return current ? tiling_container_at(current, lx, ly, surface, sx, sy) : NULL;
}
/**
@ -246,7 +246,7 @@ static struct sway_container *container_at_stacked(struct sway_node *parent,
// Surfaces
struct sway_node *current = seat_get_active_child(seat, parent);
return tiling_container_at(current, lx, ly, surface, sx, sy);
return current ? tiling_container_at(current, lx, ly, surface, sx, sy) : NULL;
}
/**

3
sway/tree/view.c
View file

@ -14,6 +14,7 @@
#include "sway/criteria.h"
#include "sway/commands.h"
#include "sway/desktop/transaction.h"
#include "sway/input/cursor.h"
#include "sway/ipc-server.h"
#include "sway/output.h"
#include "sway/input/seat.h"
@ -582,6 +583,8 @@ void view_unmap(struct sway_view *view) {
workspace_detect_urgent(ws);
}
cursor_send_pointer_motion(config->handler_context.seat->cursor, 0, true);
transaction_commit_dirty();
view->surface = NULL;
}

3
sway/tree/workspace.c
View file

@ -7,6 +7,7 @@
#include <strings.h>
#include "stringop.h"
#include "sway/input/input-manager.h"
#include "sway/input/cursor.h"
#include "sway/input/seat.h"
#include "sway/ipc-server.h"
#include "sway/output.h"
@ -400,6 +401,7 @@ bool workspace_switch(struct sway_workspace *workspace,
if (&floater->node == focus) {
seat_set_focus(seat, NULL);
seat_set_focus_container(seat, floater);
cursor_send_pointer_motion(seat->cursor, 0, true);
}
--i;
}
@ -422,6 +424,7 @@ bool workspace_switch(struct sway_workspace *workspace,
}
seat_set_focus(seat, next);
arrange_workspace(workspace);
cursor_send_pointer_motion(seat->cursor, 0, true);
return true;
}