mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-29 15:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Camilla Berglund 2013-04-29 12:33:27 +02:00
parent 822eb1c986
commit dab22c4c53
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/x11_clipboard.c
View File

@ -179,9 +179,6 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
for (i = 0; i < _GLFW_CLIPBOARD_FORMAT_COUNT; i++) for (i = 0; i < _GLFW_CLIPBOARD_FORMAT_COUNT; i++)
{ {
Atom actualType;
int actualFormat;
unsigned long itemCount, bytesAfter;
char* data; char* data;
XEvent event; XEvent event;
@ -199,27 +196,20 @@ const char* _glfwPlatformGetClipboardString(_GLFWwindow* window)
if (event.xselection.property == None) if (event.xselection.property == None)
continue; continue;
XGetWindowProperty(_glfw.x11.display, if (_glfwGetWindowProperty(event.xselection.requestor,
event.xselection.requestor,
event.xselection.property, event.xselection.property,
0, LONG_MAX,
False,
event.xselection.target, event.xselection.target,
&actualType, (unsigned char**) &data))
&actualFormat, {
&itemCount, _glfw.x11.selection.string = strdup(data);
&bytesAfter, }
(unsigned char**) &data);
XFree(data);
XDeleteProperty(_glfw.x11.display, XDeleteProperty(_glfw.x11.display,
event.xselection.requestor, event.xselection.requestor,
event.xselection.property); event.xselection.property);
if (actualType == event.xselection.target)
_glfw.x11.selection.string = strdup(data);
XFree(data);
if (_glfw.x11.selection.string) if (_glfw.x11.selection.string)
break; break;
} }