Merge branch 'uli42-pr/drop_nxmiexpose' into 3.6.x

nx-X11/programs/Xserver/Imakefile

@@ -246,7 +246,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXpicture.o     \
               hw/nxagent/NXextension.o   \
               hw/nxagent/NXglxext.o      \
-              hw/nxagent/NXmiexpose.o    \
               hw/nxagent/NXresource.o    \
               hw/nxagent/NXdamage.o      \
               $(NULL)
@@ -264,7 +263,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXextension.o   \
               hw/nxagent/NXglxext.o      \
               hw/nxagent/NXxvdisp.o      \
-              hw/nxagent/NXmiexpose.o    \
               hw/nxagent/NXresource.o    \
               hw/nxagent/NXdamage.o      \
               $(NULL)
@@ -282,7 +280,6 @@ NXAGENTOBJS = hw/nxagent/miinitext.o     \
               hw/nxagent/NXextension.o   \
               hw/nxagent/NXglxext.o      \
               hw/nxagent/NXxvdisp.o      \
-              hw/nxagent/NXmiexpose.o    \
               hw/nxagent/NXresource.o    \
               hw/nxagent/NXdamage.o      \
               dix/main.o                 \

nx-X11/programs/Xserver/hw/nxagent/Imakefile

@@ -20,7 +20,6 @@ SRCS =  \
 	NXshm.c \
         NXglxext.c \
         NXxvdisp.c \
-        NXmiexpose.c \
         NXresource.c \
 	NXdamage.c \
 	NXmitrap.c \
@@ -81,7 +80,6 @@ OBJS =  \
 	NXshm.o \
         NXglxext.o \
         NXxvdisp.o \
-        NXmiexpose.o \
         NXresource.o \
 	NXdamage.o \
 	NXmitrap.o \

nx-X11/programs/Xserver/hw/nxagent/Window.c

@@ -3484,26 +3484,7 @@ void nxagentSetTopLevelEventMask(WindowPtr pWin)
 }
 
 /*
- * This function must return 1 if we want the
- * exposures to be sent as the window's extents.
- * This is actually a harmless, but useful hack,
- * as it speeds up the window redraws considera-
- * bly, when using a very popular WM theme.
  */
-
-int nxagentExtentsPredicate(int total)
-{
-  #ifdef TEST
-  if (total == 6 || total == 11 || total == 10)
-  {
-    fprintf(stderr, "nxagentExtentsPredicate: WARNING! Returning [%d] with [%d] rectangles.\n",
-                (total == 6 || total == 11 || total == 10), total);
-  }
-  #endif
-
-  return (total == 6 || total == 11 || total == 10);
-}
-
 void nxagentFlushConfigureWindow(void)
 {
   ConfiguredWindowStruct *index;

nx-X11/programs/Xserver/mi/Imakefile

@@ -39,15 +39,6 @@ FFS_DEFINES = -DHAS_FFS
 MIINITEXTSRC = miinitext.c
 MIINITEXTOBJ = miinitext.o
 
-#if (!(defined(NXAgentServer) && NXAgentServer))
-NXAGENT_SKIP_SRCS =                     \
-                    miexpose.c          \
-                    $(NULL)
-NXAGENT_SKIP_OBJS =                     \
-                    miexpose.o          \
-                    $(NULL)
-#endif
-
 SRCS =  $(CBRT_SRC)             \
         mivaltree.c             \
         mipolyseg.c             \
@@ -83,7 +74,7 @@ SRCS =  $(CBRT_SRC)             \
         migc.c                  \
         micmap.c                \
         mioverlay.c             \
-        $(NXAGENT_SKIP_SRCS)    \
+        miexpose.c              \
         $(NULL)
 
 OBJS =  $(CBRT_OBJ)             \
@@ -121,7 +112,7 @@ OBJS =  $(CBRT_OBJ)             \
         migc.o                  \
         micmap.o                \
         mioverlay.o             \
-        $(NXAGENT_SKIP_OBJS)    \
+        miexpose.o              \
         $(NULL)
 
 #if defined(XorgVersion)

nx-X11/programs/Xserver/mi/miexpose.c

@@ -126,7 +126,6 @@ exposing is done by the backing store's GraphicsExpose function, of course.
 
 */
 
-#ifndef NXAGENT_SERVER
 RegionPtr
 miHandleExposures(pSrcDrawable, pDstDrawable,
 		  pGC, srcx, srcy, width, height, dstx, dsty, plane)
@@ -373,7 +372,6 @@ miHandleExposures(pSrcDrawable, pDstDrawable,
 	return NULL;
     }
 }
-#endif
 
 /* send GraphicsExpose events, or a NoExpose event, based on the region */
 
@@ -491,7 +489,6 @@ miSendExposures(pWin, pRgn, dx, dy)
     free(pEvent);
 }
 
-#ifndef NXAGENT_SERVER
 void 
 miWindowExposures(pWin, prgn, other_exposed)
     WindowPtr pWin;
@@ -580,7 +577,6 @@ miWindowExposures(pWin, prgn, other_exposed)
     else if (exposures && exposures != prgn)
 	RegionDestroy(exposures);
 }
-#endif
 
 /*
     this code is highly unlikely.  it is not haile selassie.
@@ -628,7 +624,6 @@ tossGC (
     return 0;
 }
 
-#ifndef NXAGENT_SERVER
 void
 miPaintWindow(pWin, prgn, what)
 register WindowPtr pWin;
@@ -654,8 +649,8 @@ int what;
     ChangeGCVal newValues [COUNT_BITS] = {{ 0 }};
 
     BITS32 gcmask, index, mask;
-    RegionRec prgnWin;
-    DDXPointRec oldCorner;
+    RegionRec prgnWin = {0};
+    DDXPointRec oldCorner = {0};
     BoxRec box = {0};
     WindowPtr	pBgWin;
     GCPtr pGC;
@@ -883,7 +878,6 @@ int what;
 	FreeScratchGC(pGC);
     }
 }
-#endif
 
 /* MICLEARDRAWABLE -- sets the entire drawable to the background color of
  * the GC.  Useful when we have a scratch drawable and need to initialize