From e5d890a1aa74fe006f779957eea0a750c40eb442 Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Thu, 21 Aug 2014 21:14:29 +0200
Subject: [PATCH] Made clipboard string member name consistent.

---
 src/x11_clipboard.c | 30 +++++++++++++++---------------
 src/x11_init.c      |  2 +-
 src/x11_platform.h  |  6 ++----
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/x11_clipboard.c b/src/x11_clipboard.c
index ba950243..3428050d 100644
--- a/src/x11_clipboard.c
+++ b/src/x11_clipboard.c
@@ -110,8 +110,8 @@ static Atom writeTargetToProperty(const XSelectionRequestEvent* request)
                                 targets[i],
                                 8,
                                 PropModeReplace,
-                                (unsigned char*) _glfw.x11.selection.string,
-                                strlen(_glfw.x11.selection.string));
+                                (unsigned char*) _glfw.x11.clipboardString,
+                                strlen(_glfw.x11.clipboardString));
             }
             else
                 targets[i + 1] = None;
@@ -162,8 +162,8 @@ static Atom writeTargetToProperty(const XSelectionRequestEvent* request)
                             request->target,
                             8,
                             PropModeReplace,
-                            (unsigned char*) _glfw.x11.selection.string,
-                            strlen(_glfw.x11.selection.string));
+                            (unsigned char*) _glfw.x11.clipboardString,
+                            strlen(_glfw.x11.clipboardString));
 
             return request->property;
         }
@@ -181,8 +181,8 @@ static Atom writeTargetToProperty(const XSelectionRequestEvent* request)
 
 void _glfwHandleSelectionClear(XEvent* event)
 {
-    free(_glfw.x11.selection.string);
-    _glfw.x11.selection.string = NULL;
+    free(_glfw.x11.clipboardString);
+    _glfw.x11.clipboardString = NULL;
 }
 
 void _glfwHandleSelectionRequest(XEvent* event)
@@ -253,8 +253,8 @@ void _glfwPushSelectionToManager(_GLFWwindow* window)
 
 void _glfwPlatformSetClipboardString(_GLFWwindow* window, const char* string)
 {
-    free(_glfw.x11.selection.string);
-    _glfw.x11.selection.string = strdup(string);
+    free(_glfw.x11.clipboardString);
+    _glfw.x11.clipboardString = strdup(string);
 
     XSetSelectionOwner(_glfw.x11.display,
                        _glfw.x11.CLIPBOARD,
@@ -281,11 +281,11 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
     {
         // Instead of doing a large number of X round-trips just to put this
         // string into a window property and then read it back, just return it
-        return _glfw.x11.selection.string;
+        return _glfw.x11.clipboardString;
     }
 
-    free(_glfw.x11.selection.string);
-    _glfw.x11.selection.string = NULL;
+    free(_glfw.x11.clipboardString);
+    _glfw.x11.clipboardString = NULL;
 
     for (i = 0;  i < formatCount;  i++)
     {
@@ -311,7 +311,7 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
                                    event.xselection.target,
                                    (unsigned char**) &data))
         {
-            _glfw.x11.selection.string = strdup(data);
+            _glfw.x11.clipboardString = strdup(data);
         }
 
         XFree(data);
@@ -320,16 +320,16 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
                         event.xselection.requestor,
                         event.xselection.property);
 
-        if (_glfw.x11.selection.string)
+        if (_glfw.x11.clipboardString)
             break;
     }
 
-    if (_glfw.x11.selection.string == NULL)
+    if (_glfw.x11.clipboardString == NULL)
     {
         _glfwInputError(GLFW_FORMAT_UNAVAILABLE,
                         "X11: Failed to convert selection to string");
     }
 
-    return _glfw.x11.selection.string;
+    return _glfw.x11.clipboardString;
 }
 
diff --git a/src/x11_init.c b/src/x11_init.c
index 5464737e..0913c1a8 100644
--- a/src/x11_init.c
+++ b/src/x11_init.c
@@ -730,7 +730,7 @@ void _glfwPlatformTerminate(void)
         _glfw.x11.cursor = (Cursor) 0;
     }
 
-    free(_glfw.x11.selection.string);
+    free(_glfw.x11.clipboardString);
 
     _glfwTerminateJoysticks();
     _glfwTerminateContextAPI();
diff --git a/src/x11_platform.h b/src/x11_platform.h
index 4ac4992b..4d23899e 100644
--- a/src/x11_platform.h
+++ b/src/x11_platform.h
@@ -114,6 +114,8 @@ typedef struct _GLFWlibraryX11
     Cursor          cursor;
     XContext        context;
 
+    char*           clipboardString;
+
     // Window manager atoms
     Atom            WM_PROTOCOLS;
     Atom            WM_STATE;
@@ -206,10 +208,6 @@ typedef struct _GLFWlibraryX11
         int         exposure;
     } saver;
 
-    struct {
-        char*       string;
-    } selection;
-
     struct {
         Window      source;
     } xdnd;