6 files changed, 42 insertions, 49 deletions

diff --git a/meson.build b/meson.build
index 82e4a96f..76eaff20 100644
--- a/meson.build
+++ b/meson.build
@@ -22,6 +22,10 @@ datadir = get_option('datadir')
 sysconfdir = get_option('sysconfdir')
 prefix = get_option('prefix')
 
+if is_freebsd
+        add_project_arguments('-D_C11_SOURCE', language: 'c')
+endif
+
 swayidle_deps = []
 
 jsonc          = dependency('json-c', version: '>=0.13')
diff --git a/sway/config/input.c b/sway/config/input.c
index fffc8518..6b43a5b9 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -52,6 +52,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
         if (src->dwt != INT_MIN) {
                 dst->dwt = src->dwt;
         }
+        if (src->left_handed != INT_MIN) {
+                dst->left_handed = src->left_handed;
+        }
         if (src->middle_emulation != INT_MIN) {
                 dst->middle_emulation = src->middle_emulation;
         }
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index 797f6b4c..34d99d52 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -31,14 +31,14 @@ struct sway_transaction_instruction {
         struct sway_transaction *transaction;
         struct sway_node *node;
         union {
-                struct sway_output_state *output_state;
-                struct sway_workspace_state *workspace_state;
-                struct sway_container_state *container_state;
+                struct sway_output_state output_state;
+                struct sway_workspace_state workspace_state;
+                struct sway_container_state container_state;
         };
         uint32_t serial;
 };
 
