diff options
author | Tony Crisci <tony@dubstepdish.com> | 2017-12-10 11:11:47 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-10 11:11:47 -0500 |
commit | 21626e8153490bf155e812644454fe9610491ffd (patch) | |
tree | 5b881dcc23dfdae692f58aaf1a9677b5d1395f61 /include | |
parent | Merge branch 'wlroots' into feature/input (diff) | |
download | sway-21626e8153490bf155e812644454fe9610491ffd.tar.gz sway-21626e8153490bf155e812644454fe9610491ffd.tar.zst sway-21626e8153490bf155e812644454fe9610491ffd.zip |
seat focus on button press
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/container.h | 4 | ||||
-rw-r--r-- | include/sway/input/input-manager.h | 3 | ||||
-rw-r--r-- | include/sway/input/seat.h | 8 |
3 files changed, 14 insertions, 1 deletions
diff --git a/include/sway/container.h b/include/sway/container.h index 0e1cc8a3..f13745ee 100644 --- a/include/sway/container.h +++ b/include/sway/container.h | |||
@@ -124,6 +124,10 @@ struct sway_container { | |||
124 | * Marks applied to the container, list_t of char*. | 124 | * Marks applied to the container, list_t of char*. |
125 | */ | 125 | */ |
126 | list_t *marks; | 126 | list_t *marks; |
127 | |||
128 | struct { | ||
129 | struct wl_signal destroy; | ||
130 | } events; | ||
127 | }; | 131 | }; |
128 | 132 | ||
129 | void swayc_descendants_of_type(swayc_t *root, enum swayc_types type, | 133 | void swayc_descendants_of_type(swayc_t *root, enum swayc_types type, |
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h index 5dc75ba7..9548c170 100644 --- a/include/sway/input/input-manager.h +++ b/include/sway/input/input-manager.h | |||
@@ -19,4 +19,7 @@ char* libinput_dev_unique_id(struct libinput_device *dev); | |||
19 | struct sway_input_manager *sway_input_manager_create( | 19 | struct sway_input_manager *sway_input_manager_create( |
20 | struct sway_server *server); | 20 | struct sway_server *server); |
21 | 21 | ||
22 | bool sway_input_manager_swayc_has_focus(struct sway_input_manager *input, | ||
23 | swayc_t *container); | ||
24 | |||
22 | #endif | 25 | #endif |
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index f7f8a1bb..964c0f7b 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h | |||
@@ -7,9 +7,13 @@ | |||
7 | struct sway_seat { | 7 | struct sway_seat { |
8 | struct wlr_seat *seat; | 8 | struct wlr_seat *seat; |
9 | struct sway_cursor *cursor; | 9 | struct sway_cursor *cursor; |
10 | struct sway_input_manager *input; | ||
11 | swayc_t *focus; | ||
12 | |||
13 | struct wl_listener focus_destroy; | ||
10 | }; | 14 | }; |
11 | 15 | ||
12 | struct sway_seat *sway_seat_create(struct wl_display *display, | 16 | struct sway_seat *sway_seat_create(struct sway_input_manager *input, |
13 | const char *seat_name); | 17 | const char *seat_name); |
14 | 18 | ||
15 | void sway_seat_add_device(struct sway_seat *seat, | 19 | void sway_seat_add_device(struct sway_seat *seat, |
@@ -20,4 +24,6 @@ void sway_seat_remove_device(struct sway_seat *seat, | |||
20 | 24 | ||
21 | void sway_seat_configure_xcursor(struct sway_seat *seat); | 25 | void sway_seat_configure_xcursor(struct sway_seat *seat); |
22 | 26 | ||
27 | void sway_seat_set_focus(struct sway_seat *seat, swayc_t *container); | ||
28 | |||
23 | #endif | 29 | #endif |