matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement X11 clipboard pull

Browse Source
This commit is contained in:
mniip 2013-08-29 00:57:08 +04:00
parent c59b6d0466
commit 8a27363c76
1 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/PowderToySDL.cpp
View File

@ -50,7 +50,7 @@ using namespace std;
#endif #endif
#if defined(USE_SDL) && defined(LIN) && defined(SDL_VIDEO_DRIVER_X11) #if defined(USE_SDL) && defined(LIN) && defined(SDL_VIDEO_DRIVER_X11)
SDL_SysWMinfo sdl_wminfo; SDL_SysWMinfo sdl_wminfo;
Atom XA_CLIPBOARD, XA_TARGETS; Atom XA_CLIPBOARD, XA_TARGETS, XA_UTF8_STRING;
#endif #endif
char *clipboardText = NULL; char *clipboardText = NULL;
@ -125,7 +125,58 @@ char * ClipboardPull()
//} //}
} }
#elif defined(LIN) && defined(SDL_VIDEO_DRIVER_X11) #elif defined(LIN) && defined(SDL_VIDEO_DRIVER_X11)
printf("Not implemented: get text from clipboard\n");
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)
{
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);
sdl_wminfo.info.x11.unlock_func();
while (1)
{
SDL_Event event;
SDL_WaitEvent(&event);
if (event.type == SDL_SYSWMEVENT)
{
XEvent xevent = event.syswm.msg->event.xevent;
if (xevent.type == SelectionNotify && xevent.xselection.requestor == sdl_wminfo.info.x11.window)
break;
evlist.push_back(event);
}
}
for (std::list<SDL_Event>::iterator iter = evlist.begin(), end = evlist.end(); iter != end; iter++)
{
SDL_Event event = *iter;
SDL_PushEvent(&event); // replay the missed events
}
sdl_wminfo.info.x11.lock_func();
XGetWindowProperty(sdl_wminfo.info.x11.display, sdl_wminfo.info.x11.window, XA_CLIPBOARD, 0, 0, 0, AnyPropertyType, &type, &format, &len, &bytesLeft, &data);
if (data)
{
XFree(data);
data = NULL;
}
if (bytesLeft)
{
result = XGetWindowProperty(sdl_wminfo.info.x11.display, sdl_wminfo.info.x11.window, XA_CLIPBOARD, 0, bytesLeft, 0, AnyPropertyType, &type, &format, &len, &_, &data);
if (result == Success)
{
text = strdup((const char*) data);
XFree(data);
}
}
XDeleteProperty(sdl_wminfo.info.x11.display, sdl_wminfo.info.x11.window, XA_CLIPBOARD);
}
sdl_wminfo.info.x11.unlock_func();
return text;
#else #else
printf("Not implemented: get text from clipboard\n"); printf("Not implemented: get text from clipboard\n");
#endif #endif
@ -769,6 +820,7 @@ int main(int argc, char * argv[])
sdl_wminfo.info.x11.lock_func(); sdl_wminfo.info.x11.lock_func();
XA_CLIPBOARD = XInternAtom(sdl_wminfo.info.x11.display, "CLIPBOARD", 1); XA_CLIPBOARD = XInternAtom(sdl_wminfo.info.x11.display, "CLIPBOARD", 1);
XA_TARGETS = XInternAtom(sdl_wminfo.info.x11.display, "TARGETS", 1); XA_TARGETS = XInternAtom(sdl_wminfo.info.x11.display, "TARGETS", 1);
XA_UTF8_STRING = XInternAtom(sdl_wminfo.info.x11.display, "UTF8_STRING", 1);
sdl_wminfo.info.x11.unlock_func(); sdl_wminfo.info.x11.unlock_func();
#endif #endif
ui::Engine::Ref().g = new Graphics(); ui::Engine::Ref().g = new Graphics();