From 9dbc935afb5b9fa8977e1d6f5c844038ece7fa73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Tue, 8 Aug 2017 14:04:51 +0200 Subject: [PATCH] X11: Stop reporting support for COMPOUND_TEXT --- README.md | 1 + src/x11_init.c | 5 +---- src/x11_window.c | 9 ++------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 93c5c2c8..4ca7a0be 100644 --- a/README.md +++ b/README.md @@ -206,6 +206,7 @@ information on what to include when reporting a bug. - [X11] Bugfix: Gamma ramp setting via RandR did not validate ramp size - [X11] Bugfix: Key name string encoding depended on current locale (#981,#983) - [X11] Bugfix: Incremental reading of selections was not supported (#275) +- [X11] Bugfix: Selection I/O reported but did not support `COMPOUND_TEXT` - [Linux] Moved to evdev for joystick input (#906,#1005) - [Linux] Bugfix: Event processing did not detect joystick disconnection (#932) - [Linux] Bugfix: The joystick device path could be truncated (#1025) diff --git a/src/x11_init.c b/src/x11_init.c index baf76fa4..6a8ba659 100644 --- a/src/x11_init.c +++ b/src/x11_init.c @@ -661,10 +661,7 @@ static GLFWbool initExtensions(void) // String format atoms _glfw.x11.NULL_ = XInternAtom(_glfw.x11.display, "NULL", False); - _glfw.x11.UTF8_STRING = - XInternAtom(_glfw.x11.display, "UTF8_STRING", False); - _glfw.x11.COMPOUND_STRING = - XInternAtom(_glfw.x11.display, "COMPOUND_STRING", False); + _glfw.x11.UTF8_STRING = XInternAtom(_glfw.x11.display, "UTF8_STRING", False); _glfw.x11.ATOM_PAIR = XInternAtom(_glfw.x11.display, "ATOM_PAIR", False); // Custom selection property atom diff --git a/src/x11_window.c b/src/x11_window.c index 592a8eb7..a0dd81be 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -683,9 +683,7 @@ static Atom writeTargetToProperty(const XSelectionRequestEvent* request) { int i; char* selectionString = NULL; - const Atom formats[] = { _glfw.x11.UTF8_STRING, - _glfw.x11.COMPOUND_STRING, - XA_STRING }; + const Atom formats[] = { _glfw.x11.UTF8_STRING, XA_STRING }; const int formatCount = sizeof(formats) / sizeof(formats[0]); if (request->selection == _glfw.x11.PRIMARY) @@ -707,7 +705,6 @@ static Atom writeTargetToProperty(const XSelectionRequestEvent* request) const Atom targets[] = { _glfw.x11.TARGETS, _glfw.x11.MULTIPLE, _glfw.x11.UTF8_STRING, - _glfw.x11.COMPOUND_STRING, XA_STRING }; XChangeProperty(_glfw.x11.display, @@ -852,9 +849,7 @@ static const char* getSelectionString(Atom selection) { size_t i; char** selectionString = NULL; - const Atom targets[] = { _glfw.x11.UTF8_STRING, - _glfw.x11.COMPOUND_STRING, - XA_STRING }; + const Atom targets[] = { _glfw.x11.UTF8_STRING, XA_STRING }; const size_t targetCount = sizeof(targets) / sizeof(targets[0]); if (selection == _glfw.x11.PRIMARY)