From 913631071ed613a7a94e6a9126a52ac5adc7ec86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Thu, 22 Feb 2024 20:46:03 +0100 Subject: [PATCH] xwayland: Use border width in xwl_glamor_gbm_create_pixmap_for_window Otherwise the pixmap is too small for a window with non-0 border width. Fixes: 9730fb64ea05 ("xwayland: Add create_pixmap_for_window() to GBM backend") Part-of: --- hw/xwayland/xwayland-glamor-gbm.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c index 7dbc9d24e..30eb953d6 100644 --- a/hw/xwayland/xwayland-glamor-gbm.c +++ b/hw/xwayland/xwayland-glamor-gbm.c @@ -396,11 +396,14 @@ xwl_glamor_gbm_create_pixmap(ScreenPtr screen, static PixmapPtr xwl_glamor_gbm_create_pixmap_for_window(struct xwl_window *xwl_window) { + WindowPtr window = xwl_window->window; + unsigned border_width = 2 * window->borderWidth; + return xwl_glamor_gbm_create_pixmap_internal(xwl_window->xwl_screen, - &xwl_window->window->drawable, - xwl_window->window->drawable.width, - xwl_window->window->drawable.height, - xwl_window->window->drawable.depth, + &window->drawable, + window->drawable.width + border_width, + window->drawable.height + border_width, + window->drawable.depth, CREATE_PIXMAP_USAGE_BACKING_PIXMAP, xwl_window->has_implicit_scanout_support); }