aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.h
diff options
context:
space:
mode:
authorKen Raeburn2016-03-08 22:17:16 -0500
committerKen Raeburn2016-03-10 14:28:54 -0500
commit8b8a6ad3e3239eb2cff325e72e29dc30fdaa58c5 (patch)
treefab743803408a7c0fcf1f1416a187f863505b2d1 /src/xterm.h
parent985dacfa0f0186531fdae13718d720cf7e27425f (diff)
downloademacs-8b8a6ad3e3239eb2cff325e72e29dc30fdaa58c5.tar.gz
emacs-8b8a6ad3e3239eb2cff325e72e29dc30fdaa58c5.zip
Don't use XRANDR 1.3 extensions if the server doesn't support them.
* src/xterm.h (struct x_display_info): Add fields to save XRANDR version number. * src/xfns.c (x_get_monitor_attributes): Save the version numbers after querying the X server. (x_get_monitor_attributes_xrandr): Don't use XRRGetOutputPrimary or XRRGetScreenResourcesCurrent if the server doesn't support at least RANDR version 1.3. Conditionalize the code blocks on compiling against library version 1.3 or better, rather than feature tests for each function. * configure.ac: Stop testing for those two functions.
Diffstat (limited to 'src/xterm.h')
-rw-r--r--src/xterm.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xterm.h b/src/xterm.h
index 06cd2e75a8b..8e1fc788bc1 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -459,6 +459,11 @@ struct x_display_info
459 /* SM */ 459 /* SM */
460 Atom Xatom_SM_CLIENT_ID; 460 Atom Xatom_SM_CLIENT_ID;
461 461
462#ifdef HAVE_XRANDR
463 int xrandr_major_version;
464 int xrandr_minor_version;
465#endif
466
462#ifdef USE_CAIRO 467#ifdef USE_CAIRO
463 XExtCodes *ext_codes; 468 XExtCodes *ext_codes;
464#endif 469#endif