fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 22:48:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync with XWin Server 4.3.0-35 release. Minor updates for crashes in

Browse source 
clipboard code.
This commit is contained in:
Harold L Hunt II 2004-01-11 02:49:14 +00:00
parent 04b40d6956
commit 991c7fdbb4
3 changed files with 55 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
hw/xwin/winclipboardwndproc.c
View file

@ -155,6 +155,20 @@ winClipboardWindowProc (HWND hwnd, UINT message,
return 0;
}
/*
* Do not take ownership of the X11 selections when something
* other than CF_TEXT or CF_UNICODETEXT has been copied
* into the Win32 clipboard.
*/
if (!IsClipboardFormatAvailable (CF_TEXT)
&& !IsClipboardFormatAvailable (CF_UNICODETEXT))
{
ErrorF ("winClipboardWindowProc - WM_DRAWCLIPBOARD - "
"Clipboard does not contain CF_TEXT nor CF_UNICODETEXT; "
"not taking ownership of X11 selections.\n");
return 0;
}
/* Reassert ownership of PRIMARY */
iReturn = XSetSelectionOwner (pDisplay,
XA_PRIMARY,
@ -196,55 +210,16 @@ winClipboardWindowProc (HWND hwnd, UINT message,
case WM_DESTROYCLIPBOARD:
#if 0
{
int iReturn;
Display *pDisplay = g_pClipboardDisplay;
/* Do nothing if winProcSetSelectionOwner called EmptyClipboard */
if (hwnd == GetClipboardOwner ())
{
ErrorF ("winClipboardWindowProc - WM_DESTROYCLIPBOARD - "
"winProcSetSelectionOwner called EmptyClipboard, "
"doing nothing.\n");
return 0;
}
/* Release ownership of PRIMARY */
iReturn = XSetSelectionOwner (pDisplay,
XA_PRIMARY,
None,
CurrentTime);
if (iReturn == BadAtom || iReturn == BadWindow)
{
ErrorF ("winClipboardWindowProc - WM_DESTROYCLIPBOARD - "
"Could not release ownership of PRIMARY\n");
}
else
{
ErrorF ("winClipboardWindowProc - WM_DESTROYCLIPBOARD - "
"Released ownership of PRIMARY\n");
}
/* Release ownership of the CLIPBOARD */
iReturn = XSetSelectionOwner (pDisplay,
XInternAtom (pDisplay,
"CLIPBOARD",
FALSE),
None,
CurrentTime);
if (iReturn == BadAtom || iReturn == BadWindow)
{
ErrorF ("winClipboardWindowProc - WM_DESTROYCLIPBOARD - "
"Could not release ownership of CLIPBOARD\n");
}
else
{
ErrorF ("winClipboardWindowProc - WM_DESTROYCLIPBOARD - "
"Released ownership of CLIPBOARD\n");
}
}
#endif
/*
* NOTE: Intentionally do nothing.
* Changes in the Win32 clipboard are handled by WM_DRAWCLIPBOARD
* above. We only process this message to conform to the specs
* for delayed clipboard rendering in Win32. You might think
* that we need to release ownership of the X11 selections, but
* we do not, because a WM_DRAWCLIPBOARD message will closely
* follow this message and reassert ownership of the X11
* selections, handling the issue for us.
*/
return 0;

7
hw/xwin/winclipboardwrappers.c
View file

@ -388,6 +388,13 @@ winProcSetSelectionOwner (ClientPtr client)
goto winProcSetSelectionOwner_Done;
}
/* Abort if no window at this point */
if (None == stuff->window)
{
ErrorF ("winProcSetSelectionOwner - No window, returning.\n");
goto winProcSetSelectionOwner_Done;
}
/* Abort if invalid selection */
if (!ValidAtom (stuff->selection))
{

26
hw/xwin/winclipboardxevents.c
View file

@ -214,9 +214,31 @@ winClipboardFlushXEvents (HWND hwnd,
/* Get a pointer to the clipboard text, in desired format */
if (fUnicodeSupport)
hGlobal = GetClipboardData (CF_UNICODETEXT);
{
/* Check that clipboard format is available */
if (!IsClipboardFormatAvailable (CF_UNICODETEXT))
{
ErrorF ("winClipboardFlushXEvents - CF_UNICODETEXT is not "
"available from Win32 clipboard. Aborting.\n");
break;
}
/* Retrieve clipboard data */
hGlobal = GetClipboardData (CF_UNICODETEXT);
}
else
hGlobal = GetClipboardData (CF_TEXT);
{
/* Check that clipboard format is available */
if (!IsClipboardFormatAvailable (CF_TEXT))
{
ErrorF ("winClipboardFlushXEvents - CF_TEXT is not "
"available from Win32 clipboard. Aborting.\n");
break;
}
/* Retrieve clipboard data */
hGlobal = GetClipboardData (CF_TEXT);
}
if (!hGlobal)
{
ErrorF ("winClipboardFlushXEvents - SelectionRequest - "