diff options
| author | jacob1 <jfu614@gmail.com> | 2013-09-12 00:41:43 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-09-12 00:41:43 (GMT) |
| commit | 332aa25bf6aa938fe3217a7a6622bf5f4c2f3201 (patch) | |
| tree | 910075200d0eb324641f6df3e46b9a7cdd594756 /src/PowderToySDL.cpp | |
| parent | 09c54b596bfaa13ae5009bbe4d5e6a0131ba50d2 (diff) | |
| download | powder-332aa25bf6aa938fe3217a7a6622bf5f4c2f3201.zip powder-332aa25bf6aa938fe3217a7a6622bf5f4c2f3201.tar.gz | |
save pavg[] in saves, for VIRS, PIPE, and STOR
Diffstat (limited to 'src/PowderToySDL.cpp')
| -rw-r--r-- | src/PowderToySDL.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index 9465e58..74cbb51 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -125,17 +125,16 @@ char * ClipboardPull() //} } #elif defined(LIN) && defined(SDL_VIDEO_DRIVER_X11) - char *text = NULL; - unsigned char *data = NULL; - Atom type; - int format, result; - unsigned long len, bytesLeft, _; Window selectionOwner; sdl_wminfo.info.x11.lock_func(); selectionOwner = XGetSelectionOwner(sdl_wminfo.info.x11.display, XA_CLIPBOARD); if (selectionOwner != None) { + unsigned char *data = NULL; + Atom type; + int format, result; + unsigned long len, bytesLeft; std::list<SDL_Event> evlist; // if there arrive any events while fetching keyboard XConvertSelection(sdl_wminfo.info.x11.display, XA_CLIPBOARD, XA_UTF8_STRING, XA_CLIPBOARD, sdl_wminfo.info.x11.window, CurrentTime); XFlush(sdl_wminfo.info.x11.display); @@ -166,7 +165,7 @@ char * ClipboardPull() } if (bytesLeft) { - result = XGetWindowProperty(sdl_wminfo.info.x11.display, sdl_wminfo.info.x11.window, XA_CLIPBOARD, 0, bytesLeft, 0, AnyPropertyType, &type, &format, &len, &_, &data); + result = XGetWindowProperty(sdl_wminfo.info.x11.display, sdl_wminfo.info.x11.window, XA_CLIPBOARD, 0, bytesLeft, 0, AnyPropertyType, &type, &format, &len, &bytesLeft, &data); if (result == Success) { text = strdup((const char*) data); |