From c5a6c37275978ddc8c221ca73ae1a39254dd68f5 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 21 Oct 2018 11:26:22 +1000 Subject: 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). --- include/sway/input/seat.h | 1 + include/sway/tree/workspace.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'include/sway') 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 { bool has_focus; struct wl_list focus_stack; // list of containers in focus order struct sway_workspace *workspace; + char *prev_workspace_name; // for workspace back_and_forth // If the focused layer is set, views cannot receive keyboard focus 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 { struct sway_workspace_state current; }; -extern char *prev_workspace_name; - struct workspace_config *workspace_find_config(const char *ws_name); struct sway_output *workspace_get_initial_output(const char *name); -- cgit v1.2.3