diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-04-08 13:53:36 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-25 00:39:26 +0200 |
| commit | 809fed64995a36605c7f4ca5c75ed4742f3c3df2 (patch) | |
| tree | ea734678021a97a0ed96e5d469a0b417107a0599 /nx-X11/programs/Xserver/mi | |
| parent | 69ac98165f6d9e4093f0d564d04d5ed131777180 (diff) | |
| download | nx-libs-809fed64995a36605c7f4ca5c75ed4742f3c3df2.tar.gz nx-libs-809fed64995a36605c7f4ca5c75ed4742f3c3df2.tar.bz2 nx-libs-809fed64995a36605c7f4ca5c75ed4742f3c3df2.zip | |
hw/nxagent/NXmiexpose.c: Shrink file, drop duplicate code that can identically be found in mi/miexpose.c.
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 | 11 |
2 files changed, 18 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile index 46ec25e5c..18a04517f 100644 --- a/nx-X11/programs/Xserver/mi/Imakefile +++ b/nx-X11/programs/Xserver/mi/Imakefile @@ -38,6 +38,15 @@ MIINITEXTSRC = miinitext.c MIINITEXTOBJ = miinitext.o #endif +#if (!(defined(NXAgentServer) && NXAgentServer)) +NXAGENT_SKIP_SRCS = \ + miexpose.c \ + $(NULL) +NXAGENT_SKIP_OBJS = \ + miexpose.o \ + $(NULL) +#endif + SRCS = $(CBRT_SRC) \ mivaltree.c \ mipolyseg.c \ @@ -58,7 +67,6 @@ SRCS = $(CBRT_SRC) \ mibitblt.c \ mipolypnt.c \ mipushpxl.c \ - miexpose.c \ miglblt.c \ mizerline.c \ mizerclip.c \ @@ -76,6 +84,7 @@ SRCS = $(CBRT_SRC) \ migc.c \ micmap.c \ mioverlay.c \ + $(NXAGENT_SKIP_SRCS) \ $(NULL) OBJS = $(CBRT_OBJ) \ @@ -98,7 +107,6 @@ OBJS = $(CBRT_OBJ) \ mibitblt.o \ mipolypnt.o \ mipushpxl.o \ - miexpose.o \ miglblt.o \ mizerline.o \ mizerclip.o \ @@ -116,6 +124,7 @@ OBJS = $(CBRT_OBJ) \ migc.o \ micmap.o \ mioverlay.o \ + $(NXAGENT_SKIP_OBJS) \ $(NULL) #if defined(XorgVersion) diff --git a/nx-X11/programs/Xserver/mi/miexpose.c b/nx-X11/programs/Xserver/mi/miexpose.c index 7b7480a91..d256c293f 100644 --- a/nx-X11/programs/Xserver/mi/miexpose.c +++ b/nx-X11/programs/Xserver/mi/miexpose.c @@ -130,6 +130,7 @@ 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) @@ -376,6 +377,7 @@ miHandleExposures(pSrcDrawable, pDstDrawable, return NULL; } } +#endif /* send GraphicsExpose events, or a NoExpose event, based on the region */ @@ -495,6 +497,7 @@ miSendExposures(pWin, pRgn, dx, dy) DEALLOCATE_LOCAL(pEvent); } +#ifndef NXAGENT_SERVER void miWindowExposures(pWin, prgn, other_exposed) WindowPtr pWin; @@ -583,7 +586,7 @@ miWindowExposures(pWin, prgn, other_exposed) else if (exposures && exposures != prgn) RegionDestroy(exposures); } - +#endif /* this code is highly unlikely. it is not haile selassie. @@ -631,7 +634,7 @@ tossGC ( return 0; } - +#ifndef NXAGENT_SERVER void miPaintWindow(pWin, prgn, what) register WindowPtr pWin; @@ -654,7 +657,7 @@ int what; #define COUNT_BITS 8 ChangeGCVal gcval[7]; - ChangeGCVal newValues [COUNT_BITS]; + ChangeGCVal newValues [COUNT_BITS] = {{ 0 }}; BITS32 gcmask, index, mask; RegionRec prgnWin; @@ -881,7 +884,7 @@ 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 |