aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/rootston/desktop.h6
-rw-r--r--rootston/cursor.c9
-rw-r--r--rootston/desktop.c183
-rw-r--r--rootston/keyboard.c6
4 files changed, 122 insertions, 82 deletions
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index 8bf1f6eb..e5c5f806 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -60,11 +60,13 @@ struct roots_server;
struct roots_desktop *desktop_create(struct roots_server *server,
struct roots_config *config);
void desktop_destroy(struct roots_desktop *desktop);
+struct roots_output *desktop_output_from_wlr_output(
+ struct roots_desktop *desktop, struct wlr_output *output);
+struct roots_view *desktop_view_at(struct roots_desktop *desktop, double lx,
+ double ly, struct wlr_surface **surface, double *sx, double *sy);
void view_init(struct roots_view *view, struct roots_desktop *desktop);
void view_destroy(struct roots_view *view);
-struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
- struct wlr_surface **surface, double *sx, double *sy);
void view_activate(struct roots_view *view, bool activate);
void output_add_notify(struct wl_listener *listener, void *data);
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 71075aa9..b3c87b30 100644
--- a/rootston/cursor.c
+++ b/rootston/cursor.c
@@ -37,7 +37,7 @@ static void roots_cursor_update_position(struct roots_cursor *cursor,
double sx, sy;
switch (cursor->mode) {
case ROOTS_CURSOR_PASSTHROUGH:
- view = view_at(desktop, cursor->cursor->x, cursor->cursor->y,
+ view = desktop_view_at(desktop, cursor->cursor->x, cursor->cursor->y,
&surface, &sx, &sy);
bool set_compositor_cursor = !view && cursor->cursor_client;
if (view) {
@@ -137,7 +137,8 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
struct wlr_surface *surface;
double sx, sy;
- struct roots_view *view = view_at(desktop, lx, ly, &surface, &sx, &sy);
+ struct roots_view *view =
+ desktop_view_at(desktop, lx, ly, &surface, &sx, &sy);
if (state == WLR_BUTTON_PRESSED &&
view &&
@@ -237,7 +238,7 @@ void roots_cursor_handle_touch_down(struct roots_cursor *cursor,
return;
}
double sx, sy;
- view_at(desktop, lx, ly, &surface, &sx, &sy);
+ desktop_view_at(desktop, lx, ly, &surface, &sx, &sy);
uint32_t serial = 0;
if (surface) {
@@ -291,7 +292,7 @@ void roots_cursor_handle_touch_motion(struct roots_cursor *cursor,
}
double sx, sy;
- view_at(desktop, lx, ly, &surface, &sx, &sy);
+ desktop_view_at(desktop, lx, ly, &surface, &sx, &sy);
if (surface) {
wlr_seat_touch_point_focus(cursor->seat->seat, surface,
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 0eb63dc4..1a21a7c2 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -163,6 +163,11 @@ void view_set_fullscreen(struct roots_view *view, bool fullscreen,
if (output == NULL) {
output = view_get_output(view);
}
+ struct roots_output *roots_output =
+ desktop_output_from_wlr_output(view->desktop, output);
+ if (roots_output == NULL) {
+ return;
+ }
struct wlr_box view_box;
view_get_box(view, &view_box);
@@ -179,14 +184,8 @@ void view_set_fullscreen(struct roots_view *view, bool fullscreen,
output_box->height);
view->rotation = 0;
- struct roots_output *roots_output;
- wl_list_for_each(roots_output, &view->desktop->outputs, link) {
- if (roots_output->wlr_output == output) {
- roots_output->fullscreen_view = view;
- view->fullscreen_output = roots_output;
- break;
- }
- }
+ roots_output->fullscreen_view = view;
+ view->fullscreen_output = roots_output;
}
if (was_fullscreen && !fullscreen) {
@@ -273,83 +272,104 @@ void view_setup(struct roots_view *view) {
view_update_output(view, &before);
}
-struct roots_view *view_at(struct roots_desktop *desktop, double lx, double ly,
+static bool view_at(struct roots_view *view, double lx, double ly,
struct wlr_surface **surface, double *sx, double *sy) {
- struct roots_view *view;
- wl_list_for_each(view, &desktop->views, link) {
- if (view->type == ROOTS_WL_SHELL_VIEW &&
- view->wl_shell_surface->state ==
- WLR_WL_SHELL_SURFACE_STATE_POPUP) {
- continue;
- }
+ if (view->type == ROOTS_WL_SHELL_VIEW &&
+ view->wl_shell_surface->state == WLR_WL_SHELL_SURFACE_STATE_POPUP) {
+ return false;
+ }
- double view_sx = lx - view->x;
- double view_sy = ly - view->y;
-
- struct wlr_surface_state *state = view->wlr_surface->current;
- struct wlr_box box = {
- .x = 0,
- .y = 0,
- .width = state->buffer_width / state->scale,
- .height = state->buffer_height / state->scale,
- };
- if (view->rotation != 0.0) {
- // Coordinates relative to the center of the view
- double ox = view_sx - (double)box.width/2,
- oy = view_sy - (double)box.height/2;
- // Rotated coordinates
- double rx = cos(view->rotation)*ox - sin(view->rotation)*oy,
- ry = cos(view->rotation)*oy + sin(view->rotation)*ox;
- view_sx = rx + (double)box.width/2;
- view_sy = ry + (double)box.height/2;
- }
+ double view_sx = lx - view->x;
+ double view_sy = ly - view->y;
+
+ struct wlr_surface_state *state = view->wlr_surface->current;
+ struct wlr_box box = {
+ .x = 0,
+ .y = 0,
+ .width = state->buffer_width / state->scale,
+ .height = state->buffer_height / state->scale,
+ };
+ if (view->rotation != 0.0) {
+ // Coordinates relative to the center of the view
+ double ox = view_sx - (double)box.width/2,
+ oy = view_sy - (double)box.height/2;
+ // Rotated coordinates
+ double rx = cos(view->rotation)*ox - sin(view->rotation)*oy,
+ ry = cos(view->rotation)*oy + sin(view->rotation)*ox;
+ view_sx = rx + (double)box.width/2;
+ view_sy = ry + (double)box.height/2;
+ }
- if (view->type == ROOTS_XDG_SHELL_V6_VIEW) {
- double popup_sx, popup_sy;
- struct wlr_xdg_surface_v6 *popup =
- wlr_xdg_surface_v6_popup_at(view->xdg_surface_v6,
- view_sx, view_sy, &popup_sx, &popup_sy);
-
- if (popup) {
- *sx = view_sx - popup_sx;
- *sy = view_sy - popup_sy;
- *surface = popup->surface;
- return view;
- }
+ if (view->type == ROOTS_XDG_SHELL_V6_VIEW) {
+ double popup_sx, popup_sy;
+ struct wlr_xdg_surface_v6 *popup =
+ wlr_xdg_surface_v6_popup_at(view->xdg_surface_v6,
+ view_sx, view_sy, &popup_sx, &popup_sy);
+
+ if (popup) {
+ *sx = view_sx - popup_sx;
+ *sy = view_sy - popup_sy;
+ *surface = popup->surface;
+ return true;
}
+ }
- if (view->type == ROOTS_WL_SHELL_VIEW) {
- double popup_sx, popup_sy;
- struct wlr_wl_shell_surface *popup =
- wlr_wl_shell_surface_popup_at(view->wl_shell_surface,
- view_sx, view_sy, &popup_sx, &popup_sy);
-
- if (popup) {
- *sx = view_sx - popup_sx;
- *sy = view_sy - popup_sy;
- *surface = popup->surface;
- return view;
- }
+ if (view->type == ROOTS_WL_SHELL_VIEW) {
+ double popup_sx, popup_sy;
+ struct wlr_wl_shell_surface *popup =
+ wlr_wl_shell_surface_popup_at(view->wl_shell_surface,
+ view_sx, view_sy, &popup_sx, &popup_sy);
+
+ if (popup) {
+ *sx = view_sx - popup_sx;
+ *sy = view_sy - popup_sy;
+ *surface = popup->surface;
+ return true;
}
+ }
- double sub_x, sub_y;
- struct wlr_subsurface *subsurface =
- wlr_surface_subsurface_at(view->wlr_surface,
- view_sx, view_sy, &sub_x, &sub_y);
- if (subsurface) {
- *sx = view_sx - sub_x;
- *sy = view_sy - sub_y;
- *surface = subsurface->surface;
- return view;
+ double sub_x, sub_y;
+ struct wlr_subsurface *subsurface =
+ wlr_surface_subsurface_at(view->wlr_surface,
+ view_sx, view_sy, &sub_x, &sub_y);
+ if (subsurface) {
+ *sx = view_sx - sub_x;
+ *sy = view_sy - sub_y;
+ *surface = subsurface->surface;
+ return true;
+ }
+
+ if (wlr_box_contains_point(&box, view_sx, view_sy) &&
+ pixman_region32_contains_point(&view->wlr_surface->current->input,
+ view_sx, view_sy, NULL)) {
+ *sx = view_sx;
+ *sy = view_sy;
+ *surface = view->wlr_surface;
+ return true;
+ }
+
+ return false;
+}
+
+struct roots_view *desktop_view_at(struct roots_desktop *desktop, double lx,
+ double ly, struct wlr_surface **surface, double *sx, double *sy) {
+ struct wlr_output *wlr_output =
+ wlr_output_layout_output_at(desktop->layout, lx, ly);
+ if (wlr_output != NULL) {
+ struct roots_output *output =
+ desktop_output_from_wlr_output(desktop, wlr_output);
+ if (output != NULL && output->fullscreen_view != NULL) {
+ if (view_at(output->fullscreen_view, lx, ly, surface, sx, sy)) {
+ return output->fullscreen_view;
+ } else {
+ return NULL;
+ }
}
+ }
- if (wlr_box_contains_point(&box, view_sx, view_sy) &&
- pixman_region32_contains_point(
- &view->wlr_surface->current->input,
- view_sx, view_sy, NULL)) {
- *sx = view_sx;
- *sy = view_sy;
- *surface = view->wlr_surface;
+ struct roots_view *view;
+ wl_list_for_each(view, &desktop->views, link) {
+ if (view_at(view, lx, ly, surface, sx, sy)) {
return view;
}
}
@@ -445,3 +465,14 @@ struct roots_desktop *desktop_create(struct roots_server *server,
void desktop_destroy(struct roots_desktop *desktop) {
// TODO
}
+
+struct roots_output *desktop_output_from_wlr_output(
+ struct roots_desktop *desktop, struct wlr_output *output) {
+ struct roots_output *roots_output;
+ wl_list_for_each(roots_output, &desktop->outputs, link) {
+ if (roots_output->wlr_output == output) {
+ return roots_output;
+ }
+ }
+ return NULL;
+}
diff --git a/rootston/keyboard.c b/rootston/keyboard.c
index f3fc9a85..6ad99077 100644
--- a/rootston/keyboard.c
+++ b/rootston/keyboard.c
@@ -95,6 +95,12 @@ static void keyboard_binding_execute(struct roots_keyboard *keyboard,
if (focus != NULL) {
view_close(focus);
}
+ } else if (strcmp(command, "fullscreen") == 0) {
+ struct roots_view *focus = roots_seat_get_focus(seat);
+ if (focus != NULL) {
+ bool is_fullscreen = focus->fullscreen_output != NULL;
+ view_set_fullscreen(focus, !is_fullscreen, NULL);
+ }
} else if (strcmp(command, "next_window") == 0) {
roots_seat_cycle_focus(seat);
} else if (strncmp(exec_prefix, command, strlen(exec_prefix)) == 0) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-22 16:27:36 +0000