aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-06-29 13:38:42 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-06-29 13:38:42 +0000
commita44a0b4ebe728625ca39c741b5c8fbfd48f9fe9f (patch)
tree520900e18bca59dccd345bf0c9d4af45a67e5233 /render.c
parentcorrect csd section entry: hide-when-maximized (diff)
parentwayland: surface_scale(): reset buffer scale when using fractional scaling (diff)
Merge branch 'fractional-scaling'
Diffstat (limited to 'render.c')
-rw-r--r--render.c231
1 files changed, 108 insertions, 123 deletions
diff --git a/render.c b/render.c
index 1858467d..11b5223a 100644
--- a/render.c
+++ b/render.c
@@ -311,7 +311,7 @@ static void
draw_unfocused_block(const struct terminal *term, pixman_image_t *pix,
const pixman_color_t *color, int x, int y, int cell_cols)
{
- const int scale = term->scale;
+ const int scale = round(term->scale);
const int width = min(min(scale, term->cell_width), term->cell_height);
pixman_image_fill_rectangles(
@@ -905,21 +905,21 @@ render_margin(struct terminal *term, struct buffer *buf,
if (apply_damage) {
/* Top */
wl_surface_damage_buffer(
- term->window->surface, 0, 0, term->width, term->margins.top);
+ term->window->surface.surf, 0, 0, term->width, term->margins.top);
/* Bottom */
wl_surface_damage_buffer(
- term->window->surface, 0, bmargin, term->width, term->margins.bottom);
+ term->window->surface.surf, 0, bmargin, term->width, term->margins.bottom);
/* Left */
wl_surface_damage_buffer(
- term->window->surface,
+ term->window->surface.surf,
0, term->margins.top + start_line * term->cell_height,
term->margins.left, line_count * term->cell_height);
/* Right */
wl_surface_damage_buffer(
- term->window->surface,
+ term->window->surface.surf,
rmargin, term->margins.top + start_line * term->cell_height,
term->margins.right, line_count * term->cell_height);
}
@@ -1027,7 +1027,7 @@ grid_render_scroll(struct terminal *term, struct buffer *buf,
#endif
wl_surface_damage_buffer(
- term->window->surface, term->margins.left, dst_y,
+ term->window->surface.surf, term->margins.left, dst_y,
term->width - term->margins.left - term->margins.right, height);
/*
@@ -1104,7 +1104,7 @@ grid_render_scroll_reverse(struct terminal *term, struct buffer *buf,
#endif
wl_surface_damage_buffer(
- term->window->surface, term->margins.left, dst_y,
+ term->window->surface.surf, term->margins.left, dst_y,
term->width - term->margins.left - term->margins.right, height);
/*
@@ -1153,7 +1153,7 @@ render_sixel_chunk(struct terminal *term, pixman_image_t *pix, const struct sixe
x, y,
width, height);
- wl_surface_damage_buffer(term->window->surface, x, y, width, height);
+ wl_surface_damage_buffer(term->window->surface.surf, x, y, width, height);
}
static void
@@ -1480,7 +1480,7 @@ render_ime_preedit_for_seat(struct terminal *term, struct seat *seat,
free(real_cells);
wl_surface_damage_buffer(
- term->window->surface,
+ term->window->surface.surf,
term->margins.left,
term->margins.top + row_idx * term->cell_height,
term->width - term->margins.left - term->margins.right,
@@ -1502,7 +1502,7 @@ render_ime_preedit(struct terminal *term, struct buffer *buf)
static void
render_overlay(struct terminal *term)
{
- struct wl_surf_subsurf *overlay = &term->window->overlay;
+ struct wayl_sub_surface *overlay = &term->window->overlay;
bool unicode_mode_active = false;
/* Check if unicode mode is active on at least one seat focusing
@@ -1523,8 +1523,8 @@ render_overlay(struct terminal *term)
if (likely(style == OVERLAY_NONE)) {
if (term->render.last_overlay_style != OVERLAY_NONE) {
/* Unmap overlay sub-surface */
- wl_surface_attach(overlay->surf, NULL, 0, 0);
- wl_surface_commit(overlay->surf);
+ wl_surface_attach(overlay->surface.surf, NULL, 0, 0);
+ wl_surface_commit(overlay->surface.surf);
term->render.last_overlay_style = OVERLAY_NONE;
term->render.last_overlay_buf = NULL;
@@ -1691,17 +1691,18 @@ render_overlay(struct terminal *term)
&(pixman_rectangle16_t){0, 0, term->width, term->height});
quirk_weston_subsurface_desync_on(overlay->sub);
+ wayl_surface_scale(
+ term->window, &overlay->surface, buf, term->scale);
wl_subsurface_set_position(overlay->sub, 0, 0);
- wl_surface_set_buffer_scale(overlay->surf, term->scale);
- wl_surface_attach(overlay->surf, buf->wl_buf, 0, 0);
+ wl_surface_attach(overlay->surface.surf, buf->wl_buf, 0, 0);
wl_surface_damage_buffer(
- overlay->surf,
+ overlay->surface.surf,
damage_bounds.x1, damage_bounds.y1,
damage_bounds.x2 - damage_bounds.x1,
damage_bounds.y2 - damage_bounds.y1);
- wl_surface_commit(overlay->surf);
+ wl_surface_commit(overlay->surface.surf);
quirk_weston_subsurface_desync_off(overlay->sub);
buf->age = 0;
@@ -1828,15 +1829,12 @@ get_csd_data(const struct terminal *term, enum csd_surface surf_idx)
}
static void
-csd_commit(struct terminal *term, struct wl_surface *surf, struct buffer *buf)
+csd_commit(struct terminal *term, struct wayl_surface *surf, struct buffer *buf)
{
- xassert(buf->width % term->scale == 0);
- xassert(buf->height % term->scale == 0);
-
- wl_surface_attach(surf, buf->wl_buf, 0, 0);
- wl_surface_damage_buffer(surf, 0, 0, buf->width, buf->height);
- wl_surface_set_buffer_scale(surf, term->scale);
- wl_surface_commit(surf);
+ wayl_surface_scale(term->window, surf, buf, term->scale);
+ wl_surface_attach(surf->surf, buf->wl_buf, 0, 0);
+ wl_surface_damage_buffer(surf->surf, 0, 0, buf->width, buf->height);
+ wl_surface_commit(surf->surf);
}
static void
@@ -1852,8 +1850,7 @@ render_csd_part(struct terminal *term,
}
static void
-render_osd(struct terminal *term,
- struct wl_surface *surf, struct wl_subsurface *sub_surf,
+render_osd(struct terminal *term, const struct wayl_sub_surface *sub_surf,
struct fcft_font *font, struct buffer *buf,
const char32_t *text, uint32_t _fg, uint32_t _bg,
unsigned x, unsigned y)
@@ -1926,23 +1923,20 @@ render_osd(struct terminal *term,
pixman_image_unref(src);
pixman_image_set_clip_region32(buf->pix[0], NULL);
- xassert(buf->width % term->scale == 0);
- xassert(buf->height % term->scale == 0);
-
- quirk_weston_subsurface_desync_on(sub_surf);
- wl_surface_attach(surf, buf->wl_buf, 0, 0);
- wl_surface_damage_buffer(surf, 0, 0, buf->width, buf->height);
- wl_surface_set_buffer_scale(surf, term->scale);
+ quirk_weston_subsurface_desync_on(sub_surf->sub);
+ wayl_surface_scale(term->window, &sub_surf->surface, buf, term->scale);
+ wl_surface_attach(sub_surf->surface.surf, buf->wl_buf, 0, 0);
+ wl_surface_damage_buffer(sub_surf->surface.surf, 0, 0, buf->width, buf->height);
struct wl_region *region = wl_compositor_create_region(term->wl->compositor);
if (region != NULL) {
wl_region_add(region, 0, 0, buf->width, buf->height);
- wl_surface_set_opaque_region(surf, region);
+ wl_surface_set_opaque_region(sub_surf->surface.surf, region);
wl_region_destroy(region);
}
- wl_surface_commit(surf);
- quirk_weston_subsurface_desync_off(sub_surf);
+ wl_surface_commit(sub_surf->surface.surf);
+ quirk_weston_subsurface_desync_off(sub_surf->sub);
}
static void
@@ -1951,13 +1945,10 @@ render_csd_title(struct terminal *term, const struct csd_data *info,
{
xassert(term->window->csd_mode == CSD_YES);
- struct wl_surf_subsurf *surf = &term->window->csd.surface[CSD_SURF_TITLE];
+ struct wayl_sub_surface *surf = &term->window->csd.surface[CSD_SURF_TITLE];
if (info->width == 0 || info->height == 0)
return;
- xassert(info->width % term->scale == 0);
- xassert(info->height % term->scale == 0);
-
uint32_t bg = term->conf->csd.color.title_set
? term->conf->csd.color.title
: 0xffu << 24 | term->conf->colors.fg;
@@ -1980,11 +1971,10 @@ render_csd_title(struct terminal *term, const struct csd_data *info,
const int margin = M != NULL ? M->advance.x : win->csd.font->max_advance.x;
- render_osd(term, surf->surf, surf->sub, win->csd.font,
- buf, title_text, fg, bg, margin,
+ render_osd(term, surf, win->csd.font, buf, title_text, fg, bg, margin,
(buf->height - win->csd.font->height) / 2);
- csd_commit(term, surf->surf, buf);
+ csd_commit(term, &surf->surface, buf);
free(_title_text);
}
@@ -1995,26 +1985,23 @@ render_csd_border(struct terminal *term, enum csd_surface surf_idx,
xassert(term->window->csd_mode == CSD_YES);
xassert(surf_idx >= CSD_SURF_LEFT && surf_idx <= CSD_SURF_BOTTOM);
- struct wl_surface *surf = term->window->csd.surface[surf_idx].surf;
+ struct wayl_surface *surf = &term->window->csd.surface[surf_idx].surface;
if (info->width == 0 || info->height == 0)
return;
- xassert(info->width % term->scale == 0);
- xassert(info->height % term->scale == 0);
-
{
pixman_color_t color = color_hex_to_pixman_with_alpha(0, 0);
- render_csd_part(term, surf, buf, info->width, info->height, &color);
+ render_csd_part(term, surf->surf, buf, info->width, info->height, &color);
}
/*
* The “visible” border.
*/
- int scale = term->scale;
- int bwidth = term->conf->csd.border_width * scale;
- int vwidth = term->conf->csd.border_width_visible * scale; /* Visible size */
+ float scale = term->scale;
+ int bwidth = round(term->conf->csd.border_width * scale);
+ int vwidth = round(term->conf->csd.border_width_visible * scale); /* Visible size */
xassert(bwidth >= vwidth);
@@ -2067,7 +2054,6 @@ render_csd_border(struct terminal *term, enum csd_surface surf_idx,
uint16_t alpha = _color >> 24 | (_color >> 24 << 8);
pixman_color_t color = color_hex_to_pixman_with_alpha(_color, alpha);
-
pixman_image_fill_rectangles(
PIXMAN_OP_SRC, buf->pix[0], &color, 1,
&(pixman_rectangle16_t){x, y, w, h});
@@ -2284,14 +2270,11 @@ render_csd_button(struct terminal *term, enum csd_surface surf_idx,
xassert(term->window->csd_mode == CSD_YES);
xassert(surf_idx >= CSD_SURF_MINIMIZE && surf_idx <= CSD_SURF_CLOSE);
- struct wl_surface *surf = term->window->csd.surface[surf_idx].surf;
+ struct wayl_surface *surf = &term->window->csd.surface[surf_idx].surface;
if (info->width == 0 || info->height == 0)
return;
- xassert(info->width % term->scale == 0);
- xassert(info->height % term->scale == 0);
-
uint32_t _color;
uint16_t alpha = 0xffff;
bool is_active = false;
@@ -2339,7 +2322,7 @@ render_csd_button(struct terminal *term, enum csd_surface surf_idx,
_color = color_dim(term, _color);
pixman_color_t color = color_hex_to_pixman_with_alpha(_color, alpha);
- render_csd_part(term, surf, buf, info->width, info->height, &color);
+ render_csd_part(term, surf->surf, buf, info->width, info->height, &color);
switch (surf_idx) {
case CSD_SURF_MINIMIZE: render_csd_button_minimize(term, buf); break;
@@ -2374,7 +2357,7 @@ render_csd(struct terminal *term)
const int width = infos[i].width;
const int height = infos[i].height;
- struct wl_surface *surf = term->window->csd.surface[i].surf;
+ struct wl_surface *surf = term->window->csd.surface[i].surface.surf;
struct wl_subsurface *sub = term->window->csd.surface[i].sub;
xassert(surf != NULL);
@@ -2413,7 +2396,7 @@ render_scrollback_position(struct terminal *term)
struct wl_window *win = term->window;
if (term->grid->view == term->grid->offset) {
- if (win->scrollback_indicator.surf != NULL) {
+ if (win->scrollback_indicator.surface.surf != NULL) {
wayl_win_subsurface_destroy(&win->scrollback_indicator);
/* Work around Sway bug - unmapping a sub-surface does not damage
@@ -2423,7 +2406,7 @@ render_scrollback_position(struct terminal *term)
return;
}
- if (win->scrollback_indicator.surf == NULL) {
+ if (win->scrollback_indicator.surface.surf == NULL) {
if (!wayl_win_subsurface_new(
win, &win->scrollback_indicator, false))
{
@@ -2432,7 +2415,7 @@ render_scrollback_position(struct terminal *term)
}
}
- xassert(win->scrollback_indicator.surf != NULL);
+ xassert(win->scrollback_indicator.surface.surf != NULL);
xassert(win->scrollback_indicator.sub != NULL);
/* Find absolute row number of the scrollback start */
@@ -2530,8 +2513,8 @@ render_scrollback_position(struct terminal *term)
const int y = (term->margins.top + surf_top) / scale * scale;
if (y + height > term->height) {
- wl_surface_attach(win->scrollback_indicator.surf, NULL, 0, 0);
- wl_surface_commit(win->scrollback_indicator.surf);
+ wl_surface_attach(win->scrollback_indicator.surface.surf, NULL, 0, 0);
+ wl_surface_commit(win->scrollback_indicator.surface.surf);
return;
}
@@ -2550,8 +2533,7 @@ render_scrollback_position(struct terminal *term)
render_osd(
term,
- win->scrollback_indicator.surf,
- win->scrollback_indicator.sub,
+ &win->scrollback_indicator,
term->fonts[0], buf, text,
fg, 0xffu << 24 | bg,
width - margin - c32len(text) * term->cell_width, margin);
@@ -2569,7 +2551,7 @@ render_render_timer(struct terminal *term, struct timespec render_time)
char32_t text[256];
mbstoc32(text, usecs_str, ALEN(text));
- const int scale = term->scale;
+ const int scale = round(term->scale);
const int cell_count = c32len(text);
const int margin = 3 * scale;
const int width =
@@ -2587,8 +2569,7 @@ render_render_timer(struct terminal *term, struct timespec render_time)
render_osd(
term,
- win->render_timer.surf,
- win->render_timer.sub,
+ &win->render_timer,
term->fonts[0], buf, text,
term->colors.table[0], 0xffu << 24 | term->colors.table[8 + 1],
margin, margin);
@@ -2935,7 +2916,7 @@ grid_render(struct terminal *term)
int height = (r - first_dirty_row) * term->cell_height;
wl_surface_damage_buffer(
- term->window->surface, x, y, width, height);
+ term->window->surface.surf, x, y, width, height);
pixman_region32_union_rect(
&buf->dirty, &buf->dirty, 0, y, buf->width, height);
}
@@ -2963,7 +2944,7 @@ grid_render(struct terminal *term)
int width = term->width - term->margins.left - term->margins.right;
int height = (term->rows - first_dirty_row) * term->cell_height;
- wl_surface_damage_buffer(term->window->surface, x, y, width, height);
+ wl_surface_damage_buffer(term->window->surface.surf, x, y, width, height);
pixman_region32_union_rect(&buf->dirty, &buf->dirty, 0, y, buf->width, height);
}
@@ -3030,17 +3011,17 @@ grid_render(struct terminal *term)
xassert(term->grid->view >= 0 && term->grid->view < term->grid->num_rows);
xassert(term->window->frame_callback == NULL);
- term->window->frame_callback = wl_surface_frame(term->window->surface);
+ term->window->frame_callback = wl_surface_frame(term->window->surface.surf);
wl_callback_add_listener(term->window->frame_callback, &frame_listener, term);
- wl_surface_set_buffer_scale(term->window->surface, term->scale);
+ wayl_win_scale(term->window, buf);
if (term->wl->presentation != NULL && term->conf->presentation_timings) {
struct timespec commit_time;
clock_gettime(term->wl->presentation_clock_id, &commit_time);
struct wp_presentation_feedback *feedback = wp_presentation_feedback(
- term->wl->presentation, term->window->surface);
+ term->wl->presentation, term->window->surface.surf);
if (feedback == NULL) {
LOG_WARN("failed to create presentation feedback");
@@ -3064,14 +3045,11 @@ grid_render(struct terminal *term)
if (term->conf->tweak.damage_whole_window) {
wl_surface_damage_buffer(
- term->window->surface, 0, 0, INT32_MAX, INT32_MAX);
+ term->window->surface.surf, 0, 0, INT32_MAX, INT32_MAX);
}
- xassert(buf->width % term->scale == 0);
- xassert(buf->height % term->scale == 0);
-
- wl_surface_attach(term->window->surface, buf->wl_buf, 0, 0);
- wl_surface_commit(term->window->surface);
+ wl_surface_attach(term->window->surface.surf, buf->wl_buf, 0, 0);
+ wl_surface_commit(term->window->surface.surf);
}
static void
@@ -3133,17 +3111,17 @@ render_search_box(struct terminal *term)
const size_t wanted_visible_cells = max(20, total_cells);
xassert(term->scale >= 1);
- const int scale = term->scale;
+ const int rounded_scale = round(term->scale);
- const size_t margin = 3 * scale;
+ const size_t margin = 3 * rounded_scale;
const size_t width = term->width - 2 * margin;
const size_t visible_width = min(
term->width - 2 * margin,
- (2 * margin + wanted_visible_cells * term->cell_width + scale - 1) / scale * scale);
+ (2 * margin + wanted_visible_cells * term->cell_width + rounded_scale - 1) / rounded_scale * rounded_scale);
const size_t height = min(
term->height - 2 * margin,
- (2 * margin + 1 * term->cell_height + scale - 1) / scale * scale);
+ (2 * margin + 1 * term->cell_height + rounded_scale - 1) / rounded_scale * rounded_scale);
const size_t visible_cells = (visible_width - 2 * margin) / term->cell_width;
size_t glyph_offset = term->render.search_glyph_offset;
@@ -3390,24 +3368,21 @@ render_search_box(struct terminal *term)
/* TODO: this is only necessary on a window resize */
wl_subsurface_set_position(
term->window->search.sub,
- margin / scale,
- max(0, (int32_t)term->height - height - margin) / scale);
-
- xassert(buf->width % scale == 0);
- xassert(buf->height % scale == 0);
+ margin / term->scale,
+ max(0, (int32_t)term->height - height - margin) / term->scale);
- wl_surface_attach(term->window->search.surf, buf->wl_buf, 0, 0);
- wl_surface_damage_buffer(term->window->search.surf, 0, 0, width, height);
- wl_surface_set_buffer_scale(term->window->search.surf, scale);
+ wayl_surface_scale(term->window, &term->window->search.surface, buf, term->scale);
+ wl_surface_attach(term->window->search.surface.surf, buf->wl_buf, 0, 0);
+ wl_surface_damage_buffer(term->window->search.surface.surf, 0, 0, width, height);
struct wl_region *region = wl_compositor_create_region(term->wl->compositor);
if (region != NULL) {
wl_region_add(region, width - visible_width, 0, visible_width, height);
- wl_surface_set_opaque_region(term->window->search.surf, region);
+ wl_surface_set_opaque_region(term->window->search.surface.surf, region);
wl_region_destroy(region);
}
- wl_surface_commit(term->window->search.surf);
+ wl_surface_commit(term->window->search.surface.surf);
quirk_weston_subsurface_desync_off(term->window->search.sub);
#if defined(FOOT_IME_ENABLED) && FOOT_IME_ENABLED
@@ -3423,7 +3398,7 @@ render_urls(struct terminal *term)
struct wl_window *win = term->window;
xassert(tll_length(win->urls) > 0);
- const int scale = term->scale;
+ const int scale = round(term->scale);
const int x_margin = 2 * scale;
const int y_margin = 1 * scale;
@@ -3488,7 +3463,7 @@ render_urls(struct terminal *term)
continue;
}
- struct wl_surface *surf = it->item.surf.surf;
+ struct wl_surface *surf = it->item.surf.surface.surf;
struct wl_subsurface *sub_surf = it->item.surf.sub;
if (surf == NULL || sub_surf == NULL)
@@ -3623,23 +3598,22 @@ render_urls(struct terminal *term)
: term->colors.table[3];
for (size_t i = 0; i < render_count; i++) {
- struct wl_surface *surf = info[i].url->surf.surf;
- struct wl_subsurface *sub_surf = info[i].url->surf.sub;
+ const struct wayl_sub_surface *sub_surf = &info[i].url->surf;
const char32_t *label = info[i].text;
const int x = info[i].x;
const int y = info[i].y;
- xassert(surf != NULL);
- xassert(sub_surf != NULL);
+ xassert(sub_surf->surface.surf != NULL);
+ xassert(sub_surf->sub != NULL);
wl_subsurface_set_position(
- sub_surf,
+ sub_surf->sub,
(term->margins.left + x) / term->scale,
(term->margins.top + y) / term->scale);
render_osd(
- term, surf, sub_surf, term->fonts[0], bufs[i], label,
+ term, sub_surf, term->fonts[0], bufs[i], label,
fg, 0xffu << 24 | bg, x_margin, y_margin);
free(info[i].text);
@@ -3869,13 +3843,17 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
if (term->cell_width == 0 && term->cell_height == 0)
return false;
- int scale = -1;
- tll_foreach(term->window->on_outputs, it) {
- if (it->item->scale > scale)
- scale = it->item->scale;
+ float scale = -1;
+ if (wayl_fractional_scaling(term->wl)) {
+ scale = term->window->scale;
+ } else {
+ tll_foreach(term->window->on_outputs, it) {
+ if (it->item->scale > scale)
+ scale = it->item->scale;
+ }
}
- if (scale < 0) {
+ if (scale < 0.) {
/* Haven't 'entered' an output yet? */
scale = term->scale;
}
@@ -3923,13 +3901,18 @@ maybe_resize(struct terminal *term, int width, int height, bool force)
* Ensure we can scale to logical size, and back to
* pixels without truncating.
*/
- if (width % scale)
- width += scale - width % scale;
- if (height % scale)
- height += scale - height % scale;
+ if (wayl_fractional_scaling(term->wl)) {
+ xassert((int)round(scale) == (int)scale);
+
+ int iscale = scale;
+ if (width % iscale)
+ width += iscale - width % iscale;
+ if (height % iscale)
+ height += iscale - height % iscale;
- xassert(width % scale == 0);
- xassert(height % scale == 0);
+ xassert(width % iscale == 0);
+ xassert(height % iscale == 0);
+ }
break;
}
}
@@ -4270,34 +4253,36 @@ render_xcursor_update(struct seat *seat)
if (seat->pointer.xcursor == XCURSOR_HIDDEN) {
/* Hide cursor */
- wl_surface_attach(seat->pointer.surface, NULL, 0, 0);
- wl_surface_commit(seat->pointer.surface);
+ wl_surface_attach(seat->pointer.surface.surf, NULL, 0, 0);
+ wl_surface_commit(seat->pointer.surface.surf);
return;
}
xassert(seat->pointer.cursor != NULL);
- const int scale = seat->pointer.scale;
+ const float scale = seat->pointer.scale;
struct wl_cursor_image *image = seat->pointer.cursor->images[0];
+ struct wl_buffer *buf = wl_cursor_image_get_buffer(image);
- wl_surface_attach(
- seat->pointer.surface, wl_cursor_image_get_buffer(image), 0, 0);
+ wayl_surface_scale_explicit_width_height(
+ seat->mouse_focus->window,
+ &seat->pointer.surface, image->width, image->height, scale);
+
+ wl_surface_attach(seat->pointer.surface.surf, buf, 0, 0);
wl_pointer_set_cursor(
seat->wl_pointer, seat->pointer.serial,
- seat->pointer.surface,
+ seat->pointer.surface.surf,
image->hotspot_x / scale, image->hotspot_y / scale);
wl_surface_damage_buffer(
- seat->pointer.surface, 0, 0, INT32_MAX, INT32_MAX);
-
- wl_surface_set_buffer_scale(seat->pointer.surface, scale);
+ seat->pointer.surface.surf, 0, 0, INT32_MAX, INT32_MAX);
xassert(seat->pointer.xcursor_callback == NULL);
- seat->pointer.xcursor_callback = wl_surface_frame(seat->pointer.surface);
+ seat->pointer.xcursor_callback = wl_surface_frame(seat->pointer.surface.surf);
wl_callback_add_listener(seat->pointer.xcursor_callback, &xcursor_listener, seat);
- wl_surface_commit(seat->pointer.surface);
+ wl_surface_commit(seat->pointer.surface.surf);
}
static void