diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | generic/tkClipboard.c | 38 | ||||
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 52 | ||||
| -rw-r--r-- | unix/tkUnixEvent.c | 38 | ||||
| -rw-r--r-- | win/tkWinX.c | 65 |
5 files changed, 138 insertions, 62 deletions
@@ -1,5 +1,12 @@ 2004-05-03 Jeff Hobbs <jeffh@ActiveState.com> + * generic/tkClipboard.c: Move TkClipCleanup from tkClipboard.c + * macosx/tkMacOSXXStubs.c: to being implemented in a platform + * unix/tkUnixEvent.c: specific manner. The cleanup order was + * win/tkWinX.c: bad at least on Windows, where we + reset/cleared display info that was still needed for the clipboard + to render. [Bug #939389, #822002, #732662] + * library/panedwindow.tcl (MarkSash): call DragSash to stop sash jump when B1 is pressed and released without moving. [Bug #932155] diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c index 2efdeac..d75826c 100644 --- a/generic/tkClipboard.c +++ b/generic/tkClipboard.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkClipboard.c,v 1.12 2002/08/05 04:30:38 dgp Exp $ + * RCS: @(#) $Id: tkClipboard.c,v 1.13 2004/05/03 22:28:45 hobbs Exp $ */ #include "tkInt.h" @@ -623,42 +623,6 @@ Tk_ClipboardObjCmd(clientData, interp, objc, objv) /* *---------------------------------------------------------------------- * - * TkClipCleanup -- - * - * This procedure is called to cleanup resources associated with - * claiming clipboard ownership and for receiving selection get - * results. This function is called in tkWindow.c. This has to be - * called by the display cleanup function because we still need the - * access display elements. - * - * Results: - * None. - * - * Side effects: - * Resources are freed - the clipboard may no longer be used. - * - *---------------------------------------------------------------------- - */ - -void -TkClipCleanup(dispPtr) - TkDisplay *dispPtr; /* display associated with clipboard */ -{ - if (dispPtr->clipWindow != NULL) { - Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, - dispPtr->applicationAtom); - Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, - dispPtr->windowAtom); - - Tk_DestroyWindow(dispPtr->clipWindow); - Tcl_Release((ClientData) dispPtr->clipWindow); - dispPtr->clipWindow = NULL; - } -} - -/* - *---------------------------------------------------------------------- - * * TkClipInit -- * * This procedure is called to initialize the window for claiming diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index fa21bce..666d524 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.5 2004/02/23 10:48:11 das Exp $ + * RCS: @(#) $Id: tkMacOSXXStubs.c,v 1.6 2004/05/03 22:28:45 hobbs Exp $ */ #include "tkInt.h" @@ -181,13 +181,6 @@ TkpCloseDisplay( Tcl_Panic("TkpCloseDisplay: tried to call TkpCloseDisplay on bad display"); } - /* - * Make sure that the local scrap is transfered to the global - * scrap if needed. - */ - - TkSuspendClipboard(); - gMacDisplay = NULL; if (display->screens != (Screen *) NULL) { if (display->screens->root_visual != (Visual *) NULL) { @@ -201,6 +194,49 @@ TkpCloseDisplay( /* *---------------------------------------------------------------------- * + * TkClipCleanup -- + * + * This procedure is called to cleanup resources associated with + * claiming clipboard ownership and for receiving selection get + * results. This function is called in tkWindow.c. This has to be + * called by the display cleanup function because we still need the + * access display elements. + * + * Results: + * None. + * + * Side effects: + * Resources are freed - the clipboard may no longer be used. + * + *---------------------------------------------------------------------- + */ + +void +TkClipCleanup(dispPtr) + TkDisplay *dispPtr; /* display associated with clipboard */ +{ + /* + * Make sure that the local scrap is transfered to the global + * scrap if needed. + */ + + TkSuspendClipboard(); + + if (dispPtr->clipWindow != NULL) { + Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, + dispPtr->applicationAtom); + Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, + dispPtr->windowAtom); + + Tk_DestroyWindow(dispPtr->clipWindow); + Tcl_Release((ClientData) dispPtr->clipWindow); + dispPtr->clipWindow = NULL; + } +} + +/* + *---------------------------------------------------------------------- + * * MacXIdAlloc -- * * This procedure is invoked by Xlib as the resource allocator diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c index 0a42ccb..f06c0ca 100644 --- a/unix/tkUnixEvent.c +++ b/unix/tkUnixEvent.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixEvent.c,v 1.15 2004/01/31 20:27:52 jenglish Exp $ + * RCS: @(#) $Id: tkUnixEvent.c,v 1.16 2004/05/03 22:28:45 hobbs Exp $ */ #include "tkInt.h" @@ -241,6 +241,42 @@ TkpCloseDisplay(dispPtr) /* *---------------------------------------------------------------------- * + * TkClipCleanup -- + * + * This procedure is called to cleanup resources associated with + * claiming clipboard ownership and for receiving selection get + * results. This function is called in tkWindow.c. This has to be + * called by the display cleanup function because we still need the + * access display elements. + * + * Results: + * None. + * + * Side effects: + * Resources are freed - the clipboard may no longer be used. + * + *---------------------------------------------------------------------- + */ + +void +TkClipCleanup(dispPtr) + TkDisplay *dispPtr; /* display associated with clipboard */ +{ + if (dispPtr->clipWindow != NULL) { + Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, + dispPtr->applicationAtom); + Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, + dispPtr->windowAtom); + + Tk_DestroyWindow(dispPtr->clipWindow); + Tcl_Release((ClientData) dispPtr->clipWindow); + dispPtr->clipWindow = NULL; + } +} + +/* + *---------------------------------------------------------------------- + * * DisplaySetupProc -- * * This procedure implements the setup part of the UNIX X display diff --git a/win/tkWinX.c b/win/tkWinX.c index 9327db1..28b83fe 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinX.c,v 1.28 2004/01/13 02:06:02 davygrvy Exp $ + * RCS: @(#) $Id: tkWinX.c,v 1.29 2004/05/03 22:28:45 hobbs Exp $ */ #include "tkWinInt.h" @@ -553,7 +553,6 @@ TkpCloseDisplay(dispPtr) TkDisplay *dispPtr; { Display *display = dispPtr->display; - HWND hwnd; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); @@ -562,20 +561,6 @@ TkpCloseDisplay(dispPtr) return; } - /* - * Force the clipboard to be rendered if we are the clipboard owner. - */ - - if (dispPtr->clipWindow) { - hwnd = Tk_GetHWND(Tk_WindowId(dispPtr->clipWindow)); - if (GetClipboardOwner() == hwnd) { - OpenClipboard(hwnd); - EmptyClipboard(); - TkWinClipboardRender(dispPtr, CF_TEXT); - CloseClipboard(); - } - } - tsdPtr->winDisplay = NULL; if (display->display_name != (char *) NULL) { @@ -599,6 +584,54 @@ TkpCloseDisplay(dispPtr) /* *---------------------------------------------------------------------- * + * TkClipCleanup -- + * + * This procedure is called to cleanup resources associated with + * claiming clipboard ownership and for receiving selection get + * results. This function is called in tkWindow.c. This has to be + * called by the display cleanup function because we still need the + * access display elements. + * + * Results: + * None. + * + * Side effects: + * Resources are freed - the clipboard may no longer be used. + * + *---------------------------------------------------------------------- + */ + +void +TkClipCleanup(dispPtr) + TkDisplay *dispPtr; /* display associated with clipboard */ +{ + if (dispPtr->clipWindow != NULL) { + /* + * Force the clipboard to be rendered if we are the clipboard owner. + */ + + HWND hwnd = Tk_GetHWND(Tk_WindowId(dispPtr->clipWindow)); + if (GetClipboardOwner() == hwnd) { + OpenClipboard(hwnd); + EmptyClipboard(); + TkWinClipboardRender(dispPtr, CF_TEXT); + CloseClipboard(); + } + + Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, + dispPtr->applicationAtom); + Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom, + dispPtr->windowAtom); + + Tk_DestroyWindow(dispPtr->clipWindow); + Tcl_Release((ClientData) dispPtr->clipWindow); + dispPtr->clipWindow = NULL; + } +} + +/* + *---------------------------------------------------------------------- + * * XBell -- * * Generate a beep. |