aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/rootston/view.h5
-rw-r--r--include/wlr/types/wlr_surface.h3
-rw-r--r--rootston/desktop.c59
-rw-r--r--rootston/xdg_shell_v6.c2
-rw-r--r--types/wlr_output.c1
-rw-r--r--types/wlr_surface.c13
6 files changed, 51 insertions, 32 deletions
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 4a5e8d08..79d61ba6 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -48,7 +48,6 @@ enum roots_view_type {
struct roots_view {
struct roots_desktop *desktop;
- struct roots_output *output;
double x, y;
float rotation;
// TODO: Something for roots-enforced width/height
@@ -72,14 +71,14 @@ struct roots_view {
// configure event from the xdg_shell
// If not then this should follow the typical type/impl pattern we use
// elsewhere
- void (*get_size)(struct roots_view *view, struct wlr_box *box);
+ void (*get_size)(const struct roots_view *view, struct wlr_box *box);
void (*activate)(struct roots_view *view, bool active);
void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
void (*set_position)(struct roots_view *view, double x, double y);
void (*close)(struct roots_view *view);
};
-void view_get_size(struct roots_view *view, struct wlr_box *box);
+void view_get_size(const struct roots_view *view, struct wlr_box *box);
void view_activate(struct roots_view *view, bool active);
void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
void view_set_position(struct roots_view *view, double x, double y);
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index e1a07566..cea53109 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -139,4 +139,7 @@ struct wlr_subsurface *wlr_surface_subsurface_at(struct wlr_surface *surface,
void wlr_surface_send_enter(struct wlr_surface *surface,
struct wlr_output *output);
+void wlr_surface_send_leave(struct wlr_surface *surface,
+ struct wlr_output *output);
+
#endif
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 37022ca4..0cc2180d 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -35,45 +35,52 @@ void view_destroy(struct roots_view *view) {
free(view);
}
-void view_get_size(struct roots_view *view, struct wlr_box *box) {
+void view_get_size(const struct roots_view *view, struct wlr_box *box) {
if (view->get_size) {
view->get_size(view, box);
- return;
+ } else {
+ box->width = view->wlr_surface->current->width;
+ box->height = view->wlr_surface->current->height;
}
- box->x = box->y = 0;
- box->width = view->wlr_surface->current->width;
- box->height = view->wlr_surface->current->height;
+ box->x = view->x;
+ box->y = view->y;
}
-static void view_update_output(struct roots_view *view) {
+static void view_update_output(const struct roots_view *view,
+ const struct wlr_box *before) {
struct roots_desktop *desktop = view->desktop;
- struct roots_output *output = NULL, *_output;
+ struct roots_output *output;
struct wlr_box box;
view_get_size(view, &box);
- wl_list_for_each(_output, &desktop->outputs, link) {
- if (!wlr_output_layout_intersects(desktop->layout, _output->wlr_output,
- view->x, view->y, view->x + box.width, view->x + box.height)) {
- continue;
+ wl_list_for_each(output, &desktop->outputs, link) {
+ bool intersected = before->x != -1 && wlr_output_layout_intersects(
+ desktop->layout, output->wlr_output,
+ before->x, before->y, before->x + before->width,
+ before->y + before->height);
+ bool intersects = wlr_output_layout_intersects(
+ desktop->layout, output->wlr_output,
+ view->x, view->y, view->x + box.width, view->y + box.height);
+ if (intersected && !intersects) {
+ wlr_log(L_DEBUG, "Leaving output %s", output->wlr_output->name);
+ wlr_surface_send_leave(view->wlr_surface, output->wlr_output);
}
- if (output == NULL
- || output->wlr_output->scale < _output->wlr_output->scale) {
- output = _output;
+ if (!intersected && intersects) {
+ wlr_log(L_DEBUG, "Entering output %s", output->wlr_output->name);
+ wlr_surface_send_enter(view->wlr_surface, output->wlr_output);
}
}
- if (output && output != view->output) {
- view->output = output;
- wlr_surface_send_enter(view->wlr_surface, output->wlr_output);
- }
}
void view_set_position(struct roots_view *view, double x, double y) {
+ struct wlr_box before;
+ view_get_size(view, &before);
if (view->set_position) {
view->set_position(view, x, y);
} else {
view->x = x;
view->y = y;
}
- view_update_output(view);
+ view_update_output(view, &before);
}
void view_activate(struct roots_view *view, bool activate) {
@@ -83,10 +90,12 @@ void view_activate(struct roots_view *view, bool activate) {
}
void view_resize(struct roots_view *view, uint32_t width, uint32_t height) {
+ struct wlr_box before;
+ view_get_size(view, &before);
if (view->resize) {
view->resize(view, width, height);
}
- view_update_output(view);
+ view_update_output(view, &before);
}
void view_close(struct roots_view *view) {
@@ -96,8 +105,8 @@ void view_close(struct roots_view *view) {
}
bool view_center(struct roots_view *view) {
- struct wlr_box size;
- view_get_size(view, &size);
+ struct wlr_box box;
+ view_get_size(view, &box);
struct roots_desktop *desktop = view->desktop;
struct wlr_cursor *cursor = desktop->server->input->cursor;
@@ -122,16 +131,14 @@ bool view_center(struct roots_view *view) {
double view_x = (double)(width - size.width) / 2 + l_output->x;
double view_y = (double)(height - size.height) / 2 + l_output->y;
-
view_set_position(view, view_x, view_y);
return true;
}
-void view_setup(struct roots_view *view) {
- view_center(view);
-
+void view_initialize(struct roots_view *view) {
struct roots_input *input = view->desktop->server->input;
+ view_center(view);
set_view_focus(input, view->desktop, view);
wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);
view_update_output(view);
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 704ccb1e..2d83019f 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -10,7 +10,7 @@
#include "rootston/server.h"
#include "rootston/input.h"
-static void get_size(struct roots_view *view, struct wlr_box *box) {
+static void get_size(const struct roots_view *view, struct wlr_box *box) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6;
// TODO: surf->geometry can be NULL
diff --git a/types/wlr_output.c b/types/wlr_output.c
index dd7e8d6a..d6efd9bf 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -43,7 +43,6 @@ static void wl_output_send_to_resource(struct wl_resource *resource) {
}
}
if (version >= WL_OUTPUT_SCALE_SINCE_VERSION) {
- wlr_log(L_DEBUG, "Sending scale");
wl_output_send_scale(resource, output->scale);
}
if (version >= WL_OUTPUT_DONE_SINCE_VERSION) {
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 28f3d05b..a21be8de 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -901,9 +901,20 @@ void wlr_surface_send_enter(struct wlr_surface *surface,
struct wl_resource *resource;
wl_resource_for_each(resource, &output->wl_resources) {
if (client == wl_resource_get_client(resource)) {
- wlr_log(L_DEBUG, "sending output enter");
wl_surface_send_enter(surface->resource, resource);
break;
}
}
}
+
+void wlr_surface_send_leave(struct wlr_surface *surface,
+ struct wlr_output *output) {
+ struct wl_client *client = wl_resource_get_client(surface->resource);
+ struct wl_resource *resource;
+ wl_resource_for_each(resource, &output->wl_resources) {
+ if (client == wl_resource_get_client(resource)) {
+ wl_surface_send_leave(surface->resource, resource);
+ break;
+ }
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 02:35:30 +0000