-static struct sway_transaction *transaction_create() {
+static struct sway_transaction *transaction_create(void) {
         struct sway_transaction *transaction =
                 calloc(1, sizeof(struct sway_transaction));
         if (!sway_assert(transaction, "Unable to allocate transaction")) {
@@ -86,14 +86,7 @@ static void transaction_destroy(struct sway_transaction *transaction) {
 
 static void copy_output_state(struct sway_output *output,
                 struct sway_transaction_instruction *instruction) {
-        struct sway_output_state *state =
-                calloc(1, sizeof(struct sway_output_state));
-        if (!state) {
-                wlr_log(WLR_ERROR, "Could not allocate output state");
-                return;
-        }
-        instruction->output_state = state;
-
+        struct sway_output_state *state = &instruction->output_state;
         state->workspaces = create_list();
         list_cat(state->workspaces, output->workspaces);
 
@@ -102,13 +95,7 @@ static void copy_output_state(struct sway_output *output,
 
 static void copy_workspace_state(struct sway_workspace *ws,
                 struct sway_transaction_instruction *instruction) {
-        struct sway_workspace_state *state =
-                calloc(1, sizeof(struct sway_workspace_state));
-        if (!state) {
-                wlr_log(WLR_ERROR, "Could not allocate workspace state");
-                return;
-        }
-        instruction->workspace_state = state;
+        struct sway_workspace_state *state = &instruction->workspace_state;
 
         state->fullscreen = ws->fullscreen;
         state->x = ws->x;
@@ -138,13 +125,7 @@ static void copy_workspace_state(struct sway_workspace *ws,
 
 static void copy_container_state(struct sway_container *container,
                 struct sway_transaction_instruction *instruction) {
-        struct sway_container_state *state =
-                calloc(1, sizeof(struct sway_container_state));
-        if (!state) {
-                wlr_log(WLR_ERROR, "Could not allocate container state");
-                return;
-        }
-        instruction->container_state = state;
+        struct sway_container_state *state = &instruction->container_state;
 
         state->layout = container->layout;
         state->con_x = container->x;
@@ -301,15 +282,15 @@ static void transaction_apply(struct sway_transaction *transaction) {
                 case N_ROOT:
                         break;
                 case N_OUTPUT:
-                        apply_output_state(node->sway_output, instruction->output_state);
+                        apply_output_state(node->sway_output, &instruction->output_state);
                         break;
                 case N_WORKSPACE:
                         apply_workspace_state(node->sway_workspace,
-                                        instruction->workspace_state);
+                                        &instruction->workspace_state);
                         break;
                 case N_CONTAINER:
                         apply_container_state(node->sway_container,
-                                        instruction->container_state);
+                                        &instruction->container_state);
                         break;
                 }
 
@@ -335,7 +316,7 @@ static bool transaction_same_nodes(struct sway_transaction *a,
         return true;
 }
 
-static void transaction_progress_queue() {
+static void transaction_progress_queue(void) {
         if (!server.transactions->length) {
                 return;
         }
@@ -390,7 +371,7 @@ static bool should_configure(struct sway_node *node,
                 return false;
         }
         struct sway_container_state *cstate = &node->sway_container->current;
-        struct sway_container_state *istate = instruction->container_state;
+        struct sway_container_state *istate = &instruction->container_state;
 #ifdef HAVE_XWAYLAND
         // Xwayland views are position-aware and need to be reconfigured
         // when their position changes.
@@ -418,10 +399,10 @@ static void transaction_commit(struct sway_transaction *transaction) {
                 struct sway_node *node = instruction->node;
                 if (should_configure(node, instruction)) {
                         instruction->serial = view_configure(node->sway_container->view,
-                                        instruction->container_state->view_x,
-                                        instruction->container_state->view_y,
-                                        instruction->container_state->view_width,
-                                        instruction->container_state->view_height);
+                                        instruction->container_state.view_x,
+                                        instruction->container_state.view_y,
+                                        instruction->container_state.view_width,
+                                        instruction->container_state.view_height);
                         ++transaction->num_waiting;
 
                         // From here on we are rendering a saved buffer of the view, which
@@ -513,8 +494,8 @@ void transaction_notify_view_ready_by_size(struct sway_view *view,
                 int width, int height) {
         struct sway_transaction_instruction *instruction =
                 view->container->node.instruction;
-        if (instruction->container_state->view_width == width &&
-                        instruction->container_state->view_height == height) {
+        if (instruction->container_state.view_width == width &&
+                        instruction->container_state.view_height == height) {
                 set_instruction_ready(instruction);
         }
 }
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index f696646f..f39fe29c 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -233,7 +233,8 @@ static void handle_new_input(struct wl_listener *listener, void *data) {
         wlr_log(WLR_DEBUG, "adding device: '%s'",
                 input_device->identifier);
 
-        if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
+        if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER ||
+                        input_device->wlr_device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
                 input_manager_libinput_config_pointer(input_device);
         }
 
@@ -393,7 +394,8 @@ void input_manager_apply_input_config(struct sway_input_manager *input,
         wl_list_for_each(input_device, &input->devices, link) {
                 if (strcmp(input_device->identifier, input_config->identifier) == 0
                                 || wildcard) {
-                        if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER) {
+                        if (input_device->wlr_device->type == WLR_INPUT_DEVICE_POINTER ||
+                                        input_device->wlr_device->type == WLR_INPUT_DEVICE_TABLET_TOOL) {
                                 input_manager_libinput_config_pointer(input_device);
                         }
 
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 99959c97..2d915502 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -1,8 +1,5 @@
 // See https://i3wm.org/docs/ipc.html for protocol information
-#ifndef __FreeBSD__
-// Any value will hide SOCK_CLOEXEC on FreeBSD (__BSD_VISIBLE=0)
-#define _XOPEN_SOURCE 700
-#endif
+#define _POSIX_C_SOURCE 200112L
 #ifdef __linux__
 #include <linux/input-event-codes.h>
 #elif __FreeBSD__
@@ -89,10 +86,16 @@ static void handle_display_destroy(struct wl_listener *listener, void *data) {
 }
 
 void ipc_init(struct sway_server *server) {
-        ipc_socket = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
+        ipc_socket = socket(AF_UNIX, SOCK_STREAM, 0);
         if (ipc_socket == -1) {
                 sway_abort("Unable to create IPC socket");
         }
+        if (fcntl(ipc_socket, F_SETFD, FD_CLOEXEC) == -1) {
+                sway_abort("Unable to set CLOEXEC on IPC socket");
+        }
+        if (fcntl(ipc_socket, F_SETFL, O_NONBLOCK) == -1) {
+                sway_abort("Unable to set NONBLOCK on IPC socket");
+        }
 
         ipc_sockaddr = ipc_user_sockaddr();
 
diff --git a/sway/tree/view.c b/sway/tree/view.c
index e370443c..a024f325 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -989,12 +989,16 @@ bool view_is_visible(struct sway_view *view) {
                 floater = floater->parent;
         }
         bool is_sticky = container_is_floating(floater) && floater->is_sticky;
+        if (!is_sticky && !workspace_is_visible(workspace)) {
+                return false;
+        }
         // Check view isn't in a tabbed or stacked container on an inactive tab
         struct sway_seat *seat = input_manager_current_seat(input_manager);
         struct sway_container *con = view->container;
         while (con) {
                 enum sway_container_layout layout = container_parent_layout(con);
-                if (layout == L_TABBED || layout == L_STACKED) {
+                if ((layout == L_TABBED || layout == L_STACKED)
+                                && !container_is_floating(con)) {
                         struct sway_node *parent = con->parent ?
                                 &con->parent->node : &con->workspace->node;
                         if (seat_get_active_tiling_child(seat, parent) != &con->node) {
@@ -1008,10 +1012,6 @@ bool view_is_visible(struct sway_view *view) {
                         !container_is_fullscreen_or_child(view->container)) {
                 return false;
         }
-        // Check the workspace is visible
-        if (!is_sticky) {
-                return workspace_is_visible(workspace);
-        }
         return true;
 }