From f4092abdf94af6a99aff944d6264bc1284e8bdd4 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Mon, 10 Oct 2011 17:43:39 +0200 Subject: Imported nx-X11-3.1.0-1.tar.gz Summary: Imported nx-X11-3.1.0-1.tar.gz Keywords: Imported nx-X11-3.1.0-1.tar.gz into Git repository --- nx-X11/lib/font/bitmap/module/Imakefile | 45 ++++++++++++++++++ nx-X11/lib/font/bitmap/module/bitmapmod.c | 76 +++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 nx-X11/lib/font/bitmap/module/Imakefile create mode 100644 nx-X11/lib/font/bitmap/module/bitmapmod.c (limited to 'nx-X11/lib/font/bitmap/module') diff --git a/nx-X11/lib/font/bitmap/module/Imakefile b/nx-X11/lib/font/bitmap/module/Imakefile new file mode 100644 index 000000000..29a49c644 --- /dev/null +++ b/nx-X11/lib/font/bitmap/module/Imakefile @@ -0,0 +1,45 @@ +XCOMM $XFree86: xc/lib/font/bitmap/module/Imakefile,v 1.5 1999/12/03 19:17:18 eich Exp $ + +#define IHaveModules +#include + + INCLUDES = -I$(FONTINCSRC) -I../../include -I$(SERVERSRC)/include \ + -I$(XINCLUDESRC) -I../ + HEADERS = + DEFINES = -DFONTMODULE -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT + +#ifdef FontFormatDefines + FORMAT_DEFS = FontFormatDefines +#endif +#if GzipFontCompression + GZIP_DEFS = -DX_GZIP_FONT_COMPRESSION +#endif + + SRCS = bdfread.c bdfutils.c bitmap.c bitmaputil.c bitscale.c \ + bitmapfunc.c pcfread.c pcfwrite.c snfread.c \ + fontink.c bitmapmod.c + + OBJS = bdfread.o bdfutils.o bitmap.o bitmaputil.o bitscale.o \ + bitmapfunc.o pcfread.o pcfwrite.o snfread.o \ + fontink.o bitmapmod.o + +SpecialCObjectRule(bitmapfunc,$(ICONFIGFILES),$(GZIP_DEFS)) + +LinkSourceFile(bdfread.c,..) +LinkSourceFile(bdfutils.c,..) +LinkSourceFile(bitmap.c,..) +LinkSourceFile(bitmaputil.c,..) +LinkSourceFile(bitscale.c,..) +LinkSourceFile(bitmapfunc.c,..) +LinkSourceFile(pcfread.c,..) +LinkSourceFile(pcfwrite.c,..) +LinkSourceFile(snfread.c,..) +LinkSourceFile(fontink.c,..) + +ModuleObjectRule() +LibraryModuleTarget(bitmap,$(OBJS)) +InstallLibraryModule(bitmap,$(MODULEDIR),fonts) + +DependTarget() + +InstallDriverSDKLibraryModule(bitmap,$(DRIVERSDKMODULEDIR),fonts) diff --git a/nx-X11/lib/font/bitmap/module/bitmapmod.c b/nx-X11/lib/font/bitmap/module/bitmapmod.c new file mode 100644 index 000000000..0ae9ff7ad --- /dev/null +++ b/nx-X11/lib/font/bitmap/module/bitmapmod.c @@ -0,0 +1,76 @@ +/* + * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * Except as contained in this notice, the name of the XFree86 Project shall + * not be used in advertising or otherwise to promote the sale, use or other + * dealings in this Software without prior written authorization from the + * XFree86 Project. + */ +/* $XFree86: xc/lib/font/bitmap/module/bitmapmod.c,v 1.7 1999/01/26 05:53:47 dawes Exp $ */ + +#ifdef HAVE_XORG_CONFIG_H +#include +#endif + +#include + +#include +#include "xf86Module.h" + +static MODULESETUPPROTO(bitmapSetup); + + /* + * This is the module data function that is accessed when loading + * libbitmap as a module. + */ + +static XF86ModuleVersionInfo VersRec = +{ + "bitmap", + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, + XORG_VERSION_CURRENT, + 1, 0, 0, + ABI_CLASS_FONT, /* Font module */ + ABI_FONT_VERSION, + MOD_CLASS_FONT, + {0,0,0,0} /* signature, to be patched into the file by a tool */ +}; + +XF86ModuleData bitmapModuleData = { &VersRec, bitmapSetup, NULL }; + +extern void BitmapRegisterFontFileFunctions(void); + +FontModule bitmapModule = { + BitmapRegisterFontFileFunctions, + "Bitmap", + NULL +}; + +static pointer +bitmapSetup(pointer mod, pointer opts, int *errmaj, int *errmin) +{ + bitmapModule.module = mod; + LoadFont(&bitmapModule); + + /* Need a non-NULL return */ + return (pointer)1; +} -- cgit v1.2.3