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

Formatting.

Browse Source
This commit is contained in:
Camilla Berglund 2012-04-09 15:12:59 +02:00
parent 508207ae04
commit 168aba78d4
1 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/x11_clipboard.c
View File

@ -47,7 +47,9 @@
Atom _glfwSelectionRequest(XSelectionRequestEvent* request) Atom _glfwSelectionRequest(XSelectionRequestEvent* request)
{ {
Atom* atoms = _glfwLibrary.X11.selection.atoms.string; Atom* formats = _glfwLibrary.X11.selection.atoms.string;
char* target = _glfwLibrary.X11.selection.clipboard.string;
if (request->target == XA_STRING) if (request->target == XA_STRING)
{ {
// TODO: ISO Latin-1 specific characters don't get converted // TODO: ISO Latin-1 specific characters don't get converted
@ -58,11 +60,11 @@ Atom _glfwSelectionRequest(XSelectionRequestEvent* request)
request->target, request->target,
8, 8,
PropModeReplace, PropModeReplace,
(unsigned char*) _glfwLibrary.X11.selection.clipboard.string, (unsigned char*) target,
8); 8);
} }
else if (request->target == atoms[_GLFW_STRING_ATOM_COMPOUND] || else if (request->target == formats[_GLFW_STRING_ATOM_COMPOUND] ||
request->target == atoms[_GLFW_STRING_ATOM_UTF8]) request->target == formats[_GLFW_STRING_ATOM_UTF8])
{ {
XChangeProperty(_glfwLibrary.X11.display, XChangeProperty(_glfwLibrary.X11.display,
request->requestor, request->requestor,
@ -70,7 +72,7 @@ Atom _glfwSelectionRequest(XSelectionRequestEvent* request)
request->target, request->target,
8, 8,
PropModeReplace, PropModeReplace,
(unsigned char*) _glfwLibrary.X11.selection.clipboard.string, (unsigned char*) target,
_glfwLibrary.X11.selection.clipboard.stringlen); _glfwLibrary.X11.selection.clipboard.stringlen);
} }
else else
@ -200,13 +202,24 @@ size_t _glfwPlatformGetClipboardData(void *data, size_t size, int format)
// The number of bytes remaining (which is all of them) // The number of bytes remaining (which is all of them)
if (rembytes > 0) if (rembytes > 0)
{ {
int result = XGetWindowProperty(_glfwLibrary.X11.display, window, int result = XGetWindowProperty(_glfwLibrary.X11.display,
*xfmt, 0, rembytes, 0, window,
AnyPropertyType, &type, &fmt, *xfmt,
&len, &dummy, &d); 0, rembytes,
0,
AnyPropertyType,
&type,
&fmt,
&len, &dummy,
&d);
if (result == Success) if (result == Success)
{ {
size_t s = size - 1 > rembytes ? rembytes : size - 1; size_t s;
if (rembytes < size - 1)
s = rembytes;
else
s = size - 1;
// Copy the data out. // Copy the data out.
memcpy(data, d, s); memcpy(data, d, s);