diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-21 11:26:22 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-21 11:26:22 +1000 |
commit | c5a6c37275978ddc8c221ca73ae1a39254dd68f5 (patch) | |
tree | 2255d845647357cdbe6fdfcb1c6a40210a69ddb7 /include | |
parent | Merge pull request #2901 from ianyfan/swaybar (diff) | |
download | sway-c5a6c37275978ddc8c221ca73ae1a39254dd68f5.tar.gz sway-c5a6c37275978ddc8c221ca73ae1a39254dd68f5.tar.zst sway-c5a6c37275978ddc8c221ca73ae1a39254dd68f5.zip |
Make workspace back_and_forth seat-specific
* When using multiple seats, each seat has its own prev_workspace_name
for the purpose of workspace back_and_forth.
* Removes prev_workspace_name global variable.
* Removes unused next_name_map function in tree/workspace.c.
* Fixes memory leak in seat_destroy (seat was not freed).
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/input/seat.h | 1 | ||||
-rw-r--r-- | include/sway/tree/workspace.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index ef65810c..bef2af77 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h | |||
@@ -51,6 +51,7 @@ struct sway_seat { | |||
51 | bool has_focus; | 51 | bool has_focus; |
52 | struct wl_list focus_stack; // list of containers in focus order | 52 | struct wl_list focus_stack; // list of containers in focus order |
53 | struct sway_workspace *workspace; | 53 | struct sway_workspace *workspace; |
54 | char *prev_workspace_name; // for workspace back_and_forth | ||
54 | 55 | ||
55 | // If the focused layer is set, views cannot receive keyboard focus | 56 | // If the focused layer is set, views cannot receive keyboard focus |
56 | struct wlr_layer_surface_v1 *focused_layer; | 57 | struct wlr_layer_surface_v1 *focused_layer; |
diff --git a/include/sway/tree/workspace.h b/include/sway/tree/workspace.h index efdae5a1..b5ae92f3 100644 --- a/include/sway/tree/workspace.h +++ b/include/sway/tree/workspace.h | |||
@@ -45,8 +45,6 @@ struct sway_workspace { | |||
45 | struct sway_workspace_state current; | 45 | struct sway_workspace_state current; |
46 | }; | 46 | }; |
47 | 47 | ||
48 | extern char *prev_workspace_name; | ||
49 | |||
50 | struct workspace_config *workspace_find_config(const char *ws_name); | 48 | struct workspace_config *workspace_find_config(const char *ws_name); |
51 | 49 | ||
52 | struct sway_output *workspace_get_initial_output(const char *name); | 50 | struct sway_output *workspace_get_initial_output(const char *name); |