diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:20:51 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-10 16:20:51 +0200 |
| commit | cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa (patch) | |
| tree | e22b443672f84f9305e682f2c6c0d0e896b967a6 /nx-X11/programs/Xserver/miext/damage | |
| parent | 9e2588e56f5b712c4501a19c1f723257c05aa6af (diff) | |
| parent | c4c5485474a03bcfd2632d12c2e6e88ba20be471 (diff) | |
| download | nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.gz nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.tar.bz2 nx-libs-cc24d8ba254f1e5062c21adfa07f8b58bb2c5eaa.zip | |
Merge branch 'sunweaver-pr/switch-to-libXfont2-API' into 3.6.x
Attributes GH PR #362: https://github.com/ArcticaProject/nx-libs/pull/362
Diffstat (limited to 'nx-X11/programs/Xserver/miext/damage')
| -rw-r--r-- | nx-X11/programs/Xserver/miext/damage/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/miext/damage/damage.c | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/miext/damage/Imakefile b/nx-X11/programs/Xserver/miext/damage/Imakefile index 34d3fcf5a..b06261b24 100644 --- a/nx-X11/programs/Xserver/miext/damage/Imakefile +++ b/nx-X11/programs/Xserver/miext/damage/Imakefile @@ -22,6 +22,8 @@ NormalLibraryTarget(damage,$(OBJS)) LintLibraryTarget(damage,$(SRCS)) NormalLintTarget($(SRCS)) + +SpecialCObjectRule(damage,$(ICONFIGFILES),$(FONT_DEFINES)) #endif DependTarget() diff --git a/nx-X11/programs/Xserver/miext/damage/damage.c b/nx-X11/programs/Xserver/miext/damage/damage.c index 348adcb65..9c9161d36 100644 --- a/nx-X11/programs/Xserver/miext/damage/damage.c +++ b/nx-X11/programs/Xserver/miext/damage/damage.c @@ -34,6 +34,11 @@ #include <X11/fonts/font.h> #include "dixfontstr.h" #include <X11/fonts/fontstruct.h> +#ifdef HAS_XFONT2 +# include <X11/fonts/libxfont2.h> +#else +# include <X11/fonts/fontutil.h> +#endif /* HAS_XFONT2 */ #include "mi.h" #include "regionstr.h" #include "globals.h" @@ -1297,7 +1302,11 @@ damageDamageChars (DrawablePtr pDrawable, ExtentInfoRec extents; BoxRec box; +#ifdef HAS_XFONT2 + xfont2_query_glyph_extents(font, charinfo, n, &extents); +#else QueryGlyphExtents(font, charinfo, n, &extents); +#endif /* HAS_XFONT2 */ if (imageblt) { if (extents.overallWidth > extents.overallRight) |