diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-11 12:10:25 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-06-11 12:10:25 +0200 |
| commit | 58cd35745086567b5b1fa0fc7a295e849ac070ce (patch) | |
| tree | f863d6b3a576dcb2ad2df58b4f9f1fc20f6377e1 /nx-X11/programs/Xserver/mi | |
| parent | a2523273485c6a3c9c598a2088bcea354815db81 (diff) | |
| parent | 073c6c17e768cf61a879cb100f5ad2cb16703518 (diff) | |
| download | nx-libs-58cd35745086567b5b1fa0fc7a295e849ac070ce.tar.gz nx-libs-58cd35745086567b5b1fa0fc7a295e849ac070ce.tar.bz2 nx-libs-58cd35745086567b5b1fa0fc7a295e849ac070ce.zip | |
Merge branch 'uli42-pr/drop_nxmiexpose' into 3.6.x
Attributes GH PR #812: https://github.com/ArcticaProject/nx-libs/pull/812
Diffstat (limited to 'nx-X11/programs/Xserver/mi')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/Imakefile | 13 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miexpose.c | 10 |
2 files changed, 4 insertions, 19 deletions
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile index 9124ace89..46e5191ad 100644 --- a/nx-X11/programs/Xserver/mi/Imakefile +++ b/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) diff --git a/nx-X11/programs/Xserver/mi/miexpose.c b/nx-X11/programs/Xserver/mi/miexpose.c index 9135d2e6e..8e60f475e 100644 --- a/nx-X11/programs/Xserver/mi/miexpose.c +++ b/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 |