From 7012d9795848982ea23e237b6dc0da466dd590fb Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 29 Apr 2013 00:23:59 +0200 Subject: [PATCH] Removed clipboard format index macros. --- src/x11_init.c | 11 ++++------- src/x11_platform.h | 6 +----- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/x11_init.c b/src/x11_init.c index 2781222a..9f706efb 100644 --- a/src/x11_init.c +++ b/src/x11_init.c @@ -546,13 +546,10 @@ static GLboolean initDisplay(void) _glfw.x11.TARGETS = XInternAtom(_glfw.x11.display, "TARGETS", False); _glfw.x11.CLIPBOARD = XInternAtom(_glfw.x11.display, "CLIPBOARD", False); - // Find or create selection target atoms - _glfw.x11.selection.formats[_GLFW_CLIPBOARD_FORMAT_UTF8] = - _glfw.x11.UTF8_STRING; - _glfw.x11.selection.formats[_GLFW_CLIPBOARD_FORMAT_COMPOUND] = - _glfw.x11.COMPOUND_STRING; - _glfw.x11.selection.formats[_GLFW_CLIPBOARD_FORMAT_STRING] = - XA_STRING; + // Store clipboard format atoms in order of preference + _glfw.x11.selection.formats[0] = _glfw.x11.UTF8_STRING; + _glfw.x11.selection.formats[1] = _glfw.x11.COMPOUND_STRING; + _glfw.x11.selection.formats[2] = XA_STRING; return GL_TRUE; } diff --git a/src/x11_platform.h b/src/x11_platform.h index 0eb8c28c..e5b2b547 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -66,11 +66,7 @@ #define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryX11 x11 #define _GLFW_PLATFORM_MONITOR_STATE _GLFWmonitorX11 x11 -// Clipboard format atom indices (in order of preference) -#define _GLFW_CLIPBOARD_FORMAT_UTF8 0 -#define _GLFW_CLIPBOARD_FORMAT_COMPOUND 1 -#define _GLFW_CLIPBOARD_FORMAT_STRING 2 -#define _GLFW_CLIPBOARD_FORMAT_COUNT 3 +#define _GLFW_CLIPBOARD_FORMAT_COUNT 3 //========================================================================