aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/rootston/desktop.h11
-rw-r--r--include/rootston/view.h9
-rw-r--r--include/wlr/types/wlr_output.h6
-rw-r--r--include/wlr/types/wlr_surface.h8
-rw-r--r--include/wlr/types/wlr_wl_shell.h10
-rw-r--r--include/wlr/types/wlr_xdg_shell_v6.h12
-rw-r--r--rootston/cursor.c9
-rw-r--r--rootston/desktop.c257
-rw-r--r--rootston/keyboard.c6
-rw-r--r--rootston/output.c59
-rw-r--r--rootston/wl_shell.c32
-rw-r--r--rootston/xdg_shell_v6.c29
-rw-r--r--rootston/xwayland.c21
-rw-r--r--types/wlr_output.c123
-rw-r--r--types/wlr_surface.c14
-rw-r--r--types/wlr_wl_shell.c87
-rw-r--r--types/wlr_xdg_shell_v6.c91
-rw-r--r--xwayland/xwm.c20
18 files changed, 549 insertions, 255 deletions
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index c245eb09..e5c5f806 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -19,13 +19,14 @@ struct roots_output {
struct wlr_output *wlr_output;
struct wl_listener frame;
struct timespec last_frame;
- struct wl_list link;
+ struct wl_list link; // roots_desktop:outputs
+ struct roots_view *fullscreen_view;
};
struct roots_desktop {
struct wl_list views; // roots_view::link
- struct wl_list outputs;
+ struct wl_list outputs; // roots_output::link
struct timespec last_frame;
struct roots_server *server;
@@ -59,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/include/rootston/view.h b/include/rootston/view.h
index 0f13b2d6..bb7297d0 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -12,7 +12,8 @@ struct roots_wl_shell_surface {
struct wl_listener destroy;
struct wl_listener request_move;
struct wl_listener request_resize;
- struct wl_listener request_set_maximized;
+ struct wl_listener request_maximize;
+ struct wl_listener request_fullscreen;
struct wl_listener set_state;
struct wl_listener surface_commit;
@@ -26,6 +27,7 @@ struct roots_xdg_surface_v6 {
struct wl_listener request_move;
struct wl_listener request_resize;
struct wl_listener request_maximize;
+ struct wl_listener request_fullscreen;
uint32_t pending_move_resize_configure_serial;
};
@@ -38,6 +40,7 @@ struct roots_xwayland_surface {
struct wl_listener request_move;
struct wl_listener request_resize;
struct wl_listener request_maximize;
+ struct wl_listener request_fullscreen;
struct wl_listener map_notify;
struct wl_listener unmap_notify;
@@ -58,6 +61,7 @@ struct roots_view {
float rotation;
bool maximized;
+ struct roots_output *fullscreen_output;
struct {
double x, y;
uint32_t width, height;
@@ -103,6 +107,7 @@ struct roots_view {
void (*move_resize)(struct roots_view *view, double x, double y,
uint32_t width, uint32_t height);
void (*maximize)(struct roots_view *view, bool maximized);
+ void (*set_fullscreen)(struct roots_view *view, bool fullscreen);
void (*close)(struct roots_view *view);
};
@@ -113,6 +118,8 @@ void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
void view_move_resize(struct roots_view *view, double x, double y,
uint32_t width, uint32_t height);
void view_maximize(struct roots_view *view, bool maximized);
+void view_set_fullscreen(struct roots_view *view, bool fullscreen,
+ struct wlr_output *output);
void view_close(struct roots_view *view);
bool view_center(struct roots_view *view);
void view_setup(struct roots_view *view);
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index cf000019..d382b593 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -64,6 +64,10 @@ struct wlr_output {
struct wl_signal destroy;
} events;
+ struct wlr_surface *fullscreen_surface;
+ struct wl_listener fullscreen_surface_commit;
+ struct wl_listener fullscreen_surface_destroy;
+
struct wl_list cursors; // wlr_output_cursor::link
struct wlr_output_cursor *hardware_cursor;
@@ -89,6 +93,8 @@ void wlr_output_swap_buffers(struct wlr_output *output);
void wlr_output_set_gamma(struct wlr_output *output,
uint32_t size, uint16_t *r, uint16_t *g, uint16_t *b);
uint32_t wlr_output_get_gamma_size(struct wlr_output *output);
+void wlr_output_set_fullscreen_surface(struct wlr_output *output,
+ struct wlr_surface *surface);
struct wlr_output_cursor *wlr_output_cursor_create(struct wlr_output *output);
bool wlr_output_cursor_set_image(struct wlr_output_cursor *cursor,
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h
index cea53109..c8e3761a 100644
--- a/include/wlr/types/wlr_surface.h
+++ b/include/wlr/types/wlr_surface.h
@@ -1,9 +1,10 @@
#ifndef WLR_TYPES_WLR_SURFACE_H
#define WLR_TYPES_WLR_SURFACE_H
-#include <wayland-server.h>
-#include <pixman.h>
#include <stdint.h>
#include <stdbool.h>
+#include <time.h>
+#include <pixman.h>
+#include <wayland-server.h>
#include <wlr/types/wlr_output.h>
struct wlr_frame_callback {
@@ -142,4 +143,7 @@ void wlr_surface_send_enter(struct wlr_surface *surface,
void wlr_surface_send_leave(struct wlr_surface *surface,
struct wlr_output *output);
+void wlr_surface_send_frame_done(struct wlr_surface *surface,
+ const struct timespec *when);
+
#endif
diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h
index 24936a34..ec087693 100644
--- a/include/wlr/types/wlr_wl_shell.h
+++ b/include/wlr/types/wlr_wl_shell.h
@@ -81,8 +81,8 @@ struct wlr_wl_shell_surface {
struct wl_signal request_move;
struct wl_signal request_resize;
- struct wl_signal request_set_fullscreen;
- struct wl_signal request_set_maximized;
+ struct wl_signal request_fullscreen;
+ struct wl_signal request_maximize;
struct wl_signal set_state;
struct wl_signal set_title;
@@ -93,14 +93,12 @@ struct wlr_wl_shell_surface {
};
struct wlr_wl_shell_surface_move_event {
- struct wl_client *client;
struct wlr_wl_shell_surface *surface;
struct wlr_seat_client *seat;
uint32_t serial;
};
struct wlr_wl_shell_surface_resize_event {
- struct wl_client *client;
struct wlr_wl_shell_surface *surface;
struct wlr_seat_client *seat;
uint32_t serial;
@@ -108,15 +106,13 @@ struct wlr_wl_shell_surface_resize_event {
};
struct wlr_wl_shell_surface_set_fullscreen_event {
- struct wl_client *client;
struct wlr_wl_shell_surface *surface;
enum wl_shell_surface_fullscreen_method method;
uint32_t framerate;
struct wlr_output *output;
};
-struct wlr_wl_shell_surface_set_maximized_event {
- struct wl_client *client;
+struct wlr_wl_shell_surface_maximize_event {
struct wlr_wl_shell_surface *surface;
struct wlr_output *output;
};
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index 6ac84cef..4eb957be 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -139,27 +139,29 @@ struct wlr_xdg_surface_v6 {
};
struct wlr_xdg_toplevel_v6_move_event {
- struct wl_client *client;
struct wlr_xdg_surface_v6 *surface;
struct wlr_seat_client *seat;
uint32_t serial;
};
struct wlr_xdg_toplevel_v6_resize_event {
- struct wl_client *client;
struct wlr_xdg_surface_v6 *surface;
struct wlr_seat_client *seat;
uint32_t serial;
uint32_t edges;
};
+struct wlr_xdg_toplevel_v6_set_fullscreen_event {
+ struct wlr_xdg_surface_v6 *surface;
+ bool fullscreen;
+ struct wlr_output *output;
+};
+
struct wlr_xdg_toplevel_v6_show_window_menu_event {
- struct wl_client *client;
struct wlr_xdg_surface_v6 *surface;
struct wlr_seat_client *seat;
uint32_t serial;
- uint32_t x;
- uint32_t y;
+ uint32_t x, y;
};
struct wlr_xdg_shell_v6 *wlr_xdg_shell_v6_create(struct wl_display *display);
diff --git a/rootston/cursor.c b/rootston/cursor.c
index 3cd5da40..f0e3d70d 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) {
@@ -131,7 +131,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 &&
@@ -231,7 +232,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) {
@@ -285,7 +286,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 608bd37d..bb3af258 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -36,7 +36,7 @@ static void view_update_output(const struct roots_view *view,
struct wlr_box box;
view_get_box(view, &box);
wl_list_for_each(output, &desktop->outputs, link) {
- bool intersected = before->x != -1 && wlr_output_layout_intersects(
+ bool intersected = before != NULL && wlr_output_layout_intersects(
desktop->layout, output->wlr_output,
before->x, before->y, before->x + before->width,
before->y + before->height);
@@ -53,6 +53,10 @@ static void view_update_output(const struct roots_view *view,
}
void view_move(struct roots_view *view, double x, double y) {
+ if (view->x == x && view->y == y) {
+ return;
+ }
+
struct wlr_box before;
view_get_box(view, &before);
if (view->move) {
@@ -61,6 +65,7 @@ void view_move(struct roots_view *view, double x, double y) {
view->x = x;
view->y = y;
}
+ view_update_output(view, &before);
}
void view_activate(struct roots_view *view, bool activate) {
@@ -102,6 +107,19 @@ void view_move_resize(struct roots_view *view, double x, double y,
view_resize(view, width, height);
}
+static struct wlr_output *view_get_output(struct roots_view *view) {
+ struct wlr_box view_box;
+ view_get_box(view, &view_box);
+
+ double output_x, output_y;
+ wlr_output_layout_closest_point(view->desktop->layout, NULL,
+ view->x + (double)view_box.width/2,
+ view->y + (double)view_box.height/2,
+ &output_x, &output_y);
+ return wlr_output_layout_output_at(view->desktop->layout, output_x,
+ output_y);
+}
+
void view_maximize(struct roots_view *view, bool maximized) {
if (view->maximized == maximized) {
return;
@@ -122,13 +140,7 @@ void view_maximize(struct roots_view *view, bool maximized) {
view->saved.width = view_box.width;
view->saved.height = view_box.height;
- double output_x, output_y;
- wlr_output_layout_closest_point(view->desktop->layout, NULL,
- view->x + (double)view_box.width/2,
- view->y + (double)view_box.height/2,
- &output_x, &output_y);
- struct wlr_output *output = wlr_output_layout_output_at(
- view->desktop->layout, output_x, output_y);
+ struct wlr_output *output = view_get_output(view);
struct wlr_box *output_box =
wlr_output_layout_get_box(view->desktop->layout, output);
@@ -146,6 +158,59 @@ void view_maximize(struct roots_view *view, bool maximized) {
}
}
+void view_set_fullscreen(struct roots_view *view, bool fullscreen,
+ struct wlr_output *output) {
+ bool was_fullscreen = view->fullscreen_output != NULL;
+ if (was_fullscreen == fullscreen) {
+ // TODO: support changing the output?
+ return;
+ }
+
+ // TODO: check if client is focused?
+
+ if (view->set_fullscreen) {
+ view->set_fullscreen(view, fullscreen);
+ }
+
+ if (!was_fullscreen && 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);
+
+ view->saved.x = view->x;
+ view->saved.y = view->y;
+ view->saved.rotation = view->rotation;
+ view->saved.width = view_box.width;
+ view->saved.height = view_box.height;
+
+ struct wlr_box *output_box =
+ wlr_output_layout_get_box(view->desktop->layout, output);
+ view_move_resize(view, output_box->x, output_box->y, output_box->width,
+ output_box->height);
+ view->rotation = 0;
+
+ roots_output->fullscreen_view = view;
+ view->fullscreen_output = roots_output;
+ }
+
+ if (was_fullscreen && !fullscreen) {
+ view_move_resize(view, view->saved.x, view->saved.y, view->saved.width,
+ view->saved.height);
+ view->rotation = view->saved.rotation;
+
+ view->fullscreen_output->fullscreen_view = NULL;
+ view->fullscreen_output = NULL;
+ }
+}
+
void view_close(struct roots_view *view) {
if (view->close) {
view->close(view);
@@ -194,6 +259,10 @@ bool view_center(struct roots_view *view) {
void view_destroy(struct roots_view *view) {
wl_signal_emit(&view->events.destroy, view);
+ if (view->fullscreen_output) {
+ view->fullscreen_output->fullscreen_view = NULL;
+ }
+
free(view);
}
@@ -211,88 +280,107 @@ void view_setup(struct roots_view *view) {
}
view_center(view);
- struct wlr_box before;
- view_get_box(view, &before);
- view_update_output(view, &before);
+ view_update_output(view, NULL);
}
-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;
}
}
@@ -388,3 +476,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 0b7afcb3..85033613 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) {
diff --git a/rootston/output.c b/rootston/output.c
index 83ff37fd..bf684f2f 100644
--- a/rootston/output.c
+++ b/rootston/output.c
@@ -2,6 +2,7 @@
#include <time.h>
#include <stdlib.h>
#include <stdbool.h>
+#include <GLES2/gl2.h>
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_wl_shell.h>
@@ -13,10 +14,6 @@
#include "rootston/desktop.h"
#include "rootston/config.h"
-static inline int64_t timespec_to_msec(const struct timespec *a) {
- return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
-}
-
/**
* Rotate a child's position relative to a parent. The parent size is (pw, ph),
* the child position is (*sx, *sy) and its size is (sw, sh).
@@ -75,12 +72,7 @@ static void render_surface(struct wlr_surface *surface,
wlr_render_with_matrix(desktop->server->renderer, surface->texture,
&matrix);
- struct wlr_frame_callback *cb, *cnext;
- wl_list_for_each_safe(cb, cnext,
- &surface->current->frame_callback_list, link) {
- wl_callback_send_done(cb->resource, timespec_to_msec(when));
- wl_resource_destroy(cb->resource);
- }
+ wlr_surface_send_frame_done(surface, when);
}
struct wlr_subsurface *subsurface;
@@ -174,6 +166,22 @@ static void render_view(struct roots_view *view, struct roots_desktop *desktop,
}
}
+static bool has_standalone_surface(struct roots_view *view) {
+ if (!wl_list_empty(&view->wlr_surface->subsurface_list)) {
+ return false;
+ }
+
+ switch (view->type) {
+ case ROOTS_XDG_SHELL_V6_VIEW:
+ return wl_list_empty(&view->xdg_surface_v6->popups);
+ case ROOTS_WL_SHELL_VIEW:
+ return wl_list_empty(&view->wl_shell_surface->popups);
+ case ROOTS_XWAYLAND_VIEW:
+ return true;
+ }
+ return true;
+}
+
static void output_frame_notify(struct wl_listener *listener, void *data) {
struct wlr_output *wlr_output = data;
struct roots_output *output = wl_container_of(listener, output, frame);
@@ -186,6 +194,37 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
wlr_output_make_current(wlr_output);
wlr_renderer_begin(server->renderer, wlr_output);
+ if (output->fullscreen_view != NULL) {
+ // Make sure the view is centered on screen
+ const struct wlr_box *output_box =
+ wlr_output_layout_get_box(desktop->layout, wlr_output);
+ struct wlr_box view_box;
+ view_get_box(output->fullscreen_view, &view_box);
+ double view_x = (double)(output_box->width - view_box.width) / 2 +
+ output_box->x;
+ double view_y = (double)(output_box->height - view_box.height) / 2 +
+ output_box->y;
+ view_move(output->fullscreen_view, view_x, view_y);
+
+ if (has_standalone_surface(output->fullscreen_view)) {
+ wlr_output_set_fullscreen_surface(wlr_output,
+ output->fullscreen_view->wlr_surface);
+ } else {
+ wlr_output_set_fullscreen_surface(wlr_output, NULL);
+
+ glClearColor(0, 0, 0, 0);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ render_view(output->fullscreen_view, desktop, wlr_output, &now);
+ }
+ wlr_renderer_end(server->renderer);
+ wlr_output_swap_buffers(wlr_output);
+ output->last_frame = desktop->last_frame = now;
+ return;
+ } else {
+ wlr_output_set_fullscreen_surface(wlr_output, NULL);
+ }
+
struct roots_view *view;
wl_list_for_each_reverse(view, &desktop->views, link) {
render_view(view, desktop, wlr_output, &now);
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c
index cf42929e..5fd6352d 100644
--- a/rootston/wl_shell.c
+++ b/rootston/wl_shell.c
@@ -50,15 +50,24 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
roots_seat_begin_resize(seat, view, e->edges);
}
-static void handle_request_set_maximized(struct wl_listener *listener,
+static void handle_request_maximize(struct wl_listener *listener,
void *data) {
struct roots_wl_shell_surface *roots_surface =
- wl_container_of(listener, roots_surface, request_set_maximized);
+ wl_container_of(listener, roots_surface, request_maximize);
struct roots_view *view = roots_surface->view;
- //struct wlr_wl_shell_surface_set_maximized_event *e = data;
+ //struct wlr_wl_shell_surface_maximize_event *e = data;
view_maximize(view, true);
}
+static void handle_request_fullscreen(struct wl_listener *listener,
+ void *data) {
+ struct roots_wl_shell_surface *roots_surface =
+ wl_container_of(listener, roots_surface, request_fullscreen);
+ struct roots_view *view = roots_surface->view;
+ struct wlr_wl_shell_surface_set_fullscreen_event *e = data;
+ view_set_fullscreen(view, true, e->output);
+}
+
static void handle_set_state(struct wl_listener *listener, void *data) {
struct roots_wl_shell_surface *roots_surface =
wl_container_of(listener, roots_surface, set_state);
@@ -68,6 +77,10 @@ static void handle_set_state(struct wl_listener *listener, void *data) {
surface->state != WLR_WL_SHELL_SURFACE_STATE_MAXIMIZED) {
view_maximize(view, false);
}
+ if (view->fullscreen_output != NULL &&
+ surface->state != WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN) {
+ view_set_fullscreen(view, false, NULL);
+ }
}
static void handle_surface_commit(struct wl_listener *listener, void *data) {
@@ -97,7 +110,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&roots_surface->destroy.link);
wl_list_remove(&roots_surface->request_move.link);
wl_list_remove(&roots_surface->request_resize.link);
- wl_list_remove(&roots_surface->request_set_maximized.link);
+ wl_list_remove(&roots_surface->request_maximize.link);
+ wl_list_remove(&roots_surface->request_fullscreen.link);
wl_list_remove(&roots_surface->set_state.link);
wl_list_remove(&roots_surface->surface_commit.link);
wl_list_remove(&roots_surface->view->link);
@@ -126,9 +140,13 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
roots_surface->request_resize.notify = handle_request_resize;
wl_signal_add(&surface->events.request_resize,
&roots_surface->request_resize);
- roots_surface->request_set_maximized.notify = handle_request_set_maximized;
- wl_signal_add(&surface->events.request_set_maximized,
- &roots_surface->request_set_maximized);
+ roots_surface->request_maximize.notify = handle_request_maximize;
+ wl_signal_add(&surface->events.request_maximize,
+ &roots_surface->request_maximize);
+ roots_surface->request_fullscreen.notify =
+ handle_request_fullscreen;
+ wl_signal_add(&surface->events.request_fullscreen,
+ &roots_surface->request_fullscreen);
roots_surface->set_state.notify = handle_set_state;
wl_signal_add(&surface->events.set_state, &roots_surface->set_state);
roots_surface->surface_commit.notify = handle_surface_commit;
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 9ef4fd3b..a0503ad8 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -117,6 +117,16 @@ static void maximize(struct roots_view *view, bool maximized) {
wlr_xdg_toplevel_v6_set_maximized(surface, maximized);
}
+static void set_fullscreen(struct roots_view *view, bool fullscreen) {
+ assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
+ struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
+ if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
+ return;
+ }
+
+ wlr_xdg_toplevel_v6_set_fullscreen(surface, fullscreen);
+}
+
static void close(struct roots_view *view) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
@@ -167,6 +177,21 @@ static void handle_request_maximize(struct wl_listener *listener, void *data) {
view_maximize(view, surface->toplevel_state->next.maximized);
}
+static void handle_request_fullscreen(struct wl_listener *listener,
+ void *data) {
+ struct roots_xdg_surface_v6 *roots_xdg_surface =
+ wl_container_of(listener, roots_xdg_surface, request_fullscreen);
+ struct roots_view *view = roots_xdg_surface->view;
+ struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
+ struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data;
+
+ if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
+ return;
+ }
+
+ view_set_fullscreen(view, e->fullscreen, e->output);
+}
+
static void handle_commit(struct wl_listener *listener, void *data) {
struct roots_xdg_surface_v6 *roots_surface =
wl_container_of(listener, roots_surface, commit);
@@ -239,6 +264,9 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
roots_surface->request_maximize.notify = handle_request_maximize;
wl_signal_add(&surface->events.request_maximize,
&roots_surface->request_maximize);
+ roots_surface->request_fullscreen.notify = handle_request_fullscreen;
+ wl_signal_add(&surface->events.request_fullscreen,
+ &roots_surface->request_fullscreen);
struct roots_view *view = calloc(1, sizeof(struct roots_view));
if (!view) {
@@ -254,6 +282,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
view->resize = resize;
view->move_resize = move_resize;
view->maximize = maximize;
+ view->set_fullscreen = set_fullscreen;
view->close = close;
roots_surface->view = view;
view_init(view, desktop);
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index 628c0e07..2b17ee3f 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -103,6 +103,13 @@ static void maximize(struct roots_view *view, bool maximized) {
view->xwayland_surface, maximized);
}
+static void set_fullscreen(struct roots_view *view, bool fullscreen) {
+ assert(view->type == ROOTS_XWAYLAND_VIEW);
+
+ wlr_xwayland_surface_set_fullscreen(view->desktop->xwayland,
+ view->xwayland_surface, fullscreen);
+}
+
static void handle_destroy(struct wl_listener *listener, void *data) {
struct roots_xwayland_surface *roots_surface =
wl_container_of(listener, roots_surface, destroy);
@@ -186,6 +193,16 @@ static void handle_request_maximize(struct wl_listener *listener, void *data) {
view_maximize(view, maximized);
}
+static void handle_request_fullscreen(struct wl_listener *listener,
+ void *data) {
+ struct roots_xwayland_surface *roots_surface =
+ wl_container_of(listener, roots_surface, request_fullscreen);
+ struct roots_view *view = roots_surface->view;
+ struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface;
+
+ view_set_fullscreen(view, xwayland_surface->fullscreen, NULL);
+}
+
static void handle_surface_commit(struct wl_listener *listener, void *data) {
struct roots_xwayland_surface *roots_surface =
wl_container_of(listener, roots_surface, surface_commit);
@@ -266,6 +283,9 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
roots_surface->request_maximize.notify = handle_request_maximize;
wl_signal_add(&surface->events.request_maximize,
&roots_surface->request_maximize);
+ roots_surface->request_fullscreen.notify = handle_request_fullscreen;
+ wl_signal_add(&surface->events.request_fullscreen,
+ &roots_surface->request_fullscreen);
roots_surface->surface_commit.notify = handle_surface_commit;
wl_signal_add(&surface->surface->events.commit,
@@ -287,6 +307,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
view->move = move;
view->move_resize = move_resize;
view->maximize = maximize;
+ view->set_fullscreen = set_fullscreen;
view->close = close;
roots_surface->view = view;
view_init(view, desktop);
diff --git a/types/wlr_output.c b/types/wlr_output.c
index 56a2a7df..21d94cfb 100644
--- a/types/wlr_output.c
+++ b/types/wlr_output.c
@@ -251,6 +251,42 @@ void wlr_output_make_current(struct wlr_output *output) {
output->impl->make_current(output);
}
+static void output_fullscreen_surface_render(struct wlr_output *output,
+ struct wlr_surface *surface, const struct timespec *when) {
+ int width, height;
+ wlr_output_effective_resolution(output, &width, &height);
+
+ int x = (width - surface->current->width) / 2;
+ int y = (height - surface->current->height) / 2;
+
+ int render_x = x * output->scale;
+ int render_y = y * output->scale;
+ int render_width = surface->current->width * output->scale;
+ int render_height = surface->current->height * output->scale;
+
+ glViewport(0, 0, output->width, output->height);
+ glClearColor(0, 0, 0, 0);
+ glClear(GL_COLOR_BUFFER_BIT);
+
+ if (!wlr_surface_has_buffer(surface)) {
+ return;
+ }
+
+ float translate[16];
+ wlr_matrix_translate(&translate, render_x, render_y, 0);
+
+ float scale[16];
+ wlr_matrix_scale(&scale, render_width, render_height, 1);
+
+ float matrix[16];
+ wlr_matrix_mul(&translate, &scale, &matrix);
+ wlr_matrix_mul(&output->transform_matrix, &matrix, &matrix);
+
+ wlr_render_with_matrix(surface->renderer, surface->texture, &matrix);
+
+ wlr_surface_send_frame_done(surface, when);
+}
+
static void output_cursor_get_box(struct wlr_output_cursor *cursor,
struct wlr_box *box) {
box->x = cursor->x - cursor->hotspot_x;
@@ -259,7 +295,8 @@ static void output_cursor_get_box(struct wlr_output_cursor *cursor,
box->height = cursor->height;
}
-static void output_cursor_render(struct wlr_output_cursor *cursor) {
+static void output_cursor_render(struct wlr_output_cursor *cursor,
+ const struct timespec *when) {
struct wlr_texture *texture = cursor->texture;
struct wlr_renderer *renderer = cursor->renderer;
if (cursor->surface != NULL) {
@@ -302,17 +339,29 @@ static void output_cursor_render(struct wlr_output_cursor *cursor) {
wlr_texture_get_matrix(texture, &matrix, &cursor->output->transform_matrix,
x, y);
wlr_render_with_matrix(renderer, texture, &matrix);
+
+ if (cursor->surface != NULL) {
+ wlr_surface_send_frame_done(cursor->surface, when);
+ }
}
void wlr_output_swap_buffers(struct wlr_output *output) {
wl_signal_emit(&output->events.swap_buffers, &output);
+ struct timespec now;
+ clock_gettime(CLOCK_MONOTONIC, &now);
+
+ if (output->fullscreen_surface != NULL) {
+ output_fullscreen_surface_render(output, output->fullscreen_surface,
+ &now);
+ }
+
struct wlr_output_cursor *cursor;
wl_list_for_each(cursor, &output->cursors, link) {
if (!cursor->enabled || output->hardware_cursor == cursor) {
continue;
}
- output_cursor_render(cursor);
+ output_cursor_render(cursor, &now);
}
output->impl->swap_buffers(output);
@@ -333,6 +382,56 @@ uint32_t wlr_output_get_gamma_size(struct wlr_output *output) {
return output->impl->get_gamma_size(output);
}
+static void output_fullscreen_surface_reset(struct wlr_output *output) {
+ if (output->fullscreen_surface != NULL) {
+ wl_list_remove(&output->fullscreen_surface_commit.link);
+ wl_list_remove(&output->fullscreen_surface_destroy.link);
+ output->fullscreen_surface = NULL;
+ output->needs_swap = true;
+ }
+}
+
+static void output_fullscreen_surface_handle_commit(
+ struct wl_listener *listener, void *data) {
+ struct wlr_output *output = wl_container_of(listener, output,
+ fullscreen_surface_commit);
+ output->needs_swap = true;
+}
+
+static void output_fullscreen_surface_handle_destroy(
+ struct wl_listener *listener, void *data) {
+ struct wlr_output *output = wl_container_of(listener, output,
+ fullscreen_surface_destroy);
+ output_fullscreen_surface_reset(output);
+}
+
+void wlr_output_set_fullscreen_surface(struct wlr_output *output,
+ struct wlr_surface *surface) {
+ // TODO: hardware fullscreen
+
+ if (output->fullscreen_surface == surface) {
+ return;
+ }
+
+ output_fullscreen_surface_reset(output);
+
+ output->fullscreen_surface = surface;
+ output->needs_swap = true;
+
+ if (surface == NULL) {
+ return;
+ }
+
+ output->fullscreen_surface_commit.notify =
+ output_fullscreen_surface_handle_commit;
+ wl_signal_add(&surface->events.commit, &output->fullscreen_surface_commit);
+ output->fullscreen_surface_destroy.notify =
+ output_fullscreen_surface_handle_destroy;
+ wl_signal_add(&surface->events.destroy,
+ &output->fullscreen_surface_destroy);
+}
+
+
static void output_cursor_reset(struct wlr_output_cursor *cursor) {
if (cursor->output->hardware_cursor != cursor) {
cursor->output->needs_swap = true;
@@ -404,30 +503,18 @@ static void output_cursor_commit(struct wlr_output_cursor *cursor) {
cursor->output->needs_swap = true;
} else {
// TODO: upload pixels
- }
-}
-static inline int64_t timespec_to_msec(const struct timespec *a) {
- return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
+ struct timespec now;
+ clock_gettime(CLOCK_MONOTONIC, &now);
+ wlr_surface_send_frame_done(cursor->surface, &now);
+ }
}
static void output_cursor_handle_commit(struct wl_listener *listener,
void *data) {
struct wlr_output_cursor *cursor = wl_container_of(listener, cursor,
surface_commit);
- struct wlr_surface *surface = data;
-
output_cursor_commit(cursor);
-
- struct timespec now;
- clock_gettime(CLOCK_MONOTONIC, &now);
-
- struct wlr_frame_callback *cb, *cnext;
- wl_list_for_each_safe(cb, cnext, &surface->current->frame_callback_list,
- link) {
- wl_callback_send_done(cb->resource, timespec_to_msec(&now));
- wl_resource_destroy(cb->resource);
- }
}
static void output_cursor_handle_destroy(struct wl_listener *listener,
diff --git a/types/wlr_surface.c b/types/wlr_surface.c
index 8cc2aa33..ad0c6f68 100644
--- a/types/wlr_surface.c
+++ b/types/wlr_surface.c
@@ -929,3 +929,17 @@ void wlr_surface_send_leave(struct wlr_surface *surface,
}
}
}
+
+static inline int64_t timespec_to_msec(const struct timespec *a) {
+ return (int64_t)a->tv_sec * 1000 + a->tv_nsec / 1000000;
+}
+
+void wlr_surface_send_frame_done(struct wlr_surface *surface,
+ const struct timespec *when) {
+ struct wlr_frame_callback *cb, *cnext;
+ wl_list_for_each_safe(cb, cnext, &surface->current->frame_callback_list,
+ link) {
+ wl_callback_send_done(cb->resource, timespec_to_msec(when));
+ wl_resource_destroy(cb->resource);
+ }
+}
diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c
index abe967d7..6174c872 100644
--- a/types/wlr_wl_shell.c
+++ b/types/wlr_wl_shell.c
@@ -108,25 +108,17 @@ static void shell_surface_protocol_pong(struct wl_client *client,
static void shell_surface_protocol_move(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *seat_resource,
uint32_t serial) {
- wlr_log(L_DEBUG, "got shell surface move");
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
struct wlr_seat_client *seat =
wl_resource_get_user_data(seat_resource);
- struct wlr_wl_shell_surface_move_event *event =
- calloc(1, sizeof(struct wlr_wl_shell_surface_move_event));
- if (event == NULL) {
- wl_client_post_no_memory(client);
- return;
- }
- event->client = client;
- event->surface = surface;
- event->seat = seat;
- event->serial = serial;
+ struct wlr_wl_shell_surface_move_event event = {
+ .surface = surface,
+ .seat = seat,
+ .serial = serial,
+ };
- wl_signal_emit(&surface->events.request_move, event);
-
- free(event);
+ wl_signal_emit(&surface->events.request_move, &event);
}
static struct wlr_wl_shell_popup_grab *shell_popup_grab_from_seat(
@@ -174,26 +166,18 @@ static void shell_surface_destroy_popup_state(
static void shell_surface_protocol_resize(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *seat_resource,
uint32_t serial, enum wl_shell_surface_resize edges) {
- wlr_log(L_DEBUG, "got shell surface resize");
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
struct wlr_seat_client *seat =
wl_resource_get_user_data(seat_resource);
- struct wlr_wl_shell_surface_resize_event *event =
- calloc(1, sizeof(struct wlr_wl_shell_surface_resize_event));
- if (event == NULL) {
- wl_client_post_no_memory(client);
- return;
- }
- event->client = client;
- event->surface = surface;
- event->seat = seat;
- event->serial = serial;
- event->edges = edges;
+ struct wlr_wl_shell_surface_resize_event event = {
+ .surface = surface,
+ .seat = seat,
+ .serial = serial,
+ .edges = edges,
+ };
- wl_signal_emit(&surface->events.request_resize, event);
-
- free(event);
+ wl_signal_emit(&surface->events.request_resize, &event);
}
static void shell_surface_set_state(struct wlr_wl_shell_surface *surface,
@@ -279,7 +263,6 @@ static void shell_surface_protocol_set_fullscreen(struct wl_client *client,
struct wl_resource *resource,
enum wl_shell_surface_fullscreen_method method, uint32_t framerate,
struct wl_resource *output_resource) {
- wlr_log(L_DEBUG, "got shell surface fullscreen");
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
struct wlr_output *output = NULL;
if (output_resource != NULL) {
@@ -289,24 +272,16 @@ static void shell_surface_protocol_set_fullscreen(struct wl_client *client,
shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_FULLSCREEN,
NULL, NULL);
- struct wlr_wl_shell_surface_set_fullscreen_event *event =
- calloc(1, sizeof(struct wlr_wl_shell_surface_set_fullscreen_event));
- if (event == NULL) {
- wl_client_post_no_memory(client);
- return;
- }
- event->client = client;
- event->surface = surface;
- event->method = method;
- event->framerate = framerate;
- event->output = output;
+ struct wlr_wl_shell_surface_set_fullscreen_event event = {
+ .surface = surface,
+ .method = method,
+ .framerate = framerate,
+ .output = output,
+ };
- wl_signal_emit(&surface->events.request_set_fullscreen, event);
-
- free(event);
+ wl_signal_emit(&surface->events.request_fullscreen, &event);
}
-
static void shell_surface_protocol_set_popup(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *seat_resource,
uint32_t serial, struct wl_resource *parent_resource, int32_t x,
@@ -368,7 +343,6 @@ static void shell_surface_protocol_set_popup(struct wl_client *client,
static void shell_surface_protocol_set_maximized(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *output_resource) {
- wlr_log(L_DEBUG, "got shell surface maximized");
struct wlr_wl_shell_surface *surface = wl_resource_get_user_data(resource);
struct wlr_output *output = NULL;
if (output_resource != NULL) {
@@ -378,19 +352,12 @@ static void shell_surface_protocol_set_maximized(struct wl_client *client,
shell_surface_set_state(surface, WLR_WL_SHELL_SURFACE_STATE_MAXIMIZED,
NULL, NULL);
- struct wlr_wl_shell_surface_set_maximized_event *event =
- calloc(1, sizeof(struct wlr_wl_shell_surface_set_maximized_event));
- if (event == NULL) {
- wl_client_post_no_memory(client);
- return;
- }
- event->client = client;
- event->surface = surface;
- event->output = output;
-
- wl_signal_emit(&surface->events.request_set_maximized, event);
+ struct wlr_wl_shell_surface_maximize_event event = {
+ .surface = surface,
+ .output = output,
+ };
- free(event);
+ wl_signal_emit(&surface->events.request_maximize, &event);
}
static void shell_surface_protocol_set_title(struct wl_client *client,
@@ -545,8 +512,8 @@ static void shell_protocol_get_shell_surface(struct wl_client *client,
wl_signal_init(&wl_surface->events.ping_timeout);
wl_signal_init(&wl_surface->events.request_move);
wl_signal_init(&wl_surface->events.request_resize);
- wl_signal_init(&wl_surface->events.request_set_fullscreen);
- wl_signal_init(&wl_surface->events.request_set_maximized);
+ wl_signal_init(&wl_surface->events.request_fullscreen);
+ wl_signal_init(&wl_surface->events.request_maximize);
wl_signal_init(&wl_surface->events.set_state);
wl_signal_init(&wl_surface->events.set_title);
wl_signal_init(&wl_surface->events.set_class);
diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c
index 8bb48a24..2627246f 100644
--- a/types/wlr_xdg_shell_v6.c
+++ b/types/wlr_xdg_shell_v6.c
@@ -564,23 +564,15 @@ static void xdg_toplevel_protocol_show_window_menu(struct wl_client *client,
return;
}
- struct wlr_xdg_toplevel_v6_show_window_menu_event *event =
- calloc(1, sizeof(struct wlr_xdg_toplevel_v6_show_window_menu_event));
- if (event == NULL) {
- wl_client_post_no_memory(client);
- return;
- }
-
- event->client = client;
- event->surface = surface;
- event->seat = seat;
- event->serial = serial;
- event->x = x;
- event->y = y;
-
- wl_signal_emit(&surface->events.request_show_window_menu, event);
+ struct wlr_xdg_toplevel_v6_show_window_menu_event event = {
+ .surface = surface,
+ .seat = seat,
+ .serial = serial,
+ .x = x,
+ .y = y,
+ };
- free(event);
+ wl_signal_emit(&surface->events.request_show_window_menu, &event);
}
static void xdg_toplevel_protocol_move(struct wl_client *client,
@@ -597,21 +589,13 @@ static void xdg_toplevel_protocol_move(struct wl_client *client,
return;
}
- struct wlr_xdg_toplevel_v6_move_event *event =
- calloc(1, sizeof(struct wlr_xdg_toplevel_v6_move_event));
- if (event == NULL) {
- wl_client_post_no_memory(client);
- return;
- }
-
- event->client = client;
- event->surface = surface;
- event->seat = seat;
- event->serial = serial;
-
- wl_signal_emit(&surface->events.request_move, event);
+ struct wlr_xdg_toplevel_v6_move_event event = {
+ .surface = surface,
+ .seat = seat,
+ .serial = serial,
+ };
- free(event);
+ wl_signal_emit(&surface->events.request_move, &event);
}
static void xdg_toplevel_protocol_resize(struct wl_client *client,
@@ -628,22 +612,14 @@ static void xdg_toplevel_protocol_resize(struct wl_client *client,
return;
}
- struct wlr_xdg_toplevel_v6_resize_event *event =
- calloc(1, sizeof(struct wlr_xdg_toplevel_v6_resize_event));
- if (event == NULL) {
- wl_client_post_no_memory(client);
- return;
- }
-
- event->client = client;
- event->surface = surface;
- event->seat = seat;
- event->serial = serial;
- event->edges = edges;
-
- wl_signal_emit(&surface->events.request_resize, event);
+ struct wlr_xdg_toplevel_v6_resize_event event = {
+ .surface = surface,
+ .seat = seat,
+ .serial = serial,
+ .edges = edges,
+ };
- free(event);
+ wl_signal_emit(&surface->events.request_resize, &event);
}
static void xdg_toplevel_protocol_set_max_size(struct wl_client *client,
@@ -677,15 +653,36 @@ static void xdg_toplevel_protocol_unset_maximized(struct wl_client *client,
static void xdg_toplevel_protocol_set_fullscreen(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *output_resource) {
struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+
+ struct wlr_output *output = NULL;
+ if (output_resource != NULL) {
+ output = wl_resource_get_user_data(output_resource);
+ }
+
surface->toplevel_state->next.fullscreen = true;
- wl_signal_emit(&surface->events.request_fullscreen, surface);
+
+ struct wlr_xdg_toplevel_v6_set_fullscreen_event event = {
+ .surface = surface,
+ .fullscreen = true,
+ .output = output,
+ };
+
+ wl_signal_emit(&surface->events.request_fullscreen, &event);
}
static void xdg_toplevel_protocol_unset_fullscreen(struct wl_client *client,
struct wl_resource *resource) {
struct wlr_xdg_surface_v6 *surface = wl_resource_get_user_data(resource);
+
surface->toplevel_state->next.fullscreen = false;
- wl_signal_emit(&surface->events.request_fullscreen, surface);
+
+ struct wlr_xdg_toplevel_v6_set_fullscreen_event event = {
+ .surface = surface,
+ .fullscreen = false,
+ .output = NULL,
+ };
+
+ wl_signal_emit(&surface->events.request_fullscreen, &event);
}
static void xdg_toplevel_protocol_set_minimized(struct wl_client *client,
diff --git a/xwayland/xwm.c b/xwayland/xwm.c
index fa0522d6..d36822b5 100644
--- a/xwayland/xwm.c
+++ b/xwayland/xwm.c
@@ -1344,18 +1344,16 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland) {
}
void wlr_xwayland_surface_set_maximized(struct wlr_xwayland *wlr_xwayland,
- struct wlr_xwayland_surface *surface, bool maximized) {
- if (xsurface_is_maximized(surface) != maximized) {
- surface->maximized_horz = maximized;
- surface->maximized_vert = maximized;
- xsurface_set_net_wm_state(surface);
- }
+ struct wlr_xwayland_surface *surface, bool maximized) {
+ surface->maximized_horz = maximized;
+ surface->maximized_vert = maximized;
+ xsurface_set_net_wm_state(surface);
+ xcb_flush(surface->xwm->xcb_conn);
}
void wlr_xwayland_surface_set_fullscreen(struct wlr_xwayland *wlr_xwayland,
- struct wlr_xwayland_surface *surface, bool fullscreen) {
- if (surface->fullscreen != fullscreen) {
- surface->fullscreen = fullscreen;
- xsurface_set_net_wm_state(surface);
- }
+ struct wlr_xwayland_surface *surface, bool fullscreen) {
+ surface->fullscreen = fullscreen;
+ xsurface_set_net_wm_state(surface);
+ xcb_flush(surface->xwm->xcb_conn);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 17:31:21 +0000