diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2022-11-06 17:49:18 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2022-11-06 17:49:18 +0000 |
| commit | 6f5e184f3688ee8f4e4723ae7679ae2a806fe0eb (patch) | |
| tree | 63e6b007e6d31cc6145b7d0459431d2ba181a288 | |
| parent | 1f579be38c14fa8e90c08b5f5460843172e888bd (diff) | |
Update libXrender to version 0.9.11
26 files changed, 4465 insertions, 958 deletions
diff --git a/lib/libXrender/ChangeLog b/lib/libXrender/ChangeLog index 79abcb8f1..6e239b1aa 100644 --- a/lib/libXrender/ChangeLog +++ b/lib/libXrender/ChangeLog @@ -1,3 +1,225 @@ +commit e5e23272394c90731debd7e18dd167e8c25b5c15 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Oct 21 18:12:50 2022 -0700 + + libXrender 0.9.11 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f6504f02ade1d27950ad0486a2032e1d665d72b8 +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Sun Sep 11 13:24:22 2022 -0400 + + fix regression + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit a7d99992bff95237a1e51ce5c6cbf9429516b9eb +Author: Oliver Hattshire <hattshire@gmail.com> +Date: Sun Sep 11 16:41:36 2022 +0000 + + WIP: Documentation + +commit 869d2b7ae8deda46f8ea6fba226455533683b0e4 +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Sun Sep 11 10:52:25 2022 -0400 + + whitespace fix + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit df5f1f04a7d123a521f0d4bfc88c3b65253491bc +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Sat Sep 10 06:17:40 2022 -0400 + + use _X_UNUSED for compiler-warnings + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit f43df87188375440dbad33d7c0beed2a607b8d1d +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Sat Sep 10 05:48:07 2022 -0400 + + use _Xconst with DataInt32/DataInt16/memcpy to reduce strict compiler warnings + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit ea28ca1a2cce8e0d8e5a1f620a809384ed276c37 +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Fri Sep 9 16:51:01 2022 -0400 + + use casts to reduce compiler warnings (no object change) + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit afc7f259668bbb25d5b06929d529add93fb39ebf +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Thu Sep 8 19:20:53 2022 -0400 + + cppcheck (removing unused assignment lets variable scope reduction) + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit b62e3f39768cd6fc5db9e4be65b47c53719598c9 +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Thu Sep 8 19:06:29 2022 -0400 + + additional cppcheck-scope warning + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit ded8aa8c97fc90f0c02f26084d118e683163e4ca +Author: Thomas E. Dickey <dickey@invisible-island.net> +Date: Thu Sep 8 19:05:07 2022 -0400 + + amend cppcheck-scope change, fixing c89 build + + Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net> + +commit 5a69e234cd4e02186b5b2627360f91cb1fa58edf +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Aug 28 12:01:13 2022 -0700 + + Rename xDepth to xPDepth to quiet -Wshadow warnings + + Xrender.c: In function ‘XRenderQueryFormats’: + Xrender.c:406:19: warning: declaration of ‘xDepth’ shadows a global declaration [-Wshadow] + xPictDepth *xDepth; + ^~~~~~ + In file included from /net/also.us.oracle.com/export/alanc/X.Org/amd64-gcc/install/usr/X11R7/include/X11/Xlibint.h:43:0, + from Xrenderint.h:31, + from Xrender.c:28: + /net/also.us.oracle.com/export/alanc/X.Org/amd64-gcc/install/usr/X11R7/include/X11/Xproto.h:329:7: note: shadowed declaration is here + } xDepth; + ^~~~~~ + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 2b927f88ad3d97e5fd1abd13b67724a86dd10404 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Aug 28 11:52:49 2022 -0700 + + Resolve -Wsign-compare warnings + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 229c65d2dd6de511a005127245dc28d426ad6860 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Aug 28 11:41:27 2022 -0700 + + Reduce variable scopes as recommended by cppcheck + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit cc4ad7a3990826ca44470dbca3a5b03c35548cab +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Aug 28 10:26:00 2022 -0700 + + Remove unnecessary casts from malloc & free calls + + These are not needed in C89 and later + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 3b888fdf89b4d8f4712c28b340c28604c8ff0b7e +Author: Dmitry Karasik <dmitry.karasik@teliacompany.com> +Date: Sat Aug 7 09:36:03 2021 +0200 + + fix coredumps in XRenderComputeTrapezoids (issue #1) + + Rationale: I don't have enough expertise to judge on how the tessellation + algorithm is broken in XRenderComputeTrapezoids but I do trust Keith Packard + that it is. However using cairo for proper tessellation, as he suggests, is + too heavyweight, and here I propose to alter the code to at least do not cause + coredumps. + + Even if/when the function will be marked as obsolete, I believe it is pretty + much capable of rendering relatively simple shapes, and still retains some + value. + +commit e314946813bcb96e8baedc1a290c48a2aa6ef162 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 17:38:47 2022 -0700 + + gitlab CI: add a basic build test + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit a5e4c91b04f542b27b811b78aa32b88ec6111c91 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 17:38:01 2022 -0700 + + Fix spelling/wording issues + + Found by using: + codespell --builtin clear,rare,usage,informal,code,names + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit b96298906cf99c3b32ad10bc27a85344d2f0e126 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jul 17 17:37:15 2022 -0700 + + Build xz tarballs instead of bzip2 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit bd87a8863c7647790de577296a77953bda6877e3 +Author: Robin Linden <dev@robinlinden.eu> +Date: Fri Jan 7 03:53:35 2022 +0100 + + Add missing HAVE_CONFIG_H guard to Xrenderint.h + + Signed-off-by: Robin Linden <dev@robinlinden.eu> + +commit bce0618839fc33f44edd8b5498b8e33d167806ff +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Dec 7 19:49:06 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit e731a0e04c31bdb6b6b513bfd884e91ad907e05f +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Mon Nov 19 22:37:07 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit f4f32f13635907940a0bffcfd1748be392db4b98 +Author: Mihail Konev <k.mvc@ya.ru> +Date: Thu Jan 26 13:52:49 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <k.mvc@ya.ru> + +commit a89bc0e850cd2b081ad3a823c40677eb87522d1b +Author: Emil Velikov <emil.l.velikov@gmail.com> +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit a20d2f9f5d6320b3dc20958228111964e36e696a +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Emil Velikov <emil.velikov@collabora.com> + commit 845716f8f14963d338e5a8d5d2424baafc90fb30 Author: Matthieu Herrb <matthieu.herrb@laas.fr> Date: Tue Oct 4 21:24:55 2016 +0200 @@ -310,7 +532,7 @@ Date: Thu Jan 14 09:43:56 2010 -0500 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> commit fc8b02894452ad93101b35fec41cb1baf72e746a -Author: Rémi Cardona <remi@gentoo.org> +Author: Rémi Cardona <remi@gentoo.org> Date: Thu Dec 17 08:30:04 2009 +0100 require autoconf 2.60 because of $(docdir) use @@ -370,7 +592,7 @@ Date: Thu Oct 22 12:34:19 2009 -0400 when the structure of the component changes. Do not edit defaults. commit 1da8c1bfbb17750e5ba51321961aaf39b8cf98f7 -Author: Tomáš Chvátal <scarabeus@gentoo.org> +Author: Tomáš Chvátal <s <scarabeus@gentoo.org> Date: Sun Nov 29 13:38:42 2009 +0100 Make libXrender use docdir for documentation placement. @@ -619,19 +841,19 @@ Date: Thu Jun 9 13:49:06 2005 +0000 $(top_srcdir) to INCLUDES commit 8f765c413911d355dd95a312e31deaf1166206f9 -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Thu May 19 20:33:55 2005 +0000 Add forgotten region.h commit 65cb00ad3da0cdaad1429ac5cb01e12d7f4a6d0d -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Thu May 19 19:58:24 2005 +0000 - Add Xrender build system commit 99a8286d49152c45ebead33df9f32bf6b7799bee -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> +Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> Date: Thu May 19 19:26:35 2005 +0000 - Conditionally include config.h in xc/lib/Xrender/*.c diff --git a/lib/libXrender/Doxyfile.in b/lib/libXrender/Doxyfile.in new file mode 100644 index 000000000..407192cf2 --- /dev/null +++ b/lib/libXrender/Doxyfile.in @@ -0,0 +1,2553 @@ +# Doxyfile 1.8.18 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the configuration +# file that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# https://www.gnu.org/software/libiconv/ for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = @PACKAGE_NAME@ + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = @PACKAGE_VERSION@ + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "@PACKAGE_BRIEF@" + +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = ./doc + +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all generated output in the proper direction. +# Possible values are: None, LTR, RTL and Context. +# The default value is: None. + +OUTPUT_TEXT_DIRECTION = None + +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = YES + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = YES + +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = NO + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = yes + +# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line +# such as +# /*************** +# as being the beginning of a Javadoc-style comment "banner". If set to NO, the +# Javadoc-style will behave just like regular comments and it will not be +# interpreted by doxygen. +# The default value is: NO. + +JAVADOC_BANNER = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines (in the resulting output). You can put ^^ in the value part of an +# alias to insert a newline as if a physical newline was in the original file. +# When you need a literal { or } or , in the value part of an alias you have to +# escape them by means of a backslash (\), this can lead to conflicts with the +# commands \{ and \} for these it is advised to use the version @{ and @} or use +# a double escape (\\{ and \\}) + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice +# sources only. Doxygen will then generate output that is more tailored for that +# language. For instance, namespaces will be presented as modules, types will be +# separated into more groups, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_SLICE = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, +# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL, +# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran: +# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser +# tries to guess whether the code is fixed or free formatted code, this is the +# default for Fortran type files). For instance to make doxygen treat .inc files +# as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See https://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 5. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 5 + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = YES + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = YES + +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = YES + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual +# methods of a class will be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIV_VIRTUAL = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# declarations. If set to NO, these declarations will be included in the +# documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES, upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# (including Cygwin) ands Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if <section_label> ... \endif and \cond <section_label> +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. If +# EXTRACT_ALL is set to YES then this flag will automatically be disabled. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. +# The default value is: NO. + +WARN_AS_ERROR = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING +# Note: If this tag is empty the current directory is searched. + +INPUT = ./include/X11/extensions + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: https://www.gnu.org/software/libiconv/) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment), +# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen +# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd, +# *.vhdl, *.ucf, *.qsf and *.ice. + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.idl \ + *.ddl \ + *.odl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.cs \ + *.d \ + *.php \ + *.php4 \ + *.php5 \ + *.phtml \ + *.inc \ + *.m \ + *.markdown \ + *.md \ + *.mm \ + *.dox \ + *.doc \ + *.txt \ + *.py \ + *.pyw \ + *.f90 \ + *.f95 \ + *.f03 \ + *.f08 \ + *.f18 \ + *.f \ + *.for \ + *.vhd \ + *.vhdl \ + *.ucf \ + *.qsf \ + *.ice + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# <filter> <input-file> +# +# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# entity all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see https://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# https://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = NO + +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via JavaScript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have JavaScript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: https://developer.apple.com/xcode/), introduced with OSX +# 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy +# genXcode/_index.html for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg +# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see +# https://inkscape.org) to generate formulas as SVG images instead of PNGs for +# the HTML output. These images will generally look nicer at scaled resolutions. +# Possible values are: png The default and svg Looks nicer but requires the +# pdf2svg tool. +# The default value is: png. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FORMULA_FORMAT = png + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands +# to create new LaTeX commands to be used in formulas as building blocks. See +# the section "Including formulas" for details. + +FORMULA_MACROFILE = + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# https://www.mathjax.org) which uses client side JavaScript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from https://www.mathjax.org before deployment. +# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = https://cdn.jsdelivr.net/npm/mathjax@2 + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use <access key> + S +# (what the <access key> is depends on the OS and browser, but it is typically +# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down +# key> to jump into the search results window, the results can be navigated +# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel +# the search. The filter options can be selected when the cursor is inside the +# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys> +# to select a filter and <Enter> or <escape> to activate or cancel the filter +# option. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a web server instead of a web client using JavaScript. There +# are two flavors of web server based searching depending on the EXTERNAL_SEARCH +# setting. When disabled, doxygen will generate a PHP script for searching and +# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing +# and searching needs to be provided by external tools. See the section +# "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SERVER_BASED_SEARCH = NO + +# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP +# script for searching. Instead the search results are written to an XML file +# which needs to be processed by an external indexer. Doxygen will invoke an +# external search engine pointed to by the SEARCHENGINE_URL option to obtain the +# search results. +# +# Doxygen ships with an example indexer (doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: https://xapian.org/). +# +# See the section "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTERNAL_SEARCH = NO + +# The SEARCHENGINE_URL should point to a search engine hosted by a web server +# which will return the search results when EXTERNAL_SEARCH is enabled. +# +# Doxygen ships with an example indexer (doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: https://xapian.org/). See the section "External Indexing and +# Searching" for details. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SEARCHENGINE_URL = + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed +# search data is written to a file for indexing by an external tool. With the +# SEARCHDATA_FILE tag the name of this file can be specified. +# The default file is: searchdata.xml. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SEARCHDATA_FILE = searchdata.xml + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the +# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is +# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple +# projects and redirect the results back to the right project. +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTERNAL_SEARCH_ID = + +# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen +# projects other than the one defined by this configuration file, but that are +# all added to the same external search index. Each project needs to have a +# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of +# to a relative location where the documentation can be found. The format is: +# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ... +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTRA_SEARCH_MAPPINGS = + +#--------------------------------------------------------------------------- +# Configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output. +# The default value is: YES. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: latex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. +# +# Note that when not enabling USE_PDFLATEX the default is latex when enabling +# USE_PDFLATEX the default is pdflatex and when in the later case latex is +# chosen this is overwritten by pdflatex. For specific output languages the +# default can have been set differently, this depends on the implementation of +# the output language. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_CMD_NAME = + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate +# index for LaTeX. +# Note: This tag is used in the Makefile / make.bat. +# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file +# (.tex). +# The default file is: makeindex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +MAKEINDEX_CMD_NAME = makeindex + +# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to +# generate index for LaTeX. In case there is no backslash (\) as first character +# it will be automatically added in the LaTeX code. +# Note: This tag is used in the generated output file (.tex). +# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat. +# The default value is: makeindex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_MAKEINDEX_CMD = makeindex + +# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used by the +# printer. +# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x +# 14 inches) and executive (7.25 x 10.5 inches). +# The default value is: a4. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +PAPER_TYPE = a4 + +# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names +# that should be included in the LaTeX output. The package can be specified just +# by its name or with the correct syntax as to be used with the LaTeX +# \usepackage command. To get the times font for instance you can specify : +# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times} +# To use the option intlimits with the amsmath package you can specify: +# EXTRA_PACKAGES=[intlimits]{amsmath} +# If left blank no extra packages will be included. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the +# generated LaTeX document. The header should contain everything until the first +# chapter. If it is left blank doxygen will generate a standard header. See +# section "Doxygen usage" for information on how to let doxygen write the +# default header to a separate file. +# +# Note: Only use a user-defined header if you know what you are doing! The +# following commands have a special meaning inside the header: $title, +# $datetime, $date, $doxygenversion, $projectname, $projectnumber, +# $projectbrief, $projectlogo. Doxygen will replace $title with the empty +# string, for the replacement values of the other commands the user is referred +# to HTML_HEADER. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_HEADER = + +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the +# generated LaTeX document. The footer should contain everything after the last +# chapter. If it is left blank doxygen will generate a standard footer. See +# LATEX_HEADER for more information on how to generate a default footer and what +# special commands can be used inside the footer. +# +# Note: Only use a user-defined footer if you know what you are doing! +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_FOOTER = + +# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# LaTeX style sheets that are included after the standard style sheets created +# by doxygen. Using this option one can overrule certain style aspects. Doxygen +# will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_STYLESHEET = + +# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the LATEX_OUTPUT output +# directory. Note that the files will be copied as-is; there are no commands or +# markers available. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_FILES = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is +# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will +# contain links (just like the HTML output) instead of page references. This +# makes the output suitable for online browsing using a PDF viewer. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate +# the PDF file directly from the LaTeX files. Set this option to YES, to get a +# higher quality PDF documentation. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode +# command to the generated LaTeX files. This will instruct LaTeX to keep running +# if errors occur, instead of asking the user for help. This option is also used +# when generating formulas in HTML. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_BATCHMODE = NO + +# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the +# index chapters (such as File Index, Compound Index, etc.) in the output. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_HIDE_INDICES = NO + +# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source +# code with syntax highlighting in the LaTeX output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_SOURCE_CODE = NO + +# The LATEX_BIB_STYLE tag can be used to specify the style to use for the +# bibliography, e.g. plainnat, or ieeetr. See +# https://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# The default value is: plain. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_BIB_STYLE = plain + +# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated +# page will contain the date and time when the page was generated. Setting this +# to NO can help when comparing the output of multiple runs. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_TIMESTAMP = NO + +# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute) +# path from which the emoji images will be read. If a relative path is entered, +# it will be relative to the LATEX_OUTPUT directory. If left blank the +# LATEX_OUTPUT directory will be used. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EMOJI_DIRECTORY = + +#--------------------------------------------------------------------------- +# Configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The +# RTF output is optimized for Word 97 and may not look too pretty with other RTF +# readers/editors. +# The default value is: NO. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: rtf. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will +# contain hyperlink fields. The RTF file will contain links (just like the HTML +# output) instead of page references. This makes the output suitable for online +# browsing using Word or some other Word compatible readers that support those +# fields. +# +# Note: WordPad (write) and others do not support links. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# configuration file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. +# +# See also section "Doxygen usage" for information on how to generate the +# default style sheet that doxygen normally uses. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an RTF document. Syntax is +# similar to doxygen's configuration file. A template extensions file can be +# generated using doxygen -e rtf extensionFile. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_EXTENSIONS_FILE = + +# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code +# with syntax highlighting in the RTF output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for +# classes and files. +# The default value is: NO. + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. A directory man3 will be created inside the directory specified by +# MAN_OUTPUT. +# The default directory is: man. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to the generated +# man pages. In case the manual section does not start with a number, the number +# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is +# optional. +# The default value is: .3. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_EXTENSION = .3 + +# The MAN_SUBDIR tag determines the name of the directory created within +# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by +# MAN_EXTENSION with the initial . removed. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_SUBDIR = + +# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it +# will generate one additional man file for each entity documented in the real +# man page(s). These additional files only source the real man page, but without +# them the man command would be unable to find the correct page. +# The default value is: NO. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that +# captures the structure of the code including all documentation. +# The default value is: NO. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: xml. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_OUTPUT = xml + +# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program +# listings (including syntax highlighting and cross-referencing information) to +# the XML output. Note that enabling this will significantly increase the size +# of the XML output. +# The default value is: YES. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_PROGRAMLISTING = YES + +# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include +# namespace members in file scope as well, matching the HTML output. +# The default value is: NO. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_NS_MEMB_FILE_SCOPE = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- + +# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files +# that can be used to generate PDF. +# The default value is: NO. + +GENERATE_DOCBOOK = NO + +# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in +# front of it. +# The default directory is: docbook. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. + +DOCBOOK_OUTPUT = docbook + +# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the +# program listings (including syntax highlighting and cross-referencing +# information) to the DOCBOOK output. Note that enabling this will significantly +# increase the size of the DOCBOOK output. +# The default value is: NO. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. + +DOCBOOK_PROGRAMLISTING = NO + +#--------------------------------------------------------------------------- +# Configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an +# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures +# the structure of the code including all documentation. Note that this feature +# is still experimental and incomplete at the moment. +# The default value is: NO. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module +# file that captures the structure of the code including all documentation. +# +# Note that this feature is still experimental and incomplete at the moment. +# The default value is: NO. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary +# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI +# output from the Perl module output. +# The default value is: NO. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely +# formatted so it can be parsed by a human reader. This is useful if you want to +# understand what is going on. On the other hand, if this tag is set to NO, the +# size of the Perl module output will be much smaller and Perl will parse it +# just the same. +# The default value is: YES. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file are +# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful +# so different doxyrules.make files included by the same Makefile don't +# overwrite each other's variables. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all +# C-preprocessor directives found in the sources and include files. +# The default value is: YES. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names +# in the source code. If set to NO, only conditional compilation will be +# performed. Macro expansion can be done in a controlled way by setting +# EXPAND_ONLY_PREDEF to YES. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then +# the macro expansion is limited to the macros specified with the PREDEFINED and +# EXPAND_AS_DEFINED tags. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES, the include files in the +# INCLUDE_PATH will be searched if a #include is found. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by the +# preprocessor. +# This tag requires that the tag SEARCH_INCLUDES is set to YES. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will be +# used. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that are +# defined before the preprocessor is started (similar to the -D option of e.g. +# gcc). The argument of the tag is a list of macros of the form: name or +# name=definition (no spaces). If the definition and the "=" are omitted, "=1" +# is assumed. To prevent a macro definition from being undefined via #undef or +# recursively expanded use the := operator instead of the = operator. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this +# tag can be used to specify a list of macro names that should be expanded. The +# macro definition that is found in the sources will be used. Use the PREDEFINED +# tag if you want to use a different macro definition that overrules the +# definition found in the source code. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will +# remove all references to function-like macros that are alone on a line, have +# an all uppercase name, and do not end with a semicolon. Such function macros +# are typically used for boiler-plate code, and will confuse the parser if not +# removed. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES tag can be used to specify one or more tag files. For each tag +# file the location of the external documentation should be added. The format of +# a tag file without this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where loc1 and loc2 can be relative or absolute paths or URLs. See the +# section "Linking to external documentation" for more information about the use +# of tag files. +# Note: Each tag file must have a unique name (where the name does NOT include +# the path). If a tag file is not located in the directory in which doxygen is +# run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create a +# tag file that is based on the input files it reads. See section "Linking to +# external documentation" for more information about the usage of tag files. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES, all external class will be listed in +# the class index. If set to NO, only the inherited external classes will be +# listed. +# The default value is: NO. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will be +# listed. +# The default value is: YES. + +EXTERNAL_GROUPS = YES + +# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in +# the related pages index. If set to NO, only the current project's pages will +# be listed. +# The default value is: YES. + +EXTERNAL_PAGES = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram +# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to +# NO turns the diagrams off. Note that this option also works with HAVE_DOT +# disabled, but it is recommended to install and use dot, since it yields more +# powerful graphs. +# The default value is: YES. + +CLASS_DIAGRAMS = YES + +# You can include diagrams made with dia in doxygen documentation. Doxygen will +# then run dia to produce the diagram and insert it in the documentation. The +# DIA_PATH tag allows you to specify the directory where the dia binary resides. +# If left empty dia is assumed to be found in the default search path. + +DIA_PATH = + +# If set to YES the inheritance and collaboration graphs will hide inheritance +# and usage relations if the target is undocumented or is not a class. +# The default value is: YES. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz (see: +# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent +# Bell Labs. The other options in this section have no effect if this option is +# set to NO +# The default value is: NO. + +HAVE_DOT = NO + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed +# to run in parallel. When set to 0 doxygen will base this on the number of +# processors available in the system. You can set it explicitly to a value +# larger than 0 to get control over the balance between CPU load and processing +# speed. +# Minimum value: 0, maximum value: 32, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_NUM_THREADS = 0 + +# When you want a differently looking font in the dot files that doxygen +# generates you can specify the font name using DOT_FONTNAME. You need to make +# sure dot is able to find the font, which can be done by putting it in a +# standard location or by setting the DOTFONTPATH environment variable or by +# setting DOT_FONTPATH to the directory containing the font. +# The default value is: Helvetica. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTNAME = Helvetica + +# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of +# dot graphs. +# Minimum value: 4, maximum value: 24, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the default font as specified with +# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set +# the path where dot can find it using this tag. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTPATH = + +# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for +# each documented class showing the direct and indirect inheritance relations. +# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a +# graph for each documented class showing the direct and indirect implementation +# dependencies (inheritance, containment, and class references variables) of the +# class with other documented classes. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for +# groups, showing the direct groups dependencies. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +UML_LOOK = NO + +# If the UML_LOOK tag is enabled, the fields and methods are shown inside the +# class node. If there are many fields or methods and many nodes the graph may +# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the +# number of items for each type to make the size more manageable. Set this to 0 +# for no limit. Note that the threshold may be exceeded by 50% before the limit +# is enforced. So when you set the threshold to 10, up to 15 fields may appear, +# but if the number exceeds 15, the total amount of fields shown is limited to +# 10. +# Minimum value: 0, maximum value: 100, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. + +UML_LIMIT_NUM_FIELDS = 10 + +# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and +# collaboration graphs will show the relations between templates and their +# instances. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +TEMPLATE_RELATIONS = NO + +# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to +# YES then doxygen will generate a graph for each documented file showing the +# direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +INCLUDE_GRAPH = YES + +# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are +# set to YES then doxygen will generate a graph for each documented file showing +# the direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH tag is set to YES then doxygen will generate a call +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. Disabling a call graph can be +# accomplished by means of the command \hidecallgraph. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. Disabling a caller graph can be +# accomplished by means of the command \hidecallergraph. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical +# hierarchy of all classes instead of a textual one. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the +# dependencies a directory has on other directories in a graphical way. The +# dependency relations are determined by the #include relations between the +# files in the directories. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. For an explanation of the image formats see the section +# output formats in the documentation of the dot tool (Graphviz (see: +# http://www.graphviz.org/)). +# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order +# to make the SVG files visible in IE 9+ (other browsers do not have this +# requirement). +# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo, +# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and +# png:gdiplus:gdiplus. +# The default value is: png. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_IMAGE_FORMAT = png + +# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to +# enable generation of interactive SVG images that allow zooming and panning. +# +# Note that this requires a modern browser other than Internet Explorer. Tested +# and working are Firefox, Chrome, Safari, and Opera. +# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make +# the SVG files visible. Older versions of IE do not have SVG support. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +INTERACTIVE_SVG = NO + +# The DOT_PATH tag can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the \dotfile +# command). +# This tag requires that the tag HAVE_DOT is set to YES. + +DOTFILE_DIRS = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the \mscfile +# command). + +MSCFILE_DIRS = + +# The DIAFILE_DIRS tag can be used to specify one or more directories that +# contain dia files that are included in the documentation (see the \diafile +# command). + +DIAFILE_DIRS = + +# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the +# path where java can find the plantuml.jar file. If left blank, it is assumed +# PlantUML is not used or called during a preprocessing step. Doxygen will +# generate a warning when it encounters a \startuml command in this case and +# will not generate output for the diagram. + +PLANTUML_JAR_PATH = + +# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a +# configuration file for plantuml. + +PLANTUML_CFG_FILE = + +# When using plantuml, the specified paths are searched for files specified by +# the !include statement in a plantuml block. + +PLANTUML_INCLUDE_PATH = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes +# that will be shown in the graph. If the number of nodes in a graph becomes +# larger than this value, doxygen will truncate the graph, which is visualized +# by representing a node as a red box. Note that doxygen if the number of direct +# children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that +# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. +# Minimum value: 0, maximum value: 10000, default value: 50. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs +# generated by dot. A depth value of 3 means that only nodes reachable from the +# root by following a path via at most 3 edges will be shown. Nodes that lay +# further from the root node will be omitted. Note that setting this option to 1 +# or 2 may greatly reduce the computation time needed for large code bases. Also +# note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. +# Minimum value: 0, maximum value: 1000, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not seem +# to support this out of the box. +# +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) support +# this, this feature is disabled by default. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page +# explaining the meaning of the various boxes and arrows in the dot generated +# graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot +# files that are used to generate the various graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_CLEANUP = YES diff --git a/lib/libXrender/Makefile.am b/lib/libXrender/Makefile.am index 1c902dce2..2939a2e71 100644 --- a/lib/libXrender/Makefile.am +++ b/lib/libXrender/Makefile.am @@ -37,3 +37,5 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL + +EXTRA_DIST = README.md diff --git a/lib/libXrender/Makefile.in b/lib/libXrender/Makefile.in index edaf729c7..90c14f73b 100644 --- a/lib/libXrender/Makefile.in +++ b/lib/libXrender/Makefile.in @@ -72,12 +72,12 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(srcdir)/xrender.pc.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \ - compile config.guess config.sub depcomp install-sh ltmain.sh \ - missing +DIST_COMMON = $(am__configure_deps) $(dist_doc_DATA) \ + $(srcdir)/Doxyfile.in $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/xrender.pc.in $(top_srcdir)/configure AUTHORS \ + COPYING ChangeLog INSTALL compile config.guess config.sub \ + depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -86,7 +86,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = xrender.pc +CONFIG_CLEAN_FILES = Doxyfile xrender.pc CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -187,9 +187,9 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best -DIST_TARGETS = dist-bzip2 dist-gzip +DIST_TARGETS = dist-xz dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -262,6 +262,7 @@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ +PACKAGE_BRIEF = @PACKAGE_BRIEF@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ @@ -329,6 +330,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -342,6 +344,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xrender.pc dist_doc_DATA = doc/libXrender.txt MAINTAINERCLEANFILES = ChangeLog INSTALL +EXTRA_DIST = README.md all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -395,6 +398,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 +Doxyfile: $(top_builddir)/config.status $(srcdir)/Doxyfile.in + cd $(top_builddir) && $(SHELL) ./config.status $@ xrender.pc: $(top_builddir)/config.status $(srcdir)/xrender.pc.in cd $(top_builddir) && $(SHELL) ./config.status $@ @@ -655,6 +660,7 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__post_remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__post_remove_distdir) @@ -662,7 +668,6 @@ dist-bzip2: distdir dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz $(am__post_remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) diff --git a/lib/libXrender/README b/lib/libXrender/README deleted file mode 100644 index c9d964a0f..000000000 --- a/lib/libXrender/README +++ /dev/null @@ -1,25 +0,0 @@ -libXrender - library for the Render Extension to the X11 protocol - -All questions regarding this software should be directed at the -Xorg mailing list: - - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - -The master development code repository can be found at: - - git://anongit.freedesktop.org/git/xorg/lib/libXrender - - http://cgit.freedesktop.org/xorg/lib/libXrender - -For patch submission instructions, see: - - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: - - http://wiki.x.org/wiki/GitPage - diff --git a/lib/libXrender/README.md b/lib/libXrender/README.md new file mode 100644 index 000000000..b777d688b --- /dev/null +++ b/lib/libXrender/README.md @@ -0,0 +1,18 @@ +libXrender - library for the Render Extension to the X11 protocol +----------------------------------------------------------------- + +All questions regarding this software should be directed at the +Xorg mailing list: + + https://lists.x.org/mailman/listinfo/xorg + +The primary development code repository can be found at: + + https://gitlab.freedesktop.org/xorg/lib/libXrender + +Please submit bug reports and requests to merge patches there. + +For patch submission instructions, see: + + https://www.x.org/wiki/Development/Documentation/SubmittingPatches + diff --git a/lib/libXrender/aclocal.m4 b/lib/libXrender/aclocal.m4 index 275eb20ba..ff9ff5994 100644 --- a/lib/libXrender/aclocal.m4 +++ b/lib/libXrender/aclocal.m4 @@ -8606,32 +8606,63 @@ m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. +dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -8653,18 +8684,19 @@ if test -n "$PKG_CONFIG"; then PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -8674,8 +8706,10 @@ m4_ifvaln([$3], [else $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -8687,10 +8721,11 @@ m4_define([_PKG_CONFIG], else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -8698,26 +8733,24 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -8727,11 +8760,11 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -8748,7 +8781,7 @@ installed software in a non-standard prefix. _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full @@ -8764,16 +8797,40 @@ else AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -8784,16 +8841,18 @@ AC_ARG_WITH([pkgconfigdir], AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -8804,7 +8863,24 @@ AC_ARG_WITH([noarch-pkgconfigdir], AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR # Copyright (C) 2002-2012 Free Software Foundation, Inc. # @@ -9829,7 +9905,7 @@ AC_SUBST([am__untar]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -9866,7 +9942,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.19.0]) +m4_define([vers_have], [1.19.2]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -9944,6 +10020,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_PROG_SED]) +case $host_os in + solaris*) + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we + # check for a man page file found in later versions that use + # traditional section numbers instead + AC_CHECK_FILE([/usr/share/man/man7/attributes.7], + [SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true]) + ;; + *) SYSV_MAN_SECTIONS=false ;; +esac + if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 fi @@ -9959,9 +10046,9 @@ if test x$LIB_MAN_DIR = x ; then fi if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; + case $SYSV_MAN_SECTIONS in + true) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then @@ -9969,9 +10056,9 @@ if test x$FILE_MAN_DIR = x ; then fi if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; + case $SYSV_MAN_SECTIONS in + true) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then @@ -9979,9 +10066,9 @@ if test x$MISC_MAN_DIR = x ; then fi if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; + case $SYSV_MAN_SECTIONS in + true) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then @@ -9989,9 +10076,9 @@ if test x$DRIVER_MAN_DIR = x ; then fi if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; + case $SYSV_MAN_SECTIONS in + true) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; esac fi if test x$ADMIN_MAN_DIR = x ; then @@ -10252,13 +10339,24 @@ m4_ifval([$1], fi]) # Test for the ability of xmlto to generate a text target +# +# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the +# following test for empty XML docbook files. +# For compatibility reasons use the following empty XML docbook file and if +# it fails try it again with a non-empty XML file. have_xmlto_text=no cat > conftest.xml << "EOF" EOF AS_IF([test "$have_xmlto" = yes], [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], [have_xmlto_text=yes], - [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])]) + [# Try it again with a non-empty XML file. + cat > conftest.xml << "EOF" +<x></x> +EOF + AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1], + [have_xmlto_text=yes], + [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])]) rm -f conftest.xml AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes]) AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) @@ -11654,8 +11752,9 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ -echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ +touch \$(top_srcdir)/INSTALL; \ +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" AC_SUBST([INSTALL_CMD]) ]) # XORG_INSTALL dnl Copyright 2005 Red Hat, Inc @@ -11716,10 +11815,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[ # # AC_DEFUN([XORG_CHANGELOG], [ -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ -echo 'git directory not found: installing possibly empty changelog.' >&2)" +|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ +touch \$(top_srcdir)/ChangeLog; \ +echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" AC_SUBST([CHANGELOG_CMD]) ]) # XORG_CHANGELOG diff --git a/lib/libXrender/compile b/lib/libXrender/compile index 531136b06..df363c8fb 100644 --- a/lib/libXrender/compile +++ b/lib/libXrender/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/lib/libXrender/configure b/lib/libXrender/configure index 791aac495..1f1e6a304 100644 --- a/lib/libXrender/configure +++ b/lib/libXrender/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libXrender 0.9.10. +# Generated by GNU Autoconf 2.69 for libXrender 0.9.11. # -# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +# Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxrender/-/issues>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +$0: https://gitlab.freedesktop.org/xorg/lib/libxrender/-/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -591,9 +591,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libXrender' PACKAGE_TARNAME='libXrender' -PACKAGE_VERSION='0.9.10' -PACKAGE_STRING='libXrender 0.9.10' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_VERSION='0.9.11' +PACKAGE_STRING='libXrender 0.9.11' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libxrender/-/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -742,6 +742,7 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +PACKAGE_BRIEF target_alias host_alias build_alias @@ -761,6 +762,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -849,6 +851,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1101,6 +1104,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1238,7 +1250,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1351,7 +1363,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libXrender 0.9.10 to adapt to many kinds of systems. +\`configure' configures libXrender 0.9.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1391,6 +1403,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1421,7 +1434,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libXrender 0.9.10:";; + short | recursive ) echo "Configuration of libXrender 0.9.11:";; esac cat <<\_ACEOF @@ -1482,7 +1495,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. +Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxrender/-/issues>. _ACEOF ac_status=$? fi @@ -1545,7 +1558,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libXrender configure 0.9.10 +libXrender configure 0.9.11 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1869,7 +1882,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libXrender $as_me 0.9.10, which was +It was created by libXrender $as_me 0.9.11, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2221,6 +2234,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h" +PACKAGE_BRIEF="Library for the Render Extension to the X11 protocol" + + # Initialize Automake am__api_version='1.12' @@ -2698,7 +2714,7 @@ fi # Define the identity of the package. PACKAGE='libXrender' - VERSION='0.9.10' + VERSION='0.9.11' cat >>confdefs.h <<_ACEOF @@ -17384,10 +17400,11 @@ _ACEOF -CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \ +CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \ mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \ -|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \ -echo 'git directory not found: installing possibly empty changelog.' >&2)" +|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \ +touch \$(top_srcdir)/ChangeLog; \ +echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))" @@ -17395,13 +17412,44 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)" macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros` INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \ mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \ -|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \ -echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)" +|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \ +touch \$(top_srcdir)/INSTALL; \ +echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))" + + +case $host_os in + solaris*) + # Solaris 2.0 - 11.3 use SysV man page section numbers, so we + # check for a man page file found in later versions that use + # traditional section numbers instead + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 +$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } +if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : + $as_echo_n "(cached) " >&6 +else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "/usr/share/man/man7/attributes.7"; then + ac_cv_file__usr_share_man_man7_attributes_7=yes +else + ac_cv_file__usr_share_man_man7_attributes_7=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 +$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } +if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : + SYSV_MAN_SECTIONS=false +else + SYSV_MAN_SECTIONS=true +fi + ;; + *) SYSV_MAN_SECTIONS=false ;; +esac if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 @@ -17418,9 +17466,9 @@ if test x$LIB_MAN_DIR = x ; then fi if test x$FILE_MAN_SUFFIX = x ; then - case $host_os in - solaris*) FILE_MAN_SUFFIX=4 ;; - *) FILE_MAN_SUFFIX=5 ;; + case $SYSV_MAN_SECTIONS in + true) FILE_MAN_SUFFIX=4 ;; + *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then @@ -17428,9 +17476,9 @@ if test x$FILE_MAN_DIR = x ; then fi if test x$MISC_MAN_SUFFIX = x ; then - case $host_os in - solaris*) MISC_MAN_SUFFIX=5 ;; - *) MISC_MAN_SUFFIX=7 ;; + case $SYSV_MAN_SECTIONS in + true) MISC_MAN_SUFFIX=5 ;; + *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then @@ -17438,9 +17486,9 @@ if test x$MISC_MAN_DIR = x ; then fi if test x$DRIVER_MAN_SUFFIX = x ; then - case $host_os in - solaris*) DRIVER_MAN_SUFFIX=7 ;; - *) DRIVER_MAN_SUFFIX=4 ;; + case $SYSV_MAN_SECTIONS in + true) DRIVER_MAN_SUFFIX=7 ;; + *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then @@ -17448,9 +17496,9 @@ if test x$DRIVER_MAN_DIR = x ; then fi if test x$ADMIN_MAN_SUFFIX = x ; then - case $host_os in - solaris*) ADMIN_MAN_SUFFIX=1m ;; - *) ADMIN_MAN_SUFFIX=8 ;; + case $SYSV_MAN_SECTIONS in + true) ADMIN_MAN_SUFFIX=1m ;; + *) ADMIN_MAN_SUFFIX=8 ;; esac fi if test x$ADMIN_MAN_DIR = x ; then @@ -17609,11 +17657,11 @@ fi RENDER_VERSION=`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'` -# Obtain compiler/linker options for depedencies +# Obtain compiler/linker options for dependencies pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RENDER" >&5 -$as_echo_n "checking for RENDER... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6 renderproto >= $RENDER_VERSION" >&5 +$as_echo_n "checking for x11 >= 1.6 renderproto >= $RENDER_VERSION... " >&6; } if test -n "$RENDER_CFLAGS"; then pkg_cv_RENDER_CFLAGS="$RENDER_CFLAGS" @@ -17653,7 +17701,7 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -17680,7 +17728,7 @@ Alternatively, you may set the environment variables RENDER_CFLAGS and RENDER_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -17702,7 +17750,7 @@ $as_echo "yes" >&6; } fi -ac_config_files="$ac_config_files Makefile src/Makefile xrender.pc" +ac_config_files="$ac_config_files Makefile src/Makefile Doxyfile xrender.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18238,7 +18286,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libXrender $as_me 0.9.10, which was +This file was extended by libXrender $as_me 0.9.11, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18298,13 +18346,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>." +Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libxrender/-/issues>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libXrender config.status 0.9.10 +libXrender config.status 0.9.11 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18715,6 +18763,7 @@ do "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;; "xrender.pc") CONFIG_FILES="$CONFIG_FILES xrender.pc" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/lib/libXrender/configure.ac b/lib/libXrender/configure.ac index e5b82b10b..e6c1b244d 100644 --- a/lib/libXrender/configure.ac +++ b/lib/libXrender/configure.ac @@ -29,13 +29,17 @@ AC_PREREQ([2.60]) # digit in the version number to track changes which don't affect the # protocol, so Xrender version l.n.m corresponds to protocol version l.n # -AC_INIT(libXrender, [0.9.10], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrender]) +AC_INIT(libXrender, [0.9.11], + [https://gitlab.freedesktop.org/xorg/lib/libxrender/-/issues], + [libXrender]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) +PACKAGE_BRIEF="Library for the Render Extension to the X11 protocol" +AC_SUBST(PACKAGE_BRIEF) + # Initialize Automake -AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-xz]) # Initialize libtool AC_PROG_LIBTOOL @@ -55,10 +59,11 @@ fi RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] AC_SUBST(RENDER_VERSION) -# Obtain compiler/linker options for depedencies +# Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(RENDER, [x11 >= 1.6] renderproto >= $RENDER_VERSION) AC_CONFIG_FILES([Makefile src/Makefile + Doxyfile xrender.pc]) AC_OUTPUT diff --git a/lib/libXrender/include/X11/extensions/Xrender.h b/lib/libXrender/include/X11/extensions/Xrender.h index 1d1cd086e..af4efaa0c 100644 --- a/lib/libXrender/include/X11/extensions/Xrender.h +++ b/lib/libXrender/include/X11/extensions/Xrender.h @@ -22,177 +22,396 @@ * Author: Keith Packard, SuSE, Inc. */ +/** + * @file Xrender.h + * @brief XRender library API. + */ + #ifndef _XRENDER_H_ #define _XRENDER_H_ -#include <X11/Xlib.h> #include <X11/Xfuncproto.h> +#include <X11/Xlib.h> #include <X11/Xosdefs.h> #include <X11/Xutil.h> #include <X11/extensions/render.h> +/** + * @mainpage libXrender API Documentation. + * + * Dummy text down here. + */ + +/** + * The direct component of a PictFormat. + * + * It contains a binary description of the color format used by the Picture. + * + * * A Zero bit alphaMask is declared to have an opaque alpha everywhere. + * * A Zero bit redMask, greenMask and blueMask is declared to have red, green, + * blue == 0 everywhere. + * * If any of redMask, greenMask or blueMask are zero, all other masks are + * zero. + */ typedef struct { - short red; - short redMask; - short green; - short greenMask; - short blue; - short blueMask; - short alpha; - short alphaMask; + /** Red component binary displacement. */ + short red; + /** Red component bit mask. */ + short redMask; + /** Green component binary displacement. */ + short green; + /** Green component bit mask. */ + short greenMask; + /** Blue component binary displacement. */ + short blue; + /** Blue component bit mask. */ + short blueMask; + /** Alpha component binary displacement. */ + short alpha; + /** Alpha component bit mask. */ + short alphaMask; } XRenderDirectFormat; +/** + * A Picture pixel format description. + * + * It describes the format used by the server to display colors. + * + * There are two types: + * * Direct: Doesn't have a Colormap and the DirectFormat structure describes + * the pixel format. + * * Indexed: Has a Colormap and it's DirectFormat structure is filled with + * zeros. + */ typedef struct { - PictFormat id; - int type; - int depth; - XRenderDirectFormat direct; - Colormap colormap; + /** XID of this structure server instance. */ + PictFormat id; + /** Color management type. */ + int type; + /** Pixel bit depth. */ + int depth; + /** Color component description. */ + XRenderDirectFormat direct; + /** XID of the map of indexed colors on the server. */ + Colormap colormap; } XRenderPictFormat; -#define PictFormatID (1 << 0) -#define PictFormatType (1 << 1) -#define PictFormatDepth (1 << 2) -#define PictFormatRed (1 << 3) -#define PictFormatRedMask (1 << 4) -#define PictFormatGreen (1 << 5) +/*< XRenderPictFormat template field masks. + * @{ + */ +/** Include ID field. @hideinitializer */ +#define PictFormatID (1 << 0) +/** Include Type field. @hideinitializer */ +#define PictFormatType (1 << 1) +/** Include Depth field. @hideinitializer */ +#define PictFormatDepth (1 << 2) + +/*<--- XRenderPictFormat->direct fields. */ +/** Include Direct->Red field. @hideinitializer */ +#define PictFormatRed (1 << 3) +/** Include Direct->RedMask field. @hideinitializer */ +#define PictFormatRedMask (1 << 4) +/** Include Direct->Green field. @hideinitializer */ +#define PictFormatGreen (1 << 5) +/** Include Direct->GreenMask field. @hideinitializer */ #define PictFormatGreenMask (1 << 6) -#define PictFormatBlue (1 << 7) -#define PictFormatBlueMask (1 << 8) -#define PictFormatAlpha (1 << 9) +/** Include Direct->Blue field. @hideinitializer */ +#define PictFormatBlue (1 << 7) +/** Include Direct->BlueMask field. @hideinitializer */ +#define PictFormatBlueMask (1 << 8) +/** Include Direct->Alpha field. @hideinitializer */ +#define PictFormatAlpha (1 << 9) +/** Include Direct->AlphaMask field. @hideinitializer */ #define PictFormatAlphaMask (1 << 10) -#define PictFormatColormap (1 << 11) +/** Include Colormap field. @hideinitializer */ +#define PictFormatColormap (1 << 11) +/** @} */ + +/** + * Picture rendering attributes. + */ typedef struct _XRenderPictureAttributes { - int repeat; - Picture alpha_map; - int alpha_x_origin; - int alpha_y_origin; - int clip_x_origin; - int clip_y_origin; - Pixmap clip_mask; - Bool graphics_exposures; - int subwindow_mode; - int poly_edge; - int poly_mode; - Atom dither; - Bool component_alpha; + /** How to repeat the picture. */ + int repeat; + + /** A replacement alpha-map. Must be a pixmap-containing Picture. */ + Picture alpha_map; + /** Horizontal displacement of the replacement alpha-map. */ + int alpha_x_origin; + /** Vertical displacement of the replacement alpha-map. */ + int alpha_y_origin; + + /** Horizontal displacement of the clip mask. */ + int clip_x_origin; + /** Vertical displacement of the clip mask. */ + int clip_y_origin; + /** A r/w restriction to the drawable. */ + Pixmap clip_mask; + + /** Whether to receive GraphicsExpose events. @note Ignored field. */ + Bool graphics_exposures; + /** How to clip pixels on subwindow overlap. */ + int subwindow_mode; + /** Alpha mask generation mode. */ + int poly_edge; + /** Alpha value rasterization mode. */ + int poly_mode; + /** Dithering mode. @note Ignored field. */ + Atom dither; + /** Treat alpha channels independently. */ + Bool component_alpha; } XRenderPictureAttributes; +/** An alpha-blended color with premultiplied components. + * + * Values are in the range from 0 to 65535 inclusive, scaled down to the right + * hardware values by the server. Colors must be premultiplied by alpha by the + * client in all cases but gradient operations. + */ typedef struct { - unsigned short red; - unsigned short green; - unsigned short blue; - unsigned short alpha; + /** Red color channel. */ + unsigned short red; + /** Green color channel. */ + unsigned short green; + /** Blue color channel. */ + unsigned short blue; + /** Alpha color channel. */ + unsigned short alpha; } XRenderColor; +/** + * Glyph positioning and sizing information. + * + * A glyph is positioned by taking the requested position and substracting the + * center offset. + */ typedef struct _XGlyphInfo { - unsigned short width; - unsigned short height; - short x; - short y; - short xOff; - short yOff; + /** Glyph width. */ + unsigned short width; + /** Glyph height. */ + unsigned short height; + + /** Horizontal Glyph center offset relative to the upper-left corner. */ + short x; + /** Vertical Glyph center offset relative to the upper-left corner. */ + short y; + + /** Horizontal margin to the next Glyph. */ + short xOff; + /** Vertical margin to the next Glyph. */ + short yOff; } XGlyphInfo; +/*< Glyph Elements. + * Group of glyphs to be rendered. + * While selecting the right element type, you should use as a reference the + * largest identifier in Elt->glyphset. + */ +/** @{ */ + +/** + * 8-bit Glyph Element. + */ typedef struct _XGlyphElt8 { - GlyphSet glyphset; - _Xconst char *chars; - int nchars; - int xOff; - int yOff; + /** Set of available glyphs. */ + GlyphSet glyphset; + + /** 8-bit glyph id array. */ + _Xconst char *chars; + /** Glyph array size. */ + int nchars; + + /** Horizontal offset. */ + int xOff; + /** Vertical offset. */ + int yOff; } XGlyphElt8; +/** + * 16-bit Glyph Element. + */ typedef struct _XGlyphElt16 { - GlyphSet glyphset; - _Xconst unsigned short *chars; - int nchars; - int xOff; - int yOff; + /** Set of available glyphs. */ + GlyphSet glyphset; + + /** 16-bit glyph id array. */ + _Xconst unsigned short *chars; + /** Glyph array size. */ + int nchars; + + /** Horizontal offset. */ + int xOff; + /** Vertical offset. */ + int yOff; } XGlyphElt16; +/** + * 32-bit Glyph Element. + */ typedef struct _XGlyphElt32 { - GlyphSet glyphset; - _Xconst unsigned int *chars; - int nchars; - int xOff; - int yOff; + /** Set of available glyphs. */ + GlyphSet glyphset; + + /** 32-bit glyph id array. */ + _Xconst unsigned int *chars; + /** Glyph array size. */ + int nchars; + + /** Horizontal offset. */ + int xOff; + /** Vertical offset. */ + int yOff; } XGlyphElt32; +/**@} */ -typedef double XDouble; - -typedef struct _XPointDouble { - XDouble x, y; -} XPointDouble; +/*< Utility number types. + * + */ +/**@{ */ -#define XDoubleToFixed(f) ((XFixed) ((f) * 65536)) -#define XFixedToDouble(f) (((XDouble) (f)) / 65536) +/** + * Floating-point number. + */ +typedef double XDouble; +/** + * Fixed-point number. + */ typedef int XFixed; +/** Turn XDouble into XFixed. @hideinitializer */ +#define XDoubleToFixed(f) ((XFixed)((f)*65536)) +/** Turn XFixed into XDouble. @hideinitializer */ +#define XFixedToDouble(f) (((XDouble)(f)) / 65536) +/** @} */ + +/** + * Point coordinates stored as floats. + */ +typedef struct _XPointDouble { + XDouble x, y; +} XPointDouble; + +/** + * Point coordinates as integers. + */ typedef struct _XPointFixed { - XFixed x, y; + XFixed x, y; } XPointFixed; +/** + * Line described by two points. + */ typedef struct _XLineFixed { - XPointFixed p1, p2; + XPointFixed p1, p2; } XLineFixed; +/** + * Triangle described by it's vertices. + * @see XTrap + */ typedef struct _XTriangle { - XPointFixed p1, p2, p3; + XPointFixed p1, p2, p3; } XTriangle; +/** + * Circle described by it's center point and a radius. + */ typedef struct _XCircle { XFixed x; XFixed y; XFixed radius; } XCircle; +/** A trapezoid. + * + * @deprecated Use XTrap instead + * @see + * * XTriangle + * * XTrap + */ typedef struct _XTrapezoid { - XFixed top, bottom; - XLineFixed left, right; + XFixed top, bottom; + XLineFixed left, right; } XTrapezoid; +/** + * A transform matrix. + */ typedef struct _XTransform { - XFixed matrix[3][3]; + XFixed matrix[3][3]; } XTransform; +/** + * Group filters and filter aliases. + */ typedef struct _XFilters { - int nfilter; - char **filter; - int nalias; - short *alias; + /** Filter names count. */ + int nfilter; + /** Filter names array. */ + char **filter; + /** Aliases array count. */ + int nalias; + /** Array of «Index in .filter of the aliased filter or 0xffff». */ + short *alias; } XFilters; +/** + * The value of an indexed color. + */ typedef struct _XIndexValue { - unsigned long pixel; - unsigned short red, green, blue, alpha; + /** Index ID. */ + unsigned long pixel; + /** Color components. */ + unsigned short red, green, blue, alpha; } XIndexValue; +/** + * A single cursor frame. + */ typedef struct _XAnimCursor { - Cursor cursor; - unsigned long delay; + /** Existing cursor. */ + Cursor cursor; + /** Animation delay. */ + unsigned long delay; } XAnimCursor; +/** + * An horizontal line. + */ typedef struct _XSpanFix { - XFixed left, right, y; + XFixed left, right, y; } XSpanFix; +/** + * A trapezoid defined by two lines. + * @see XTriangle + */ typedef struct _XTrap { - XSpanFix top, bottom; + XSpanFix top, bottom; } XTrap; +/** + * Linear gradient shape. + */ typedef struct _XLinearGradient { XPointFixed p1; XPointFixed p2; } XLinearGradient; +/** + * Radial gradient shape. + */ typedef struct _XRadialGradient { XCircle inner; XCircle outer; } XRadialGradient; +/** + * Conical gradient shape. + */ typedef struct _XConicalGradient { XPointFixed center; XFixed angle; /* in degrees */ @@ -200,328 +419,639 @@ typedef struct _XConicalGradient { _XFUNCPROTOBEGIN -Bool XRenderQueryExtension (Display *dpy, int *event_basep, int *error_basep); - -Status XRenderQueryVersion (Display *dpy, - int *major_versionp, - int *minor_versionp); - -Status XRenderQueryFormats (Display *dpy); - -int XRenderQuerySubpixelOrder (Display *dpy, int screen); - -Bool XRenderSetSubpixelOrder (Display *dpy, int screen, int subpixel); - -XRenderPictFormat * -XRenderFindVisualFormat (Display *dpy, _Xconst Visual *visual); - -XRenderPictFormat * -XRenderFindFormat (Display *dpy, - unsigned long mask, - _Xconst XRenderPictFormat *templ, - int count); - -#define PictStandardARGB32 0 -#define PictStandardRGB24 1 -#define PictStandardA8 2 -#define PictStandardA4 3 -#define PictStandardA1 4 -#define PictStandardNUM 5 - -XRenderPictFormat * -XRenderFindStandardFormat (Display *dpy, - int format); - -XIndexValue * -XRenderQueryPictIndexValues(Display *dpy, - _Xconst XRenderPictFormat *format, - int *num); - -Picture -XRenderCreatePicture (Display *dpy, - Drawable drawable, - _Xconst XRenderPictFormat *format, - unsigned long valuemask, - _Xconst XRenderPictureAttributes *attributes); - -void -XRenderChangePicture (Display *dpy, - Picture picture, - unsigned long valuemask, - _Xconst XRenderPictureAttributes *attributes); - -void -XRenderSetPictureClipRectangles (Display *dpy, - Picture picture, - int xOrigin, - int yOrigin, - _Xconst XRectangle *rects, - int n); - -void -XRenderSetPictureClipRegion (Display *dpy, - Picture picture, - Region r); - -void -XRenderSetPictureTransform (Display *dpy, - Picture picture, - XTransform *transform); - -void -XRenderFreePicture (Display *dpy, - Picture picture); - -void -XRenderComposite (Display *dpy, - int op, - Picture src, - Picture mask, - Picture dst, - int src_x, - int src_y, - int mask_x, - int mask_y, - int dst_x, - int dst_y, - unsigned int width, - unsigned int height); - -GlyphSet -XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format); - -GlyphSet -XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing); - -void -XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset); - -void -XRenderAddGlyphs (Display *dpy, - GlyphSet glyphset, - _Xconst Glyph *gids, - _Xconst XGlyphInfo *glyphs, - int nglyphs, - _Xconst char *images, - int nbyte_images); - -void -XRenderFreeGlyphs (Display *dpy, - GlyphSet glyphset, - _Xconst Glyph *gids, - int nglyphs); - -void -XRenderCompositeString8 (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - GlyphSet glyphset, - int xSrc, - int ySrc, - int xDst, - int yDst, - _Xconst char *string, - int nchar); - -void -XRenderCompositeString16 (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - GlyphSet glyphset, - int xSrc, - int ySrc, - int xDst, - int yDst, - _Xconst unsigned short *string, - int nchar); - -void -XRenderCompositeString32 (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - GlyphSet glyphset, - int xSrc, - int ySrc, - int xDst, - int yDst, - _Xconst unsigned int *string, - int nchar); - -void -XRenderCompositeText8 (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - int xSrc, - int ySrc, - int xDst, - int yDst, - _Xconst XGlyphElt8 *elts, - int nelt); - -void -XRenderCompositeText16 (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - int xSrc, - int ySrc, - int xDst, - int yDst, - _Xconst XGlyphElt16 *elts, - int nelt); - -void -XRenderCompositeText32 (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - int xSrc, - int ySrc, - int xDst, - int yDst, - _Xconst XGlyphElt32 *elts, - int nelt); - -void -XRenderFillRectangle (Display *dpy, - int op, - Picture dst, - _Xconst XRenderColor *color, - int x, - int y, - unsigned int width, - unsigned int height); - -void -XRenderFillRectangles (Display *dpy, - int op, - Picture dst, - _Xconst XRenderColor *color, - _Xconst XRectangle *rectangles, - int n_rects); - -void -XRenderCompositeTrapezoids (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - int xSrc, - int ySrc, - _Xconst XTrapezoid *traps, - int ntrap); - -void -XRenderCompositeTriangles (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - int xSrc, - int ySrc, - _Xconst XTriangle *triangles, - int ntriangle); - -void -XRenderCompositeTriStrip (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - int xSrc, - int ySrc, - _Xconst XPointFixed *points, - int npoint); - -void -XRenderCompositeTriFan (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - int xSrc, - int ySrc, - _Xconst XPointFixed *points, - int npoint); - -void -XRenderCompositeDoublePoly (Display *dpy, - int op, - Picture src, - Picture dst, - _Xconst XRenderPictFormat *maskFormat, - int xSrc, - int ySrc, - int xDst, - int yDst, - _Xconst XPointDouble *fpoints, - int npoints, - int winding); -Status -XRenderParseColor(Display *dpy, - char *spec, - XRenderColor *def); - -Cursor -XRenderCreateCursor (Display *dpy, - Picture source, - unsigned int x, - unsigned int y); - -XFilters * -XRenderQueryFilters (Display *dpy, Drawable drawable); - -void -XRenderSetPictureFilter (Display *dpy, - Picture picture, - const char *filter, - XFixed *params, - int nparams); - -Cursor -XRenderCreateAnimCursor (Display *dpy, - int ncursor, - XAnimCursor *cursors); - - -void -XRenderAddTraps (Display *dpy, - Picture picture, - int xOff, - int yOff, - _Xconst XTrap *traps, - int ntrap); - -Picture XRenderCreateSolidFill (Display *dpy, - const XRenderColor *color); - -Picture XRenderCreateLinearGradient (Display *dpy, - const XLinearGradient *gradient, - const XFixed *stops, - const XRenderColor *colors, - int nstops); +/** @defgroup queries Early check queries. + * @{ + */ + +/** + * Ask for the Render extension presence and its base numbers. + * + * @param dpy Connection to the X server. + * @param[out] event_basep first event number for the extension. + * @param[out] error_basep first error number for the extension. + * @return True if Render is present. + */ +Bool XRenderQueryExtension(Display *dpy, int *event_basep, int *error_basep); + +/** + * Ask for the extension version. + * + * @param dpy Connection to the X server. + * @param[out] major_versionp Extension's major version. + * @param[out] minor_versionp Extension's major version. + * @return Status «1» on success. + */ +Status XRenderQueryVersion(Display *dpy, int *major_versionp, + int *minor_versionp); + +/** + * Check for and cache compatible picture formats. + * + * @param dpy Connection to the X server. + * @return Status «1» on success. + */ +Status XRenderQueryFormats(Display *dpy); + +/** + * Ask for the current subpixel order of a screen. + * + * @param dpy Connection to the X server. + * @param[in] screen Target screen number. + * @return SubPixelUnknown on error, else a subpixel order. + */ +int XRenderQuerySubpixelOrder(Display *dpy, int screen); + +/** + * Change the subpixel order of a screen. + * + * @param dpy Connection to the X server + * @param[in] screen Target screen number. + * @param[in] subpixel Requested subpixel order. + * @return True if the operation was successful. + */ +Bool XRenderSetSubpixelOrder(Display *dpy, int screen, int subpixel); +/** @} */ + +/** + * Ask for the Picture format for a Visual. + * + * @param dpy Connection to the X server. + * @param[in] visual Reference Visual object. + * @return The requested Picture format. + */ +XRenderPictFormat *XRenderFindVisualFormat(Display *dpy, + _Xconst Visual *visual); + +/** + * Ask for matching Picture formats from a template. + * + * @param dpy Connection to the X server. + * @param[in] mask `templ` fields mask to use. + * @param[in] templ Requested Picture format template. + * @param[in] count Skip `count` formats. + * @return NULL if no matching format found, else a Picture format. + */ +XRenderPictFormat *XRenderFindFormat(Display *dpy, unsigned long mask, + _Xconst XRenderPictFormat *templ, + int count); + +/** Standard format specifiers. + * @{ + */ +/** 8-bit RGB with Alpha. @hideinitializer */ +#define PictStandardARGB32 0 +/** 8-bit RGB. @hideinitializer */ +#define PictStandardRGB24 1 +/** 8-bit Alpha map. @hideinitializer */ +#define PictStandardA8 2 +/** 4-bit Alpha map. @hideinitializer */ +#define PictStandardA4 3 +/** 1-bit Alpha map. @hideinitializer */ +#define PictStandardA1 4 +/** Supported standard formats count. @hideinitializer */ +#define PictStandardNUM 5 +/** @} */ + +/** + * Ask for a predefined standard picture format. + * + * This is a shorthand to XRenderFindFormat for finding common formats. + * + * @param dpy Connection to the X server. + * @param[in] format Desired format specifier. + * @return NULL if no matching format found, else a Picture format. + */ +XRenderPictFormat *XRenderFindStandardFormat(Display *dpy, int format); + +/** + * Ask for the indexed colors of a Picture format. + * + * @param dpy Connection to the X server. + * @param[in] format Queried picture format. + * @param[out] num Size of the output array. + * @return An array of XIndexValue. + */ +XIndexValue *XRenderQueryPictIndexValues(Display *dpy, + _Xconst XRenderPictFormat *format, + int *num); + +/** + * Creates a Picture for a drawable. + * + * @param dpy Connection to the X server. + * @param[in] drawable Target Drawable. + * @param[in] format Format for the Picture. + * @param[in] valuemask `attributes` fields mask to use. + * @param[in] attributes Desired attributes for the Picture. + * @return A Picture tied to the drawable. + */ +Picture XRenderCreatePicture(Display *dpy, Drawable drawable, + _Xconst XRenderPictFormat *format, + unsigned long valuemask, + _Xconst XRenderPictureAttributes *attributes); + +/** + * Free allocated structures for a Picture. + * + * @warning A freed Picture shouldn't be used again. + * + * @param dpy Connection to the X server. + * @param[in] picture Target Picture. + */ +void XRenderFreePicture(Display *dpy, Picture picture); + +/** + * Change a Picture's attributes structure. + * + * @param dpy Connection to the X server. + * @param[in] picture Target Picture. + * @param[in] valuemask `attributes` fields mask to use. + * @param[in] attributes Desired attributes for the Picture. + */ +void XRenderChangePicture(Display *dpy, Picture picture, + unsigned long valuemask, + _Xconst XRenderPictureAttributes *attributes); + +/** + * Change a Picture's clip mask to the specified rectangles. + * + * @param dpy Connection to the X server. + * @param[in] picture Target Picture. + * @param[in] xOrigin Horizontal mask origin. + * @param[in] yOrigin Vertical mask origin. + * @param[in] rects Array of rectangles to clip with. + * @param[in] n `rects` array size. + */ +void XRenderSetPictureClipRectangles(Display *dpy, Picture picture, int xOrigin, + int yOrigin, _Xconst XRectangle *rects, + int n); + +/** + * Change a Picture's clip mask to the specified Region. + * + * @param dpy Connection to the X server. + * @param[in] picture Target Picture. + * @param[in] r Region to clip with. + */ +void XRenderSetPictureClipRegion(Display *dpy, Picture picture, Region r); + +/** + * Change a Picture's Transform matrix. + * + * @param dpy Connection to the X server + * @param[in] picture Target Picture. + * @param[in] transform Transform matrix to use. + */ +void XRenderSetPictureTransform(Display *dpy, Picture picture, + XTransform *transform); + +/** + * Combines two Pictures with the specified compositing operation. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] mask Composition mask. + * @param[in] dst Picture to combine into. + * @param[in] src_x Horizontal `src` origin offset. + * @param[in] src_y Vertical `src` origin offset + * @param[in] mask_x Horizontal `mask` origin offset. + * @param[in] mask_y Vertical `mask` origin offset. + * @param[in] dst_x Horizontal `dst` origin offset. + * @param[in] dst_y Vertical `dst` origin offset. + * @param[in] width Maximum composition width. + * @param[in] height Maximum composition height. + */ +void XRenderComposite(Display *dpy, int op, Picture src, Picture mask, + Picture dst, int src_x, int src_y, int mask_x, int mask_y, + int dst_x, int dst_y, unsigned int width, + unsigned int height); + +/** + * Create a Glyph Set. + * + * @param dpy Connection to the X server. + * @param[in] format Desired format for the Glyphs Picture. + * @return A GlyphSet. + */ +GlyphSet XRenderCreateGlyphSet(Display *dpy, _Xconst XRenderPictFormat *format); + +/** + * Generate a new reference for an existing Glyph Set. + * + * @param dpy Connection to the X server. + * @param[in] existing Target Glyph Set. + * @return A GlyphSet identical to `existing`. + */ +GlyphSet XRenderReferenceGlyphSet(Display *dpy, GlyphSet existing); + +/** + * Free allocated structures for a GlyphSet. + * + * If there's more references to the underlying GlyphSet structures, this will + * remove only the specified GlyphSet reference. + * + * @warning A freed GlyphSet shouldn't be used again. + * + * @param dpy Connection to the X server. + * @param[in] glyphset Target GlyphSet. + */ +void XRenderFreeGlyphSet(Display *dpy, GlyphSet glyphset); + +/** + * Add new Glyphs to a GlyphSet. + * + * @param dpy Connection to the X server. + * @param[in] glyphset Glyph storage destination. + * @param[in] gids Array of ids for the new Glyphs. + * @param[in] glyphs Array of new Glyphs info. + * @param[in] nglyphs Number of Glyphs to add. + * @param[in] images Byte array containing the Glyphs graphics. + * @param[in] nbyte_images Size of the `images` byte array. + */ +void XRenderAddGlyphs(Display *dpy, GlyphSet glyphset, _Xconst Glyph *gids, + _Xconst XGlyphInfo *glyphs, int nglyphs, + _Xconst char *images, int nbyte_images); + +/** + * Free allocated Glyphs. + * + * @param dpy Connection to the X server. + * @param[in] glyphset GlyphSet storing the Glyphs. + * @param[in] gids Identifier array of the Glyphs to dellocate. + * @param[in] nglyphs Glyph count. + */ +void XRenderFreeGlyphs(Display *dpy, GlyphSet glyphset, _Xconst Glyph *gids, + int nglyphs); + +/** + * Draw a 8-bit character string into a Picture. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] glyphset Glyph Source. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] xDst Horizontal `dst` origin offset. + * @param[in] yDst Vertical `dst` origin offset. + * @param[in] string String to clip to. + * @param[in] nchar String length. + */ +void XRenderCompositeString8(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, + GlyphSet glyphset, int xSrc, int ySrc, int xDst, + int yDst, _Xconst char *string, int nchar); + +/** + * Draw a 16-bit character string into a Picture. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] glyphset Glyph Source. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] xDst Horizontal `dst` origin offset. + * @param[in] yDst Vertical `dst` origin offset. + * @param[in] string String to clip to. + * @param[in] nchar String length. + */ +void XRenderCompositeString16(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, + GlyphSet glyphset, int xSrc, int ySrc, int xDst, + int yDst, _Xconst unsigned short *string, + int nchar); + +/** + * Draw a 32-bit character string into a Picture. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] glyphset Glyph Source. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] xDst Horizontal `dst` origin offset. + * @param[in] yDst Vertical `dst` origin offset. + * @param[in] string String to clip to. + * @param[in] nchar String length. + */ +void XRenderCompositeString32(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, + GlyphSet glyphset, int xSrc, int ySrc, int xDst, + int yDst, _Xconst unsigned int *string, + int nchar); + +/** + * Draw several 8-bit Glyph Elements into a Picture. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] xDst Horizontal `dst` origin offset. + * @param[in] yDst Vertical `dst` origin offset. + * @param[in] elts Glyph Elements array to clip with. + * @param[in] nelt Glyph Elements array size. + */ +void XRenderCompositeText8(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, int xSrc, + int ySrc, int xDst, int yDst, + _Xconst XGlyphElt8 *elts, int nelt); + +/** + * Draw several 16-bit Glyph Elements into a Picture. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] xDst Horizontal `dst` origin offset. + * @param[in] yDst Vertical `dst` origin offset. + * @param[in] elts Glyph Elements array to clip with. + * @param[in] nelt Glyph Elements array size. + */ +void XRenderCompositeText16(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, int xSrc, + int ySrc, int xDst, int yDst, + _Xconst XGlyphElt16 *elts, int nelt); + +/** + * Draw several 32-bit Glyph Elements into a Picture. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] xDst Horizontal `dst` origin offset. + * @param[in] yDst Vertical `dst` origin offset. + * @param[in] elts Glyph Elements to clip with. + * @param[in] nelt Glyph Elements array size. + */ +void XRenderCompositeText32(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, int xSrc, + int ySrc, int xDst, int yDst, + _Xconst XGlyphElt32 *elts, int nelt); + +/** + * Fill a Rectangle with the given color. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] dst Picture to draw into. + * @param[in] color Color to fill with. + * @param[in] x Horizontal offset. + * @param[in] y Vertical offset. + * @param[in] width Rectangle width. + * @param[in] height Rectangle height. + */ +void XRenderFillRectangle(Display *dpy, int op, Picture dst, + _Xconst XRenderColor *color, int x, int y, + unsigned int width, unsigned int height); -Picture XRenderCreateRadialGradient (Display *dpy, - const XRadialGradient *gradient, +/** + * Fill a bunch of Rectangle with the given color. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] dst Picture to draw into. + * @param[in] color Color to fill with. + * @param[in] rectangles Array of Rectangles to fill. + * @param[in] n_rects `rectangles` array size. + */ +void XRenderFillRectangles(Display *dpy, int op, Picture dst, + _Xconst XRenderColor *color, + _Xconst XRectangle *rectangles, int n_rects); + +/** + * Combine two Pictures using a bunch of Trapezoids as the mask. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] traps Array of Trapezoids to clip with. + * @param[in] ntrap `traps` Array size. + */ +void XRenderCompositeTrapezoids(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, int xSrc, + int ySrc, _Xconst XTrapezoid *traps, int ntrap); + +/** + * Combine two Pictures using a bunch of Triangles as the mask. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] triangles Array of Triangles to clip with. + * @param[in] ntriangle `triangles` array size. + */ +void XRenderCompositeTriangles(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, int xSrc, + int ySrc, _Xconst XTriangle *triangles, + int ntriangle); + +/** + * Combine two Pictures using a Triangle Strip as the mask. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] points Array of Points to create Triangles with. + * @param[in] npoint `points` array size. + */ +void XRenderCompositeTriStrip(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, int xSrc, + int ySrc, _Xconst XPointFixed *points, + int npoint); + +/** + * Combine two Pictures using a Triangle Fan as the mask. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] points Array of Points to create Triangles with. + * @param[in] npoint `points` array size. + */ +void XRenderCompositeTriFan(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, int xSrc, + int ySrc, _Xconst XPointFixed *points, int npoint); + +/** + * Combine two Pictures using a Polygon as the mask. + * + * @param dpy Connection to the X server. + * @param[in] op Compositing operation to perform. + * @param[in] src Picture to combine with. + * @param[in] dst Picture to combine into. + * @param[in] maskFormat Picture format of the generated Picture mask. + * @param[in] xSrc Horizontal `src` origin offset. + * @param[in] ySrc Vertical `src` origin offset. + * @param[in] xDst Horizontal `dst` origin offset. + * @param[in] yDst Vertical `dst` origin offset. + * @param[in] fpoints Array of DoublePoints to create a Polygon with. + * @param[in] npoints `points` array size. + * @param winding Unused. + */ +void XRenderCompositeDoublePoly(Display *dpy, int op, Picture src, Picture dst, + _Xconst XRenderPictFormat *maskFormat, int xSrc, + int ySrc, int xDst, int yDst, + _Xconst XPointDouble *fpoints, int npoints, + int winding); + +/** + * Parse a color string. + * + * @param dpy Connection to the X server. + * @param[in] spec Null-terminated string. + * @param[out] def Parsing result. + * @return Status «1» on success. + */ +Status XRenderParseColor(Display *dpy, char *spec, XRenderColor *def); + +/** + * Creates a cursor looking like a Picture. + * + * @param dpy Connection to the X server. + * @param[in] source Picture defining the cursor look. + * @param[in] x Horizontal offset. + * @param[in] y Vertical offset. + * @return A Cursor. + */ +Cursor XRenderCreateCursor(Display *dpy, Picture source, unsigned int x, + unsigned int y); + +/** + * Ask for Filters applicable to some Drawable. + * + * @param dpy Connection to the X server. + * @param[in] drawable Target Drawable. + * @return Available Filters and Aliases. + */ +XFilters *XRenderQueryFilters(Display *dpy, Drawable drawable); + +/** + * Set the current filter of a Picture. + * + * @note On Picture creation, the «Nearest» filter is set by default. + * + * @param dpy Connection to the X server. + * @param[in] picture Target. + * @param[in] filter Filter name. + * @param[in] params Filter parameters array. + * @param[in] nparams `params` array size. + */ +void XRenderSetPictureFilter(Display *dpy, Picture picture, const char *filter, + XFixed *params, int nparams); + +/** + * Create an animated Cursor from the given Cursor frames. + * + * @param dpy Connection to the X server. + * @param[in] ncursor Cursor frames count. + * @param[in] cursors Cursor frames array. + * @return An animated Cursor. + */ +Cursor XRenderCreateAnimCursor(Display *dpy, int ncursor, XAnimCursor *cursors); + +/** + * Add the given Trapezoids to a single-channel Picture. + * + * @param dpy Connection to the X server. + * @param[in] picture An alpha-only Picture. + * @param[in] xOff Horizontal offset. + * @param[in] yOff Vertical offset. + * @param[in] traps Array of trapezoids. + * @param[in] ntrap `traps` array size. + */ +void XRenderAddTraps(Display *dpy, Picture picture, int xOff, int yOff, + _Xconst XTrap *traps, int ntrap); + +/** + * Create a Picture filled with a single Color. + * + * @param dpy Connection to the X server. + * @param[in] color Desired filling. + * @return A single Color Picture. + */ +Picture XRenderCreateSolidFill(Display *dpy, const XRenderColor *color); + +/** + * Create a Picture filled with a Linear Gradient. + * + * @param dpy Connection to the X server. + * @param[in] gradient Gradient geometry. + * @param[in] stops Stop sections. + * @param[in] colors Stop colors. + * @param[in] nstops Stops count. + * @return A Picture filled with a Linear Gradient. + */ +Picture XRenderCreateLinearGradient(Display *dpy, + const XLinearGradient *gradient, + const XFixed *stops, + const XRenderColor *colors, int nstops); + +/** + * Create a Picture filled with a Radial Gradient. + * + * @param dpy Connection to the X server. + * @param[in] gradient Gradient geometry. + * @param[in] stops Stop sections. + * @param[in] colors Stop colors. + * @param[in] nstops Stops count. + * @return A Picture filled with a Radial Gradient. + */ +Picture XRenderCreateRadialGradient(Display *dpy, + const XRadialGradient *gradient, + const XFixed *stops, + const XRenderColor *colors, int nstops); + +/** + * Create a Picture filled with a Conical Gradient. + * + * @param dpy Connection to the X server. + * @param[in] gradient Gradient geometry. + * @param[in] stops Stop sections. + * @param[in] colors Stop colors. + * @param[in] nstops Stops count. + * @return A Picture filled with a Conical Gradient. + */ +Picture XRenderCreateConicalGradient(Display *dpy, + const XConicalGradient *gradient, const XFixed *stops, - const XRenderColor *colors, - int nstops); - -Picture XRenderCreateConicalGradient (Display *dpy, - const XConicalGradient *gradient, - const XFixed *stops, - const XRenderColor *colors, - int nstops); + const XRenderColor *colors, int nstops); _XFUNCPROTOEND diff --git a/lib/libXrender/src/AddTrap.c b/lib/libXrender/src/AddTrap.c index 421463def..5588ea301 100644 --- a/lib/libXrender/src/AddTrap.c +++ b/lib/libXrender/src/AddTrap.c @@ -36,30 +36,31 @@ XRenderAddTraps (Display *dpy, int ntrap) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - xRenderAddTrapsReq *req; - int n; - long len; unsigned long max_req = dpy->bigreq_size ? dpy->bigreq_size : dpy->max_request_size; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); while (ntrap) { + xRenderAddTrapsReq *req; + int n; + unsigned long len; + GetReq(RenderAddTraps, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderAddTraps; - req->picture = picture; - req->xOff = xOff; - req->yOff = yOff; + req->picture = (CARD32) picture; + req->xOff = (INT16) xOff; + req->yOff = (INT16) yOff; n = ntrap; - len = ((long) n) * (SIZEOF (xTrap) >> 2); + len = ((unsigned long) n) * (SIZEOF (xTrap) >> 2); if (len > (max_req - req->length)) { - n = (max_req - req->length) / (SIZEOF (xTrap) >> 2); - len = ((long)n) * (SIZEOF (xTrap) >> 2); + n = (int) ((max_req - req->length) / (SIZEOF (xTrap) >> 2)); + len = ((unsigned long) n) * (SIZEOF (xTrap) >> 2); } SetReqLen (req, len, len); len <<= 2; - DataInt32 (dpy, (int *) traps, len); + DataInt32 (dpy, (_Xconst int *) traps, (long) len); ntrap -= n; traps += n; } diff --git a/lib/libXrender/src/Color.c b/lib/libXrender/src/Color.c index 23ef8008b..1c481368d 100644 --- a/lib/libXrender/src/Color.c +++ b/lib/libXrender/src/Color.c @@ -34,8 +34,7 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) { unsigned short elements[4]; unsigned short *pShort; - int i, n; - char c; + int i; spec += 5; /* @@ -43,28 +42,31 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) */ pShort = elements; for (i = 0; i < 4; i++, pShort++, spec++) { - n = 0; + int n = 0; + *pShort = 0; while (*spec != '/' && *spec != '\0') { + char c; + if (++n > 4) { return 0; } c = *spec++; - *pShort <<= 4; + *pShort = (unsigned short) (*pShort << 4); if (c >= '0' && c <= '9') - *pShort |= c - '0'; + *pShort = (unsigned short) (*pShort | (c - '0')); /* assume string in lowercase else if (c >= 'A' && c <= 'F') *pShort |= c - ('A' - 10); */ else if (c >= 'a' && c <= 'f') - *pShort |= c - ('a' - 10); + *pShort = (unsigned short) (*pShort | (c - ('a' - 10))); else return 0; } if (n == 0) return 0; if (n < 4) { - *pShort = ((unsigned long)*pShort * 0xFFFF) / ((1 << n*4) - 1); + *pShort = (unsigned short) (((unsigned long)*pShort * 0xFFFF) / (unsigned long) ((1 << n*4) - 1)); } } def->red = elements[0]; @@ -85,8 +87,8 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) def->blue = coreColor.blue; def->alpha = 0xffff; } - def->red = (def->red * def->alpha) / 0xffffU; - def->green = (def->green * def->alpha) / 0xffffU; - def->blue = (def->blue * def->alpha) / 0xffffU; + def->red = (unsigned short) ((unsigned) (def->red * def->alpha) / 0xffffU); + def->green = (unsigned short) ((unsigned) (def->green * def->alpha) / 0xffffU); + def->blue = (unsigned short) ((unsigned) (def->blue * def->alpha) / 0xffffU); return 1; } diff --git a/lib/libXrender/src/Composite.c b/lib/libXrender/src/Composite.c index b529088ab..ea028317a 100644 --- a/lib/libXrender/src/Composite.c +++ b/lib/libXrender/src/Composite.c @@ -42,26 +42,26 @@ XRenderComposite (Display *dpy, unsigned int width, unsigned int height) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeReq *req; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); GetReq(RenderComposite, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderComposite; - req->op = (CARD8) op; - req->src = src; - req->mask = mask; - req->dst = dst; - req->xSrc = src_x; - req->ySrc = src_y; - req->xMask = mask_x; - req->yMask = mask_y; - req->xDst = dst_x; - req->yDst = dst_y; - req->width = width; - req->height = height; + req->op = (CARD8) op; + req->src = (CARD32) src; + req->mask = (CARD32) mask; + req->dst = (CARD32) dst; + req->xSrc = (INT16) src_x; + req->ySrc = (INT16) src_y; + req->xMask = (INT16) mask_x; + req->yMask = (INT16) mask_y; + req->xDst = (INT16) dst_x; + req->yDst = (INT16) dst_y; + req->width = (CARD16) width; + req->height = (CARD16) height; UnlockDisplay(dpy); SyncHandle(); } diff --git a/lib/libXrender/src/Cursor.c b/lib/libXrender/src/Cursor.c index 1d44c80ac..0e2b5e178 100644 --- a/lib/libXrender/src/Cursor.c +++ b/lib/libXrender/src/Cursor.c @@ -32,19 +32,19 @@ XRenderCreateCursor (Display *dpy, unsigned int x, unsigned int y) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); Cursor cid; xRenderCreateCursorReq *req; RenderCheckExtension (dpy, info, 0); LockDisplay(dpy); GetReq(RenderCreateCursor, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCreateCursor; - req->cid = cid = XAllocID (dpy); - req->src = source; - req->x = x; - req->y = y; + req->cid = (CARD32) (cid = XAllocID (dpy)); + req->src = (CARD32) source; + req->x = (CARD16) x; + req->y = (CARD16) y; UnlockDisplay(dpy); SyncHandle(); @@ -56,7 +56,7 @@ XRenderCreateAnimCursor (Display *dpy, int ncursor, XAnimCursor *cursors) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); Cursor cid; xRenderCreateAnimCursorReq *req; long len; @@ -64,9 +64,9 @@ XRenderCreateAnimCursor (Display *dpy, RenderCheckExtension (dpy, info, 0); LockDisplay(dpy); GetReq(RenderCreateAnimCursor, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCreateAnimCursor; - req->cid = cid = XAllocID (dpy); + req->cid = (CARD32) (cid = XAllocID (dpy)); len = (long) ncursor * SIZEOF (xAnimCursorElt) >> 2; SetReqLen (req, len, len); diff --git a/lib/libXrender/src/FillRect.c b/lib/libXrender/src/FillRect.c index 04757feae..2d9a7d526 100644 --- a/lib/libXrender/src/FillRect.c +++ b/lib/libXrender/src/FillRect.c @@ -41,7 +41,7 @@ XRenderFillRectangle (Display *dpy, unsigned int width, unsigned int height) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRectangle *rect; xRenderFillRectanglesReq *req; #ifdef MUSTCOPY @@ -67,7 +67,7 @@ XRenderFillRectangle (Display *dpy, dpy->bufptr + SIZEOF(xRectangle) <= dpy->bufmax && (char *)dpy->bufptr - (char *)req < size) { - req->length += SIZEOF(xRectangle) >> 2; + req->length = (CARD16) (req->length + (SIZEOF(xRectangle) >> 2)); #ifndef MUSTCOPY rect = (xRectangle *) dpy->bufptr; dpy->bufptr += SIZEOF(xRectangle); @@ -77,10 +77,10 @@ XRenderFillRectangle (Display *dpy, { GetReqExtra(RenderFillRectangles, SIZEOF(xRectangle), req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderFillRectangles; - req->op = op; - req->dst = dst; + req->op = (CARD8) op; + req->dst = (CARD32) dst; req->color.red = color->red; req->color.green = color->green; req->color.blue = color->blue; @@ -92,10 +92,10 @@ XRenderFillRectangle (Display *dpy, rect = (xRectangle *) NEXTPTR(req,xRenderFillRectanglesReq); #endif /* MUSTCOPY */ } - rect->x = x; - rect->y = y; - rect->width = width; - rect->height = height; + rect->x = (INT16) x; + rect->y = (INT16) y; + rect->width = (CARD16) width; + rect->height = (CARD16) height; #ifdef MUSTCOPY Data (dpy, (char *) rect, len); diff --git a/lib/libXrender/src/FillRects.c b/lib/libXrender/src/FillRects.c index ec88f4b88..0a5cb571c 100644 --- a/lib/libXrender/src/FillRects.c +++ b/lib/libXrender/src/FillRects.c @@ -39,22 +39,23 @@ XRenderFillRectangles (Display *dpy, _Xconst XRectangle *rectangles, int n_rects) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderFillRectanglesReq *req; - long len; - int n; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); while (n_rects) { + long len; + int n; + GetReq(RenderFillRectangles, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderFillRectangles; - req->op = op; - req->dst = dst; + req->op = (CARD8) op; + req->dst = (CARD32) dst; req->color.red = color->red; req->color.green = color->green; req->color.blue = color->blue; @@ -64,12 +65,12 @@ XRenderFillRectangles (Display *dpy, len = ((long)n) << 1; if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { - n = (dpy->max_request_size - req->length) >> 1; + n = (int) ((dpy->max_request_size - req->length) >> 1); len = ((long)n) << 1; } SetReqLen(req, len, len); len <<= 2; /* watch out for macros... */ - Data16 (dpy, (short *) rectangles, len); + Data16 (dpy, (_Xconst short *) rectangles, len); n_rects -= n; rectangles += n; } diff --git a/lib/libXrender/src/Filter.c b/lib/libXrender/src/Filter.c index 8d701eb98..0f36f1f55 100644 --- a/lib/libXrender/src/Filter.c +++ b/lib/libXrender/src/Filter.c @@ -30,15 +30,15 @@ XFilters * XRenderQueryFilters (Display *dpy, Drawable drawable) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); XRenderInfo *xri; xRenderQueryFiltersReq *req; xRenderQueryFiltersReply rep; XFilters *filters; char *name; char len; - int i; - unsigned long nbytes, nbytesAlias, nbytesName, reply_left; + unsigned int i; + unsigned long nbytesName, reply_left; if (!RenderHasExtension (info)) return NULL; @@ -52,9 +52,9 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) LockDisplay (dpy); GetReq (RenderQueryFilters, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderQueryFilters; - req->drawable = drawable; + req->drawable = (CARD32) drawable; if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { UnlockDisplay (dpy); @@ -69,6 +69,8 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) if ((rep.length < (INT_MAX >> 2)) && (rep.numFilters < ((INT_MAX / 4) / sizeof (char *))) && (rep.numAliases < ((INT_MAX / 4) / sizeof (short)))) { + unsigned long nbytes, nbytesAlias; + /* * Compute total number of bytes for filter names */ @@ -104,8 +106,8 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) * nbytesName char strings */ - filters->nfilter = rep.numFilters; - filters->nalias = rep.numAliases; + filters->nfilter = (int) rep.numFilters; + filters->nalias = (int) rep.numAliases; filters->filter = (char **) (filters + 1); filters->alias = (short *) (filters->filter + rep.numFilters); name = (char *) (filters->alias + rep.numAliases); @@ -132,14 +134,14 @@ XRenderQueryFilters (Display *dpy, Drawable drawable) SyncHandle (); return NULL; } - nbytesName -= l + 1; + nbytesName -= (unsigned long) (l + 1); filters->filter[i] = name; _XRead (dpy, name, l); - reply_left -= l; + reply_left -= (unsigned long) l; name[l] = '\0'; name += l + 1; } - i = name - (char *) (filters->alias + rep.numAliases); + i = (unsigned) (name - (char *) (filters->alias + rep.numAliases)); if (i & 3) _XEatData (dpy, 4 - (i & 3)); @@ -156,20 +158,20 @@ XRenderSetPictureFilter (Display *dpy, XFixed *params, int nparams) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderSetPictureFilterReq *req; - int nbytes = strlen (filter); + int nbytes = (int) strlen (filter); RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); GetReq(RenderSetPictureFilter, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderSetPictureFilter; - req->picture = picture; - req->nbytes = nbytes; - req->length += ((nbytes + 3) >> 2) + nparams; + req->picture = (CARD32) picture; + req->nbytes = (CARD16) nbytes; + req->length = (CARD16) (req->length + (((nbytes + 3) >> 2) + nparams)); Data (dpy, filter, nbytes); - Data (dpy, (_Xconst char *)params, nparams << 2); + Data (dpy, (_Xconst char *)params, (nparams << 2)); UnlockDisplay(dpy); SyncHandle(); } diff --git a/lib/libXrender/src/Glyph.c b/lib/libXrender/src/Glyph.c index 48e40c3ed..bc9593317 100644 --- a/lib/libXrender/src/Glyph.c +++ b/lib/libXrender/src/Glyph.c @@ -30,17 +30,17 @@ GlyphSet XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); GlyphSet gsid; xRenderCreateGlyphSetReq *req; RenderCheckExtension (dpy, info, 0); LockDisplay(dpy); GetReq(RenderCreateGlyphSet, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCreateGlyphSet; - req->gsid = gsid = XAllocID(dpy); - req->format = format->id; + req->gsid = (CARD32) (gsid = XAllocID(dpy)); + req->format = (CARD32) format->id; UnlockDisplay(dpy); SyncHandle(); return gsid; @@ -49,17 +49,17 @@ XRenderCreateGlyphSet (Display *dpy, _Xconst XRenderPictFormat *format) GlyphSet XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); GlyphSet gsid; xRenderReferenceGlyphSetReq *req; RenderCheckExtension (dpy, info, 0); LockDisplay(dpy); GetReq(RenderReferenceGlyphSet, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderReferenceGlyphSet; - req->gsid = gsid = XAllocID(dpy); - req->existing = existing; + req->gsid = (CARD32) (gsid = XAllocID(dpy)); + req->existing = (CARD32) existing; UnlockDisplay(dpy); SyncHandle(); return gsid; @@ -68,15 +68,15 @@ XRenderReferenceGlyphSet (Display *dpy, GlyphSet existing) void XRenderFreeGlyphSet (Display *dpy, GlyphSet glyphset) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderFreeGlyphSetReq *req; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); GetReq(RenderFreeGlyphSet, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderFreeGlyphSet; - req->glyphset = glyphset; + req->glyphset = (CARD32) glyphset; UnlockDisplay(dpy); SyncHandle(); } @@ -90,7 +90,7 @@ XRenderAddGlyphs (Display *dpy, _Xconst char *images, int nbyte_images) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderAddGlyphsReq *req; long len; @@ -99,14 +99,14 @@ XRenderAddGlyphs (Display *dpy, RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); GetReq(RenderAddGlyphs, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderAddGlyphs; - req->glyphset = glyphset; - req->nglyphs = nglyphs; + req->glyphset = (CARD32) glyphset; + req->nglyphs = (CARD32) nglyphs; len = (nglyphs * (SIZEOF (xGlyphInfo) + 4) + nbyte_images) >> 2; SetReqLen(req, len, len); - Data32 (dpy, (long *) gids, nglyphs * 4); - Data16 (dpy, (short *) glyphs, nglyphs * SIZEOF (xGlyphInfo)); + Data32 (dpy, (_Xconst long *) gids, nglyphs * 4); + Data16 (dpy, (_Xconst short *) glyphs, nglyphs * SIZEOF (xGlyphInfo)); Data (dpy, images, nbyte_images); UnlockDisplay(dpy); SyncHandle(); @@ -118,20 +118,20 @@ XRenderFreeGlyphs (Display *dpy, _Xconst Glyph *gids, int nglyphs) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderFreeGlyphsReq *req; long len; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); GetReq(RenderFreeGlyphs, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderFreeGlyphs; - req->glyphset = glyphset; + req->glyphset = (CARD32) glyphset; len = nglyphs; SetReqLen(req, len, len); len <<= 2; - Data32 (dpy, (long *) gids, len); + Data32 (dpy, (_Xconst long *) gids, len); UnlockDisplay(dpy); SyncHandle(); } @@ -150,7 +150,7 @@ XRenderCompositeString8 (Display *dpy, _Xconst char *string, int nchar) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs8Req *req; long len; xGlyphElt *elt; @@ -163,15 +163,15 @@ XRenderCompositeString8 (Display *dpy, LockDisplay(dpy); GetReq(RenderCompositeGlyphs8, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs8; - req->op = op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : None; - req->glyphset = glyphset; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->op = (CARD8) op; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : None); + req->glyphset = (CARD32) glyphset; + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; /* * xGlyphElt must be aligned on a 32-bit boundary; this is @@ -183,7 +183,7 @@ XRenderCompositeString8 (Display *dpy, len = SIZEOF(xGlyphElt) * ((nchar + MAX_8-1) / MAX_8) + nchar; - req->length += (len + 3)>>2; /* convert to number of 32-bit words */ + req->length = (CARD16) (req->length + ((len + 3)>>2)); /* convert to number of 32-bit words */ /* * If the entire request does not fit into the remaining space in the @@ -198,8 +198,8 @@ XRenderCompositeString8 (Display *dpy, nbytes = MAX_8 + SIZEOF(xGlyphElt); BufAlloc (xGlyphElt *, elt, nbytes); elt->len = MAX_8; - elt->deltax = xDst; - elt->deltay = yDst; + elt->deltax = (INT16) xDst; + elt->deltay = (INT16) yDst; xDst = 0; yDst = 0; memcpy ((char *) (elt + 1), string, MAX_8); @@ -211,10 +211,10 @@ XRenderCompositeString8 (Display *dpy, { nbytes = (nchar + SIZEOF(xGlyphElt) + 3) & ~3; BufAlloc (xGlyphElt *, elt, nbytes); - elt->len = nchar; - elt->deltax = xDst; - elt->deltay = yDst; - memcpy ((char *) (elt + 1), string, nchar); + elt->len = (CARD8) nchar; + elt->deltax = (INT16) xDst; + elt->deltay = (INT16) yDst; + memcpy ((char *) (elt + 1), string, (size_t) nchar); } #undef MAX_8 @@ -235,7 +235,7 @@ XRenderCompositeString16 (Display *dpy, _Xconst unsigned short *string, int nchar) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs8Req *req; long len; xGlyphElt *elt; @@ -248,21 +248,21 @@ XRenderCompositeString16 (Display *dpy, LockDisplay(dpy); GetReq(RenderCompositeGlyphs16, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs16; - req->op = op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : None; - req->glyphset = glyphset; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->op = (CARD8) op; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : None); + req->glyphset = (CARD32) glyphset; + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; #define MAX_16 254 len = SIZEOF(xGlyphElt) * ((nchar + MAX_16-1) / MAX_16) + nchar * 2; - req->length += (len + 3)>>2; /* convert to number of 32-bit words */ + req->length = (CARD16) (req->length + ((len + 3)>>2)); /* convert to number of 32-bit words */ /* * If the entire request does not fit into the remaining space in the @@ -277,11 +277,11 @@ XRenderCompositeString16 (Display *dpy, nbytes = MAX_16 * 2 + SIZEOF(xGlyphElt); BufAlloc (xGlyphElt *, elt, nbytes); elt->len = MAX_16; - elt->deltax = xDst; - elt->deltay = yDst; + elt->deltax = (INT16) xDst; + elt->deltay = (INT16) yDst; xDst = 0; yDst = 0; - memcpy ((char *) (elt + 1), (char *) string, MAX_16 * 2); + memcpy ((char *) (elt + 1), (_Xconst char *) string, MAX_16 * 2); nchar = nchar - MAX_16; string += MAX_16; } @@ -290,10 +290,10 @@ XRenderCompositeString16 (Display *dpy, { nbytes = (nchar * 2 + SIZEOF(xGlyphElt) + 3) & ~3; BufAlloc (xGlyphElt *, elt, nbytes); - elt->len = nchar; - elt->deltax = xDst; - elt->deltay = yDst; - memcpy ((char *) (elt + 1), (char *) string, nchar * 2); + elt->len = (CARD8) nchar; + elt->deltax = (INT16) xDst; + elt->deltay = (INT16) yDst; + memcpy ((char *) (elt + 1), (_Xconst char *) string, (size_t) (nchar * 2)); } #undef MAX_16 @@ -315,7 +315,7 @@ XRenderCompositeString32 (Display *dpy, _Xconst unsigned int *string, int nchar) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs8Req *req; long len; xGlyphElt *elt; @@ -328,21 +328,21 @@ XRenderCompositeString32 (Display *dpy, LockDisplay(dpy); GetReq(RenderCompositeGlyphs32, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs32; - req->op = op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : None; - req->glyphset = glyphset; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->op = (CARD8) op; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : None); + req->glyphset = (CARD32) glyphset; + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; #define MAX_32 254 len = SIZEOF(xGlyphElt) * ((nchar + MAX_32-1) / MAX_32) + nchar * 4; - req->length += (len + 3)>>2; /* convert to number of 32-bit words */ + req->length = (CARD16) (req->length + ((len + 3)>>2)); /* convert to number of 32-bit words */ /* * If the entire request does not fit into the remaining space in the @@ -357,11 +357,11 @@ XRenderCompositeString32 (Display *dpy, nbytes = MAX_32 * 4 + SIZEOF(xGlyphElt); BufAlloc (xGlyphElt *, elt, nbytes); elt->len = MAX_32; - elt->deltax = xDst; - elt->deltay = yDst; + elt->deltax = (INT16) xDst; + elt->deltay = (INT16) yDst; xDst = 0; yDst = 0; - memcpy ((char *) (elt + 1), (char *) string, MAX_32 * 4); + memcpy ((char *) (elt + 1), (_Xconst char *) string, MAX_32 * 4); nchar = nchar - MAX_32; string += MAX_32; } @@ -370,10 +370,10 @@ XRenderCompositeString32 (Display *dpy, { nbytes = nchar * 4 + SIZEOF(xGlyphElt); BufAlloc (xGlyphElt *, elt, nbytes); - elt->len = nchar; - elt->deltax = xDst; - elt->deltay = yDst; - memcpy ((char *) (elt + 1), (char *) string, nchar * 4); + elt->len = (CARD8) nchar; + elt->deltax = (INT16) xDst; + elt->deltay = (INT16) yDst; + memcpy ((char *) (elt + 1), (_Xconst char *) string, (size_t) (nchar * 4)); } #undef MAX_32 @@ -394,15 +394,11 @@ XRenderCompositeText8 (Display *dpy, _Xconst XGlyphElt8 *elts, int nelt) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs8Req *req; GlyphSet glyphset; long len; - long elen; - xGlyphElt *elt; int i; - _Xconst char *chars; - int nchars; if (!nelt) return; @@ -411,15 +407,15 @@ XRenderCompositeText8 (Display *dpy, LockDisplay(dpy); GetReq(RenderCompositeGlyphs8, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs8; - req->op = op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : None; - req->glyphset = elts[0].glyphset; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->op = (CARD8) op; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : None); + req->glyphset = (CARD32) elts[0].glyphset; + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; /* * Compute the space necessary @@ -431,6 +427,9 @@ XRenderCompositeText8 (Display *dpy, glyphset = elts[0].glyphset; for (i = 0; i < nelt; i++) { + long elen; + int nchars; + /* * Check for glyphset change */ @@ -449,7 +448,7 @@ XRenderCompositeText8 (Display *dpy, len += (elen + 3) >> 2; } - req->length += len; + req->length = (CARD16) (req->length + len); /* * Send the glyphs @@ -457,6 +456,10 @@ XRenderCompositeText8 (Display *dpy, glyphset = elts[0].glyphset; for (i = 0; i < nelt; i++) { + xGlyphElt *elt; + _Xconst char *chars; + int nchars; + /* * Switch glyphsets */ @@ -478,9 +481,9 @@ XRenderCompositeText8 (Display *dpy, int this_chars = nchars > MAX_8 ? MAX_8 : nchars; BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)) - elt->len = this_chars; - elt->deltax = xDst; - elt->deltay = yDst; + elt->len = (CARD8) this_chars; + elt->deltax = (INT16) xDst; + elt->deltay = (INT16) yDst; xDst = 0; yDst = 0; Data (dpy, chars, this_chars); @@ -507,15 +510,11 @@ XRenderCompositeText16 (Display *dpy, _Xconst XGlyphElt16 *elts, int nelt) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs16Req *req; GlyphSet glyphset; long len; - long elen; - xGlyphElt *elt; int i; - _Xconst unsigned short *chars; - int nchars; if (!nelt) return; @@ -524,15 +523,15 @@ XRenderCompositeText16 (Display *dpy, LockDisplay(dpy); GetReq(RenderCompositeGlyphs16, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs16; - req->op = op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : None; - req->glyphset = elts[0].glyphset; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->op = (CARD8) op; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : None); + req->glyphset = (CARD32) elts[0].glyphset; + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; /* * Compute the space necessary @@ -544,6 +543,9 @@ XRenderCompositeText16 (Display *dpy, glyphset = elts[0].glyphset; for (i = 0; i < nelt; i++) { + int nchars; + long elen; + /* * Check for glyphset change */ @@ -562,11 +564,15 @@ XRenderCompositeText16 (Display *dpy, len += (elen + 3) >> 2; } - req->length += len; + req->length = (CARD16) (req->length + len); glyphset = elts[0].glyphset; for (i = 0; i < nelt; i++) { + xGlyphElt *elt; + _Xconst unsigned short *chars; + int nchars; + /* * Switch glyphsets */ @@ -589,9 +595,9 @@ XRenderCompositeText16 (Display *dpy, int this_bytes = this_chars * 2; BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)) - elt->len = this_chars; - elt->deltax = xDst; - elt->deltay = yDst; + elt->len = (CARD8) this_chars; + elt->deltax = (INT16) xDst; + elt->deltay = (INT16) yDst; xDst = 0; yDst = 0; Data16 (dpy, chars, this_bytes); @@ -618,15 +624,11 @@ XRenderCompositeText32 (Display *dpy, _Xconst XGlyphElt32 *elts, int nelt) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderCompositeGlyphs32Req *req; GlyphSet glyphset; long len; - long elen; - xGlyphElt *elt; int i; - _Xconst unsigned int *chars; - int nchars; if (!nelt) return; @@ -636,15 +638,15 @@ XRenderCompositeText32 (Display *dpy, GetReq(RenderCompositeGlyphs32, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCompositeGlyphs32; - req->op = op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : None; - req->glyphset = elts[0].glyphset; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->op = (CARD8) op; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : None); + req->glyphset = (CARD32) elts[0].glyphset; + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; /* * Compute the space necessary @@ -656,6 +658,9 @@ XRenderCompositeText32 (Display *dpy, glyphset = elts[0].glyphset; for (i = 0; i < nelt; i++) { + int nchars; + long elen; + /* * Check for glyphset change */ @@ -669,11 +674,15 @@ XRenderCompositeText32 (Display *dpy, len += (elen + 3) >> 2; } - req->length += len; + req->length = (CARD16) (req->length + len); glyphset = elts[0].glyphset; for (i = 0; i < nelt; i++) { + xGlyphElt *elt; + _Xconst unsigned int *chars; + int nchars; + /* * Switch glyphsets */ @@ -695,9 +704,9 @@ XRenderCompositeText32 (Display *dpy, int this_chars = nchars > MAX_32 ? MAX_32 : nchars; int this_bytes = this_chars * 4; BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt)) - elt->len = this_chars; - elt->deltax = xDst; - elt->deltay = yDst; + elt->len = (CARD8) this_chars; + elt->deltax = (INT16) xDst; + elt->deltay = (INT16) yDst; xDst = 0; yDst = 0; DataInt32 (dpy, chars, this_bytes); diff --git a/lib/libXrender/src/Makefile.in b/lib/libXrender/src/Makefile.in index f07eed646..469b2b2f2 100644 --- a/lib/libXrender/src/Makefile.in +++ b/lib/libXrender/src/Makefile.in @@ -218,6 +218,7 @@ OBJEXT = @OBJEXT@ OTOOL = @OTOOL@ OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ +PACKAGE_BRIEF = @PACKAGE_BRIEF@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ @@ -285,6 +286,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/lib/libXrender/src/Picture.c b/lib/libXrender/src/Picture.c index d9d6913f2..1b7639bcb 100644 --- a/lib/libXrender/src/Picture.c +++ b/lib/libXrender/src/Picture.c @@ -39,33 +39,33 @@ _XRenderProcessPictureAttributes (Display *dpy, unsigned int nvalues; if (valuemask & CPRepeat) - *value++ = attributes->repeat; + *value++ = (unsigned long) attributes->repeat; if (valuemask & CPAlphaMap) *value++ = attributes->alpha_map; if (valuemask & CPAlphaXOrigin) - *value++ = attributes->alpha_x_origin; + *value++ = (unsigned long) attributes->alpha_x_origin; if (valuemask & CPAlphaYOrigin) - *value++ = attributes->alpha_y_origin; + *value++ = (unsigned long) attributes->alpha_y_origin; if (valuemask & CPClipXOrigin) - *value++ = attributes->clip_x_origin; + *value++ = (unsigned long) attributes->clip_x_origin; if (valuemask & CPClipYOrigin) - *value++ = attributes->clip_y_origin; + *value++ = (unsigned long) attributes->clip_y_origin; if (valuemask & CPClipMask) *value++ = attributes->clip_mask; if (valuemask & CPGraphicsExposure) - *value++ = attributes->graphics_exposures; + *value++ = (unsigned long) attributes->graphics_exposures; if (valuemask & CPSubwindowMode) - *value++ = attributes->subwindow_mode; + *value++ = (unsigned long) attributes->subwindow_mode; if (valuemask & CPPolyEdge) - *value++ = attributes->poly_edge; + *value++ = (unsigned long) attributes->poly_edge; if (valuemask & CPPolyMode) - *value++ = attributes->poly_mode; + *value++ = (unsigned long) attributes->poly_mode; if (valuemask & CPDither) *value++ = attributes->dither; if (valuemask & CPComponentAlpha) - *value++ = attributes->component_alpha; + *value++ = (unsigned long) attributes->component_alpha; - req->length += (nvalues = value - values); + req->length += (nvalues = (unsigned) (value - values)); nvalues <<= 2; /* watch out for macros... */ Data32 (dpy, (long *) values, (long)nvalues); @@ -78,19 +78,19 @@ XRenderCreatePicture (Display *dpy, unsigned long valuemask, _Xconst XRenderPictureAttributes *attributes) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); Picture pid; xRenderCreatePictureReq *req; RenderCheckExtension (dpy, info, 0); LockDisplay(dpy); GetReq(RenderCreatePicture, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCreatePicture; - req->pid = pid = XAllocID(dpy); - req->drawable = drawable; - req->format = format->id; - if ((req->mask = valuemask)) + req->pid = (CARD32) (pid = XAllocID(dpy)); + req->drawable = (CARD32) drawable; + req->format = (CARD32) format->id; + if ((req->mask = (CARD32) valuemask)) _XRenderProcessPictureAttributes (dpy, (xRenderChangePictureReq *) req, valuemask, @@ -106,16 +106,16 @@ XRenderChangePicture (Display *dpy, unsigned long valuemask, _Xconst XRenderPictureAttributes *attributes) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - xRenderChangePictureReq *req; + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + xRenderChangePictureReq *req; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); GetReq(RenderChangePicture, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderChangePicture; - req->picture = picture; - req->mask = valuemask; + req->picture = (CARD32) picture; + req->mask = (CARD32) valuemask; _XRenderProcessPictureAttributes (dpy, req, valuemask, @@ -137,15 +137,15 @@ _XRenderSetPictureClipRectangles (Display *dpy, long len; GetReq (RenderSetPictureClipRectangles, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderSetPictureClipRectangles; - req->picture = picture; - req->xOrigin = xOrigin; - req->yOrigin = yOrigin; + req->picture = (CARD32) picture; + req->xOrigin = (INT16) xOrigin; + req->yOrigin = (INT16) yOrigin; len = ((long) n) << 1; SetReqLen (req, len, 1); len <<= 2; - Data16 (dpy, (short *) rects, len); + Data16 (dpy, (_Xconst short *) rects, len); } void @@ -172,25 +172,27 @@ XRenderSetPictureClipRegion (Display *dpy, Region r) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - int i; - XRectangle *xr, *pr; - BOX *pb; + XRectangle *xr; unsigned long total; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); - total = r->numRects * sizeof (XRectangle); + total = (unsigned long) ((size_t) r->numRects * sizeof (XRectangle)); if ((xr = (XRectangle *) _XAllocTemp(dpy, total))) { - for (pr = xr, pb = r->rects, i = r->numRects; --i >= 0; pr++, pb++) { + int i; + XRectangle *pr; + BOX *pb; + + for (pr = xr, pb = r->rects, i = (int) r->numRects; --i >= 0; pr++, pb++) { pr->x = pb->x1; pr->y = pb->y1; - pr->width = pb->x2 - pb->x1; - pr->height = pb->y2 - pb->y1; + pr->width = (unsigned short) (pb->x2 - pb->x1); + pr->height = (unsigned short) (pb->y2 - pb->y1); } } if (xr || !r->numRects) _XRenderSetPictureClipRectangles (dpy, info, picture, 0, 0, - xr, r->numRects); + xr, (int) r->numRects); if (xr) _XFreeTemp(dpy, (char *)xr, total); UnlockDisplay(dpy); @@ -202,15 +204,15 @@ XRenderSetPictureTransform (Display *dpy, Picture picture, XTransform *transform) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderSetPictureTransformReq *req; RenderSimpleCheckExtension (dpy, info); LockDisplay (dpy); GetReq(RenderSetPictureTransform, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderSetPictureTransform; - req->picture = picture; + req->picture = (CARD32) picture; req->transform.matrix11 = transform->matrix[0][0]; req->transform.matrix12 = transform->matrix[0][1]; req->transform.matrix13 = transform->matrix[0][2]; @@ -229,15 +231,15 @@ void XRenderFreePicture (Display *dpy, Picture picture) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderFreePictureReq *req; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); GetReq(RenderFreePicture, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderFreePicture; - req->picture = picture; + req->picture = (CARD32) picture; UnlockDisplay(dpy); SyncHandle(); } @@ -247,16 +249,16 @@ Picture XRenderCreateSolidFill(Display *dpy, const XRenderColor *color) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - Picture pid; - xRenderCreateSolidFillReq *req; + Picture pid; + xRenderCreateSolidFillReq *req; RenderCheckExtension (dpy, info, 0); LockDisplay(dpy); GetReq(RenderCreateSolidFill, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCreateSolidFill; - req->pid = pid = XAllocID(dpy); + req->pid = (CARD32) (pid = XAllocID(dpy)); req->color.red = color->red; req->color.green = color->green; req->color.blue = color->blue; @@ -275,23 +277,23 @@ Picture XRenderCreateLinearGradient(Display *dpy, int nStops) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - Picture pid; + Picture pid; xRenderCreateLinearGradientReq *req; long len; RenderCheckExtension (dpy, info, 0); LockDisplay(dpy); GetReq(RenderCreateLinearGradient, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCreateLinearGradient; - req->pid = pid = XAllocID(dpy); + req->pid = (CARD32) (pid = XAllocID(dpy)); req->p1.x = gradient->p1.x; req->p1.y = gradient->p1.y; req->p2.x = gradient->p2.x; req->p2.y = gradient->p2.y; - req->nStops = nStops; + req->nStops = (CARD32) nStops; len = (long) nStops * 3; SetReqLen (req, len, 6); DataInt32(dpy, stops, nStops * 4); @@ -309,17 +311,17 @@ Picture XRenderCreateRadialGradient(Display *dpy, int nStops) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - Picture pid; + Picture pid; xRenderCreateRadialGradientReq *req; long len; RenderCheckExtension (dpy, info, 0); LockDisplay(dpy); GetReq(RenderCreateRadialGradient, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCreateRadialGradient; - req->pid = pid = XAllocID(dpy); + req->pid = (CARD32) (pid = XAllocID(dpy)); req->inner.x = gradient->inner.x; req->inner.y = gradient->inner.y; req->outer.x = gradient->outer.x; @@ -327,7 +329,7 @@ Picture XRenderCreateRadialGradient(Display *dpy, req->inner_radius = gradient->inner.radius; req->outer_radius = gradient->outer.radius; - req->nStops = nStops; + req->nStops = (CARD32) nStops; len = (long) nStops * 3; SetReqLen (req, len, 6); DataInt32(dpy, stops, nStops * 4); @@ -345,22 +347,22 @@ Picture XRenderCreateConicalGradient(Display *dpy, int nStops) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - Picture pid; + Picture pid; xRenderCreateConicalGradientReq *req; long len; RenderCheckExtension (dpy, info, 0); LockDisplay(dpy); GetReq(RenderCreateConicalGradient, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderCreateConicalGradient; - req->pid = pid = XAllocID(dpy); + req->pid = (CARD32) (pid = XAllocID(dpy)); req->center.x = gradient->center.x; req->center.y = gradient->center.y; req->angle = gradient->angle; - req->nStops = nStops; + req->nStops = (CARD32) nStops; len = (long) nStops * 3; SetReqLen (req, len, 6); DataInt32(dpy, stops, nStops * 4); diff --git a/lib/libXrender/src/Poly.c b/lib/libXrender/src/Poly.c index 5c4185f82..aa69eeb53 100644 --- a/lib/libXrender/src/Poly.c +++ b/lib/libXrender/src/Poly.c @@ -81,23 +81,27 @@ XRenderComputeIntersect (XLineFixed *l1, XLineFixed *l2) double m2 = XRenderComputeInverseSlope (l2); double b2 = XRenderComputeXIntercept (l2, m2); + if ( m1 == m2 ) return XDoubleToFixed(32766); /* lines don't intersect */ + return XDoubleToFixed ((b2 - b1) / (m1 - m2)); } static int XRenderComputeTrapezoids (Edge *edges, int nedges, - int winding, - XTrapezoid *traps) + int winding _X_UNUSED, + XTrapezoid *traps, + int *ntraps, + int maxtraps) { - int ntraps = 0; - int inactive; + int ok = 1, inactive; Edge *active; Edge *e, *en, *next; XFixed y, next_y, intersect; - qsort (edges, nedges, sizeof (Edge), CompareEdge); + qsort (edges, (size_t) nedges, sizeof (Edge), CompareEdge); + *ntraps = 0; y = edges[0].edge.p1.y; active = NULL; inactive = 0; @@ -182,7 +186,7 @@ XRenderComputeTrapezoids (Edge *edges, intersect = XRenderComputeIntersect (&e->edge, &e->next->edge); /* make sure this point is below the actual intersection */ intersect = intersect + 1; - if (intersect < next_y) + if (intersect < next_y && intersect > y) next_y = intersect; } } @@ -198,7 +202,11 @@ XRenderComputeTrapezoids (Edge *edges, traps->left = e->edge; traps->right = en->edge; traps++; - ntraps++; + (*ntraps)++; + if ( --maxtraps <= 0 ) { + ok = 0; + break; + } } y = next_y; @@ -218,7 +226,7 @@ XRenderComputeTrapezoids (Edge *edges, } } } - return ntraps; + return ok; } void @@ -229,8 +237,8 @@ XRenderCompositeDoublePoly (Display *dpy, _Xconst XRenderPictFormat *maskFormat, int xSrc, int ySrc, - int xDst, - int yDst, + int xDst _X_UNUSED, + int yDst _X_UNUSED, _Xconst XPointDouble *fpoints, int npoints, int winding) @@ -238,17 +246,19 @@ XRenderCompositeDoublePoly (Display *dpy, Edge *edges; XTrapezoid *traps; int i, nedges, ntraps; - XFixed x, y, prevx = 0, prevy = 0, firstx = 0, firsty = 0; + XFixed prevx = 0, prevy = 0, firstx = 0, firsty = 0; XFixed top = 0, bottom = 0; /* GCCism */ - edges = (Edge *) Xmalloc (npoints * sizeof (Edge) + - (npoints * npoints * sizeof (XTrapezoid))); + edges = Xmalloc (((size_t) npoints * sizeof (Edge)) + + ((size_t) (npoints * npoints) * sizeof (XTrapezoid))); if (!edges) return; traps = (XTrapezoid *) (edges + npoints); nedges = 0; for (i = 0; i <= npoints; i++) { + XFixed x, y; + if (i == npoints) { x = firstx; @@ -295,8 +305,9 @@ XRenderCompositeDoublePoly (Display *dpy, prevx = x; prevy = y; } - ntraps = XRenderComputeTrapezoids (edges, nedges, winding, traps); - /* XXX adjust xSrc/xDst */ - XRenderCompositeTrapezoids (dpy, op, src, dst, maskFormat, xSrc, ySrc, traps, ntraps); + if ( XRenderComputeTrapezoids (edges, nedges, winding, traps, &ntraps, npoints * npoints )) { + /* XXX adjust xSrc/xDst */ + XRenderCompositeTrapezoids (dpy, op, src, dst, maskFormat, xSrc, ySrc, traps, ntraps); + } Xfree (edges); } diff --git a/lib/libXrender/src/Trap.c b/lib/libXrender/src/Trap.c index 919aaef53..24f24109a 100644 --- a/lib/libXrender/src/Trap.c +++ b/lib/libXrender/src/Trap.c @@ -37,34 +37,35 @@ XRenderCompositeTrapezoids (Display *dpy, _Xconst XTrapezoid *traps, int ntrap) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - xRenderTrapezoidsReq *req; - int n; - long len; + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); unsigned long max_req = dpy->bigreq_size ? dpy->bigreq_size : dpy->max_request_size; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); while (ntrap) { + xRenderTrapezoidsReq *req; + int n; + unsigned long len; + GetReq(RenderTrapezoids, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderTrapezoids; req->op = (CARD8) op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : 0; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : 0); + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; n = ntrap; - len = ((long) n) * (SIZEOF (xTrapezoid) >> 2); + len = ((unsigned long) n) * (SIZEOF (xTrapezoid) >> 2); if (len > (max_req - req->length)) { - n = (max_req - req->length) / (SIZEOF (xTrapezoid) >> 2); - len = ((long)n) * (SIZEOF (xTrapezoid) >> 2); + n = (int) ((max_req - req->length) / (SIZEOF (xTrapezoid) >> 2)); + len = ((unsigned long) n) * (SIZEOF (xTrapezoid) >> 2); } SetReqLen (req, len, len); len <<= 2; - DataInt32 (dpy, (int *) traps, len); + DataInt32 (dpy, (_Xconst int *) traps, len); ntrap -= n; traps += n; } diff --git a/lib/libXrender/src/Tri.c b/lib/libXrender/src/Tri.c index 155f2ce14..b64ad6954 100644 --- a/lib/libXrender/src/Tri.c +++ b/lib/libXrender/src/Tri.c @@ -37,33 +37,34 @@ XRenderCompositeTriangles (Display *dpy, _Xconst XTriangle *triangles, int ntriangle) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - xRenderTrianglesReq *req; - int n; - long len; + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); while (ntriangle) { + xRenderTrianglesReq *req; + int n; + long len; + GetReq(RenderTriangles, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderTriangles; req->op = (CARD8) op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : 0; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : 0); + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; n = ntriangle; len = ((long) n) * (SIZEOF (xTriangle) >> 2); if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { - n = (dpy->max_request_size - req->length) / (SIZEOF (xTriangle) >> 2); + n = (int) ((dpy->max_request_size - req->length) / (SIZEOF (xTriangle) >> 2)); len = ((long)n) * (SIZEOF (xTriangle) >> 2); } SetReqLen (req, len, len); len <<= 2; - DataInt32 (dpy, (int *) triangles, len); + DataInt32 (dpy, (_Xconst int *) triangles, len); ntriangle -= n; triangles += n; } @@ -82,33 +83,34 @@ XRenderCompositeTriStrip (Display *dpy, _Xconst XPointFixed *points, int npoint) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); - xRenderTriStripReq *req; - int n; - long len; + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); while (npoint > 2) { + xRenderTriStripReq *req; + int n; + long len; + GetReq(RenderTriStrip, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderTriStrip; req->op = (CARD8) op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : 0; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : 0); + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; n = npoint; len = ((long) n) * (SIZEOF (xPointFixed) >> 2); if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { - n = (dpy->max_request_size - req->length) / (SIZEOF (xPointFixed) >> 2); + n = (int) ((dpy->max_request_size - req->length) / (SIZEOF (xPointFixed) >> 2)); len = ((long)n) * (SIZEOF (xPointFixed) >> 2); } SetReqLen (req, len, len); len <<= 2; - DataInt32 (dpy, (int *) points, len); + DataInt32 (dpy, (_Xconst int *) points, len); npoint -= (n - 2); points += (n - 2); } @@ -127,12 +129,8 @@ XRenderCompositeTriFan (Display *dpy, _Xconst XPointFixed *points, int npoint) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); _Xconst XPointFixed *first = points; - xPointFixed *p; - xRenderTriFanReq *req; - int n; - long len; RenderSimpleCheckExtension (dpy, info); LockDisplay(dpy); @@ -140,27 +138,32 @@ XRenderCompositeTriFan (Display *dpy, npoint--; while (npoint > 1) { + xRenderTriFanReq *req; + xPointFixed *p; + int n; + long len; + GetReqExtra(RenderTriFan, SIZEOF (xPointFixed), req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderTriFan; req->op = (CARD8) op; - req->src = src; - req->dst = dst; - req->maskFormat = maskFormat ? maskFormat->id : 0; - req->xSrc = xSrc; - req->ySrc = ySrc; + req->src = (CARD32) src; + req->dst = (CARD32) dst; + req->maskFormat = (CARD32) (maskFormat ? maskFormat->id : 0); + req->xSrc = (INT16) xSrc; + req->ySrc = (INT16) ySrc; p = (xPointFixed *) (req + 1); p->x = first->x; p->y = first->y; n = npoint; len = ((long) n) * (SIZEOF (xPointFixed) >> 2); if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { - n = (dpy->max_request_size - req->length) / (SIZEOF (xPointFixed) >> 2); + n = (int) ((dpy->max_request_size - req->length) / (SIZEOF (xPointFixed) >> 2)); len = ((long)n) * (SIZEOF (xPointFixed) >> 2); } SetReqLen (req, len, len); len <<= 2; - DataInt32 (dpy, (int *) points, len); + DataInt32 (dpy, (_Xconst int *) points, len); npoint -= (n - 1); points += (n - 1); } diff --git a/lib/libXrender/src/Xrender.c b/lib/libXrender/src/Xrender.c index 71cf3e6d7..61a1139b6 100644 --- a/lib/libXrender/src/Xrender.c +++ b/lib/libXrender/src/Xrender.c @@ -98,14 +98,17 @@ XRenderDepthCheckErrorHandler (Display *dpy, XErrorEvent *evt) if (evt->request_code == X_CreatePixmap && evt->error_code == BadValue) { DepthCheckPtr d; + _XLockMutex(_Xglobal_lock); for (d = depthChecks; d; d = d->next) + { if (d->dpy == dpy) { if ((long) (evt->serial - d->serial) >= 0) d->missing |= DEPTH_MASK(evt->resourceid); break; } + } _XUnlockMutex (_Xglobal_lock); } return 0; @@ -158,7 +161,7 @@ XRenderHasDepths (Display *dpy) if ((missing & DEPTH_MASK(d)) && d != 1) { Pixmap p; - p = XCreatePixmap (dpy, RootWindow (dpy, s), 1, 1, d); + p = XCreatePixmap (dpy, RootWindow (dpy, s), 1, 1, (unsigned) d); XFreePixmap (dpy, p); } XSync (dpy, False); @@ -194,7 +197,7 @@ XRenderExtAddDisplay (XRenderExtInfo *extinfo, { XRenderExtDisplayInfo *dpyinfo; - dpyinfo = (XRenderExtDisplayInfo *) Xmalloc (sizeof (XRenderExtDisplayInfo)); + dpyinfo = Xmalloc (sizeof (XRenderExtDisplayInfo)); if (!dpyinfo) return NULL; dpyinfo->display = dpy; dpyinfo->info = NULL; @@ -273,7 +276,7 @@ XRenderExtRemoveDisplay (XRenderExtInfo *extinfo, Display *dpy) if (dpyinfo == extinfo->cur) extinfo->cur = NULL; /* flush cache */ _XUnlockMutex(_Xglobal_lock); - Xfree ((char *) dpyinfo); + Xfree (dpyinfo); return 1; } @@ -292,7 +295,7 @@ XRenderFindDisplay (Display *dpy) } static int -XRenderCloseDisplay (Display *dpy, XExtCodes *codes) +XRenderCloseDisplay (Display *dpy, XExtCodes *codes _X_UNUSED) { XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); if (info && info->info) XFree (info->info); @@ -386,15 +389,15 @@ _XRenderVersionHandler (Display *dpy, _XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len, (SIZEOF(xRenderQueryVersionReply) - SIZEOF(xReply)) >> 2, True); - state->major_version = repl->majorVersion; - state->minor_version = repl->minorVersion; + state->major_version = (int) repl->majorVersion; + state->minor_version = (int) repl->minorVersion; return True; } Status XRenderQueryFormats (Display *dpy) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); _XAsyncHandler async; _XrenderVersionState async_state; xRenderQueryVersionReq *vreq; @@ -407,11 +410,12 @@ XRenderQueryFormats (Display *dpy) XRenderVisual *visual; xPictFormInfo *xFormat; xPictScreen *xScreen; - xPictDepth *xDepth; + xPictDepth *xPDepth; xPictVisual *xVisual; CARD32 *xSubpixel; void *xData; - int nf, ns, nd, nv; + int ns, nd; + unsigned nf; unsigned long rlength; unsigned long nbytes; @@ -423,7 +427,7 @@ XRenderQueryFormats (Display *dpy) return 1; } GetReq (RenderQueryVersion, vreq); - vreq->reqType = info->codes->major_opcode; + vreq->reqType = (CARD8) info->codes->major_opcode; vreq->renderReqType = X_RenderQueryVersion; vreq->majorVersion = RENDER_MAJOR; vreq->minorVersion = RENDER_MINOR; @@ -436,7 +440,7 @@ XRenderQueryFormats (Display *dpy) dpy->async_handlers = &async; GetReq (RenderQueryPictFormats, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderQueryPictFormats; if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) @@ -495,14 +499,14 @@ XRenderQueryFormats (Display *dpy) xri->major_version = async_state.major_version; xri->minor_version = async_state.minor_version; xri->format = (XRenderPictFormat *) (xri + 1); - xri->nformat = rep.numFormats; + xri->nformat = (int) rep.numFormats; xri->screen = (XRenderScreen *) (xri->format + rep.numFormats); - xri->nscreen = rep.numScreens; + xri->nscreen = (int) rep.numScreens; xri->depth = (XRenderDepth *) (xri->screen + rep.numScreens); - xri->ndepth = rep.numDepths; + xri->ndepth = (int) rep.numDepths; xri->visual = (XRenderVisual *) (xri->depth + rep.numDepths); - xri->nvisual = rep.numVisuals; - _XRead (dpy, (char *) xData, rlength); + xri->nvisual = (int) rep.numVisuals; + _XRead (dpy, (char *) xData, (long) rlength); format = xri->format; xFormat = (xPictFormInfo *) xData; for (nf = 0; nf < rep.numFormats; nf++) @@ -510,14 +514,14 @@ XRenderQueryFormats (Display *dpy) format->id = xFormat->id; format->type = xFormat->type; format->depth = xFormat->depth; - format->direct.red = xFormat->direct.red; - format->direct.redMask = xFormat->direct.redMask; - format->direct.green = xFormat->direct.green; - format->direct.greenMask = xFormat->direct.greenMask; - format->direct.blue = xFormat->direct.blue; - format->direct.blueMask = xFormat->direct.blueMask; - format->direct.alpha = xFormat->direct.alpha; - format->direct.alphaMask = xFormat->direct.alphaMask; + format->direct.red = (short) xFormat->direct.red; + format->direct.redMask = (short) xFormat->direct.redMask; + format->direct.green = (short) xFormat->direct.green; + format->direct.greenMask = (short) xFormat->direct.greenMask; + format->direct.blue = (short) xFormat->direct.blue; + format->direct.blueMask = (short) xFormat->direct.blueMask; + format->direct.alpha = (short) xFormat->direct.alpha; + format->direct.alphaMask = (short) xFormat->direct.alphaMask; format->colormap = xFormat->colormap; format++; xFormat++; @@ -529,10 +533,10 @@ XRenderQueryFormats (Display *dpy) for (ns = 0; ns < xri->nscreen; ns++) { screen->depths = depth; - screen->ndepths = xScreen->nDepth; + screen->ndepths = (int) xScreen->nDepth; screen->fallback = _XRenderFindFormat (xri, xScreen->fallback); screen->subpixel = SubPixelUnknown; - xDepth = (xPictDepth *) (xScreen + 1); + xPDepth = (xPictDepth *) (xScreen + 1); if (screen->ndepths > rep.numDepths) { Xfree (xri); Xfree (xData); @@ -541,13 +545,15 @@ XRenderQueryFormats (Display *dpy) SyncHandle (); return 0; } - rep.numDepths -= screen->ndepths; + rep.numDepths -= (CARD32) screen->ndepths; for (nd = 0; nd < screen->ndepths; nd++) { - depth->depth = xDepth->depth; - depth->nvisuals = xDepth->nPictVisuals; + int nv; + + depth->depth = xPDepth->depth; + depth->nvisuals = xPDepth->nPictVisuals; depth->visuals = visual; - xVisual = (xPictVisual *) (xDepth + 1); + xVisual = (xPictVisual *) (xPDepth + 1); if (depth->nvisuals > rep.numVisuals) { Xfree (xri); Xfree (xData); @@ -556,7 +562,7 @@ XRenderQueryFormats (Display *dpy) SyncHandle (); return 0; } - rep.numVisuals -= depth->nvisuals; + rep.numVisuals -= (CARD32) depth->nvisuals; for (nv = 0; nv < depth->nvisuals; nv++) { visual->visual = _XRenderFindVisual (dpy, xVisual->visual); @@ -565,16 +571,16 @@ XRenderQueryFormats (Display *dpy) xVisual++; } depth++; - xDepth = (xPictDepth *) xVisual; + xPDepth = (xPictDepth *) xVisual; } screen++; - xScreen = (xPictScreen *) xDepth; + xScreen = (xPictScreen *) xPDepth; } xSubpixel = (CARD32 *) xScreen; screen = xri->screen; for (ns = 0; ns < rep.numSubpixel; ns++) { - screen->subpixel = *xSubpixel; + screen->subpixel = (int) *xSubpixel; xSubpixel++; screen++; } @@ -858,19 +864,19 @@ XRenderQueryPictIndexValues(Display *dpy, _Xconst XRenderPictFormat *format, int *num) { - XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); + XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy); xRenderQueryPictIndexValuesReq *req; xRenderQueryPictIndexValuesReply rep; XIndexValue *values; - unsigned int nbytes, nread, rlength, i; + unsigned int nbytes, nread, i; RenderCheckExtension (dpy, info, NULL); LockDisplay (dpy); GetReq (RenderQueryPictIndexValues, req); - req->reqType = info->codes->major_opcode; + req->reqType = (CARD8) info->codes->major_opcode; req->renderReqType = X_RenderQueryPictIndexValues; - req->format = format->id; + req->format = (CARD32) format->id; if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { UnlockDisplay (dpy); @@ -880,17 +886,18 @@ XRenderQueryPictIndexValues(Display *dpy, if ((rep.length < (INT_MAX >> 2)) && (rep.numIndexValues < (INT_MAX / sizeof (XIndexValue)))) { + unsigned int rlength; /* request data length */ nbytes = rep.length << 2; /* bytes of actual data in the request */ nread = rep.numIndexValues * SIZEOF (xIndexValue); /* size of array returned to application */ - rlength = rep.numIndexValues * sizeof (XIndexValue); + rlength = (unsigned) ((unsigned long) rep.numIndexValues * sizeof (XIndexValue)); /* allocate returned data */ values = Xmalloc (rlength); } else { - nbytes = nread = rlength = 0; + nbytes = nread = 0; values = NULL; } @@ -903,8 +910,8 @@ XRenderQueryPictIndexValues(Display *dpy, } /* read the values one at a time and convert */ - *num = rep.numIndexValues; - for(i = 0; i < rep.numIndexValues; i++) + *num = (int) rep.numIndexValues; + for (i = 0; i < rep.numIndexValues; i++) { xIndexValue value; diff --git a/lib/libXrender/src/Xrenderint.h b/lib/libXrender/src/Xrenderint.h index 57b13dac2..1a9b86461 100644 --- a/lib/libXrender/src/Xrenderint.h +++ b/lib/libXrender/src/Xrenderint.h @@ -25,12 +25,18 @@ #ifndef _XRENDERINT_H_ #define _XRENDERINT_H_ -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <X11/Xlibint.h> #include <X11/Xutil.h> #include <X11/extensions/renderproto.h> #include "Xrender.h" +#ifndef _X_UNUSED +#define _X_UNUSED /* nothing */ +#endif + typedef struct { Visual *visual; XRenderPictFormat *format; @@ -104,9 +110,9 @@ XRenderFindDisplay (Display *dpy); */ #ifdef WORD64 -#define DataInt32(dpy,d,len) Data32(dpy,(long *) (d),len) +#define DataInt32(dpy,d,len) Data32(dpy,(_Xconst long *) (d),len) #else -#define DataInt32(dpy,d,len) Data(dpy,(char *) (d),len) +#define DataInt32(dpy,d,len) Data(dpy,(_Xconst char *) (d),len) #endif #endif /* _XRENDERINT_H_ */ |