Skip to content

N
nx-libs
Commit f4c80a78 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Xserver: Support building against libXfont2 (v2) API and old libXfont(1) API alike.

Fixes ArcticaProject/nx-libs#296. Inspired by the following X.org commit. Other than X.org, we will continue support for building nx-libs against libXfont1 for a while. commit 05a793f5b3c40747d5a92a076def7f4fb673c7e7 Author: Keith Packard <keithp@keithp.com> Date: Tue Sep 1 18:50:55 2015 -0700 dix: Switch to the libXfont2 API (v2) This new libXfont API eliminates exposing internal X server symbols to the font library, replacing those with a struct full of the entire API needed to use that library. v2: Use libXfont2 instead of libXfont_2 Signed-off-by: 's avatarKeith Packard <keithp@keithp.com> Reviewed-by: 's avatarAdam Jackson <ajax@redhat.com>
parent f743f9f7
Show whitespace changes
Inline Side-by-side
Showing with 614 additions and 13 deletions
nx-X11/config/cf/Imake.tmpl
View file @ f4c80a78
......@@ -564,6 +564,9 @@ X_BYTE_ORDER = ByteOrder
#ifndef HasFfs
#define HasFfs YES
#endif
#ifndef HasXfont2
#define HasXfont2 NO
#endif
#ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */
#define GzipLibrary -lz
#endif
......
nx-X11/config/cf/Server.tmpl
View file @ f4c80a78
......@@ -70,3 +70,11 @@ GLX_DEFINES = GlxDefines
#ifdef XorgVersion
#include <xorg.tmpl>
#endif
#if HasXfont2
FONT_DEFINES = -DHAS_XFONT2
XFONTLIB = -lXfont2
#else
FONT_DEFINES =
XFONTLIB = -lXfont
#endif
nx-X11/config/cf/host.def
View file @ f4c80a78
......@@ -390,6 +390,12 @@
#define BuildXKBlib YES
/*
* If you want to build against libXfont2, rather than libXfont(1), uncomment this.
*
#define HasXfont2 YES
*/
/*
* If you are running NetBSD 0.9C or later, and have the aperture driver
* installed, uncomment this.
*
......
nx-X11/config/cf/xorg.cf
View file @ f4c80a78
......@@ -424,6 +424,10 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# define BuildXKBlib YES
#endif
#ifndef HasXfont2
# define HasXfont2 NO
#endif
#ifndef BuildScreenSaverExt
# define BuildScreenSaverExt YES
#endif
......
nx-X11/programs/Xserver/Imakefile
View file @ f4c80a78
......@@ -323,7 +323,7 @@ NXAGENTNXLIBS = -L/usr/sfw/lib \
-lXcompshad \
-lXrender \
-lXfixes \
-lXfont \
$(XFONTLIB) \
-lXcomposite \
-lXinerama \
-lXdmcp \
......@@ -338,7 +338,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \
-lXcompshad \
-lXrender \
-lXfixes \
-lXfont \
$(XFONTLIB) \
-lXcomposite \
-lXdmcp \
-lNX_X11 \
......@@ -353,7 +353,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \
-lXcompshad \
-lXrender \
-lXfixes \
-lXfont \
$(XFONTLIB) \
-lXcomposite \
-lXinerama \
-lXdmcp \
......@@ -368,7 +368,7 @@ NXAGENTNXLIBS = -L../../../nxcomp \
-lXcompshad \
-lXrender \
-lXfixes \
-lXfont \
$(XFONTLIB) \
-lXcomposite \
-lXinerama \
-lXdmcp \
......
nx-X11/programs/Xserver/Xext/Imakefile
View file @ f4c80a78
......@@ -119,7 +119,7 @@ LintLibraryTarget(ext,$(SRCS))
NormalLintTarget($(SRCS))
#if BuildXF86BigfontExt
SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES))
SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES) $(FONT_DEFINES))
#endif
#if BuildXCSecurity
SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF))
......
nx-X11/programs/Xserver/Xext/xf86bigfont.c
View file @ f4c80a78
......@@ -75,6 +75,10 @@
#define _XF86BIGFONT_SERVER_
#include <nx-X11/extensions/xf86bigfproto.h>
#ifdef HAS_XFONT2
# include <X11/fonts/libxfont2.h>
#endif /* HAS_XFONT2 */
static void XF86BigfontResetProc(
ExtensionEntry * /* extEntry */
);
......@@ -186,7 +190,11 @@ XFree86BigfontExtensionInit()
+ (unsigned int) (65536.0/(RAND_MAX+1.0) * rand());
/* fprintf(stderr, "signature = 0x%08X\n", signature); */
#ifdef HAS_XFONT2
FontShmdescIndex = xfont2_allocate_font_private_index();
#else
FontShmdescIndex = AllocateFontPrivateIndex();
#endif /* HAS_XFONT2 */
#if !defined(CSRG_BASED) && !defined(__CYGWIN__)
pagesize = SHMLBA;
......@@ -526,7 +534,11 @@ ProcXF86BigfontQueryFont(
#ifdef HAS_SHM
if (pDesc && !badSysCall) {
*(CARD32 *)(pCI + nCharInfos) = signature;
#ifdef HAS_XFONT2
if (!xfont2_font_set_private(pFont, FontShmdescIndex, pDesc)) {
#else
if (!FontSetPrivate(pFont, FontShmdescIndex, pDesc)) {
#endif /* HAS_XFONT2 */
shmdealloc(pDesc);
return BadAlloc;
}
......
nx-X11/programs/Xserver/dix/Imakefile
View file @ f4c80a78
......@@ -133,7 +133,9 @@ LintLibraryTarget(dix,$(SRCS) $(XPSRC))
NormalLintTarget($(SRCS) $(XPSRC))
SpecialCObjectRule(globals,$(ICONFIGFILES),$(SITE_DEFINES))
SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES))
SpecialCObjectRule(main,$(ICONFIGFILES),$(VENDOR_DEFINES) $(FONT_DEFINES))
SpecialCObjectRule(dispatch,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(dixfonts,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(pixmap,$(ICONFIGFILES),$(_NOOP_))
SpecialCObjectRule(privates,$(ICONFIGFILES),$(_NOOP_))
SpecialCObjectRule(window,$(ICONFIGFILES),$(QUARTZ_DEFINES))
......
nx-X11/programs/Xserver/dix/dispatch.c
View file @ f4c80a78
......@@ -86,6 +86,11 @@ int ProcInitialConnection();
#include "windowstr.h"
#include <X11/fonts/fontstruct.h>
#ifdef HAS_XFONT2
# include <X11/fonts/libxfont2.h>
#else
# include <X11/fonts/fontutil.h>
#endif /* HAS_XFONT2 */
#include "dixfontstr.h"
#include "gcstruct.h"
#include "selection.h"
......@@ -1399,7 +1404,11 @@ ProcQueryTextExtents(register ClientPtr client)
return(BadLength);
length--;
}
#ifdef HAS_XFONT2
if (!xfont2_query_text_extents(pFont, length, (unsigned char *)&stuff[1], &info))
#else
if (!QueryTextExtents(pFont, length, (unsigned char *)&stuff[1], &info))
#endif /* HAS_XFONT2 */
return(BadAlloc);
reply.type = X_Reply;
reply.length = 0;
......
nx-X11/programs/Xserver/dix/dixfonts.c
View file @ f4c80a78
......@@ -59,10 +59,14 @@ Equipment Corporation.
#include "resource.h"
#include "dixstruct.h"
#include "cursorstr.h"
#include "list.h"
#include "misc.h"
#include "opaque.h"
#include "dixfontstr.h"
#include "closestr.h"
#ifdef HAS_XFONT2
# include <X11/fonts/libxfont2.h>
#endif /* HAS_XFONT2 */
#ifdef DEBUG
#include <stdio.h>
......@@ -79,14 +83,20 @@ Equipment Corporation.
#define QUERYCHARINFO(pci, pr) *(pr) = (pci)->metrics
#ifndef HAS_XFONT2
extern void register_fpe_functions(void);
#endif
extern void * fosNaturalParams;
extern FontPtr defaultFont;
static FontPathElementPtr *font_path_elements = (FontPathElementPtr *) 0;
static int num_fpes = 0;
#ifdef HAS_XFONT2
xfont2_fpe_funcs_rec const **fpe_functions;
#else
FPEFunctions *fpe_functions = (FPEFunctions *) 0;
#endif
static int num_fpe_types = 0;
static unsigned char *font_path_string;
......@@ -94,7 +104,11 @@ static unsigned char *font_path_string;
static int num_slept_fpes = 0;
static int size_slept_fpes = 0;
static FontPathElementPtr *slept_fpes = (FontPathElementPtr *) 0;
#ifdef HAS_XFONT2
xfont2_pattern_cache_ptr patternCache;
#else
static FontPatternCachePtr patternCache;
#endif /* HAS_FONT2 */
int
FontToXError(err)
......@@ -205,7 +219,11 @@ FontWakeup(void * data, int count, void * LastSelectMask)
/* wake up any fpe's that may be waiting for information */
for (i = 0; i < num_slept_fpes; i++) {
fpe = slept_fpes[i];
#ifdef HAS_XFONT2
(void) (*fpe_functions[fpe->type]->wakeup_fpe) (fpe);
#else
(void) (*fpe_functions[fpe->type].wakeup_fpe) (fpe, LastSelectMask);
#endif /* HAS_XFONT2 */
}
}
......@@ -221,7 +239,11 @@ FreeFPE (FontPathElementPtr fpe)
{
fpe->refcount--;
if (fpe->refcount == 0) {
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->free_fpe) (fpe);
#else
(*fpe_functions[fpe->type].free_fpe) (fpe);
#endif
free(fpe->name);
free(fpe);
}
......@@ -276,14 +298,22 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
if (c->current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current_fpe];
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
}
err = Successful;
goto bail;
}
while (c->current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current_fpe];
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->open_font)
#else
err = (*fpe_functions[fpe->type].open_font)
#endif /* HAS_XFONT2 */
((void *) client, fpe, c->flags,
c->fontname, c->fnamelen, FontFormat,
BitmapFormatMaskByte |
......@@ -361,7 +391,11 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
goto bail;
}
if (patternCache && pfont != c->non_cachable_font)
#ifdef HAS_XFONT2
xfont2_cache_font_pattern(patternCache, c->origFontName, c->origFontNameLen,
#else
CacheFontPattern(patternCache, c->origFontName, c->origFontNameLen,
#endif /* HAS_XFONT2 */
pfont);
bail:
if (err != Successful && c->client != serverClient) {
......@@ -417,7 +451,11 @@ OpenFont(ClientPtr client, XID fid, Mask flags, unsigned lenfname, char *pfontna
** having to create another instance of a font that already exists.
*/
#ifdef HAS_XFONT2
cached = xfont2_find_cached_font_pattern(patternCache, pfontname, lenfname);
#else
cached = FindCachedFontPattern(patternCache, pfontname, lenfname);
#endif /* HAS_XFONT2 */
if (cached && cached->info.cachable)
{
if (!AddResource(fid, RT_FONT, (void *) cached))
......@@ -482,7 +520,11 @@ CloseFont(void * value, XID fid)
return (Success);
if (--pfont->refcnt == 0) {
if (patternCache)
#ifdef HAS_XFONT2
xfont2_remove_cached_font_pattern(patternCache, pfont);
#else
RemoveCachedFontPattern (patternCache, pfont);
#endif /* HAS_XFONT2 */
/*
* since the last reference is gone, ask each screen to free any
* storage it may have allocated locally for it.
......@@ -498,7 +540,11 @@ CloseFont(void * value, XID fid)
XF86BigfontFreeFontShm(pfont);
#endif
fpe = pfont->fpe;
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->close_font) (fpe, pfont);
#else
(*fpe_functions[fpe->type].close_font) (fpe, pfont);
#endif
FreeFPE(fpe);
}
return (Success);
......@@ -597,7 +643,11 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (c->current.current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current.current_fpe];
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
}
err = Successful;
goto bail;
......@@ -610,11 +660,19 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
fpe = c->fpe_list[c->current.current_fpe];
err = Successful;
#ifdef HAS_XFONT2
if (!fpe_functions[fpe->type]->start_list_fonts_and_aliases)
#else
if (!fpe_functions[fpe->type].start_list_fonts_and_aliases)
#endif /* HAS_XFONT2 */
{
/* This FPE doesn't support/require list_fonts_and_aliases */
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->list_fonts)
#else
err = (*fpe_functions[fpe->type].list_fonts)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
c->names);
......@@ -643,7 +701,11 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
the FPEs. */
if (!c->current.list_started) {
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->start_list_fonts_and_aliases)
#else
err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
&c->current.private);
......@@ -662,7 +724,11 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (err == Successful) {
char *tmpname;
name = 0;
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->list_next_font_or_alias)
#else
err = (*fpe_functions[fpe->type].list_next_font_or_alias)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, &name, &namelen, &tmpname,
&resolvedlen, c->current.private);
if (err == Suspended) {
......@@ -687,11 +753,19 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (c->haveSaved)
{
if (c->savedName)
#ifdef HAS_XFONT2
(void)xfont2_add_font_names_name(c->names, c->savedName,
#else
(void)AddFontNamesName(c->names, c->savedName,
#endif /* HAS_XFONT2 */
c->savedNameLen);
}
else
#ifdef HAS_XFONT2
(void)xfont2_add_font_names_name(c->names, name, namelen);
#else
(void)AddFontNamesName(c->names, name, namelen);
#endif /* HAS_XFONT2 */
}
/*
......@@ -716,7 +790,11 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
int tmpnamelen;
tmpname = 0;
#ifdef HAS_XFONT2
(void) (*fpe_functions[fpe->type]->list_next_font_or_alias)
#else
(void) (*fpe_functions[fpe->type].list_next_font_or_alias)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, &tmpname, &tmpnamelen,
&tmpname, &tmpnamelen, c->current.private);
if (--aliascount <= 0)
......@@ -827,7 +905,11 @@ bail:
FreeFPE(c->fpe_list[i]);
free(c->fpe_list);
if (c->savedName) free(c->savedName);
#ifdef HAS_XFONT2
xfont2_free_font_names(names);
#else
FreeFontNames(names);
#endif /* HAS_XFONT2 */
free(c);
if (resolved) free(resolved);
return TRUE;
......@@ -857,7 +939,11 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length,
free(c);
return BadAlloc;
}
#ifdef HAS_XFONT2
c->names = xfont2_make_font_names_record(max_names < 100 ? max_names : 100);
#else
c->names = MakeFontNamesRecord(max_names < 100 ? max_names : 100);
#endif /* HAS_XFONT2 */
if (!c->names)
{
free(c->fpe_list);
......@@ -905,7 +991,11 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
if (c->current.current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current.current_fpe];
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
}
err = Successful;
goto bail;
......@@ -919,7 +1009,11 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
err = Successful;
if (!c->current.list_started)
{
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->start_list_fonts_with_info)
#else
err = (*fpe_functions[fpe->type].start_list_fonts_with_info)
#endif /* HAS_XFONT2 */
(client, fpe, c->current.pattern, c->current.patlen,
c->current.max_names, &c->current.private);
if (err == Suspended)
......@@ -938,7 +1032,11 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
{
name = 0;
pFontInfo = &fontInfo;
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->list_next_font_with_info)
#else
err = (*fpe_functions[fpe->type].list_next_font_with_info)
#endif /* HAS_XFONT2 */
(client, fpe, &name, &namelen, &pFontInfo,
&numFonts, c->current.private);
if (err == Suspended)
......@@ -975,7 +1073,11 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
tmpname = 0;
tmpFontInfo = &fontInfo;
#ifdef HAS_XFONT2
(void) (*fpe_functions[fpe->type]->list_next_font_with_info)
#else
(void) (*fpe_functions[fpe->type].list_next_font_with_info)
#endif /* HAS_XFONT2 */
(client, fpe, &tmpname, &tmpnamelen, &tmpFontInfo,
&numFonts, c->current.private);
if (--aliascount <= 0)
......@@ -1175,7 +1277,11 @@ doPolyText(ClientPtr client, register PTclosurePtr c)
if (client->clientGone)
{
fpe = c->pGC->font->fpe;
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
if (c->slept)
{
......@@ -1203,7 +1309,11 @@ doPolyText(ClientPtr client, register PTclosurePtr c)
the FPE code to clean up after client and avoid further
rendering while we clean up after ourself. */
fpe = c->pGC->font->fpe;
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
c->pDraw = (DrawablePtr)0;
}
......@@ -1480,7 +1590,11 @@ doImageText(ClientPtr client, register ITclosurePtr c)
if (client->clientGone)
{
fpe = c->pGC->font->fpe;
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif
err = Success;
goto bail;
}
......@@ -1494,7 +1608,11 @@ doImageText(ClientPtr client, register ITclosurePtr c)
/* Our drawable has disappeared. Treat like client died... ask
the FPE code to clean up after client. */
fpe = c->pGC->font->fpe;
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
err = Success;
goto bail;
}
......@@ -1642,7 +1760,11 @@ DetermineFPEType(char *pathname)
int i;
for (i = 0; i < num_fpe_types; i++) {
#ifdef HAS_XFONT2
if ((*fpe_functions[i]->name_check) (pathname))
#else
if ((*fpe_functions[i].name_check) (pathname))
#endif /* HAS_XFONT2 */
return i;
}
return -1;
......@@ -1706,8 +1828,13 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
return BadAlloc;
}
for (i = 0; i < num_fpe_types; i++) {
#ifdef HAS_XFONT2
if (fpe_functions[i]->set_path_hook)
(*fpe_functions[i]->set_path_hook) ();
#else
if (fpe_functions[i].set_path_hook)
(*fpe_functions[i].set_path_hook) ();
#endif /* HAS_XFONT2 */
}
for (i = 0; i < npaths; i++)
{
......@@ -1729,7 +1856,11 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
fpe = find_existing_fpe(font_path_elements, num_fpes, cp, len);
if (fpe)
{
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->reset_fpe) (fpe);
#else
err = (*fpe_functions[fpe->type].reset_fpe) (fpe);
#endif /* HAS_XFONT2 */
if (err == Successful)
{
UseFPE(fpe);/* since it'll be decref'd later when freed
......@@ -1763,7 +1894,11 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
if (fpe->type == -1)
err = BadValue;
else
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->init_fpe) (fpe);
#else
err = (*fpe_functions[fpe->type].init_fpe) (fpe);
#endif /* HAS_XFONT2 */
if (err != Successful)
{
#ifndef NXAGENT_SERVER
......@@ -1793,7 +1928,11 @@ SetFontPathElements(int npaths, unsigned char *paths, int *bad, Bool persist)
FreeFontPath(font_path_elements, num_fpes, FALSE);
font_path_elements = fplist;
if (patternCache)
#ifdef HAS_XFONT2
xfont2_empty_font_pattern_cache(patternCache);
#else
EmptyFontPatternCache(patternCache);
#endif /* HAS_XFONT2 */
num_fpes = valid_paths;
return Success;
......@@ -1928,14 +2067,36 @@ GetFontPath(int *count, int *length)
int
LoadGlyphs(ClientPtr client, FontPtr pfont, unsigned nchars, int item_size, unsigned char *data)
{
#ifdef HAS_XFONT2
if (fpe_functions[pfont->fpe->type]->load_glyphs)
return (*fpe_functions[pfont->fpe->type]->load_glyphs)
#else
if (fpe_functions[pfont->fpe->type].load_glyphs)
return (*fpe_functions[pfont->fpe->type].load_glyphs)
#endif
(client, pfont, 0, nchars, item_size, data);
else
return Successful;
}
void
#ifdef HAS_XFONT2
GetGlyphs(FontPtr font, unsigned long count, unsigned char *chars,
FontEncoding fontEncoding,
unsigned long *glyphcount, /* RETURN */
CharInfoPtr *glyphs) /* RETURN */
#else
dixGetGlyphs(FontPtr font, unsigned long count, unsigned char *chars,
FontEncoding fontEncoding,
unsigned long *glyphcount, /* RETURN */
CharInfoPtr *glyphs) /* RETURN */
#endif /* HAS_XFONT2 */
{
(*font->get_glyphs) (font, count, chars, fontEncoding, glyphcount, glyphs);
}
void
DeleteClientFontStuff(ClientPtr client)
{
int i;
......@@ -1944,11 +2105,33 @@ DeleteClientFontStuff(ClientPtr client)
for (i = 0; i < num_fpes; i++)
{
fpe = font_path_elements[i];
#ifdef HAS_XFONT2
if (fpe_functions[fpe->type]->client_died)
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
if (fpe_functions[fpe->type].client_died)
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
}
}
#ifdef HAS_XFONT2
static int
register_fpe_funcs(const xfont2_fpe_funcs_rec *funcs)
{
xfont2_fpe_funcs_rec const **new;
/* grow the list */
new = reallocarray(fpe_functions, num_fpe_types + 1, sizeof(xfont2_fpe_funcs_ptr));
if (!new)
return -1;
fpe_functions = new;
fpe_functions[num_fpe_types] = funcs;
return num_fpe_types++;
}
#else
void
InitFonts ()
{
......@@ -1958,16 +2141,38 @@ InitFonts ()
register_fpe_functions();
}
#endif /* HAS_XFONT2 */
#ifdef HAS_XFONT2
static unsigned long
get_server_generation(void)
{
return serverGeneration;
}
static void *
get_server_client(void)
{
return serverClient;
}
static int
get_default_point_size(void)
#else
int
GetDefaultPointSize ()
#endif /* HAS_XFONT2 */
{
return 120;
}
#ifdef HAS_XFONT2
static FontResolutionPtr
get_client_resolutions(int *num)
#else
FontResolutionPtr
GetClientResolutions (int *num)
#endif /* HAS_XFONT2 */
{
if (requestingClient && requestingClient->fontResFunc != NULL &&
!requestingClient->clientGone)
......@@ -1999,6 +2204,7 @@ GetClientResolutions (int *num)
}
}
#ifndef HAS_XFONT2
/*
* returns the type index of the new fpe
*
......@@ -2053,12 +2259,17 @@ RegisterFPEFunctions(NameCheckFunc name_func,
return num_fpe_types++;
}
#endif /* !HAS_XFONT2 */
void
FreeFonts()
{
if (patternCache) {
#ifdef HAS_XFONT2
xfont2_free_font_pattern_cache(patternCache);
#else
FreeFontPatternCache(patternCache);
#endif /* HAS_XFONT2 */
patternCache = 0;
}
FreeFontPath(font_path_elements, num_fpes, TRUE);
......@@ -2066,11 +2277,18 @@ FreeFonts()
num_fpes = 0;
free(fpe_functions);
num_fpe_types = 0;
#ifdef HAS_XFONT2
fpe_functions = NULL;
#else
fpe_functions = (FPEFunctions *) 0;
#endif /* HAS_XFONT2 */
}
/* convenience functions for FS interface */
#ifdef HAS_XFONT2
static
#endif /* HAS_XFONT2 */
FontPtr
find_old_font(XID id)
{
......@@ -2078,26 +2296,46 @@ find_old_font(XID id)
DixUnknownAccess);
}
#ifdef HAS_XFONT2
static Font
get_new_font_client_id(void)
#else
Font
GetNewFontClientID()
#endif /* HAS_XFONT2 */
{
return FakeClientID(0);
}
#ifdef HAS_XFONT2
static int
store_font_Client_font(FontPtr pfont, Font id)
#else
int
StoreFontClientFont(FontPtr pfont, Font id)
#endif /* HAS_XFONT2 */
{
return AddResource(id, RT_NONE, (void *) pfont);
}
#ifdef HAS_XFONT2
static void
delete_font_client_id(Font id)
#else
void
DeleteFontClientID(Font id)
#endif /* HAS_XFONT2 */
{
FreeResource(id, RT_NONE);
}
#ifdef HAS_XFONT2
static int
_client_auth_generation(ClientPtr client)
#else
int
client_auth_generation(ClientPtr client)
#endif /* HAS_XFONT2 */
{
return 0;
}
......@@ -2105,8 +2343,78 @@ client_auth_generation(ClientPtr client)
static int fs_handlers_installed = 0;
static unsigned int last_server_gen;
#ifdef HAS_XFONT2
static void
fs_block_handler(void *blockData, OSTimePtr timeout, void *readmask)
{
FontBlockHandlerProcPtr block_handler = blockData;
(*block_handler)(timeout);
}
struct fs_fd_entry {
struct xorg_list entry;
int fd;
void *data;
FontFdHandlerProcPtr handler;
};
static void
fs_fd_handler(int fd, int ready, void *data)
{
struct fs_fd_entry *entry = data;
entry->handler(fd, entry->data);
}
static struct xorg_list fs_fd_list;
static int
add_fs_fd(int fd, FontFdHandlerProcPtr handler, void *data)
{
struct fs_fd_entry *entry = calloc(1, sizeof (struct fs_fd_entry));
if (!entry)
return FALSE;
entry->fd = fd;
entry->data = data;
entry->handler = handler;
if (!SetNotifyFd(fd, fs_fd_handler, X_NOTIFY_READ, entry)) {
free(entry);
return FALSE;
}
xorg_list_add(&entry->entry, &fs_fd_list);
return TRUE;
}
static void
remove_fs_fd(int fd)
{
struct fs_fd_entry *entry, *temp;
xorg_list_for_each_entry_safe(entry, temp, &fs_fd_list, entry) {
if (entry->fd == fd) {
xorg_list_del(&entry->entry);
free(entry);
break;
}
}
RemoveNotifyFd(fd);
}
static void
adjust_fs_wait_for_delay(void *wt, unsigned long newdelay)
{
AdjustWaitForDelay(wt, newdelay);
}
static int
_init_fs_handlers(FontPathElementPtr fpe, FontBlockHandlerProcPtr block_handler)
#else
int
init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
#endif /* HAS_XFONT2 */
{
/* if server has reset, make sure the b&w handlers are reinstalled */
if (last_server_gen < serverGeneration) {
......@@ -2119,17 +2427,30 @@ init_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler)
fprintf(stderr, "adding FS b & w handlers\n");
#endif
#ifdef HAS_XFONT2
if (!RegisterBlockAndWakeupHandlers(fs_block_handler,
FontWakeup, (void *) block_handler))
#else
if (!RegisterBlockAndWakeupHandlers(block_handler,
FontWakeup, (void *) 0))
#endif /* HAS_XFONT2 */
return AllocError;
#ifdef HAS_XFONT2
xorg_list_init(&fs_fd_list);
#endif /* HAS_XFONT2 */
fs_handlers_installed++;
}
QueueFontWakeup(fpe);
return Successful;
}
#ifdef HAS_XFONT2
static void
_remove_fs_handlers(FontPathElementPtr fpe, FontBlockHandlerProcPtr block_handler, Bool all)
#else
void
remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bool all)
#endif /* HAS_XFONT2 */
{
if (all) {
/* remove the handlers if no one else is using them */
......@@ -2139,13 +2460,57 @@ remove_fs_handlers(FontPathElementPtr fpe, BlockHandlerProcPtr block_handler, Bo
fprintf(stderr, "removing FS b & w handlers\n");
#endif
#ifdef HAS_XFONT2
RemoveBlockAndWakeupHandlers(fs_block_handler, FontWakeup,
(void *) block_handler);
#else
RemoveBlockAndWakeupHandlers(block_handler, FontWakeup,
(void *) 0);
#endif /* HAS_XFONT2 */
}
}
RemoveFontWakeup(fpe);
}
#ifdef HAS_XFONT2
static const xfont2_client_funcs_rec xfont2_client_funcs = {
.version = XFONT2_CLIENT_FUNCS_VERSION,
.client_auth_generation = _client_auth_generation,
.client_signal = ClientSignal,
.delete_font_client_id = delete_font_client_id,
.verrorf = VErrorF,
.find_old_font = find_old_font,
.get_client_resolutions = get_client_resolutions,
.get_default_point_size = get_default_point_size,
.get_new_font_client_id = get_new_font_client_id,
.get_time_in_millis = GetTimeInMillis,
.init_fs_handlers = _init_fs_handlers,
.register_fpe_funcs = register_fpe_funcs,
.remove_fs_handlers = _remove_fs_handlers,
.get_server_client = get_server_client,
.set_font_authorizations = set_font_authorizations,
.store_font_client_font = store_font_Client_font,
.make_atom = MakeAtom,
.valid_atom = ValidAtom,
.name_for_atom = NameForAtom,
.get_server_generation = get_server_generation,
.add_fs_fd = add_fs_fd,
.remove_fs_fd = remove_fs_fd,
.adjust_fs_wait_for_delay = adjust_fs_wait_for_delay,
};
xfont2_pattern_cache_ptr fontPatternCache;
void
InitFonts(void)
{
if (fontPatternCache)
xfont2_free_font_pattern_cache(fontPatternCache);
fontPatternCache = xfont2_make_font_pattern_cache();
xfont2_init(&xfont2_client_funcs);
}
#endif /* HAS_XFONT2 */
#ifdef DEBUG
#define GLWIDTHBYTESPADDED(bits,nbytes) \
((nbytes) == 1 ? (((bits)+7)>>3) /* pad to 1 byte */ \
......
nx-X11/programs/Xserver/dix/main.c
View file @ f4c80a78
......@@ -95,6 +95,12 @@ Equipment Corporation.
#include "colormapst.h"
#include "cursorstr.h"
#include <X11/fonts/font.h>
#include <X11/fonts/fontstruct.h>
#ifdef HAS_XFONT2
# include <X11/fonts/libxfont2.h>
#else
# include <X11/fonts/fontutil.h>
#endif /* HAS_XFONT2 */
#include "opaque.h"
#include "servermd.h"
#include "site.h"
......@@ -252,7 +258,11 @@ main(int argc, char *argv[], char *envp[])
InitAtoms();
InitEvents();
#ifdef HAS_XFONT2
xfont2_init_glyph_caching();
#else
InitGlyphCaching();
#endif /* of HAS_XFONT2 */
ResetClientPrivates();
ResetScreenPrivates();
ResetWindowPrivates();
......
nx-X11/programs/Xserver/hw/nxagent/Font.c
View file @ f4c80a78
......@@ -41,6 +41,7 @@ is" without express or implied warranty.
#include "dixstruct.h"
#include <X11/fonts/font.h>
#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "misc.h"
#include "miscstruct.h"
#include "opaque.h"
......@@ -495,7 +496,11 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont)
const char *name;
char *origName = (char*) pScreen;
#ifdef HAS_XFONT2
xfont2_font_set_private(pFont, nxagentFontPrivateIndex, NULL);
#else
FontSetPrivate(pFont, nxagentFontPrivateIndex, NULL);
#endif /* HAS_XFONT2 */
if (requestingClient && XpClientIsPrintClient(requestingClient, NULL))
return True;
......@@ -540,7 +545,11 @@ Bool nxagentRealizeFont(ScreenPtr pScreen, FontPtr pFont)
}
priv = (void *)malloc(sizeof(nxagentPrivFont));
#ifdef HAS_XFONT2
xfont2_font_set_private(pFont, nxagentFontPrivateIndex, priv);
#else
FontSetPrivate(pFont, nxagentFontPrivateIndex, priv);
#endif /* HAS_XFONT2 */
nxagentFontPriv(pFont) -> mirrorID = 0;
......@@ -688,7 +697,11 @@ Bool nxagentUnrealizeFont(ScreenPtr pScreen, FontPtr pFont)
FreeResource(nxagentFontPriv(pFont) -> mirrorID, RT_NONE);
free(nxagentFontPriv(pFont));
#ifdef HAS_XFONT2
xfont2_font_set_private(pFont, nxagentFontPrivateIndex, NULL);
#else
FontSetPrivate(pFont, nxagentFontPrivateIndex, NULL);
#endif /* HAS_XFONT2 */
}
return True;
......
nx-X11/programs/Xserver/hw/nxagent/Imakefile
View file @ f4c80a78
......@@ -257,7 +257,11 @@ all:: $(OBJS)
LinkSourceFile(stubs.c,$(SERVERSRC)/Xi)
LinkSourceFile(xpstubs.c,$(SERVERSRC)/dix)
SpecialCObjectRule(Init,$(ICONFIGFILES),$(_NOOP_))
SpecialCObjectRule(Init,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(Font,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(NXdamage,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(NXdispatch,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(NXdixfonts,$(ICONFIGFILES),$(FONT_DEFINES))
LinkSourceFile(miinitext.c,$(SERVERSRC)/mi)
SpecialCObjectRule(miinitext,$(ICONFIGFILES), $(_NOOP_))
......
nx-X11/programs/Xserver/hw/nxagent/Init.c
View file @ f4c80a78
......@@ -51,6 +51,7 @@ is" without express or implied warranty.
#include "servermd.h"
#include "mi.h"
#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "Agent.h"
#include "Display.h"
......@@ -367,7 +368,11 @@ FIXME: These variables, if not removed at all because have probably
nxagentWindowPrivateIndex = AllocateWindowPrivateIndex();
nxagentGCPrivateIndex = AllocateGCPrivateIndex();
RT_NX_GC = CreateNewResourceType(nxagentDestroyNewGCResourceType);
#ifdef HAS_XFONT2
nxagentFontPrivateIndex = xfont2_allocate_font_private_index();
#else
nxagentFontPrivateIndex = AllocateFontPrivateIndex();
#endif /* HAS_XFONT2 */
RT_NX_FONT = CreateNewResourceType(nxagentDestroyNewFontResourceType);
nxagentClientPrivateIndex = AllocateClientPrivateIndex();
nxagentPixmapPrivateIndex = AllocatePixmapPrivateIndex();
......
nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
View file @ f4c80a78
......@@ -210,14 +210,22 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
if (c->current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current_fpe];
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
}
err = Successful;
goto bail;
}
while (c->current_fpe < c->num_fpes) {
fpe = c->fpe_list[c->current_fpe];
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->open_font)
#else
err = (*fpe_functions[fpe->type].open_font)
#endif /* HAS_XFONT2 */
((void *) client, fpe, c->flags,
c->fontname, c->fnamelen, FontFormat,
BitmapFormatMaskByte |
......@@ -314,7 +322,11 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
}
}
if (patternCache && pfont != c->non_cachable_font)
#ifdef HAS_XFONT2
xfont2_cache_font_pattern(patternCache, nxagentOrigFontName, nxagentOrigFontNameLen,
#else
CacheFontPattern(patternCache, nxagentOrigFontName, nxagentOrigFontNameLen,
#endif /* HAS_XFONT2 */
pfont);
bail:
if (err != Successful && c->client != serverClient) {
......@@ -359,7 +371,11 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (c->current.current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current.current_fpe];
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
}
err = Successful;
goto bail;
......@@ -372,11 +388,19 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
fpe = c->fpe_list[c->current.current_fpe];
err = Successful;
#ifdef HAS_XFONT2
if (!fpe_functions[fpe->type]->start_list_fonts_and_aliases)
#else
if (!fpe_functions[fpe->type].start_list_fonts_and_aliases)
#endif /* HAS_XFONT2 */
{
/* This FPE doesn't support/require list_fonts_and_aliases */
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->list_fonts)
#else
err = (*fpe_functions[fpe->type].list_fonts)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
c->names);
......@@ -408,7 +432,11 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
the FPEs. */
if (!c->current.list_started) {
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->start_list_fonts_and_aliases)
#else
err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
&c->current.private);
......@@ -427,7 +455,11 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (err == Successful) {
char *tmpname;
name = 0;
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->list_next_font_or_alias)
#else
err = (*fpe_functions[fpe->type].list_next_font_or_alias)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, &name, &namelen, &tmpname,
&resolvedlen, c->current.private);
if (err == Suspended) {
......@@ -458,11 +490,19 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
if (c->haveSaved)
{
if (c->savedName)
#ifdef HAS_XFONT2
(void)xfont2_add_font_names_name(c->names, c->savedName,
#else
(void)AddFontNamesName(c->names, c->savedName,
#endif /* HAS_XFONT2 */
c->savedNameLen);
}
else
#ifdef HAS_XFONT2
(void)xfont2_add_font_names_name(c->names, name, namelen);
#else
(void)AddFontNamesName(c->names, name, namelen);
#endif /* HAS_XFONT2 */
}
/*
......@@ -487,7 +527,11 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c)
int tmpnamelen;
tmpname = 0;
#ifdef HAS_XFONT2
(void) (*fpe_functions[fpe->type]->list_next_font_or_alias)
#else
(void) (*fpe_functions[fpe->type].list_next_font_or_alias)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, &tmpname, &tmpnamelen,
&tmpname, &tmpnamelen, c->current.private);
if (--aliascount <= 0)
......@@ -621,7 +665,11 @@ bail:
FreeFPE(c->fpe_list[i]);
free(c->fpe_list);
if (c->savedName) free(c->savedName);
#ifdef HAS_XFONT2
xfont2_free_font_names(names);
#else
FreeFontNames(names);
#endif /* HAS_XFONT2 */
free(c);
if (resolved) free(resolved);
return TRUE;
......@@ -651,7 +699,11 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length,
free(c);
return BadAlloc;
}
#ifdef HAS_XFONT2
c->names = xfont2_make_font_names_record(max_names < nxagentMaxFontNames ? max_names : nxagentMaxFontNames);
#else
c->names = MakeFontNamesRecord(max_names < nxagentMaxFontNames ? max_names : nxagentMaxFontNames);
#endif /* HAS_XFONT2 */
if (!c->names)
{
free(c->fpe_list);
......@@ -699,7 +751,11 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
if (c->current.current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current.current_fpe];
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
}
err = Successful;
goto bail;
......@@ -713,7 +769,11 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
err = Successful;
if (!c->current.list_started)
{
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->start_list_fonts_with_info)
#else
err = (*fpe_functions[fpe->type].start_list_fonts_with_info)
#endif /* HAS_XFONT2 */
(client, fpe, c->current.pattern, c->current.patlen,
c->current.max_names, &c->current.private);
if (err == Suspended)
......@@ -735,7 +795,11 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
{
name = 0;
pFontInfo = &fontInfo;
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->list_next_font_with_info)
#else
err = (*fpe_functions[fpe->type].list_next_font_with_info)
#endif /* HAS_XFONT2 */
(client, fpe, &name, &namelen, &pFontInfo,
&numFonts, c->current.private);
if (err == Suspended)
......@@ -775,7 +839,11 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
tmpname = 0;
tmpFontInfo = &fontInfo;
#ifdef HAS_XFONT2
(void) (*fpe_functions[fpe->type]->list_next_font_with_info)
#else
(void) (*fpe_functions[fpe->type].list_next_font_with_info)
#endif /* HAS_XFONT2 */
(client, fpe, &tmpname, &tmpnamelen, &tmpFontInfo,
&numFonts, c->current.private);
if (--aliascount <= 0)
......@@ -1028,7 +1096,11 @@ nxdoListFontsAndAliases(client, fss)
if (c->current.current_fpe < c->num_fpes)
{
fpe = c->fpe_list[c->current.current_fpe];
#ifdef HAS_XFONT2
(*fpe_functions[fpe->type]->client_died) ((void *) client, fpe);
#else
(*fpe_functions[fpe->type].client_died) ((void *) client, fpe);
#endif /* HAS_XFONT2 */
}
err = Successful;
goto bail;
......@@ -1041,11 +1113,19 @@ nxdoListFontsAndAliases(client, fss)
fpe = c->fpe_list[c->current.current_fpe];
err = Successful;
#ifdef HAS_XFONT2
if (!fpe_functions[fpe->type]->start_list_fonts_and_aliases)
#else
if (!fpe_functions[fpe->type].start_list_fonts_and_aliases)
#endif /* HAS_XFONT2 */
{
/* This FPE doesn't support/require list_fonts_and_aliases */
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->list_fonts)
#else
err = (*fpe_functions[fpe->type].list_fonts)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
c->names);
......@@ -1077,7 +1157,11 @@ nxdoListFontsAndAliases(client, fss)
the FPEs. */
if (!c->current.list_started) {
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->start_list_fonts_and_aliases)
#else
err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, c->current.pattern,
c->current.patlen, c->current.max_names - c->names->nnames,
&c->current.private);
......@@ -1099,7 +1183,11 @@ nxdoListFontsAndAliases(client, fss)
if (err == Successful) {
char *tmpname;
name = 0;
#ifdef HAS_XFONT2
err = (*fpe_functions[fpe->type]->list_next_font_or_alias)
#else
err = (*fpe_functions[fpe->type].list_next_font_or_alias)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, &name, &namelen, &tmpname,
&resolvedlen, c->current.private);
if (err == Suspended) {
......@@ -1170,7 +1258,11 @@ nxdoListFontsAndAliases(client, fss)
int tmpnamelen;
tmpname = 0;
#ifdef HAS_XFONT2
(void) (*fpe_functions[fpe->type]->list_next_font_or_alias)
#else
(void) (*fpe_functions[fpe->type].list_next_font_or_alias)
#endif /* HAS_XFONT2 */
((void *) c->client, fpe, &tmpname, &tmpnamelen,
&tmpname, &tmpnamelen, c->current.private);
if (--aliascount <= 0)
......@@ -1281,7 +1373,11 @@ finish:
FreeFPE(c->fpe_list[i]);
free(c->fpe_list);
if (c->savedName) free(c->savedName);
#ifdef HAS_XFONT2
xfont2_free_font_names(c->names);
#else
FreeFontNames(c->names);
#endif /* HAS_XFONT2 */
free(c);
free(fss);
if (resolved) free(resolved);
......@@ -1333,7 +1429,11 @@ nxOpenFont(client, fid, flags, lenfname, pfontname)
** having to create another instance of a font that already exists.
*/
#ifdef HAS_XFONT2
cached = xfont2_find_cached_font_pattern(patternCache, pfontname, lenfname);
#else
cached = FindCachedFontPattern(patternCache, pfontname, lenfname);
#endif /* HAS_XFONT2 */
if (cached && cached->info.cachable)
{
if (!AddResource(fid, RT_FONT, (void *) cached))
......@@ -1357,7 +1457,11 @@ nxOpenFont(client, fid, flags, lenfname, pfontname)
free(fss);
return BadAlloc;
}
#ifdef HAS_XFONT2
c->names = xfont2_make_font_names_record(100);
#else
c->names = MakeFontNamesRecord(100);
#endif /* HAS_XFONT2 */
if (!c->names)
{
free(c->fpe_list);
......
nx-X11/programs/Xserver/include/dixfont.h
View file @ f4c80a78
......@@ -29,11 +29,21 @@ SOFTWARE.
#include "closure.h"
#include <X11/fonts/fontstruct.h>
#ifdef HAS_XFONT2
# include <X11/fonts/libxfont2.h>
#else
# include <X11/fonts/fontutil.h>
#endif /* HAS XFONT2 */
#define NullDIXFontProp ((DIXFontPropPtr)0)
typedef struct _DIXFontProp *DIXFontPropPtr;
#ifdef HAS_XFONT2
xfont2_fpe_funcs_rec const **fpe_functions;
#else
extern FPEFunctions *fpe_functions;
#endif /* HAS_XFONT2 */
extern int FontToXError(int /*err*/);
......@@ -124,15 +134,26 @@ extern void InitFonts(void);
extern void FreeFonts(void);
#ifdef HAS_XFONT2
extern void GetGlyphs(FontPtr /*font */ ,
unsigned long /*count */ ,
unsigned char * /*chars */ ,
FontEncoding /*fontEncoding */ ,
unsigned long * /*glyphcount */ ,
CharInfoPtr * /*glyphs */ );
#else
extern FontPtr find_old_font(XID /*id*/);
extern void GetGlyphs(FontPtr /*font*/,
#define GetGlyphs dixGetGlyphs
extern void dixGetGlyphs(FontPtr /*font*/,
unsigned long /*count*/,
unsigned char * /*chars*/,
FontEncoding /*fontEncoding*/,
unsigned long * /*glyphcount*/,
CharInfoPtr * /*glyphs*/);
extern void register_fpe_functions(void);
extern void QueryGlyphExtents(FontPtr /*pFont*/,
CharInfoPtr * /*charinfo*/,
unsigned long /*count*/,
......@@ -142,6 +163,7 @@ extern Bool QueryTextExtents(FontPtr /*pFont*/,
unsigned long /*count*/,
unsigned char * /*chars*/,
ExtentInfoPtr /*info*/);
#endif /* HAS_XFONT2 */
extern Bool ParseGlyphCachingMode(char * /*str*/);
......@@ -149,6 +171,4 @@ extern void InitGlyphCaching(void);
extern void SetGlyphCachingMode(int /*newmode*/);
extern void register_fpe_functions(void);
#endif /* DIXFONT_H */
nx-X11/programs/Xserver/include/dixfontstr.h
View file @ f4c80a78
......@@ -27,6 +27,9 @@ SOFTWARE.
#include "servermd.h"
#include "dixfont.h"
#include <X11/fonts/fontstruct.h>
#ifdef HAS_XFONT2
# include <X11/fonts/libxfont2.h>
#endif /* HAS_XFONT2 */
#include "closure.h"
#include <nx-X11/Xproto.h> /* for xQueryFontReply */
......
nx-X11/programs/Xserver/mi/Imakefile
View file @ f4c80a78
......@@ -179,6 +179,9 @@ NormalLibraryTarget(cbrt,cbrt.o)
SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES))
SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES))
SpecialCObjectRule(miglblt,$(ICONFIGFILES),$(FONT_DEFINES))
SpecialCObjectRule(mipolytext,$(ICONFIGFILES),$(FONT_DEFINES))
#ifdef ItsyCompilerBug
SpecialCObjectRule(mipolycon,$(_NOOP_),-O0)
#endif
......
nx-X11/programs/Xserver/mi/miglblt.c
View file @ f4c80a78
......@@ -55,6 +55,11 @@ SOFTWARE.
#include <nx-X11/Xproto.h>
#include "misc.h"
#include <X11/fonts/fontstruct.h>
#ifdef HAS_XFONT2
# include <X11/fonts/libxfont2.h>
#else
# include <X11/fonts/fontutil.h>
#endif /* HAS_XFONT2 */
#include "dixfontstr.h"
#include "gcstruct.h"
#include "windowstr.h"
......@@ -203,13 +208,18 @@ miImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
CharInfoPtr *ppci; /* array of character info */
void *pglyphBase; /* start of array of glyphs */
{
ExtentInfoRec info; /* used by QueryGlyphExtents() */
ExtentInfoRec info; /* used by xfont2_query_glyph_extents (libXfont2)
resp. QueryGlyphExtents() (libXfont1) */
XID gcvals[3];
int oldAlu, oldFS;
unsigned long oldFG;
xRectangle backrect;
#ifdef HAS_XFONT2
xfont2_query_glyph_extents(pGC->font, ppci, (unsigned long) nglyph, &info);
#else
QueryGlyphExtents(pGC->font, ppci, (unsigned long)nglyph, &info);
#endif /* HAS_XFONT2 */
if (info.overallWidth >= 0)
{
......
nx-X11/programs/Xserver/miext/damage/Imakefile
View file @ f4c80a78
......@@ -22,6 +22,8 @@ NormalLibraryTarget(damage,$(OBJS))
LintLibraryTarget(damage,$(SRCS))
NormalLintTarget($(SRCS))
SpecialCObjectRule(damage,$(ICONFIGFILES),$(FONT_DEFINES))
#endif
DependTarget()
......
nx-X11/programs/Xserver/miext/damage/damage.c
View file @ f4c80a78
......@@ -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)
......
nx-X11/programs/Xserver/os/Imakefile
View file @ f4c80a78
......@@ -248,7 +248,7 @@ SpecialCObjectRule(connection,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES))
SpecialCObjectRule(osinit,$(ICONFIGFILES),$(ADM_DEFINES))
SpecialCObjectRule(WaitFor,$(ICONFIGFILES),$(EXT_DEFINES))
SpecialCObjectRule(io,$(ICONFIGFILES),$(EXT_DEFINES))
SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES) $(ERROR_DEFINES) $(PAM_DEFINES))
SpecialCObjectRule(utils,$(ICONFIGFILES),$(XDMCP_DEFINES) $(EXT_DEFINES) $(ERROR_DEFINES) $(PAM_DEFINES) $(FONT_DEFINES))
#if defined(SparcArchitecture) && HasGcc && !HasGcc2
oscolor.o: oscolor.c $(ICONFIGFILES)
$(RM) $@
......
nx-X11/programs/Xserver/os/utils.c
View file @ f4c80a78
......@@ -96,6 +96,11 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <nx-X11/Xtrans/Xtrans.h>
#include "input.h"
#include "dixfont.h"
#ifdef HAS_XFONT2
# include <X11/fonts/libxfont2.h>
#else
# include <X11/fonts/fontutil.h>
#endif /* HAS_XFONT2 */
#include "osdep.h"
#ifdef X_POSIX_C_SOURCE
#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
......@@ -797,7 +802,11 @@ ProcessCommandLine(int argc, char *argv[])
#endif
else if ( strcmp( argv[i], "-deferglyphs") == 0)
{
#ifdef HAS_XFONT2
if(++i >= argc || !!xfont2_parse_glyph_caching_mode(argv[i]))
#else
if(++i >= argc || !ParseGlyphCachingMode(argv[i]))
#endif /* HAS_XFONT2 */
UseMsg();
}
else if ( strcmp( argv[i], "-f") == 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment