diff options
| author | Brian Ashworth <RedSoxFan@users.noreply.github.com> | 2018-09-03 00:24:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-03 00:24:28 -0400 |
| commit | afb69688746b04d7667e1d57d9ac844bd2671570 (patch) | |
| tree | f950fd298c335abd992005a26029dbfba8010136 /include | |
| parent | 349d1f3be87ad9fd49482f64c71eb2665750261b (diff) | |
| parent | 3af9588eb4aab0b4f45edf2601c9a7ff0846861f (diff) | |
| download | sway-afb69688746b04d7667e1d57d9ac844bd2671570.tar.xz | |
Merge branch 'master' into disabled-no-modeset
Diffstat (limited to 'include')
| -rw-r--r-- | include/sway/commands.h | 1 | ||||
| -rw-r--r-- | include/sway/config.h | 11 | ||||
| -rw-r--r-- | include/sway/tree/view.h | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index 8e91c158..b0b5ed0f 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h @@ -117,6 +117,7 @@ sway_cmd cmd_floating_modifier; sway_cmd cmd_floating_scroll; sway_cmd cmd_focus; sway_cmd cmd_focus_follows_mouse; +sway_cmd cmd_focus_on_window_activation; sway_cmd cmd_focus_wrapping; sway_cmd cmd_font; sway_cmd cmd_for_window; diff --git a/include/sway/config.h b/include/sway/config.h index 18d10faa..4ee8c3c2 100644 --- a/include/sway/config.h +++ b/include/sway/config.h @@ -58,6 +58,16 @@ struct sway_mouse_binding { }; /** + * Focus on window activation. + */ +enum sway_fowa { + FOWA_SMART, + FOWA_URGENT, + FOWA_FOCUS, + FOWA_NONE, +}; + +/** * A "mode" of keybindings created via the `mode` command. */ struct sway_mode { @@ -340,6 +350,7 @@ struct sway_config { size_t font_height; bool pango_markup; size_t urgent_timeout; + enum sway_fowa focus_on_window_activation; // Flags bool focus_follows_mouse; diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index f73ce571..382ab6b9 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -167,6 +167,7 @@ struct sway_xwayland_view { struct wl_listener request_maximize; struct wl_listener request_configure; struct wl_listener request_fullscreen; + struct wl_listener request_activate; struct wl_listener set_title; struct wl_listener set_class; struct wl_listener set_window_type; @@ -259,6 +260,11 @@ void view_autoconfigure(struct sway_view *view); void view_set_activated(struct sway_view *view, bool activated); +/** + * Called when the view requests to be focused. + */ +void view_request_activate(struct sway_view *view); + void view_set_tiled(struct sway_view *view, bool tiled); void view_close(struct sway_view *view); |