mirror of
https://github.com/swaywm/sway.git
synced 2024-11-23 08:21:28 +00:00
Implement focus_follows_mouse
Also contains two other small changes: - Clicking any button will focus the container clicked (not just left) - Remove seamless_mouse (doesn't make sense on wlroots)
This commit is contained in:
parent
ae6d459000
commit
9b38ef950f
|
@ -304,7 +304,6 @@ struct sway_config {
|
||||||
bool reloading;
|
bool reloading;
|
||||||
bool reading;
|
bool reading;
|
||||||
bool auto_back_and_forth;
|
bool auto_back_and_forth;
|
||||||
bool seamless_mouse;
|
|
||||||
bool show_marks;
|
bool show_marks;
|
||||||
|
|
||||||
bool edge_gaps;
|
bool edge_gaps;
|
||||||
|
|
|
@ -98,6 +98,7 @@ static struct cmd_handler handlers[] = {
|
||||||
{ "bindsym", cmd_bindsym },
|
{ "bindsym", cmd_bindsym },
|
||||||
{ "exec", cmd_exec },
|
{ "exec", cmd_exec },
|
||||||
{ "exec_always", cmd_exec_always },
|
{ "exec_always", cmd_exec_always },
|
||||||
|
{ "focus_follows_mouse", cmd_focus_follows_mouse },
|
||||||
{ "include", cmd_include },
|
{ "include", cmd_include },
|
||||||
{ "input", cmd_input },
|
{ "input", cmd_input },
|
||||||
{ "mode", cmd_mode },
|
{ "mode", cmd_mode },
|
||||||
|
|
12
sway/commands/focus_follows_mouse.c
Normal file
12
sway/commands/focus_follows_mouse.c
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <strings.h>
|
||||||
|
#include "sway/commands.h"
|
||||||
|
|
||||||
|
struct cmd_results *cmd_focus_follows_mouse(int argc, char **argv) {
|
||||||
|
struct cmd_results *error = NULL;
|
||||||
|
if ((error = checkarg(argc, "focus_follows_mouse", EXPECTED_EQUAL_TO, 1))) {
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
config->focus_follows_mouse = !strcasecmp(argv[0], "yes");
|
||||||
|
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
|
||||||
|
}
|
|
@ -178,7 +178,6 @@ static void config_defaults(struct sway_config *config) {
|
||||||
config->active = false;
|
config->active = false;
|
||||||
config->failed = false;
|
config->failed = false;
|
||||||
config->auto_back_and_forth = false;
|
config->auto_back_and_forth = false;
|
||||||
config->seamless_mouse = true;
|
|
||||||
config->reading = false;
|
config->reading = false;
|
||||||
config->show_marks = true;
|
config->show_marks = true;
|
||||||
|
|
||||||
|
|
|
@ -125,7 +125,10 @@ static void cursor_send_pointer_motion(struct sway_cursor *cursor,
|
||||||
struct wlr_seat *seat = cursor->seat->wlr_seat;
|
struct wlr_seat *seat = cursor->seat->wlr_seat;
|
||||||
struct wlr_surface *surface = NULL;
|
struct wlr_surface *surface = NULL;
|
||||||
double sx, sy;
|
double sx, sy;
|
||||||
container_at_cursor(cursor, &surface, &sx, &sy);
|
struct sway_container *c = container_at_cursor(cursor, &surface, &sx, &sy);
|
||||||
|
if (c && config->focus_follows_mouse) {
|
||||||
|
sway_seat_set_focus(cursor->seat, c);
|
||||||
|
}
|
||||||
|
|
||||||
// reset cursor if switching between clients
|
// reset cursor if switching between clients
|
||||||
struct wl_client *client = NULL;
|
struct wl_client *client = NULL;
|
||||||
|
@ -170,7 +173,6 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
|
||||||
struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
|
struct sway_cursor *cursor = wl_container_of(listener, cursor, button);
|
||||||
struct wlr_event_pointer_button *event = data;
|
struct wlr_event_pointer_button *event = data;
|
||||||
|
|
||||||
if (event->button == BTN_LEFT) {
|
|
||||||
struct wlr_surface *surface = NULL;
|
struct wlr_surface *surface = NULL;
|
||||||
double sx, sy;
|
double sx, sy;
|
||||||
struct sway_container *cont =
|
struct sway_container *cont =
|
||||||
|
@ -197,7 +199,6 @@ static void handle_cursor_button(struct wl_listener *listener, void *data) {
|
||||||
} else {
|
} else {
|
||||||
sway_seat_set_focus(cursor->seat, cont);
|
sway_seat_set_focus(cursor->seat, cont);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec,
|
wlr_seat_pointer_notify_button(cursor->seat->wlr_seat, event->time_msec,
|
||||||
event->button, event->state);
|
event->button, event->state);
|
||||||
|
|
|
@ -13,6 +13,7 @@ sway_sources = files(
|
||||||
'commands/exec.c',
|
'commands/exec.c',
|
||||||
'commands/exec_always.c',
|
'commands/exec_always.c',
|
||||||
'commands/focus.c',
|
'commands/focus.c',
|
||||||
|
'commands/focus_follows_mouse.c',
|
||||||
'commands/kill.c',
|
'commands/kill.c',
|
||||||
'commands/include.c',
|
'commands/include.c',
|
||||||
'commands/input.c',
|
'commands/input.c',
|
||||||
|
|
Loading…
Reference in a new issue