diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-07 08:51:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-07 08:51:42 +0000 |
| commit | c674ca155b4449ea7343637976a541b68e24e163 (patch) | |
| tree | 5afe1622a5cc7e8f0b0fdb134661e25692d375fa | |
| parent | 036a5b11200fe8371bc2ebfb6a7b31ab43faff50 (diff) | |
| download | vcxsrv-c674ca155b4449ea7343637976a541b68e24e163.tar.gz vcxsrv-c674ca155b4449ea7343637976a541b68e24e163.tar.bz2 vcxsrv-c674ca155b4449ea7343637976a541b68e24e163.zip | |
Don't assume we'll always have converted the selection after 2 attempts
| -rw-r--r-- | xorg-server/hw/xwin/winclipboardwndproc.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/xorg-server/hw/xwin/winclipboardwndproc.c b/xorg-server/hw/xwin/winclipboardwndproc.c index 26a77ef74..1f2bf756a 100644 --- a/xorg-server/hw/xwin/winclipboardwndproc.c +++ b/xorg-server/hw/xwin/winclipboardwndproc.c @@ -46,7 +46,6 @@ * Constants
*/
-#define WIN_CLIPBOARD_PROP "cyg_clipboard_prop"
#define WIN_POLL_TIMEOUT 1
/*
@@ -90,9 +89,9 @@ winProcessXEventsTimeout (HWND hwnd, int iWindow, Display *pDisplay, pDisplay,
fUseUnicode,
TRUE);
- if (WIN_XEVENTS_NOTIFY == iReturn || WIN_XEVENTS_CONVERT == iReturn)
+ if (WIN_XEVENTS_NOTIFY == iReturn)
{
- /* Bail out if convert or notify processed */
+ /* Bail out if notify processed */
return iReturn;
}
@@ -489,23 +488,9 @@ winClipboardWindowProc (HWND hwnd, UINT message, pDisplay,
fConvertToUnicode,
WIN_POLL_TIMEOUT);
- if (WIN_XEVENTS_CONVERT == iReturn)
- {
- /*
- * The selection was offered for conversion first, so we have
- * to process a second SelectionNotify event to get the actual
- * data in the selection.
- */
- winDebug("winClipboardWindowProc - Previous winProcessXEventsTimeout returned WIN_XEVENTS_CONVERT, calling it again\n");
- iReturn = winProcessXEventsTimeout (hwnd,
- iWindow,
- pDisplay,
- fConvertToUnicode,
- WIN_POLL_TIMEOUT);
- }
/*
- * The last of the up-to two calls to winProcessXEventsTimeout
+ * The last call to winProcessXEventsTimeout
* from above had better have seen a notify event, or else we
* are dealing with a buggy or old X11 app. In these cases we
* have to paste some fake data to the Win32 clipboard to
|