nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-21 22:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

backend/wayland: store output xdg_toplevel title

Browse Source 
This will be required to re-initialize the toplevel properly later.
This commit is contained in:
Kirill Primak 2024-02-11 10:07:50 +03:00
parent 385c9ade5f
commit a62dfebf10
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
backend/wayland/output.c
View File

@ -17,7 +17,6 @@
#include "backend/wayland.h" #include "backend/wayland.h"
#include "render/pixel_format.h" #include "render/pixel_format.h"
#include "render/wlr_renderer.h"
#include "types/wlr_output.h" #include "types/wlr_output.h"
#include "linux-dmabuf-v1-client-protocol.h" #include "linux-dmabuf-v1-client-protocol.h"
@ -263,6 +262,25 @@ static struct wlr_wl_buffer *get_or_create_wl_buffer(struct wlr_wl_backend *wl,
return create_wl_buffer(wl, wlr_buffer); return create_wl_buffer(wl, wlr_buffer);
} }
static bool update_title(struct wlr_wl_output *output, const char *title) {
struct wlr_output *wlr_output = &output->wlr_output;
char default_title[64];
if (title == NULL) {
snprintf(default_title, sizeof(default_title), "wlroots - %s", wlr_output->name);
title = default_title;
}
char *wl_title = strdup(title);
if (wl_title == NULL) {
return false;
}
free(output->title);
output->title = wl_title;
return true;
}
static bool output_test(struct wlr_output *wlr_output, static bool output_test(struct wlr_output *wlr_output,
const struct wlr_output_state *state) { const struct wlr_output_state *state) {
struct wlr_wl_output *output = struct wlr_wl_output *output =
@ -680,6 +698,9 @@ static void output_destroy(struct wlr_output *wlr_output) {
wl_surface_destroy(output->surface); wl_surface_destroy(output->surface);
} }
wl_display_flush(output->backend->remote_display); wl_display_flush(output->backend->remote_display);
free(output->title);
free(output); free(output);
} }
@ -862,15 +883,22 @@ struct wlr_output *wlr_wl_output_create(struct wlr_backend *wlr_backend) {
ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
} }
wlr_wl_output_set_title(&output->wlr_output, NULL); if (!update_title(output, NULL)) {
wlr_log_errno(WLR_ERROR, "Could not allocate xdg toplevel title");
goto error;
}
xdg_toplevel_set_title(output->xdg_toplevel, output->title);
xdg_toplevel_set_app_id(output->xdg_toplevel, "wlroots"); xdg_toplevel_set_app_id(output->xdg_toplevel, "wlroots");
xdg_surface_add_listener(output->xdg_surface, xdg_surface_add_listener(output->xdg_surface,
&xdg_surface_listener, output); &xdg_surface_listener, output);
xdg_toplevel_add_listener(output->xdg_toplevel, xdg_toplevel_add_listener(output->xdg_toplevel,
&xdg_toplevel_listener, output); &xdg_toplevel_listener, output);
wl_surface_commit(output->surface); wl_surface_commit(output->surface);
wl_display_flush(backend->remote_display);
while (!output->configured) { while (!output->configured) {
int ret = wl_event_loop_dispatch(backend->event_loop, -1); int ret = wl_event_loop_dispatch(backend->event_loop, -1);
if (ret < 0) { if (ret < 0) {
@ -914,16 +942,10 @@ void wlr_wl_output_set_title(struct wlr_output *output, const char *title) {
struct wlr_wl_output *wl_output = get_wl_output_from_output(output); struct wlr_wl_output *wl_output = get_wl_output_from_output(output);
assert(wl_output->xdg_toplevel != NULL); assert(wl_output->xdg_toplevel != NULL);
char wl_title[32]; if (update_title(wl_output, title)) {
if (title == NULL) { xdg_toplevel_set_title(wl_output->xdg_toplevel, wl_output->title);
if (snprintf(wl_title, sizeof(wl_title), "wlroots - %s", output->name) <= 0) { wl_display_flush(wl_output->backend->remote_display);
return;
}
title = wl_title;
} }
xdg_toplevel_set_title(wl_output->xdg_toplevel, title);
wl_display_flush(wl_output->backend->remote_display);
} }
struct wl_surface *wlr_wl_output_get_surface(struct wlr_output *output) { struct wl_surface *wlr_wl_output_get_surface(struct wlr_output *output) {

2
include/backend/wayland.h
View File

@ -90,6 +90,8 @@ struct wlr_wl_output {
struct zxdg_toplevel_decoration_v1 *zxdg_toplevel_decoration_v1; struct zxdg_toplevel_decoration_v1 *zxdg_toplevel_decoration_v1;
struct wl_list presentation_feedbacks; struct wl_list presentation_feedbacks;
char *title;
bool configured; bool configured;
uint32_t enter_serial; uint32_t enter_serial;