mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fl::clipboard_contains(): handle now properly the case when there's nothing in the clipboard.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10176 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2014-05-29 15:28:04 +00:00
parent 67f3c4cc82
commit 44c2ca6521
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Fl_x.cxx
View File

@ -814,11 +814,14 @@ int Fl::clipboard_contains(const char *type)
unsigned char* portion = NULL;
Fl_Window *win = Fl::first_window();
if (!win || !fl_xid(win)) return 0;
XConvertSelection(fl_display, CLIPBOARD, TARGETS, CLIPBOARD,
fl_xid(win), fl_event_time);
XConvertSelection(fl_display, CLIPBOARD, TARGETS, CLIPBOARD, fl_xid(win), CurrentTime);
XFlush(fl_display);
do { XNextEvent(fl_display, &event); i++; }
while (i < 10 && (event.type != SelectionNotify || event.xselection.property == None));
do {
XNextEvent(fl_display, &event);
if (event.type == SelectionNotify && event.xselection.property == None) return 0;
i++;
}
while (i < 10 && event.type != SelectionNotify);
if (i >= 10) return 0;
XGetWindowProperty(fl_display,
event.xselection.requestor,