diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-14 15:05:44 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-14 15:05:44 +0000 |
| commit | 248700c18b5ec849231f8d0d464b2a021bfbaef8 (patch) | |
| tree | 928691dbf8a3724355c1bd58e3697af67f628248 /xorg-server/hw/xwin/winclipboardwrappers.c | |
| parent | 493a8d159a08f852eadca7a23553e5ab69bb0ec6 (diff) | |
| download | vcxsrv-248700c18b5ec849231f8d0d464b2a021bfbaef8.tar.gz vcxsrv-248700c18b5ec849231f8d0d464b2a021bfbaef8.tar.bz2 vcxsrv-248700c18b5ec849231f8d0d464b2a021bfbaef8.zip | |
Solved endless loop when copy/pasting.
Diffstat (limited to 'xorg-server/hw/xwin/winclipboardwrappers.c')
| -rw-r--r-- | xorg-server/hw/xwin/winclipboardwrappers.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c index 8470ca6c9..7a954daa7 100644 --- a/xorg-server/hw/xwin/winclipboardwrappers.c +++ b/xorg-server/hw/xwin/winclipboardwrappers.c @@ -316,7 +316,6 @@ winProcSetSelectionOwner (ClientPtr client) int i; DrawablePtr pDrawable; WindowPtr pWindow = None; - Bool fOwnedToNotOwned = FALSE; static Window s_iOwners[CLIP_NUM_SELECTIONS] = {None}; static unsigned long s_ulServerGeneration = 0; REQUEST(xSetSelectionOwnerReq); @@ -364,8 +363,6 @@ winProcSetSelectionOwner (ClientPtr client) if (None == stuff->window && None != s_iOwners[CLIP_OWN_PRIMARY]) { - fOwnedToNotOwned = TRUE; - winDebug ("winProcSetSelectionOwner - PRIMARY - Going from " "owned to not owned.\n"); @@ -388,8 +385,6 @@ winProcSetSelectionOwner (ClientPtr client) if (None == stuff->window && None != s_iOwners[CLIP_OWN_CLIPBOARD]) { - fOwnedToNotOwned = TRUE; - winDebug ("winProcSetSelectionOwner - CLIPBOARD - Going from " "owned to not owned.\n"); @@ -419,33 +414,6 @@ winProcSetSelectionOwner (ClientPtr client) if (g_iClipboardWindow == s_iOwners[CLIP_OWN_CLIPBOARD]) s_iOwners[CLIP_OWN_CLIPBOARD] = None; - /* - * Handle case when selection is being disowned, - * WM_DRAWCLIPBOARD did not do the disowning, - * both monitored selections are no longer owned, - * an owned to not owned transition was detected, - * and we currently own the Win32 clipboard. - */ - if (stuff->window == None - && s_iOwners[CLIP_OWN_PRIMARY] == None - && s_iOwners[CLIP_OWN_CLIPBOARD] == None - && fOwnedToNotOwned - && g_hwndClipboard != NULL - && g_hwndClipboard == GetClipboardOwner ()) - { - winDebug ("winProcSetSelectionOwner - We currently own the " - "clipboard and neither the PRIMARY nor the CLIPBOARD " - "selections are owned, releasing ownership of Win32 " - "clipboard.\n"); - - /* Release ownership of the Windows clipboard */ - OpenClipboard (NULL); - EmptyClipboard (); - CloseClipboard (); - - goto winProcSetSelectionOwner_Done; - } - /* Abort if no window at this point */ if (None == stuff->window) { |