mirror of
https://github.com/swaywm/sway.git
synced 2025-11-22 06:59:48 -05:00
seat focus on button press
This commit is contained in:
parent
0fdecb4d3a
commit
21626e8153
7 changed files with 90 additions and 4 deletions
|
|
@ -5,16 +5,17 @@
|
|||
#include "sway/input/cursor.h"
|
||||
#include "sway/input/input-manager.h"
|
||||
#include "sway/output.h"
|
||||
#include "sway/view.h"
|
||||
#include "log.h"
|
||||
|
||||
struct sway_seat *sway_seat_create(struct wl_display *display,
|
||||
struct sway_seat *sway_seat_create(struct sway_input_manager *input,
|
||||
const char *seat_name) {
|
||||
struct sway_seat *seat = calloc(1, sizeof(struct sway_seat));
|
||||
if (!seat) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
seat->seat = wlr_seat_create(display, seat_name);
|
||||
seat->seat = wlr_seat_create(input->server->wl_display, seat_name);
|
||||
if (!sway_assert(seat->seat, "could not allocate seat")) {
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -26,6 +27,8 @@ struct sway_seat *sway_seat_create(struct wl_display *display,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
seat->input = input;
|
||||
|
||||
wlr_seat_set_capabilities(seat->seat,
|
||||
WL_SEAT_CAPABILITY_KEYBOARD |
|
||||
WL_SEAT_CAPABILITY_POINTER |
|
||||
|
|
@ -110,3 +113,40 @@ void sway_seat_configure_xcursor(struct sway_seat *seat) {
|
|||
wlr_cursor_warp(seat->cursor->cursor, NULL, seat->cursor->cursor->x,
|
||||
seat->cursor->cursor->y);
|
||||
}
|
||||
|
||||
static void handle_focus_destroy(struct wl_listener *listener, void *data) {
|
||||
struct sway_seat *seat = wl_container_of(listener, seat, focus_destroy);
|
||||
//swayc_t *container = data;
|
||||
|
||||
// TODO set new focus based on the state of the tree
|
||||
sway_seat_set_focus(seat, NULL);
|
||||
}
|
||||
|
||||
void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container) {
|
||||
swayc_t *last_focus = seat->focus;
|
||||
|
||||
if (last_focus == container) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (last_focus) {
|
||||
wl_list_remove(&seat->focus_destroy.link);
|
||||
}
|
||||
|
||||
if (container) {
|
||||
struct sway_view *view = container->sway_view;
|
||||
view->iface.set_activated(view, true);
|
||||
wl_signal_add(&container->events.destroy, &seat->focus_destroy);
|
||||
seat->focus_destroy.notify = handle_focus_destroy;
|
||||
// TODO give keyboard focus
|
||||
}
|
||||
|
||||
seat->focus = container;
|
||||
|
||||
if (last_focus &&
|
||||
!sway_input_manager_swayc_has_focus(seat->input, last_focus)) {
|
||||
struct sway_view *view = last_focus->sway_view;
|
||||
view->iface.set_activated(view, false);
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue