From: Yuuki Harano <masm+github@masm11.me>
Date: Mon, 11 Jan 2021 10:56:32 +0000 (+0900)
Subject: Fix visual-bell on X
X-Git-Tag: emacs-29.0.90~3738
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7326982d283abe7545d5f5742ea2b57e513fd285;p=emacs.git

Fix visual-bell on X

* src/pgtkterm.c (pgtk_flash): Change size source.

On X, surface_orig is not an image surface but xlib surface, so I
cannot get its size with cairo_image_surface_get_{width,height}.
---

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 00381671f21..44e1f3e2966 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -3706,8 +3706,8 @@ pgtk_flash (struct frame *f)
   {
     cairo_surface_t *surface_orig = FRAME_CR_SURFACE (f);
 
-    int width = cairo_image_surface_get_width (surface_orig);
-    int height = cairo_image_surface_get_height (surface_orig);
+    int width = FRAME_CR_SURFACE_DESIRED_WIDTH (f);
+    int height = FRAME_CR_SURFACE_DESIRED_HEIGHT (f);
     cairo_surface_t *surface =
       cairo_surface_create_similar (surface_orig, CAIRO_CONTENT_COLOR_ALPHA,
 				    width, height);