Drop the FONTCACHE extension.
This appears to have been dead code since X-TT was merged.
This commit is contained in:
parent
b85392e66b
commit
0b45ba488d
@ -106,12 +106,6 @@ if MULTIBUFFER
|
||||
MODULE_SRCS += $(MULTIBUFFER_SRCS)
|
||||
endif
|
||||
|
||||
# Font Cache extension
|
||||
FONTCACHE_SRCS = fontcache.c
|
||||
if FONTCACHE
|
||||
MODULE_SRCS += $(FONTCACHE_SRCS)
|
||||
endif
|
||||
|
||||
# XF86 Big Font extension
|
||||
BIGFONT_SRCS = xf86bigfont.c
|
||||
if XF86BIGFONT
|
||||
|
323
Xext/fontcache.c
323
Xext/fontcache.c
@ -1,323 +0,0 @@
|
||||
/*-
|
||||
* Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 1998-1999 X-TrueType Server Project, All rights
|
||||
* reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/* THIS IS NOT AN X CONSORTIUM STANDARD */
|
||||
|
||||
#define NEED_REPLIES
|
||||
#define NEED_EVENTS
|
||||
#ifdef HAVE_DIX_CONFIG_H
|
||||
#include <dix-config.h>
|
||||
#endif
|
||||
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xproto.h>
|
||||
#include "misc.h"
|
||||
#include "dixstruct.h"
|
||||
#include "extnsionst.h"
|
||||
#include "scrnintstr.h"
|
||||
#include "inputstr.h"
|
||||
#include "servermd.h"
|
||||
#define _FONTCACHE_SERVER_
|
||||
#include <X11/extensions/fontcacheP.h>
|
||||
#include <X11/extensions/fontcachstr.h>
|
||||
#include <X11/Xfuncproto.h>
|
||||
|
||||
#include "swaprep.h"
|
||||
#include "modinit.h"
|
||||
|
||||
static int miscErrorBase;
|
||||
|
||||
static void FontCacheResetProc(
|
||||
ExtensionEntry* /* extEntry */
|
||||
);
|
||||
|
||||
static DISPATCH_PROC(ProcFontCacheDispatch);
|
||||
static DISPATCH_PROC(ProcFontCacheGetCacheSettings);
|
||||
static DISPATCH_PROC(ProcFontCacheGetCacheStatistics);
|
||||
static DISPATCH_PROC(ProcFontCacheQueryVersion);
|
||||
static DISPATCH_PROC(ProcFontCacheChangeCacheSettings);
|
||||
static DISPATCH_PROC(SProcFontCacheDispatch);
|
||||
static DISPATCH_PROC(SProcFontCacheGetCacheSettings);
|
||||
static DISPATCH_PROC(SProcFontCacheGetCacheStatistics);
|
||||
static DISPATCH_PROC(SProcFontCacheQueryVersion);
|
||||
static DISPATCH_PROC(SProcFontCacheChangeCacheSettings);
|
||||
|
||||
void
|
||||
FontCacheExtensionInit(INITARGS)
|
||||
{
|
||||
ExtensionEntry* extEntry;
|
||||
|
||||
if (
|
||||
(extEntry = AddExtension(FONTCACHENAME,
|
||||
FontCacheNumberEvents,
|
||||
FontCacheNumberErrors,
|
||||
ProcFontCacheDispatch,
|
||||
SProcFontCacheDispatch,
|
||||
FontCacheResetProc,
|
||||
StandardMinorOpcode))) {
|
||||
miscErrorBase = extEntry->errorBase;
|
||||
}
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
FontCacheResetProc (extEntry)
|
||||
ExtensionEntry* extEntry;
|
||||
{
|
||||
}
|
||||
|
||||
static int
|
||||
ProcFontCacheQueryVersion(client)
|
||||
ClientPtr client;
|
||||
{
|
||||
xFontCacheQueryVersionReply rep;
|
||||
int n;
|
||||
|
||||
REQUEST_SIZE_MATCH(xFontCacheQueryVersionReq);
|
||||
rep.type = X_Reply;
|
||||
rep.length = 0;
|
||||
rep.sequenceNumber = client->sequence;
|
||||
rep.majorVersion = FONTCACHE_MAJOR_VERSION;
|
||||
rep.minorVersion = FONTCACHE_MINOR_VERSION;
|
||||
if (client->swapped) {
|
||||
swaps(&rep.sequenceNumber, n);
|
||||
swapl(&rep.length, n);
|
||||
swaps(&rep.majorVersion, n);
|
||||
swaps(&rep.minorVersion, n);
|
||||
}
|
||||
WriteToClient(client, SIZEOF(xFontCacheQueryVersionReply), (char *)&rep);
|
||||
return (client->noClientException);
|
||||
}
|
||||
|
||||
static int
|
||||
ProcFontCacheGetCacheSettings(client)
|
||||
ClientPtr client;
|
||||
{
|
||||
xFontCacheGetCacheSettingsReply rep;
|
||||
FontCacheSettings cinfo;
|
||||
int n;
|
||||
|
||||
REQUEST_SIZE_MATCH(xFontCacheGetCacheSettingsReq);
|
||||
rep.type = X_Reply;
|
||||
rep.sequenceNumber = client->sequence;
|
||||
rep.length = 0;
|
||||
|
||||
/* XXX */
|
||||
FontCacheGetSettings(&cinfo);
|
||||
rep.himark = cinfo.himark;
|
||||
rep.lowmark = cinfo.lowmark;
|
||||
rep.balance = cinfo.balance;
|
||||
rep.reserve0 = 0;
|
||||
rep.reserve1 = 0;
|
||||
rep.reserve2 = 0;
|
||||
|
||||
if (client->swapped) {
|
||||
swaps(&rep.sequenceNumber, n);
|
||||
swapl(&rep.himark, n);
|
||||
swapl(&rep.lowmark, n);
|
||||
swapl(&rep.balance, n);
|
||||
swapl(&rep.reserve0, n);
|
||||
swapl(&rep.reserve1, n);
|
||||
swapl(&rep.reserve2, n);
|
||||
}
|
||||
/* XXX */
|
||||
|
||||
WriteToClient(client, SIZEOF(xFontCacheGetCacheSettingsReply),
|
||||
(char *)&rep);
|
||||
return (client->noClientException);
|
||||
}
|
||||
|
||||
static int
|
||||
ProcFontCacheGetCacheStatistics(client)
|
||||
ClientPtr client;
|
||||
{
|
||||
xFontCacheGetCacheStatisticsReply rep;
|
||||
FontCacheStatistics cstats;
|
||||
int n;
|
||||
|
||||
REQUEST_SIZE_MATCH(xFontCacheGetCacheStatisticsReq);
|
||||
rep.type = X_Reply;
|
||||
rep.sequenceNumber = client->sequence;
|
||||
rep.length = (sz_xFontCacheGetCacheStatisticsReply - 32) >> 2;
|
||||
|
||||
/* XXX */
|
||||
FontCacheGetStatistics(&cstats);
|
||||
rep.purge_runs = cstats.purge_runs;
|
||||
rep.purge_stat = cstats.purge_stat;
|
||||
rep.balance = cstats.balance;
|
||||
rep.reserve0 = 0;
|
||||
rep.f_hits = cstats.f.hits;
|
||||
rep.f_misshits = cstats.f.misshits;
|
||||
rep.f_purged = cstats.f.purged;
|
||||
rep.f_usage = cstats.f.usage;
|
||||
rep.f_reserve0 = 0;
|
||||
rep.v_hits = cstats.v.hits;
|
||||
rep.v_misshits = cstats.v.misshits;
|
||||
rep.v_purged = cstats.v.purged;
|
||||
rep.v_usage = cstats.v.usage;
|
||||
rep.v_reserve0 = 0;
|
||||
if (client->swapped) {
|
||||
swaps(&rep.sequenceNumber, n);
|
||||
swapl(&rep.length, n);
|
||||
swapl(&rep.purge_runs, n);
|
||||
swapl(&rep.purge_stat, n);
|
||||
swapl(&rep.balance, n);
|
||||
swapl(&rep.reserve0, n);
|
||||
swapl(&rep.f_hits, n);
|
||||
swapl(&rep.f_misshits, n);
|
||||
swapl(&rep.f_purged, n);
|
||||
swapl(&rep.f_usage, n);
|
||||
swapl(&rep.f_reserve0, n);
|
||||
swapl(&rep.v_hits, n);
|
||||
swapl(&rep.v_misshits, n);
|
||||
swapl(&rep.v_purged, n);
|
||||
swapl(&rep.v_usage, n);
|
||||
swapl(&rep.v_reserve0, n);
|
||||
}
|
||||
/* XXX */
|
||||
WriteToClient(client, SIZEOF(xFontCacheGetCacheStatisticsReply),
|
||||
(char *)&rep);
|
||||
return (client->noClientException);
|
||||
}
|
||||
|
||||
static int
|
||||
ProcFontCacheChangeCacheSettings(client)
|
||||
ClientPtr client;
|
||||
{
|
||||
FontCacheSettings cs;
|
||||
|
||||
REQUEST(xFontCacheChangeCacheSettingsReq);
|
||||
|
||||
REQUEST_SIZE_MATCH(xFontCacheChangeCacheSettingsReq);
|
||||
|
||||
/* XXX */
|
||||
cs.himark = stuff->himark;
|
||||
cs.lowmark = stuff->lowmark;
|
||||
cs.balance = stuff->balance;
|
||||
|
||||
if (cs.himark < 0 || cs.lowmark < 0)
|
||||
return BadValue;
|
||||
if (cs.himark <= cs.lowmark)
|
||||
return BadValue;
|
||||
if (!(10 <= cs.balance && cs.balance <= 90))
|
||||
return BadValue;
|
||||
|
||||
if (FontCacheChangeSettings(&cs) == 0)
|
||||
return miscErrorBase + FontCacheCannotAllocMemory;
|
||||
/* XXX */
|
||||
|
||||
return (client->noClientException);
|
||||
}
|
||||
|
||||
static int
|
||||
ProcFontCacheDispatch (client)
|
||||
ClientPtr client;
|
||||
{
|
||||
REQUEST(xReq);
|
||||
switch (stuff->data)
|
||||
{
|
||||
case X_FontCacheQueryVersion:
|
||||
return ProcFontCacheQueryVersion(client);
|
||||
case X_FontCacheGetCacheSettings:
|
||||
return ProcFontCacheGetCacheSettings(client);
|
||||
case X_FontCacheGetCacheStatistics:
|
||||
return ProcFontCacheGetCacheStatistics(client);
|
||||
case X_FontCacheChangeCacheSettings:
|
||||
return ProcFontCacheChangeCacheSettings(client);
|
||||
default:
|
||||
return miscErrorBase + FontCacheBadProtocol;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
SProcFontCacheQueryVersion(client)
|
||||
ClientPtr client;
|
||||
{
|
||||
int n;
|
||||
REQUEST(xFontCacheQueryVersionReq);
|
||||
swaps(&stuff->length, n);
|
||||
return ProcFontCacheQueryVersion(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcFontCacheGetCacheSettings(client)
|
||||
ClientPtr client;
|
||||
{
|
||||
int n;
|
||||
REQUEST(xFontCacheGetCacheSettingsReq);
|
||||
swaps(&stuff->length, n);
|
||||
REQUEST_SIZE_MATCH(xFontCacheGetCacheSettingsReq);
|
||||
return ProcFontCacheGetCacheSettings(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcFontCacheGetCacheStatistics(client)
|
||||
ClientPtr client;
|
||||
{
|
||||
int n;
|
||||
REQUEST(xFontCacheGetCacheStatisticsReq);
|
||||
swaps(&stuff->length, n);
|
||||
REQUEST_SIZE_MATCH(xFontCacheGetCacheStatisticsReq);
|
||||
return ProcFontCacheGetCacheStatistics(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcFontCacheChangeCacheSettings(client)
|
||||
ClientPtr client;
|
||||
{
|
||||
int n;
|
||||
REQUEST(xFontCacheChangeCacheSettingsReq);
|
||||
swaps(&stuff->length, n);
|
||||
REQUEST_SIZE_MATCH(xFontCacheChangeCacheSettingsReq);
|
||||
/* XXX */
|
||||
swapl(&stuff->himark, n);
|
||||
swapl(&stuff->lowmark, n);
|
||||
swapl(&stuff->balance, n);
|
||||
/* XXX */
|
||||
return ProcFontCacheChangeCacheSettings(client);
|
||||
}
|
||||
|
||||
static int
|
||||
SProcFontCacheDispatch (client)
|
||||
ClientPtr client;
|
||||
{
|
||||
REQUEST(xReq);
|
||||
switch (stuff->data)
|
||||
{
|
||||
case X_FontCacheQueryVersion:
|
||||
return SProcFontCacheQueryVersion(client);
|
||||
case X_FontCacheGetCacheSettings:
|
||||
return SProcFontCacheGetCacheSettings(client);
|
||||
case X_FontCacheGetCacheStatistics:
|
||||
return SProcFontCacheGetCacheStatistics(client);
|
||||
case X_FontCacheChangeCacheSettings:
|
||||
return SProcFontCacheChangeCacheSettings(client);
|
||||
default:
|
||||
return miscErrorBase + FontCacheBadProtocol;
|
||||
}
|
||||
}
|
@ -539,7 +539,6 @@ AC_ARG_ENABLE(xcalibrate, AS_HELP_STRING([--enable-xcalibrate], [Build XCali
|
||||
AC_ARG_ENABLE(tslib, AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
|
||||
AC_ARG_ENABLE(xevie, AS_HELP_STRING([--disable-xevie], [Build XEvIE extension (default: enabled)]), [XEVIE=$enableval], [XEVIE=yes])
|
||||
AC_ARG_ENABLE(multibuffer, AS_HELP_STRING([--enable-multibuffer], [Build Multibuffer extension (default: disabled)]), [MULTIBUFFER=$enableval], [MULTIBUFFER=no])
|
||||
AC_ARG_ENABLE(fontcache, AS_HELP_STRING([--enable-fontcache], [Build FontCache extension (default: disabled)]), [FONTCACHE=$enableval], [FONTCACHE=no])
|
||||
AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
|
||||
AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--disable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])
|
||||
AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
|
||||
@ -911,12 +910,6 @@ if test "x$MULTIBUFFER" = xyes; then
|
||||
# Requires xextproto which is always required
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(FONTCACHE, [test "x$FONTCACHE" = xyes])
|
||||
if test "x$FONTCACHE" = xyes; then
|
||||
AC_DEFINE(FONTCACHE, 1, [Build FontCache extension])
|
||||
REQUIRED_MODULES="$REQUIRED_MODULES fontcacheproto"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(DBE, [test "x$DBE" = xyes])
|
||||
if test "x$DBE" = xyes; then
|
||||
AC_DEFINE(DBE, 1, [Support DBE extension])
|
||||
|
@ -73,11 +73,8 @@
|
||||
#define DMXEXT
|
||||
|
||||
/* Disable the extensions that are not currently supported */
|
||||
#undef BEZIER
|
||||
#undef PEXEXT
|
||||
#undef MULTIBUFFER
|
||||
#undef XV
|
||||
#undef XIE
|
||||
#undef DBE
|
||||
#undef XF86VIDMODE
|
||||
#undef XFreeXDGA
|
||||
@ -87,6 +84,5 @@
|
||||
#undef XFIXES
|
||||
#undef DAMAGE
|
||||
#undef COMPOSITE
|
||||
#undef FONTCACHE
|
||||
|
||||
#endif /* DMX_CONFIG_H */
|
||||
|
@ -137,15 +137,6 @@ static ExtensionModule extensionModules[] = {
|
||||
NULL
|
||||
},
|
||||
#endif
|
||||
#ifdef FONTCACHE
|
||||
{
|
||||
FontCacheExtensionInit,
|
||||
FONTCACHENAME,
|
||||
&noFontCacheExtension,
|
||||
NULL,
|
||||
NULL
|
||||
},
|
||||
#endif
|
||||
#ifdef XV
|
||||
{
|
||||
XvExtensionInit,
|
||||
|
@ -69,13 +69,6 @@ extern void DPMSExtensionInit(INITARGS);
|
||||
#include <X11/extensions/dpmsstr.h>
|
||||
#endif
|
||||
|
||||
#ifdef FONTCACHE
|
||||
extern void FontCacheExtensionInit(INITARGS);
|
||||
#define _FONTCACHE_SERVER_
|
||||
#include "fontcacheP.h"
|
||||
#include "fontcachstr.h"
|
||||
#endif
|
||||
|
||||
#ifdef XV
|
||||
extern void XvExtensionInit(INITARGS);
|
||||
extern void XvMCExtensionInit(INITARGS);
|
||||
|
@ -356,9 +356,6 @@ _X_HIDDEN void *dixLookupTab[] = {
|
||||
#ifdef DPMSExtension
|
||||
SYMVAR(noDPMSExtension)
|
||||
#endif
|
||||
#ifdef FONTCACHE
|
||||
SYMVAR(noFontCacheExtension)
|
||||
#endif
|
||||
#ifdef GLXEXT
|
||||
SYMVAR(noGlxExtension)
|
||||
#endif
|
||||
|
@ -65,10 +65,6 @@ extern Bool noDbeExtension;
|
||||
extern Bool noDPMSExtension;
|
||||
#endif
|
||||
|
||||
#ifdef FONTCACHE
|
||||
extern Bool noFontCacheExtension;
|
||||
#endif
|
||||
|
||||
#ifdef GLXEXT
|
||||
extern Bool noGlxExtension;
|
||||
#endif
|
||||
|
@ -101,9 +101,6 @@ extern Bool noDbeExtension;
|
||||
#ifdef DPMSExtension
|
||||
extern Bool noDPMSExtension;
|
||||
#endif
|
||||
#ifdef FONTCACHE
|
||||
extern Bool noFontCacheExtension;
|
||||
#endif
|
||||
#ifdef GLXEXT
|
||||
extern Bool noGlxExtension;
|
||||
#endif
|
||||
@ -284,9 +281,6 @@ extern void XFree86DRIExtensionInit(INITARGS);
|
||||
#ifdef DPMSExtension
|
||||
extern void DPMSExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef FONTCACHE
|
||||
extern void FontCacheExtensionInit(INITARGS);
|
||||
#endif
|
||||
#ifdef RENDER
|
||||
extern void RenderExtensionInit(INITARGS);
|
||||
#endif
|
||||
@ -340,9 +334,6 @@ static ExtensionToggle ExtensionToggleList[] =
|
||||
#ifdef DPMSExtension
|
||||
{ "DPMS", &noDPMSExtension },
|
||||
#endif
|
||||
#ifdef FONTCACHE
|
||||
{ "FontCache", &noFontCacheExtension },
|
||||
#endif
|
||||
#ifdef GLXEXT
|
||||
{ "GLX", &noGlxExtension },
|
||||
#endif
|
||||
@ -504,9 +495,6 @@ InitExtensions(int argc, char *argv[])
|
||||
#if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
|
||||
if (!noDPMSExtension) DPMSExtensionInit();
|
||||
#endif
|
||||
#ifdef FONTCACHE
|
||||
if (!noFontCacheExtension) FontCacheExtensionInit();
|
||||
#endif
|
||||
#ifdef XF86BIGFONT
|
||||
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit();
|
||||
#endif
|
||||
|
@ -140,9 +140,6 @@ _X_EXPORT Bool noDbeExtension = FALSE;
|
||||
#ifdef DPMSExtension
|
||||
_X_EXPORT Bool noDPMSExtension = FALSE;
|
||||
#endif
|
||||
#ifdef FONTCACHE
|
||||
_X_EXPORT Bool noFontCacheExtension = FALSE;
|
||||
#endif
|
||||
#ifdef GLXEXT
|
||||
_X_EXPORT Bool noGlxExtension = FALSE;
|
||||
_X_EXPORT Bool noGlxVisualInit = FALSE;
|
||||
|
Loading…
Reference in New Issue
Block a user