[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 97226aa: Do not assume Xrender merely because Cairo
From: |
Paul Eggert |
Subject: |
master 97226aa: Do not assume Xrender merely because Cairo |
Date: |
Mon, 4 Jan 2021 13:35:28 -0500 (EST) |
branch: master
commit 97226aacfde717ec48fa8931c870497e089da17b
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>
Do not assume Xrender merely because Cairo
Problem reported by Andrea Corallo in:
https://lists.gnu.org/r/emacs-devel/2021-01/msg00225.html
* src/xterm.c (x_term_init) [USE_CAIRO && !HAVE_XRENDER]:
Do not call XRenderQueryExtension.
---
src/xterm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/xterm.c b/src/xterm.c
index 0a86738..b8374fe 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13035,13 +13035,13 @@ x_term_init (Lisp_Object display_name, char
*xrm_option, char *resource_name)
or larger than other for other applications, even if it is the same
font name (monospace-10 for example). */
+# ifdef HAVE_XRENDER
int event_base, error_base;
- char *v;
- double d;
-
XRenderQueryExtension (dpyinfo->display, &event_base, &error_base);
+# endif
- v = XGetDefault (dpyinfo->display, "Xft", "dpi");
+ char *v = XGetDefault (dpyinfo->display, "Xft", "dpi");
+ double d;
if (v != NULL && sscanf (v, "%lf", &d) == 1)
dpyinfo->resy = dpyinfo->resx = d;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 97226aa: Do not assume Xrender merely because Cairo,
Paul Eggert <=