hw/nxagent/NXmiwindow.c: Drop complete file.

Reasoning: (1) The diff between this file and mi/miwindow.c is so minimal, we simply apply the change to mi/miwindow.c. (2) In recent X.org, the fixed code has gone, so this patch won't exist after having rebased nx-libs against X.org.

hw/nxagent/NXmiwindow.c: Drop complete file.
8fab4afb · Mike Gabriel · 148f7506 · 8fab4afb · 8fab4afb · 148f7506
Commit 8fab4afb authored Apr 08, 2016 by Mike Gabriel
4 changed files
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -360,7 +360,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
              hw/nxagent/NXmiglyph.o     \
              hw/nxagent/NXmiexpose.o    \
              hw/nxagent/NXresource.o    \
-              hw/nxagent/NXmiwindow.o    \
              hw/nxagent/NXdamage.o
 #elif !defined(LynxOSArchitecture) && \
      !defined(Win32Architecture) && \
@@ -381,7 +380,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
              hw/nxagent/NXmiglyph.o     \
              hw/nxagent/NXmiexpose.o    \
              hw/nxagent/NXresource.o    \
-              hw/nxagent/NXmiwindow.o    \
              hw/nxagent/NXdamage.o
 #else
 NXAGENTOBJS = hw/nxagent/miinitext.o     \
@@ -400,7 +398,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
              hw/nxagent/NXmiglyph.o     \
              hw/nxagent/NXmiexpose.o    \
              hw/nxagent/NXresource.o    \
-              hw/nxagent/NXmiwindow.o    \
              hw/nxagent/NXdamage.o      \
              dix/main.o
 #endif

--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -23,7 +23,6 @@ SRCS =  NXwindow.c \
        NXmiglyph.c \
        NXmiexpose.c \
        NXresource.c \
-        NXmiwindow.c \
 	NXdamage.c \
 	NXmitrap.c \
 	Args.c \
@@ -85,7 +84,6 @@ OBJS =  NXwindow.o \
        NXmiglyph.o \
        NXmiexpose.o \
        NXresource.o \
-        NXmiwindow.o \
 	NXdamage.o \
 	NXmitrap.o \
 	Args.o \

--- a/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c
--- a/nx-X11/programs/Xserver/mi/miwindow.c
+++ b/nx-X11/programs/Xserver/mi/miwindow.c
@@ -1048,7 +1048,25 @@ miSetShape(pWin)
 	bsExposed = (*pScreen->TranslateBackingStore)
 			     (pWin, 0, 0, pOldClip,
 			      pWin->drawable.x, pWin->drawable.y);
-	if (WasViewable)
+
+	/*
+	 * Applies to NXAGENT_SERVER builds:
+	 *
+	 * We got a few, rare, segfaults here after having
+	 * started using the backing store. It may be a
+	 * different bug but miChangeSaveUnder() calls mi-
+	 * CheckSubSaveUnder() that, in turn, can change
+	 * the backing store attribute of the window. This
+	 * means that we may try to destroy the region
+	 * even if it was not created at the beginning of
+	 * this function as, at the time, the backing store
+	 * was off. miCheckSubSaveUnder() appear to get a
+	 * pointer to the parent, so maybe doesn't change
+	 * the attribute of the window itself. This is to
+	 * be better investigated.
+	 */
+
+	if (WasViewable && pOldClip)
 	    RegionDestroy(pOldClip);
 	if (bsExposed)
 	{