aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
Diffstat (limited to 'rootston')
-rw-r--r--rootston/desktop.c45
-rw-r--r--rootston/wl_shell.c10
-rw-r--r--rootston/xdg_shell_v6.c11
3 files changed, 31 insertions, 35 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c
index d5cac575..a7137255 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -67,35 +67,42 @@ void view_close(struct roots_view *view) {
bool view_center(struct roots_view *view) {
struct wlr_box size;
view_get_size(view, &size);
- if (size.width == 0 && size.height == 0) {
- return false;
- }
struct roots_desktop *desktop = view->desktop;
struct wlr_cursor *cursor = desktop->server->input->cursor;
- struct wlr_output *output = wlr_output_layout_output_at(desktop->layout,
- cursor->x, cursor->y);
- const struct wlr_output_layout_output *output_layout =
- wlr_output_layout_get(desktop->layout, output);
+
+ struct wlr_output *output =
+ wlr_output_layout_output_at(desktop->layout, cursor->x, cursor->y);
+
+ if (!output) {
+ output = wlr_output_layout_get_center_output(desktop->layout);
+ }
+
if (!output) {
+ // empty layout
return false;
}
- view->x = (double)(output->width - size.width) / 2
- + output_layout->x;
- view->y = (double)(output->height - size.height) / 2
- + output_layout->y;
+ const struct wlr_output_layout_output *l_output =
+ wlr_output_layout_get(desktop->layout, output);
+
+ int width, height;
+ wlr_output_effective_resolution(output, &width, &height);
+
+ view->x = (double)(width - size.width) / 2
+ + l_output->x;
+ view->y = (double)(height - size.height) / 2
+ + l_output->y;
+
return true;
}
-bool view_initialize(struct roots_view *view) {
- bool centered = view_center(view);
- if (centered) {
- struct roots_input *input = view->desktop->server->input;
- set_view_focus(input, view->desktop, view);
- wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);
- }
- return centered;
+void view_initialize(struct roots_view *view) {
+ view_center(view);
+ struct roots_input *input = view->desktop->server->input;
+
+ set_view_focus(input, view->desktop, view);
+ wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);
}
struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c
index 34f53c7a..33f54a32 100644
--- a/rootston/wl_shell.c
+++ b/rootston/wl_shell.c
@@ -50,14 +50,7 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
}
static void handle_surface_commit(struct wl_listener *listener, void *data) {
- struct roots_wl_shell_surface *roots_surface =
- wl_container_of(listener, roots_surface, surface_commit);
- struct roots_view *view = roots_surface->view;
-
- if (view->wl_shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_TOPLEVEL &&
- !roots_surface->initialized) {
- roots_surface->initialized = view_initialize(view);
- }
+ // TODO do we need to do anything here?
}
static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -137,4 +130,5 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
view->desktop = desktop;
roots_surface->view = view;
list_add(desktop->views, view);
+ view_initialize(view);
}
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 9b8d8882..1e21fa02 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -68,14 +68,7 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
}
static void handle_commit(struct wl_listener *listener, void *data) {
- struct roots_xdg_surface_v6 *roots_xdg_surface =
- wl_container_of(listener, roots_xdg_surface, commit);
- struct roots_view *view = roots_xdg_surface->view;
-
- if (view->xdg_surface_v6->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL &&
- !roots_xdg_surface->initialized) {
- roots_xdg_surface->initialized = view_initialize(view);
- }
+ // TODO is there anything we need to do here?
}
static void handle_destroy(struct wl_listener *listener, void *data) {
@@ -141,4 +134,6 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
view->desktop = desktop;
roots_surface->view = view;
list_add(desktop->views, view);
+
+ view_initialize(view);
}