aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/pango.c2
-rw-r--r--include/sway/input/cursor.h7
-rw-r--r--include/sway/tree/view.h3
-rw-r--r--sway/commands/border.c2
-rw-r--r--sway/commands/mark.c2
-rw-r--r--sway/commands/title_format.c2
-rw-r--r--sway/commands/unmark.c2
-rw-r--r--sway/desktop/xdg_shell.c20
-rw-r--r--sway/desktop/xdg_shell_v6.c23
-rw-r--r--sway/desktop/xwayland.c12
-rw-r--r--sway/input/cursor.c41
-rw-r--r--sway/input/seat.c27
-rw-r--r--sway/tree/view.c37
13 files changed, 107 insertions, 73 deletions
diff --git a/common/pango.c b/common/pango.c
index f0b8db66..3bc97808 100644
--- a/common/pango.c
+++ b/common/pango.c
@@ -10,7 +10,7 @@
#include "log.h"
#include "stringop.h"
-static const char *overflow = "[buffer overflow]";
+static const char overflow[] = "[buffer overflow]";
static const int max_chars = 16384;
size_t escape_markup_text(const char *src, char *dest) {
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 4d47ab42..5556ea11 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -46,6 +46,11 @@ void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec,
uint32_t button, enum wlr_button_state state);
void cursor_set_image(struct sway_cursor *cursor, const char *image,
- struct wl_client *client);
+ struct wl_client *client);
+void cursor_warp_to_container(struct sway_cursor *cursor,
+ struct sway_container *container);
+
+void cursor_warp_to_workspace(struct sway_cursor *cursor,
+ struct sway_workspace *workspace);
#endif
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 870ef2e0..dc1f0b02 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -329,7 +329,8 @@ void view_destroy(struct sway_view *view);
void view_begin_destroy(struct sway_view *view);
-void view_map(struct sway_view *view, struct wlr_surface *wlr_surface);
+void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
+ bool fullscreen, bool decoration);
void view_unmap(struct sway_view *view);
diff --git a/sway/commands/border.c b/sway/commands/border.c
index cc0d635a..2eed27bd 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -59,7 +59,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
}
struct sway_container *container = config->handler_context.container;
- if (!container->view) {
+ if (!container || !container->view) {
return cmd_results_new(CMD_INVALID, "border",
"Only views can have borders");
}
diff --git a/sway/commands/mark.c b/sway/commands/mark.c
index fb95a7d0..b1f47be1 100644
--- a/sway/commands/mark.c
+++ b/sway/commands/mark.c
@@ -19,7 +19,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) {
return error;
}
struct sway_container *container = config->handler_context.container;
- if (!container->view) {
+ if (!container || !container->view) {
return cmd_results_new(CMD_INVALID, "mark",
"Only views can have marks");
}
diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c
index c9ffe8fa..ef1c8935 100644
--- a/sway/commands/title_format.c
+++ b/sway/commands/title_format.c
@@ -12,7 +12,7 @@ struct cmd_results *cmd_title_format(int argc, char **argv) {
return error;
}
struct sway_container *container = config->handler_context.container;
- if (!container->view) {
+ if (!container || !container->view) {
return cmd_results_new(CMD_INVALID, "title_format",
"Only views can have a title_format");
}
diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c
index c6251dc8..c671ed4e 100644
--- a/sway/commands/unmark.c
+++ b/sway/commands/unmark.c
@@ -25,7 +25,7 @@ struct cmd_results *cmd_unmark(int argc, char **argv) {
struct sway_view *view = NULL;
if (config->handler_context.using_criteria) {
struct sway_container *container = config->handler_context.container;
- if (!container->view) {
+ if (!container || !container->view) {
return cmd_results_new(CMD_INVALID, "unmark",
"Only views can have marks");
}
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 46582204..1ed45a6b 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -406,27 +406,19 @@ static void handle_map(struct wl_listener *listener, void *data) {
view->natural_height = view->wlr_xdg_surface->surface->current.height;
}
- view_map(view, view->wlr_xdg_surface->surface);
+ bool csd = false;
if (!view->xdg_decoration) {
struct sway_server_decoration *deco =
- decoration_from_surface(xdg_surface->surface);
- bool csd = !deco || deco->wlr_server_decoration->mode ==
+ decoration_from_surface(xdg_surface->surface);
+ csd = !deco || deco->wlr_server_decoration->mode ==
WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
- view_update_csd_from_client(view, csd);
- }
- if (xdg_surface->toplevel->client_pending.fullscreen) {
- container_set_fullscreen(view->container, true);
- arrange_workspace(view->container->workspace);
- } else {
- if (view->container->parent) {
- arrange_container(view->container->parent);
- } else if (view->container->workspace) {
- arrange_workspace(view->container->workspace);
- }
}
+ view_map(view, view->wlr_xdg_surface->surface,
+ xdg_surface->toplevel->client_pending.fullscreen, csd);
+
transaction_commit_dirty();
xdg_shell_view->commit.notify = handle_commit;
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 165cc7eb..eb8ba853 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -402,25 +402,14 @@ static void handle_map(struct wl_listener *listener, void *data) {
view->natural_width = view->wlr_xdg_surface_v6->surface->current.width;
view->natural_height = view->wlr_xdg_surface_v6->surface->current.height;
}
+ struct sway_server_decoration *deco =
+ decoration_from_surface(xdg_surface->surface);
+ bool csd = !deco || deco->wlr_server_decoration->mode
+ == WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
- view_map(view, view->wlr_xdg_surface_v6->surface);
+ view_map(view, view->wlr_xdg_surface_v6->surface,
+ xdg_surface->toplevel->client_pending.fullscreen, csd);
- struct sway_server_decoration *deco =
- decoration_from_surface(xdg_surface->surface);
- bool csd = !deco || deco->wlr_server_decoration->mode ==
- WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
- view_update_csd_from_client(view, csd);
-
- if (xdg_surface->toplevel->client_pending.fullscreen) {
- container_set_fullscreen(view->container, true);
- arrange_workspace(view->container->workspace);
- } else {
- if (view->container->parent) {
- arrange_container(view->container->parent);
- } else if (view->container->workspace) {
- arrange_workspace(view->container->workspace);
- }
- }
transaction_commit_dirty();
xdg_shell_v6_view->commit.notify = handle_commit;
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index ebf2131e..066556b8 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -405,18 +405,8 @@ static void handle_map(struct wl_listener *listener, void *data) {
xwayland_view->commit.notify = handle_commit;
// Put it back into the tree
- view_map(view, xsurface->surface);
+ view_map(view, xsurface->surface, xsurface->fullscreen, false);
- if (xsurface->fullscreen) {
- container_set_fullscreen(view->container, true);
- arrange_workspace(view->container->workspace);
- } else {
- if (view->container->parent) {
- arrange_container(view->container->parent);
- } else if (view->container->workspace) {
- arrange_workspace(view->container->workspace);
- }
- }
transaction_commit_dirty();
}
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index bbe6b890..925190d6 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -9,6 +9,7 @@
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_xcursor_manager.h>
#include <wlr/types/wlr_idle.h>
+#include <wlr/types/wlr_box.h>
#include "list.h"
#include "log.h"
#include "config.h"
@@ -1271,4 +1272,44 @@ struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
cursor->cursor = wlr_cursor;
return cursor;
+
+}
+
+/**
+ * Warps the cursor to the middle of the container argument.
+ * Does nothing if the cursor is already inside the container.
+ * If container is NULL, returns without doing anything.
+ */
+void cursor_warp_to_container(struct sway_cursor *cursor,
+ struct sway_container *container) {
+ if (!container) {
+ return;
+ }
+
+ struct wlr_box box;
+ container_get_box(container, &box);
+ if (wlr_box_contains_point(&box, cursor->cursor->x, cursor->cursor->y)) {
+ return;
+ }
+
+ double x = container->x + container->width / 2.0;
+ double y = container->y + container->height / 2.0;
+
+ wlr_cursor_warp(cursor->cursor, NULL, x, y);
+}
+
+/**
+ * Warps the cursor to the middle of the workspace argument.
+ * If workspace is NULL, returns without doing anything.
+ */
+void cursor_warp_to_workspace(struct sway_cursor *cursor,
+ struct sway_workspace *workspace) {
+ if (!workspace) {
+ return;
+ }
+
+ double x = workspace->x + workspace->width / 2.0;
+ double y = workspace->y + workspace->height / 2.0;
+
+ wlr_cursor_warp(cursor->cursor, NULL, x, y);
}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index c7deabed..d8d2f3a4 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -774,27 +774,18 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node,
workspace_consider_destroy(last_workspace);
}
- if (last_focus) {
- if (config->mouse_warping && warp &&
- (new_output != last_output ||
- config->mouse_warping == WARP_CONTAINER)) {
- double x = 0;
- double y = 0;
+ if (last_focus && warp) {
+ if (container && config->mouse_warping == WARP_CONTAINER) {
+ cursor_warp_to_container(seat->cursor, container);
+ cursor_send_pointer_motion(seat->cursor, 0, true);
+ } else if (new_output != last_output &&
+ config->mouse_warping >= WARP_OUTPUT) {
if (container) {
- x = container->x + container->width / 2.0;
- y = container->y + container->height / 2.0;
+ cursor_warp_to_container(seat->cursor, container);
} else {
- x = new_workspace->x + new_workspace->width / 2.0;
- y = new_workspace->y + new_workspace->height / 2.0;
- }
-
- if (!wlr_output_layout_contains_point(root->output_layout,
- new_output->wlr_output, seat->cursor->cursor->x,
- seat->cursor->cursor->y)
- || config->mouse_warping == WARP_CONTAINER) {
- wlr_cursor_warp(seat->cursor->cursor, NULL, x, y);
- cursor_send_pointer_motion(seat->cursor, 0, true);
+ cursor_warp_to_workspace(seat->cursor, new_workspace);
}
+ cursor_send_pointer_motion(seat->cursor, 0, true);
}
}
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 1104af36..85998547 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -544,7 +544,8 @@ static bool should_focus(struct sway_view *view) {
return len == 0;
}
-void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
+void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
+ bool fullscreen, bool decoration) {
if (!sway_assert(view->surface == NULL, "cannot map mapped view")) {
return;
}
@@ -595,13 +596,28 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
}
}
- if (should_focus(view)) {
- input_manager_set_focus(input_manager, &view->container->node);
- }
-
view_update_title(view, false);
container_update_representation(view->container);
view_execute_criteria(view);
+
+ if (decoration) {
+ view_update_csd_from_client(view, decoration);
+ }
+
+ if (fullscreen) {
+ container_set_fullscreen(view->container, true);
+ arrange_workspace(view->container->workspace);
+ } else {
+ if (view->container->parent) {
+ arrange_container(view->container->parent);
+ } else if (view->container->workspace) {
+ arrange_workspace(view->container->workspace);
+ }
+ }
+
+ if (should_focus(view)) {
+ input_manager_set_focus(input_manager, &view->container->node);
+ }
}
void view_unmap(struct sway_view *view) {
@@ -630,7 +646,16 @@ void view_unmap(struct sway_view *view) {
struct sway_seat *seat;
wl_list_for_each(seat, &input_manager->seats, link) {
- cursor_send_pointer_motion(seat->cursor, 0, true);
+ if (config->mouse_warping == WARP_CONTAINER) {
+ struct sway_node *node = seat_get_focus(seat);
+ if (node && node->type == N_CONTAINER) {
+ cursor_warp_to_container(seat->cursor, node->sway_container);
+ } else if (node && node->type == N_WORKSPACE) {
+ cursor_warp_to_workspace(seat->cursor, node->sway_workspace);
+ }
+ } else {
+ cursor_send_pointer_motion(seat->cursor, 0, true);
+ }
}
transaction_commit_dirty();
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-16 06:44:22 +0000