diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2016-06-25 01:35:40 +0200 |
| commit | 975511c875674f097bbd2be33fa947a48d8c77c6 (patch) | |
| tree | 207bba2c48054f551f19ed5aa89b9dd9616b8c60 /nx-X11/programs/Xserver/mi/miexpose.c | |
| parent | 9df153668423af868d0df739188a772fbc3356c6 (diff) | |
| parent | a5befd4e20813910022ed771cb599f15bbf4664d (diff) | |
| download | nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.gz nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.tar.bz2 nx-libs-975511c875674f097bbd2be33fa947a48d8c77c6.zip | |
Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xserver-code-and-include-in-nxagent' into arctica-3.6.x
Attributes GH PR #120: https://github.com/ArcticaProject/nx-libs/pull/120
Diffstat (limited to 'nx-X11/programs/Xserver/mi/miexpose.c')
| -rw-r--r-- | nx-X11/programs/Xserver/mi/miexpose.c | 11 |
1 files changed, 7 insertions, 4 deletions
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 |