From 992bf5f3ec71e3f5bab9d2469769b5d2e315dd52 Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Mon, 5 Apr 2021 06:03:15 -0500 Subject: [PATCH 1/3] tkPanedWindow.c: backport 1.13.2.5 Contains fix for https://core.tcl-lang.org/tk/info/928413 --- pTk/mTk/generic/tkPanedWindow.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pTk/mTk/generic/tkPanedWindow.c b/pTk/mTk/generic/tkPanedWindow.c index a9b8baf0..719d733b 100644 --- a/pTk/mTk/generic/tkPanedWindow.c +++ b/pTk/mTk/generic/tkPanedWindow.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: tkPanedWindow.c,v 1.13.2.4 2003/08/19 21:00:13 jenglish Exp $ + * RCS: @(#) $Id: tkPanedWindow.c,v 1.13.2.5 2004/05/03 19:17:39 hobbs Exp $ */ #include "tkPort.h" @@ -1748,6 +1748,18 @@ Unlink(slavePtr) } } + /* + * Clean out any -after or -before references to this slave + */ + for (i = 0; i < masterPtr->numSlaves; i++) { + if (masterPtr->slaves[i]->before == slavePtr->tkwin) { + masterPtr->slaves[i]->before = None; + } + if (masterPtr->slaves[i]->after == slavePtr->tkwin) { + masterPtr->slaves[i]->after = None; + } + } + masterPtr->flags |= REQUESTED_RELAYOUT; if (!(masterPtr->flags & REDRAW_PENDING)) { masterPtr->flags |= REDRAW_PENDING; From c5da515f36da434eac710fe21361248813af5b30 Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Mon, 5 Apr 2021 06:07:13 -0500 Subject: [PATCH 2/3] tkPanedWindow.c: backport 1.13.2.6 Contains fix for https://core.tcl-lang.org/tk/info/1010938 --- pTk/mTk/generic/tkPanedWindow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pTk/mTk/generic/tkPanedWindow.c b/pTk/mTk/generic/tkPanedWindow.c index 719d733b..1fa4d613 100644 --- a/pTk/mTk/generic/tkPanedWindow.c +++ b/pTk/mTk/generic/tkPanedWindow.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: tkPanedWindow.c,v 1.13.2.5 2004/05/03 19:17:39 hobbs Exp $ + * RCS: @(#) $Id: tkPanedWindow.c,v 1.13.2.6 2004/08/18 08:23:07 dkf Exp $ */ #include "tkPort.h" @@ -252,7 +252,7 @@ static Tk_OptionSpec optionSpecs[] = { TK_OPTION_NULL_OK, 0, 0}, {TK_OPTION_PIXELS, "-handlepad", "handlePad", "HandlePad", DEF_PANEDWINDOW_HANDLEPAD, -1, Tk_Offset(PanedWindow, handlePad), - 0, 0}, + 0, 0, GEOMETRY}, {TK_OPTION_PIXELS, "-handlesize", "handleSize", "HandleSize", DEF_PANEDWINDOW_HANDLESIZE, Tk_Offset(PanedWindow, handleSizePtr), Tk_Offset(PanedWindow, handleSize), 0, 0, GEOMETRY}, From 04dfdb41085beb752bcf62b1edec9bdfa48c175d Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Mon, 5 Apr 2021 07:29:20 -0500 Subject: [PATCH 3/3] tkPanedWindow.c: backport 1.13.2.7 Contains fix for https://core.tcl-lang.org/tk/info/1036963 --- pTk/mTk/generic/tkPanedWindow.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pTk/mTk/generic/tkPanedWindow.c b/pTk/mTk/generic/tkPanedWindow.c index 1fa4d613..0f89f82d 100644 --- a/pTk/mTk/generic/tkPanedWindow.c +++ b/pTk/mTk/generic/tkPanedWindow.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: tkPanedWindow.c,v 1.13.2.6 2004/08/18 08:23:07 dkf Exp $ + * RCS: @(#) $Id: tkPanedWindow.c,v 1.13.2.7 2004/11/17 22:18:07 hobbs Exp $ */ #include "tkPort.h" @@ -341,6 +341,7 @@ Tk_PanedWindowObjCmd(clientData, interp, objc, objv) PanedWindow *pwPtr; Tk_Window tkwin, parent; OptionTables *pwOpts; + XSetWindowAttributes atts; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "pathName ?options?"); @@ -429,11 +430,15 @@ Tk_PanedWindowObjCmd(clientData, interp, objc, objv) * panedwindow despite being children of windows with potentially * different characteristics, and it looks better that way too. * [Bug 702230] + * Also Set the X window save under attribute to avoid expose events as + * the proxy sash is dragged across the panes. [Bug 1036963] */ Tk_SetWindowVisual(pwPtr->proxywin, Tk_Visual(tkwin), Tk_Depth(tkwin), Tk_Colormap(tkwin)); Tk_CreateEventHandler(pwPtr->proxywin, ExposureMask, ProxyWindowEventProc, (ClientData) pwPtr); + atts.save_under = True; + Tk_ChangeWindowAttributes(pwPtr->proxywin, CWSaveUnder, &atts); if (ConfigurePanedWindow(interp, pwPtr, objc - 2, objv + 2) != TCL_OK) { Tk_DestroyWindow(pwPtr->proxywin);