From 8602df60ad189c73464bbf6b6918b538da43a22e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 21 Jul 2022 17:24:10 +0200 Subject: Change license, improve makefile, remove dist/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- .gitignore | 14 +- COPYING | 15 - DEPENDENCIES | 1 - LICENSE | 683 +------------------------ Makefile | 225 +++------ README | 3 +- config.mk | 8 + dist/archlinux/stable/.gitignore | 6 - dist/archlinux/stable/PKGBUILD | 26 - libgamma-error.cc | 134 +++++ libgamma-error.hh | 177 +++++++ libgamma-facade.cc | 443 +++++++++++++++++ libgamma-facade.hh | 251 ++++++++++ libgamma-method.cc | 535 ++++++++++++++++++++ libgamma-method.hh | 1006 +++++++++++++++++++++++++++++++++++++ libgamma-native.hh | 26 + libgamma.hh | 12 + libgammamm.a | Bin 0 -> 48418 bytes libgammamm.pc | 1 - mk/linux.mk | 6 + mk/macos.mk | 6 + mk/windows.mk | 6 + src/libgamma-error.cc | 150 ------ src/libgamma-error.hh | 193 ------- src/libgamma-facade.cc | 459 ----------------- src/libgamma-facade.hh | 267 ---------- src/libgamma-method.cc | 551 -------------------- src/libgamma-method.hh | 1022 -------------------------------------- src/libgamma-native.hh | 42 -- src/libgamma.hh | 28 -- src/test.cc | 323 ------------ test.cc | 307 ++++++++++++ 32 files changed, 2997 insertions(+), 3929 deletions(-) delete mode 100644 COPYING create mode 100644 config.mk delete mode 100644 dist/archlinux/stable/.gitignore delete mode 100644 dist/archlinux/stable/PKGBUILD create mode 100644 libgamma-error.cc create mode 100644 libgamma-error.hh create mode 100644 libgamma-facade.cc create mode 100644 libgamma-facade.hh create mode 100644 libgamma-method.cc create mode 100644 libgamma-method.hh create mode 100644 libgamma-native.hh create mode 100644 libgamma.hh create mode 100644 libgammamm.a create mode 100644 mk/linux.mk create mode 100644 mk/macos.mk create mode 100644 mk/windows.mk delete mode 100644 src/libgamma-error.cc delete mode 100644 src/libgamma-error.hh delete mode 100644 src/libgamma-facade.cc delete mode 100644 src/libgamma-facade.hh delete mode 100644 src/libgamma-method.cc delete mode 100644 src/libgamma-method.hh delete mode 100644 src/libgamma-native.hh delete mode 100644 src/libgamma.hh delete mode 100644 src/test.cc create mode 100644 test.cc diff --git a/.gitignore b/.gitignore index 4f7dd78..f523fe1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,4 @@ -_/ -bin/ -obj/ -\#*\# -.* -!.git* +*\#* *~ *.bak *.swp @@ -12,4 +7,9 @@ obj/ *.gch *.out *.o - +*.lo +*.so +*.so.* +*.dll +*.dylib +/test diff --git a/COPYING b/COPYING deleted file mode 100644 index 8ebec10..0000000 --- a/COPYING +++ /dev/null @@ -1,15 +0,0 @@ -libgammamm -- Display server abstraction layer for gamma ramp and C++ -Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - -This library 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 3 of the License, or -(at your option) any later version. - -This library 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 library. If not, see . diff --git a/DEPENDENCIES b/DEPENDENCIES index 139ca2d..b349ec5 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -19,4 +19,3 @@ INSTALL DEPENDENCIES: make coreutils - diff --git a/LICENSE b/LICENSE index 94a9ed0..d3ebfaa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,674 +1,15 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 +ISC License - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +© 2014, 2022 Mattias Andrée - Preamble +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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 3 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, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/Makefile b/Makefile index 640ce35..db413a0 100644 --- a/Makefile +++ b/Makefile @@ -1,188 +1,83 @@ -# Copying and distribution of this file, with or without modification, -# are permitted in any medium without royalty provided the copyright -# notice and this notice are preserved. This file is offered as-is, -# without any warranty. - - -# The package path prefix, if you want to install to another root, set DESTDIR to that root -PREFIX ?= /usr -# The library path excluding prefix -LIB ?= /lib -# The library header path excluding prefix. -INCLUDE ?= /include -# The resource path excluding prefix -DATA ?= /share -# The library path including prefix -LIBDIR ?= $(PREFIX)$(LIB) -# The library header path including prefix. -INCLUDEDIR ?= $(PREFIX)$(INCLUDE) -# The pkg-config file path including prefix. -PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig -# The resource path including prefix -DATADIR ?= $(PREFIX)$(DATA) -# The generic documentation path including prefix -DOCDIR ?= $(DATADIR)/doc -# The info manual documentation path including prefix -INFODIR ?= $(DATADIR)/info -# The license base path including prefix -LICENSEDIR ?= $(DATADIR)/licenses - -# The name of the package as it should be installed -PKGNAME = libgammamm - - - -# The version of the library. -LIB_MAJOR = 1 -LIB_MINOR = 0 -LIB_VERSION = $(LIB_MAJOR).$(LIB_MINOR) - -# The so in libgammamm.so as the library file is named on Linux -ifeq ($(PLATFORM),w32) -SO = dll -else -ifeq ($(PLATFORM),osx) -SO = dylib -else -SO = so -endif -endif - -# Platform dependent flags -ifeq ($(PLATFORM),w32) -SHARED = -mdll -LDSO = -Wl,-soname,libgammamm.$(SO).$(LIB_MAJOR) -PIC = -else -ifeq ($(PLATFORM),osx) -SHARED = -dynamiclib -LDSO = -PIC = -fPIC -else -SHARED = -shared -LDSO = -Wl,-soname,libgammamm.$(SO).$(LIB_MAJOR) -PIC = -fPIC -endif -endif - -# The C++ standard for C++ code compilation -STD = c++11 -# Optimisation settings for C++ code compilation -OPTIMISE ?= -Og -g -# Definitions for CPP, remove __GCC__ if you are not using g++ -DEFS = __GCC__ - -# Warning flags, set to empty if you are not using GCC -WARN = -Wall -Wextra -pedantic -Wdouble-promotion -Wformat=2 -Winit-self \ - -Wmissing-include-dirs -Wtrampolines -Wfloat-equal -Wshadow \ - -Wmissing-declarations -Wredundant-decls -Winline -Wno-variadic-macros \ - -Weffc++ -Wc++11-compat -Wzero-as-null-pointer-constant -Wuseless-cast \ - -Wsync-nand -Wunsafe-loop-optimizations -Wcast-align -Wstrict-overflow \ - -Wundef -Wcast-qual -Wwrite-strings -Wlogical-op \ - -Wpacked -Wvector-operation-performance -Wsuggest-attribute=const \ - -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ - -Wsuggest-attribute=format -Wnormalized=nfkc -Wconversion \ - -fstrict-aliasing -fstrict-overflow -fipa-pure-const -ftree-vrp \ - -fstack-usage -funsafe-loop-optimizations -# ignored: -Waggregate-return - - - -# Flags to use when compiling -CXX_FLAGS = $(foreach D,$(DEFS),-D$(D)) -std=$(STD) $(OPTIMISE) $(PIC) $(WARN) - -# Flags to use when linking -LD_FLAGS = -lgamma -std=$(STD) $(OPTIMISE) $(WARN) - - -# Header files -HEADERS = libgamma libgamma-error libgamma-facade libgamma-method libgamma-native - +.POSIX: +CONFIGFILE = config.mk +include $(CONFIGFILE) -.PHONY: all lib test -all: lib test -lib: bin/libgammamm.$(SO).$(LIB_VERSION) bin/libgammamm.$(SO).$(LIB_MAJOR) bin/libgammamm.$(SO) -test: bin/test +OS = linux +include mk/$(OS).mk -bin/libgammamm.$(SO).$(LIB_VERSION): obj/libgamma-error.o obj/libgamma-facade.o obj/libgamma-method.o - @mkdir -p bin - $(CXX) $(LD_FLAGS) $(SHARED) $(LDSO) -o $@ $^ -bin/libgammamm.$(SO).$(LIB_MAJOR): - @mkdir -p bin - ln -sf libgammamm.$(SO).$(LIB_VERSION) $@ - -bin/libgammamm.$(SO): - @mkdir -p bin - ln -sf libgammamm.$(SO).$(LIB_VERSION) $@ - -bin/test: obj/test.o obj/libgamma-error.o obj/libgamma-facade.o obj/libgamma-method.o - $(CXX) $(LD_FLAGS) -o $@ $^ $(LDFLAGS) - -obj/%.o: src/%.cc src/*.hh - @mkdir -p obj - $(CXX) $(CXX_FLAGS) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) - - - -.PHONY: install -install: install-base +LIB_MAJOR = 1 +LIB_MINOR = 0 +LIB_VERSION = $(LIB_MAJOR).$(LIB_MINOR) +LIB_NAME = gammamm -.PHONY: install -install-all: install-base -.PHONY: install-base -install-base: install-lib install-include install-pc install-copyright +HDR =\ + libgamma.hh\ + libgamma-error.hh\ + libgamma-facade.hh\ + libgamma-method.hh\ + libgamma-native.hh +OBJ =\ + libgamma-error.o\ + libgamma-facade.o\ + libgamma-method.o -.PHONY: install-lib -install-lib: bin/libgammamm.$(SO).$(LIB_VERSION) - install -dm755 -- "$(DESTDIR)$(LIBDIR)" - install -m755 $< -- "$(DESTDIR)$(LIBDIR)/libgammamm.$(SO).$(LIB_VERSION)" - ln -sf libgammamm.$(SO).$(LIB_VERSION) -- "$(DESTDIR)$(LIBDIR)/libgammamm.$(SO).$(LIB_MAJOR)" - ln -sf libgammamm.$(SO).$(LIB_VERSION) -- "$(DESTDIR)$(LIBDIR)/libgammamm.$(SO)" +LOBJ = $(OBJ:.o=.lo) -.PHONY: install-include -install-include: - install -dm755 -- "$(DESTDIR)$(INCLUDEDIR)" - install -m644 $(foreach H,$(HEADERS),src/$(H).hh) -- "$(DESTDIR)$(INCLUDEDIR)" -.PHONY: install-pc -install-pc: - install -dm755 -- "$(DESTDIR)$(PKGCONFIGDIR)" - install -m644 libgammamm.pc -- "$(DESTDIR)$(PKGCONFIGDIR)" +all: libgammamm.a libgammamm.$(LIBEXT) +$(OBJ): $(HDR) +$(LOBJ): $(HDR) +test.o: test.cc $(HDR) +libgammamm.a: $(OBJ) + @rm -f -- $@ + $(AR) rc $@ $(OBJ) -.PHONY: install-copyright -install-copyright: install-copying install-license +libgammamm.$(LIBEXT): $(LOBJ) + $(CXX) $(LIBFLAGS) -o $@ $(LOBJ) $(LDFLAGS) -.PHONY: install-copying -install-copying: - install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" - install -m644 COPYING -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/COPYING" +test: test.o libgammamm.a + $(CXX) -o $@ test.o libgammamm.a $(LDFLAGS) -.PHONY: install-license -install-license: - install -dm755 -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" - install -m644 LICENSE -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE" +.cc.o: + $(CXX) -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) +.cc.lo: + $(CXX) -fPIC -c -o $@ $< $(CXXFLAGS) $(CPPFLAGS) +install: libgammamm.a libgammamm.$(LIBEXT) + mkdir -p -- "$(DESTDIR)$(PREFIX)/lib" + mkdir -p -- "$(DESTDIR)$(PREFIX)/include" + mkdir -p -- "$(DESTDIR)$(PKGCONFIGDIR)" + cp -- libgammamm.pc "$(DESTDIR)$(PKGCONFIGDIR)" + cp -- libgammamm.a "$(DESTDIR)$(PREFIX)/lib/" + cp -- libgammamm.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libgammamm.$(LIBMINOREXT)" + $(FIX_INSTALL_NAME) "$(DESTDIR)$(PREFIX)/lib/libgammamm.$(LIBMINOREXT)" + ln -sf -- libgammamm.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libgammamm.$(LIBMAJOREXT)" + ln -sf -- libgammamm.$(LIBMAJOREXT) "$(DESTDIR)$(PREFIX)/lib/libgammamm.$(LIBEXT)" + cp -- $(HDR) "$(DESTDIR)$(PREFIX)/include/" -.PHONY: uninstall uninstall: - -rm -- "$(DESTDIR)$(LIBDIR)/libgammamm.$(SO).$(LIB_VERSION)" - -rm -- "$(DESTDIR)$(LIBDIR)/libgammamm.$(SO).$(LIB_MAJOR)" - -rm -- "$(DESTDIR)$(LIBDIR)/libgammamm.$(SO)" - -rm -- $(foreach H,$(HEADERS),"$(DESTDIR)$(INCLUDEDIR)/$(H).hh") + mkdir -p -- "$(DESTDIR)$(PREFIX)/lib" + mkdir -p -- "$(DESTDIR)$(PREFIX)/include" + -rm -f -- "$(DESTDIR)$(PREFIX)/lib/libgammamm.a" + -rm -f -- "$(DESTDIR)$(PREFIX)/lib/libgammamm.$(LIBMINOREXT)" + -rm -f -- "$(DESTDIR)$(PREFIX)/lib/libgammamm.$(LIBMAJOREXT)" + -rm -f -- "$(DESTDIR)$(PREFIX)/lib/libgammamm.$(LIBEXT)" + -cd "$(DESTDIR)$(PREFIX)/include/" && rm -f -- $(HDR) -rm -- "$(DESTDIR)$(PKGCONFIGDIR)/libgammamm.pc" - -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/COPYING" - -rm -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)/LICENSE" - -rmdir -- "$(DESTDIR)$(LICENSEDIR)/$(PKGNAME)" +run-test: + ./test - -.PHONY: clean clean: - -rm -r obj bin + -rm -f -- *.su *.so *.so.* *.dll *.dylib *.$(LIBEXT) *.o *.lo test + +.SUFFIXES: +.SUFFIXES: .lo .o .cc +.PHONY: all install uninstall check run-test clean diff --git a/README b/README index 0fda7e4..8c35d96 100644 --- a/README +++ b/README @@ -1,2 +1 @@ -C++ wrapper for libgamma. - +C++ wrapper for libgamma diff --git a/config.mk b/config.mk new file mode 100644 index 0000000..793d086 --- /dev/null +++ b/config.mk @@ -0,0 +1,8 @@ +PREFIX = /usr +PKGCONFIGDIR = $(PREFIX)/lib/pkgconfig + +CXX = c++ -std=c++11 + +CPPFLAGS = +CXXFLAGS = -Wall -O3 +LDFLAGS = -lgamma diff --git a/dist/archlinux/stable/.gitignore b/dist/archlinux/stable/.gitignore deleted file mode 100644 index c77dbc5..0000000 --- a/dist/archlinux/stable/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -* -!/.git* -*~ -!/PKGBUILD -!/libgammamm.install - diff --git a/dist/archlinux/stable/PKGBUILD b/dist/archlinux/stable/PKGBUILD deleted file mode 100644 index 66e8fd1..0000000 --- a/dist/archlinux/stable/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=libgammamm -pkgver=1.0.1 -pkgrel=1 -pkgdesc="Display server abstraction layer for gamma ramps and C++" -arch=(i686 x86_64) -url="https://github.com/maandree/libgammamm" -license=('GPL3') -depends=('libgamma>=0.3' glibc gcc-libs) -makedepends=('libgamma>=0.3' glibc gcc-libs gcc make coreutils) -source=($url/archive/$pkgver.tar.gz) -sha256sums=(712df650ffcc4666421e952c52b94660f371e8fb401a7d0e2ffd196580b84d50) - - -build() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr -} - - -package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr install DESTDIR="$pkgdir" -} - diff --git a/libgamma-error.cc b/libgamma-error.cc new file mode 100644 index 0000000..db66bbe --- /dev/null +++ b/libgamma-error.cc @@ -0,0 +1,134 @@ +/* See LICENSE file for copyright and license details. */ +#include "libgamma-error.hh" + +#include +#include + + +namespace libgamma +{ + /** + * Prints an error to stderr in a `perror` fashion, + * however this function will not translate the `libgamma` + * errors into human-readable strings, it will simply + * print the name of the error. If the value `error_code` + * is the value of `LIBGAMMA_ERRNO_SET`, `perror` will be + * used to print the current error stored in `errno`. + * If `error_code` is non-negative (an `errno` value`), that + * value will be stored in `errno` and `perror` will be + * used to print it. Additionally, if the `error_code` is + * the value of `LIBGAMMA_DEVICE_REQUIRE_GROUP` the + * required group will be printed with its numerical value + * and, if known, its name. + * + * @param name The text to add at the beginning. + * @param value The error code, may be an `errno` value. + */ + void perror(const std::string name, int error_code) + { + libgamma_perror(name.c_str(), error_code); + } + + /** + * Returns the name of the definition associated with a `nullptr` error code. + * + * @param value The error code. + * @return The name of the definition associated with the error code, + * `nullptr` if the error code does not exist. + */ + std::string* name_of_error(int value) + { + const char* cstr = libgamma_name_of_error(value); + if (cstr == nullptr) + return nullptr; + return new std::string(cstr); + } + + /** + * Return the value of a `libgamma` error definition refered to by name. + * + * @param name The name of the definition associated with the error code. + * @return The error code, zero if the name is `nullptr` + * or does not refer to a `libgamma` error. + */ + int value_of_error(const std::string* name) + { + const char* cstr = nullptr; + if (name != nullptr) + cstr = name->c_str(); + return libgamma_value_of_error(cstr); + } + + +#ifdef __GNUC__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif + + /** + * Constructor. + * + * @param error_code The error code. + */ + LibgammaException::LibgammaException(int error_code) throw() : + error_code(error_code) + { + /* Do nothing. */ + } + + /** + * Destructor. + */ + LibgammaException::~LibgammaException() throw() + { + /* Do nothing. */ + } + + /** + * Get the error as a string. + */ + const char* LibgammaException::what() const throw() + { + if (this->error_code < 0) + return libgamma_name_of_error(this->error_code); + else + return strerror(this->error_code); + } + +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + + + /** + * Create an exception from an error code + * that may come from `errno.h` or be a + * `libgamma` error code. + * + * @param error_code The error code. + * @return The error object. + */ + LibgammaException create_error(int error_code) + { + if (error_code == LIBGAMMA_ERRNO_SET) + error_code = errno; + return LibgammaException(error_code); + } + + + /** + * Group that the user needs to be a member of if + * `LIBGAMMA_DEVICE_REQUIRE_GROUP` is returned. + */ + GroupGid group_gid; + + /** + * Group that the user needs to be a member of if + * `LIBGAMMA_DEVICE_REQUIRE_GROUP` is returned, + * `nullptr` if the name of the group + * `libgamma::group_gid` cannot be determined. + */ + GroupName group_name; + +} + diff --git a/libgamma-error.hh b/libgamma-error.hh new file mode 100644 index 0000000..5f65e86 --- /dev/null +++ b/libgamma-error.hh @@ -0,0 +1,177 @@ +/* See LICENSE file for copyright and license details. */ +#ifndef LIBGAMMA_ERROR_HH +#define LIBGAMMA_ERROR_HH + + +#include +#include + +#include "libgamma-native.hh" + + +#ifndef __GNUC__ +# define __attribute__(X) /* emtpy */ +#endif + + +#ifndef __WIN32__ +# define libgamma_gid_t gid_t +#else +# define libgamma_gid_t short +#endif + + + +namespace libgamma +{ + /** + * Class for `group_gid`. + */ + class GroupGid; + + /** + * Class for `group_name`. + */ + class GroupName; + + + /** + * Prints an error to stderr in a `perror` fashion, + * however this function will not translate the `libgamma` + * errors into human-readable strings, it will simply + * print the name of the error. If the value `error_code` + * is the value of `LIBGAMMA_ERRNO_SET`, `perror` will be + * used to print the current error stored in `errno`. + * If `error_code` is non-negative (an `errno` value`), that + * value will be stored in `errno` and `perror` will be + * used to print it. Additionally, if the `error_code` is + * the value of `LIBGAMMA_DEVICE_REQUIRE_GROUP` the + * required group will be printed with its numerical value + * and, if known, its name. + * + * @param name The text to add at the beginning. + * @param value The error code, may be an `errno` value. + */ + void perror(const std::string name, int error_code); + + /** + * Returns the name of the definition associated with a `nullptr` error code. + * + * @param value The error code. + * @return The name of the definition associated with the error code, + * `nullptr` if the error code does not exist. + */ + std::string* name_of_error(int value); + + /** + * Return the value of a `libgamma` error definition refered to by name. + * + * @param name The name of the definition associated with the error code. + * @return The error code, zero if the name is `nullptr` + * or does not refer to a `libgamma` error. + */ + int value_of_error(const std::string* name) __attribute__((pure)); + + + /** + * Class for `group_gid`. + */ + class GroupGid + { + public: + const GroupGid& operator =(const libgamma_gid_t& value) const + { + libgamma_group_gid = value; + return *this; + } + + operator libgamma_gid_t() const + { + return libgamma_group_gid; + } + }; + + /** + * Group that the user needs to be a member of if + * `LIBGAMMA_DEVICE_REQUIRE_GROUP` is returned. + */ + extern GroupGid group_gid; + + + /** + * Class for `group_name`. + */ + class GroupName + { + public: + const GroupName& operator =(const char* value) const + { + libgamma_group_name = value; + return *this; + } + + operator const char*() const + { + return libgamma_group_name; + } + }; + + /** + * Group that the user needs to be a member of if + * `LIBGAMMA_DEVICE_REQUIRE_GROUP` is returned, + * `nullptr` if the name of the group + * `libgamma::group_gid` cannot be determined. + */ + extern GroupName group_name; + + + /** + * Libgamma exception class. + */ + class LibgammaException : public std::exception + { + public: + /** + * Constructor. + * + * @param error_code The error code. + */ + LibgammaException(int error_code) throw(); + + /** + * Destructor. + */ + virtual ~LibgammaException() throw(); + + /** + * Get the error as a string. + */ + virtual const char* what() const throw(); + + /** + * The error code. + */ + int error_code; + + }; + + + /** + * Create an exception from an error code + * that may come from `errno.h` or be a + * `libgamma` error code. + * + * @param error_code The error code. + * @return The error object. + */ + LibgammaException create_error(int error_code); + +} + + +#ifndef __GNUC__ +# undef __attribute__ +#endif + +#endif + diff --git a/libgamma-facade.cc b/libgamma-facade.cc new file mode 100644 index 0000000..9d74d6f --- /dev/null +++ b/libgamma-facade.cc @@ -0,0 +1,443 @@ +/* See LICENSE file for copyright and license details. */ +#include "libgamma-facade.hh" + +#include "libgamma-error.hh" + +#include + + +namespace libgamma +{ + /** + * List available adjustment methods by their order of preference based on the environment. + * + * @param operation Allowed values: + * 0: Methods that the environment suggests will work, excluding fake. + * 1: Methods that the environment suggests will work, including fake. + * 2: All real non-fake methods. + * 3: All real methods. + * 4: All methods. + * Other values invoke undefined behaviour. + * @return Array of methods. + */ + std::vector list_methods(int operation) + { + int* methods = (int*)malloc(LIBGAMMA_METHOD_COUNT * sizeof(int)); + size_t n, i; + std::vector rc; + + n = libgamma_list_methods(methods, LIBGAMMA_METHOD_COUNT, operation); + if (n > LIBGAMMA_METHOD_COUNT) + { + free(methods); + methods = (int*)malloc(n * sizeof(int)); + libgamma_list_methods(methods, n, operation); + } + + for (i = 0; i < n; i++) + rc.push_back(methods[i]); + + free(methods); + return rc; + } + + /** + * Check whether an adjustment method is available, non-existing (invalid) methods will be + * identified as not available under the rationale that the library may be out of date. + * + * @param method The adjustment method. + * @return Whether the adjustment method is available. + */ + int is_method_available(int method) + { + return libgamma_is_method_available(method); + } + + /** + * Return the capabilities of an adjustment method. + * + * @param output The data structure to fill with the method's capabilities, + * @param method The adjustment method (display server and protocol). + */ + void method_capabilities(MethodCapabilities* output, int method) + { + libgamma_method_capabilities_t caps; + libgamma_method_capabilities(&caps, method); + *output = MethodCapabilities(&caps); + } + + /** + * Return the default site for an adjustment method. + * + * @param method The adjustment method (display server and protocol.) + * @return The default site, `nullptr` if it cannot be determined or if + * multiple sites are not supported by the adjustment method. + */ + std::string* method_default_site(int method) + { + char* cstr = libgamma_method_default_site(method); + if (cstr == nullptr) + return nullptr; + return new std::string(cstr); + } + + /** + * Return the default variable that determines + * the default site for an adjustment method. + * + * @param method The adjustment method (display server and protocol.) + * @return The environ variables that is used to determine the + * default site. `nullptr` if there is none, that is, if + * the method does not support multiple sites. + * This value should not be `free`:d. + */ + std::string* method_default_site_variable(int method) + { + const char* cstr = libgamma_method_default_site_variable(method); + if (cstr == nullptr) + return nullptr; + return new std::string(cstr); + } + + + /** + * Convert a raw representation of an EDID to a lowercase hexadecimal representation. + * + * @param edid The EDID in raw representation. + * @param length The length of `edid`. + * @return The EDID in lowercase hexadecimal representation. + */ + std::string behex_edid(const unsigned char* edid, size_t length) + { + return behex_edid_lowercase(edid, length); + } + + /** + * Convert a raw representation of an EDID to a lowercase hexadecimal representation. + * + * @param edid The EDID in raw representation. + * @param length The length of `edid`. + * @return The EDID in lowercase hexadecimal representation. + */ + std::string behex_edid_lowercase(const unsigned char* edid, size_t length) + { + char* cstr = libgamma_behex_edid_lowercase(edid, length); + std::string rc = std::string(cstr); + free(cstr); + return rc; + } + + /** + * Convert a raw representation of an EDID to an uppercase hexadecimal representation. + * + * @param edid The EDID in raw representation. + * @param length The length of `edid`. + * @return The EDID in uppercase hexadecimal representation. + */ + std::string behex_edid_uppercase(const unsigned char* edid, size_t length) + { + char* cstr = libgamma_behex_edid_uppercase(edid, length); + std::string rc = std::string(cstr); + free(cstr); + return rc; + } + + /** + * Convert an hexadecimal representation of an EDID to a raw representation. + * + * @param edid The EDID in hexadecimal representation. + * @return The EDID in raw representation, it will be half the length + * of `edid` (the input value). + */ + unsigned char* unhex_edid(const std::string edid) + { + const char* cstr = edid.c_str(); + return libgamma_unhex_edid(cstr); + } + + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_ramps8_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) + { + libgamma_gamma_ramps8_t native; + int r; + native.red_size = ramps->red.size = red; + native.green_size = ramps->green.size = green; + native.blue_size = ramps->blue.size = blue; + ramps->depth = 8; + r = libgamma_gamma_ramps8_initialise(&native); + if (r != 0) + throw create_error(r); + ramps->red.ramp = native.red; + ramps->green.ramp = native.green; + ramps->blue.ramp = native.blue; + } + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_ramps16_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) + { + libgamma_gamma_ramps16_t native; + int r; + native.red_size = ramps->red.size = red; + native.green_size = ramps->green.size = green; + native.blue_size = ramps->blue.size = blue; + ramps->depth = 16; + r = libgamma_gamma_ramps16_initialise(&native); + if (r != 0) + throw create_error(r); + ramps->red.ramp = native.red; + ramps->green.ramp = native.green; + ramps->blue.ramp = native.blue; + } + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_ramps32_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) + { + libgamma_gamma_ramps32_t native; + int r; + native.red_size = ramps->red.size = red; + native.green_size = ramps->green.size = green; + native.blue_size = ramps->blue.size = blue; + ramps->depth = 32; + r = libgamma_gamma_ramps32_initialise(&native); + if (r != 0) + throw create_error(r); + ramps->red.ramp = native.red; + ramps->green.ramp = native.green; + ramps->blue.ramp = native.blue; + } + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_ramps64_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) + { + libgamma_gamma_ramps64_t native; + int r; + native.red_size = ramps->red.size = red; + native.green_size = ramps->green.size = green; + native.blue_size = ramps->blue.size = blue; + ramps->depth = 64; + r = libgamma_gamma_ramps64_initialise(&native); + if (r != 0) + throw create_error(r); + ramps->red.ramp = native.red; + ramps->green.ramp = native.green; + ramps->blue.ramp = native.blue; + } + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_rampsf_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) + { + libgamma_gamma_rampsf_t native; + int r; + native.red_size = ramps->red.size = red; + native.green_size = ramps->green.size = green; + native.blue_size = ramps->blue.size = blue; + ramps->depth = -1; + r = libgamma_gamma_rampsf_initialise(&native); + if (r != 0) + throw create_error(r); + ramps->red.ramp = native.red; + ramps->green.ramp = native.green; + ramps->blue.ramp = native.blue; + } + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_rampsd_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) + { + libgamma_gamma_rampsd_t native; + int r; + native.red_size = ramps->red.size = red; + native.green_size = ramps->green.size = green; + native.blue_size = ramps->blue.size = blue; + ramps->depth = -2; + r = libgamma_gamma_rampsd_initialise(&native); + if (r != 0) + throw create_error(r); + ramps->red.ramp = native.red; + ramps->green.ramp = native.green; + ramps->blue.ramp = native.blue; + } + + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_ramps8_create(size_t red, size_t blue, size_t green) + { + libgamma_gamma_ramps8_t ramps; + int r; + ramps.red_size = red; + ramps.green_size = green; + ramps.blue_size = blue; + r = libgamma_gamma_ramps8_initialise(&ramps); + if (r != 0) + throw create_error(r); + return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, 8); + } + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_ramps16_create(size_t red, size_t blue, size_t green) + { + libgamma_gamma_ramps16_t ramps; + int r; + ramps.red_size = red; + ramps.green_size = green; + ramps.blue_size = blue; + r = libgamma_gamma_ramps16_initialise(&ramps); + if (r != 0) + throw create_error(r); + return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, 16); + } + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_ramps32_create(size_t red, size_t blue, size_t green) + { + libgamma_gamma_ramps32_t ramps; + int r; + ramps.red_size = red; + ramps.green_size = green; + ramps.blue_size = blue; + r = libgamma_gamma_ramps32_initialise(&ramps); + if (r != 0) + throw create_error(r); + return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, 32); + } + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_ramps64_create(size_t red, size_t blue, size_t green) + { + libgamma_gamma_ramps64_t ramps; + int r; + ramps.red_size = red; + ramps.green_size = green; + ramps.blue_size = blue; + r = libgamma_gamma_ramps64_initialise(&ramps); + if (r != 0) + throw create_error(r); + return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, 64); + } + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_rampsf_create(size_t red, size_t blue, size_t green) + { + libgamma_gamma_rampsf_t ramps; + int r; + ramps.red_size = red; + ramps.green_size = green; + ramps.blue_size = blue; + r = libgamma_gamma_rampsf_initialise(&ramps); + if (r != 0) + throw create_error(r); + return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, -1); + } + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_rampsd_create(size_t red, size_t blue, size_t green) + { + libgamma_gamma_rampsd_t ramps; + int r; + ramps.red_size = red; + ramps.green_size = green; + ramps.blue_size = blue; + r = libgamma_gamma_rampsd_initialise(&ramps); + if (r != 0) + throw create_error(r); + return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, -2); + } + +} + diff --git a/libgamma-facade.hh b/libgamma-facade.hh new file mode 100644 index 0000000..3ac3321 --- /dev/null +++ b/libgamma-facade.hh @@ -0,0 +1,251 @@ +/* See LICENSE file for copyright and license details. */ +#ifndef LIBGAMMA_FACADE_HH +#define LIBGAMMA_FACADE_HH + + +#include +#include + +#include "libgamma-native.hh" +#include "libgamma-method.hh" + + +#ifndef __GNUC__ +# define __attribute__(X) /* emtpy */ +#endif + + + +namespace libgamma +{ + /** + * List available adjustment methods by their order of preference based on the environment. + * + * @param operation Allowed values: + * 0: Methods that the environment suggests will work, excluding fake. + * 1: Methods that the environment suggests will work, including fake. + * 2: All real non-fake methods. + * 3: All real methods. + * 4: All methods. + * Other values invoke undefined behaviour. + * @return Array of methods. + */ + std::vector list_methods(int operation); + + /** + * Check whether an adjustment method is available, non-existing (invalid) methods will be + * identified as not available under the rationale that the library may be out of date. + * + * @param method The adjustment method. + * @return Whether the adjustment method is available. + */ + int is_method_available(int method) __attribute__((const)); + + /** + * Return the capabilities of an adjustment method. + * + * @param output The data structure to fill with the method's capabilities, + * @param method The adjustment method (display server and protocol). + */ + void method_capabilities(MethodCapabilities* output, int method); + + /** + * Return the default site for an adjustment method. + * + * @param method The adjustment method (display server and protocol.) + * @return The default site, `nullptr` if it cannot be determined or if + * multiple sites are not supported by the adjustment method. + */ + std::string* method_default_site(int method); + + /** + * Return the default variable that determines + * the default site for an adjustment method. + * + * @param method The adjustment method (display server and protocol.) + * @return The environ variables that is used to determine the + * default site. `nullptr` if there is none, that is, if + * the method does not support multiple sites. + */ + std::string* method_default_site_variable(int method); + + + /** + * Convert a raw representation of an EDID to a lowercase hexadecimal representation. + * + * @param edid The EDID in raw representation. + * @param length The length of `edid`. + * @return The EDID in lowercase hexadecimal representation. + */ + std::string behex_edid(const unsigned char* edid, size_t length); + + /** + * Convert a raw representation of an EDID to a lowercase hexadecimal representation. + * + * @param edid The EDID in raw representation. + * @param length The length of `edid`. + * @return The EDID in lowercase hexadecimal representation. + */ + std::string behex_edid_lowercase(const unsigned char* edid, size_t length); + + /** + * Convert a raw representation of an EDID to an uppercase hexadecimal representation. + * + * @param edid The EDID in raw representation. + * @param length The length of `edid`. + * @return The EDID in uppercase hexadecimal representation. + */ + std::string behex_edid_uppercase(const unsigned char* edid, size_t length); + + /** + * Convert an hexadecimal representation of an EDID to a raw representation. + * + * @param edid The EDID in hexadecimal representation. + * @return The EDID in raw representation, it will be half the length + * of `edid` (the input value). + */ + unsigned char* unhex_edid(const std::string edid); + + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_ramps8_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_ramps16_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_ramps32_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_ramps64_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_rampsf_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); + + /** + * Initialise a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param ramps The gamma ramp to initialise. + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + */ + void gamma_rampsd_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); + + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_ramps8_create(size_t red, size_t blue, size_t green); + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_ramps16_create(size_t red, size_t blue, size_t green); + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_ramps32_create(size_t red, size_t blue, size_t green); + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_ramps64_create(size_t red, size_t blue, size_t green); + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_rampsf_create(size_t red, size_t blue, size_t green); + + /** + * Create a gamma ramp in the proper way that allows all adjustment + * methods to read from and write to it without causing segmentation violation. + * + * @param red The size of the gamma ramp for the red channel. + * @param green The size of the gamma ramp for the green channel. + * @param blue The size of the gamma ramp for the blue channel. + * @return The gamma ramp. + */ + GammaRamps* gamma_rampsd_create(size_t red, size_t blue, size_t green); + +} + + +#ifndef __GNUC__ +# undef __attribute__ +#endif + +#endif + diff --git a/libgamma-method.cc b/libgamma-method.cc new file mode 100644 index 0000000..79230f2 --- /dev/null +++ b/libgamma-method.cc @@ -0,0 +1,535 @@ +/* See LICENSE file for copyright and license details. */ +#include "libgamma-method.hh" + +#include "libgamma-error.hh" + +#include +#include +#include + + +namespace libgamma +{ + /** + * Constructor. + */ + MethodCapabilities::MethodCapabilities() : + crtc_information(0), + default_site_known(false), + multiple_sites(false), + multiple_partitions(false), + multiple_crtcs(false), + partitions_are_graphics_cards(false), + site_restore(false), + partition_restore(false), + crtc_restore(false), + identical_gamma_sizes(false), + fixed_gamma_size(false), + fixed_gamma_depth(false), + real(false), + fake(false) + { + /* Do nothing. */ + } + + + /** + * Constructor. + * + * @param caps The information in the native structure. + */ + MethodCapabilities::MethodCapabilities(libgamma_method_capabilities_t* caps) : + crtc_information(caps->crtc_information), + default_site_known(caps->default_site_known), + multiple_sites(caps->multiple_sites), + multiple_partitions(caps->multiple_partitions), + multiple_crtcs(caps->multiple_crtcs), + partitions_are_graphics_cards(caps->partitions_are_graphics_cards), + site_restore(caps->site_restore), + partition_restore(caps->partition_restore), + crtc_restore(caps->crtc_restore), + identical_gamma_sizes(caps->identical_gamma_sizes), + fixed_gamma_size(caps->fixed_gamma_size), + fixed_gamma_depth(caps->fixed_gamma_depth), + real(caps->real), + fake(caps->fake) + { + /* Do nothing. */ + } + + + /** + * Copy constructor. + * + * @param other The information to copy. + */ + MethodCapabilities::MethodCapabilities(const MethodCapabilities& other) : + crtc_information(other.crtc_information), + default_site_known(other.default_site_known), + multiple_sites(other.multiple_sites), + multiple_partitions(other.multiple_partitions), + multiple_crtcs(other.multiple_crtcs), + partitions_are_graphics_cards(other.partitions_are_graphics_cards), + site_restore(other.site_restore), + partition_restore(other.partition_restore), + crtc_restore(other.crtc_restore), + identical_gamma_sizes(other.identical_gamma_sizes), + fixed_gamma_size(other.fixed_gamma_size), + fixed_gamma_depth(other.fixed_gamma_depth), + real(other.real), + fake(other.fake) + { + /* Do nothing. */ + } + + + /** + * Destructor. + */ + MethodCapabilities::~MethodCapabilities() + { + /* Do nothing. */ + } + + + /** + * Copy operator. + * + * @param other The information to copy. + */ + MethodCapabilities& MethodCapabilities::operator =(const MethodCapabilities& other) + { + this->crtc_information = other.crtc_information; + this->default_site_known = other.default_site_known; + this->multiple_sites = other.multiple_sites; + this->multiple_partitions = other.multiple_partitions; + this->multiple_crtcs = other.multiple_crtcs; + this->partitions_are_graphics_cards = other.partitions_are_graphics_cards; + this->site_restore = other.site_restore; + this->partition_restore = other.partition_restore; + this->crtc_restore = other.crtc_restore; + this->identical_gamma_sizes = other.identical_gamma_sizes; + this->fixed_gamma_size = other.fixed_gamma_size; + this->fixed_gamma_depth = other.fixed_gamma_depth; + this->real = other.real; + this->fake = other.fake; + + return *this; + } + + + + + + /** + * Constructor. + */ + CRTCInformation::CRTCInformation() : + edid(nullptr), + edid_length(0), + edid_error(0), + width_mm(0), + width_mm_error(0), + height_mm(0), + height_mm_error(0), + width_mm_edid(0), + width_mm_edid_error(0), + height_mm_edid(0), + height_mm_edid_error(0), + red_gamma_size(0), + green_gamma_size(0), + blue_gamma_size(0), + gamma_size_error(0), + gamma_depth(0), + gamma_depth_error(0), + gamma_support(0), + gamma_support_error(0), + subpixel_order((SubpixelOrder)0), + subpixel_order_error(0), + active(0), + active_error(0), + connector_name(nullptr), + connector_name_error(0), + connector_type((ConnectorType)0), + connector_type_error(0), + gamma_red(0), + gamma_green(0), + gamma_blue(0), + gamma_error(0) + { + /* Do nothing. */ + } + + + /** + * Constructor. + * + * @param info The information in the native structure. + */ + CRTCInformation::CRTCInformation(libgamma_crtc_information_t* info) : + edid(info->edid), + edid_length(info->edid_length), + edid_error(info->edid_error), + width_mm(info->width_mm), + width_mm_error(info->width_mm_error), + height_mm(info->height_mm), + height_mm_error(info->height_mm_error), + width_mm_edid(info->width_mm_edid), + width_mm_edid_error(info->width_mm_edid_error), + height_mm_edid(info->height_mm_edid), + height_mm_edid_error(info->height_mm_edid_error), + red_gamma_size(info->red_gamma_size), + green_gamma_size(info->green_gamma_size), + blue_gamma_size(info->blue_gamma_size), + gamma_size_error(info->gamma_size_error), + gamma_depth(info->gamma_depth), + gamma_depth_error(info->gamma_depth_error), + gamma_support(info->gamma_support), + gamma_support_error(info->gamma_support_error), + subpixel_order(info->subpixel_order), + subpixel_order_error(info->subpixel_order_error), + active(info->active), + active_error(info->active_error), + connector_name(nullptr), + connector_name_error(info->connector_name_error), + connector_type(info->connector_type), + connector_type_error(info->connector_type_error), + gamma_red(info->gamma_red), + gamma_green(info->gamma_green), + gamma_blue(info->gamma_blue), + gamma_error(info->gamma_error) + { + if (info->connector_name != nullptr) + { + this->connector_name = new std::string(info->connector_name); + free(info->connector_name); + } + } + + + /** + * Copy constructor. + * + * @param other The information to copy. + */ + CRTCInformation::CRTCInformation(const CRTCInformation& other) : + edid(nullptr), + edid_length(other.edid_length), + edid_error(other.edid_error), + width_mm(other.width_mm), + width_mm_error(other.width_mm_error), + height_mm(other.height_mm), + height_mm_error(other.height_mm_error), + width_mm_edid(other.width_mm_edid), + width_mm_edid_error(other.width_mm_edid_error), + height_mm_edid(other.height_mm_edid), + height_mm_edid_error(other.height_mm_edid_error), + red_gamma_size(other.red_gamma_size), + green_gamma_size(other.green_gamma_size), + blue_gamma_size(other.blue_gamma_size), + gamma_size_error(other.gamma_size_error), + gamma_depth(other.gamma_depth), + gamma_depth_error(other.gamma_depth_error), + gamma_support(other.gamma_support), + gamma_support_error(other.gamma_support_error), + subpixel_order(other.subpixel_order), + subpixel_order_error(other.subpixel_order_error), + active(other.active), + active_error(other.active_error), + connector_name(nullptr), + connector_name_error(other.connector_name_error), + connector_type(other.connector_type), + connector_type_error(other.connector_type_error), + gamma_red(other.gamma_red), + gamma_green(other.gamma_green), + gamma_blue(other.gamma_blue), + gamma_error(other.gamma_error) + { + if (other.edid != nullptr) + { + this->edid = (unsigned char*)malloc(this->edid_length * sizeof(unsigned char)); + memcpy(this->edid, other.edid, this->edid_length * sizeof(unsigned char)); + } + if (other.connector_name != nullptr) + this->connector_name = new std::string(*(other.connector_name)); + } + + + /** + * Destructor. + */ + CRTCInformation::~CRTCInformation() + { + if (this->connector_name != nullptr) + delete this->connector_name; + free(this->edid); + } + + + /** + * Copy operator. + * + * @param other The information to copy. + */ + CRTCInformation& CRTCInformation::operator =(const CRTCInformation& other) + { + this->edid = nullptr; + this->edid_length = other.edid_length; + this->edid_error = other.edid_error; + this->width_mm = other.width_mm; + this->width_mm_error = other.width_mm_error; + this->height_mm = other.height_mm; + this->height_mm_error = other.height_mm_error; + this->width_mm_edid = other.width_mm_edid; + this->width_mm_edid_error = other.width_mm_edid_error; + this->height_mm_edid = other.height_mm_edid; + this->height_mm_edid_error = other.height_mm_edid_error; + this->red_gamma_size = other.red_gamma_size; + this->green_gamma_size = other.green_gamma_size; + this->blue_gamma_size = other.blue_gamma_size; + this->gamma_size_error = other.gamma_size_error; + this->gamma_depth = other.gamma_depth; + this->gamma_depth_error = other.gamma_depth_error; + this->gamma_support = other.gamma_support; + this->gamma_support_error = other.gamma_support_error; + this->subpixel_order = other.subpixel_order; + this->subpixel_order_error = other.subpixel_order_error; + this->active = other.active; + this->active_error = other.active_error; + this->connector_name = nullptr; + this->connector_name_error = other.connector_name_error; + this->connector_type = other.connector_type; + this->connector_type_error = other.connector_type_error; + this->gamma_red = other.gamma_red; + this->gamma_green = other.gamma_green; + this->gamma_blue = other.gamma_blue; + this->gamma_error = other.gamma_error; + + if (other.edid != nullptr) + { + this->edid = (unsigned char*)malloc(this->edid_length * sizeof(unsigned char)); + memcpy(this->edid, other.edid, this->edid_length * sizeof(unsigned char)); + } + if (other.connector_name != nullptr) + this->connector_name = new std::string(*(other.connector_name)); + + return *this; + } + +#ifdef __GNUC__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif + + /** + * Constructor. + */ + Site::Site() : + method(0), + site(nullptr), + partitions_available(0), + native(nullptr) + { + /* Do nothing. */ + } + + /** + * Constructor. + * + * @param method The adjustment method of the site. + * @param site The site identifier, will be moved into + * the structure, must be `delete`:able. + */ + Site::Site(int method, std::string* site) : + method(method), + site(site), + partitions_available(0), + native(nullptr) + { + char* cstr = nullptr; + int r; + + if (site != nullptr) + { + const char* cstr_ = site->c_str(); + cstr = (char*)malloc((strlen(cstr_) + 1) * sizeof(char)); + memcpy(cstr, cstr_, (strlen(cstr_) + 1) * sizeof(char)); + } + this->native = (libgamma_site_state_t*)malloc(sizeof(libgamma_site_state_t)); + r = libgamma_site_initialise(this->native, method, cstr); + if (r < 0) + { + int saved_errno = errno; + free(this->native); + this->native = nullptr; + errno = saved_errno; + throw create_error(r); + } + this->partitions_available = this->native->partitions_available; + } + + /** + * Destructor. + */ + Site::~Site() + { + if (this->site != nullptr) + delete this->site; + if (this->native != nullptr) + libgamma_site_free(this->native); + } + + /** + * Restore the gamma ramps all CRTC:s with a site to + * the system settings. + */ + void Site::restore() + { + int r; + r = libgamma_site_restore(this->native); + if (r != 0) + throw create_error(r); + } + + + + /** + * Constructor. + */ + Partition::Partition() : + site(nullptr), + partition(0), + crtcs_available(0), + native(nullptr) + { + /* Do nothing. */ + } + + /** + * Constructor. + * + * @param site The site of the partition. + * @param partition The index of the partition. + */ + Partition::Partition(Site* site, size_t partition) : + site(site), + partition(partition), + crtcs_available(0), + native(nullptr) + { + int r; + this->native = (libgamma_partition_state_t*)malloc(sizeof(libgamma_partition_state_t)); + r = libgamma_partition_initialise(this->native, site->native, partition); + if (r < 0) + { + int saved_errno = errno; + free(this->native); + this->native = nullptr; + errno = saved_errno; + throw create_error(r); + } + this->crtcs_available = this->native->crtcs_available; + } + + /** + * Destructor. + */ + Partition::~Partition() + { + if (this->native != nullptr) + libgamma_partition_free(this->native); + } + + /** + * Restore the gamma ramps all CRTC:s with a partition + * to the system settings. + */ + void Partition::restore() + { + int r; + r = libgamma_partition_restore(this->native); + if (r != 0) + throw create_error(r); + } + + + + /** + * Constructor. + */ + CRTC::CRTC() : + partition(nullptr), + crtc(0), + native(nullptr) + { + /* Do nothing. */ + } + + /** + * Constructor. + * + * @param partition The partition of the CRTC. + * @param crtc The index of the CRTC. + */ + CRTC::CRTC(Partition* partition, size_t crtc) : + partition(partition), + crtc(crtc), + native(nullptr) + { + int r; + this->native = (libgamma_crtc_state_t*)malloc(sizeof(libgamma_crtc_state_t)); + r = libgamma_crtc_initialise(this->native, partition->native, crtc); + if (r < 0) + { + int saved_errno = errno; + free(this->native); + this->native = nullptr; + errno = saved_errno; + throw create_error(r); + } + } + + /** + * Destructor. + */ + CRTC::~CRTC() + { + if (this->native != nullptr) + libgamma_crtc_free(this->native); + } + + /** + * Restore the gamma ramps for a CRTC to the system + * settings for that CRTC. + */ + void CRTC::restore() + { + int r; + r = libgamma_crtc_restore(this->native); + if (r != 0) + throw create_error(r); + } + + /** + * Read information about a CRTC. + * + * @param output Instance of a data structure to fill with the information about the CRTC. + * @param fields OR:ed identifiers for the information about the CRTC that should be read. + * @return Whether an error has occurred and is stored in a `*_error` field. + */ + bool CRTC::information(CRTCInformation* output, int32_t fields) + { + libgamma_crtc_information_t info; + int r; + + r = libgamma_get_crtc_information(&info, this->native, fields); + *output = CRTCInformation(&info); + return r != 0; + } + +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + +} + diff --git a/libgamma-method.hh b/libgamma-method.hh new file mode 100644 index 0000000..43b4983 --- /dev/null +++ b/libgamma-method.hh @@ -0,0 +1,1006 @@ +/* See LICENSE file for copyright and license details. */ +#ifndef LIBGAMMA_METHOD_HH +#define LIBGAMMA_METHOD_HH + + +#include +#include + +#include "libgamma-native.hh" +#include "libgamma-error.hh" + + +#ifndef __GNUC__ +# define __attribute__(X) /* emtpy */ +#endif + + + +namespace libgamma +{ + /** + * Cathode ray tube controller information data structure. + */ + class CRTCInformation; + + /** + * Capabilities of adjustment methods. + */ + class MethodCapabilities; + + /** + * Site state. + * + * On operating systems that integrate a graphical environment + * there is usually just one site. However, one systems with + * pluggable graphics, like Unix-like systems such as GNU/Linux + * and the BSD:s, there can usually be any (feasible) number of + * sites. In X.org parlance they are called displays. + */ + class Site; + + /** + * Partition state. + * + * Probably the majority of display server only one partition + * per site. However, X.org can, and traditional used to have + * on multi-headed environments, multiple partitions per site. + * In X.org partitions are called 'screens'. It is not to be + * confused with monitor. A screen is a collection of monitors, + * and the mapping from monitors to screens is a surjection. + * On hardware-level adjustment methods, such as Direct + * Rendering Manager, a partition is a graphics card. + */ + class Partition; + + /** + * Cathode ray tube controller state. + * + * The CRTC controls the gamma ramps for the + * monitor that is plugged in to the connector + * that the CRTC belongs to. + */ + class CRTC; + + + + /** + * Capabilities of adjustment methods. + */ + class MethodCapabilities + { + public: + /** + * Constructor. + */ + MethodCapabilities(); + + /** + * Constructor. + * + * @param caps The information in the native structure. + */ + MethodCapabilities(libgamma_method_capabilities_t* caps); + + /** + * Copy constructor. + * + * @param other The information to copy. + */ + MethodCapabilities(const MethodCapabilities& other); + + /** + * Destructor. + */ + ~MethodCapabilities(); + + /** + * Copy operator. + * + * @param other The information to copy. + */ + MethodCapabilities& operator =(const MethodCapabilities& other); + + + + + /** + * OR of the CRTC information fields in `libgamma_crtc_information_t` + * that may (but can fail) be read successfully. + */ + int32_t crtc_information; + + /** + * Whether the default site is known, if true the site is integrated + * to the system or can be determined using environment variables. + */ + bool default_site_known; + + /** + * Whether the adjustment method supports multiple sites rather + * than just the default site. + */ + bool multiple_sites; + + /** + * Whether the adjustment method supports multiple partitions + * per site. + */ + bool multiple_partitions; + + /** + * Whether the adjustment method supports multiple CRTC:s + * per partition per site. + */ + bool multiple_crtcs; + + /** + * Whether the partition to graphics card is a bijection. + */ + bool partitions_are_graphics_cards; + + /** + * Whether the adjustment method supports `libgamma_site_restore`. + */ + bool site_restore; + + /** + * Whether the adjustment method supports `libgamma_partition_restore`. + */ + bool partition_restore; + + /** + * Whether the adjustment method supports `libgamma_crtc_restore`. + */ + bool crtc_restore; + + /** + * Whether the `red_gamma_size`, `green_gamma_size` and `blue_gamma_size` + * fields in `libgamma_crtc_information_t` will always have the same + * values as each other for the adjustment method. + */ + bool identical_gamma_sizes; + + /** + * Whether the `red_gamma_size`, `green_gamma_size` and `blue_gamma_size` + * fields in `libgamma_crtc_information_t` will always be filled with the + * same value for the adjustment method. + */ + bool fixed_gamma_size; + + /** + * Whether the `gamma_depth` field in `libgamma_crtc_information_t` + * will always be filled with the same value for the adjustment method. + */ + bool fixed_gamma_depth; + + /** + * Whether the adjustment method will actually perform adjustments. + */ + bool real; + + /** + * Whether the adjustment method is implement using a translation layer. + */ + bool fake; + + }; + + + /** + * Types for connectors. + */ + typedef libgamma_connector_type_t ConnectorType; + + /** + * Orders for subpixels. Currently the possible values are + * very biased to LCD, Plasma and monochrome monitors. + */ + typedef libgamma_subpixel_order_t SubpixelOrder; + + + /** + * Cathode ray tube controller information data structure. + */ + class CRTCInformation + { + public: + /** + * Constructor. + */ + CRTCInformation(); + + /** + * Constructor. + * + * @param info The information in the native structure. + */ + CRTCInformation(libgamma_crtc_information_t* info); + + /** + * Copy constructor. + * + * @param other The information to copy. + */ + CRTCInformation(const CRTCInformation& other); + + /** + * Destructor. + */ + ~CRTCInformation(); + + /** + * Copy operator. + * + * @param other The information to copy. + */ + CRTCInformation& operator =(const CRTCInformation& other); + + + + /** + * The Extended Display Identification Data associated with + * the attached monitor. This is raw byte array that is usually + * 128 bytes long. It is not NUL-terminate, rather its length + * is stored in `edid_length`. + */ + unsigned char* edid; + + /** + * The length of `edid`. + */ + size_t edid_length; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int edid_error; + + + /** + * The phyical width, in millimetres, of the viewport of the + * attached monitor, as reported by the adjustment method. This + * value may be incorrect, which is a known issue with the X + * server where it is the result of the X server attempting + * the estimate the size on its own. + * Zero means that its is not applicable, which is the case + * for projectors. + */ + size_t width_mm; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int width_mm_error; + + + /** + * The phyical height, in millimetres, of the viewport of the + * attached monitor, as reported by the adjustment method. This + * value may be incorrect, which is a known issue with the X + * server where it is the result of the X server attempting + * the estimate the size on its own. + * Zero means that its is not applicable, which is the case + * for projectors. + */ + size_t height_mm; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int height_mm_error; + + + /** + * The phyical width, in millimetres, of the viewport of the + * attached monitor, as reported by it the monitor's Extended + * Display Information Data. This value can only contain whole + * centimetres, which means that the result is always zero + * modulus ten. However, this could change with revisions of + * the EDID structure. + * Zero means that its is not applicable, which is the case + * for projectors. + */ + size_t width_mm_edid; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int width_mm_edid_error; + + + /** + * The phyical height, in millimetres, of the viewport of the + * attached monitor, as reported by it the monitor's Extended + * Display Information Data. This value can only contain whole + * centimetres, which means that the result is always zero + * modulus ten. However, this could change with revisions of + * the EDID structure. + * Zero means that its is not applicable, which is the case + * for projectors. + */ + size_t height_mm_edid; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int height_mm_edid_error; + + + /** + * The size of the encoding axis of the red gamma ramp. + */ + size_t red_gamma_size; + + /** + * The size of the encoding axis of the green gamma ramp. + */ + size_t green_gamma_size; + + /** + * The size of the encoding axis of the blue gamma ramp. + */ + size_t blue_gamma_size; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int gamma_size_error; + + + /** + * The bit-depth of the value axes of gamma ramps, + * -1 for single precision floating point, and -2 for + * double precision floating point. + */ + signed gamma_depth; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int gamma_depth_error; + + + /** + * Non-zero gamma ramp adjustments are supported. + */ + int gamma_support; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int gamma_support_error; + + + /** + * The layout of the subpixels. + * You cannot count on this value --- especially for CRT:s --- + * but it is provided anyway as a means of distinguishing monitors. + */ + SubpixelOrder subpixel_order; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int subpixel_order_error; + + + /** + * Whether there is a monitors connected to the CRTC. + */ + int active; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int active_error; + + + /** + * The name of the connector as designated by the display + * server or as give by this library in case the display + * server lacks this feature. + */ + std::string* connector_name; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int connector_name_error; + + + /** + * The type of the connector that is associated with the CRTC. + */ + ConnectorType connector_type; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int connector_type_error; + + + /** + * The gamma characteristics of the monitor as reported + * in its Extended Display Information Data. The value + * holds the value for the red channel. If you do not have + * and more accurate measurement of the gamma for the + * monitor this could be used to give a rought gamma + * correction; simply divide the value with 2.2 and use + * the result for the red channel in the gamma correction. + */ + float gamma_red; + + /** + * The gamma characteristics of the monitor as reported + * in its Extended Display Information Data. The value + * holds the value for the green channel. If you do not have + * and more accurate measurement of the gamma for the + * monitor this could be used to give a rought gamma + * correction; simply divide the value with 2.2 and use + * the result for the green channel in the gamma correction. + */ + float gamma_green; + + /** + * The gamma characteristics of the monitor as reported + * in its Extended Display Information Data. The value + * holds the value for the blue channel. If you do not have + * and more accurate measurement of the gamma for the + * monitor this could be used to give a rought gamma + * correction; simply divide the value with 2.2 and use + * the result for the blue channel in the gamma correction. + */ + float gamma_blue; + + /** + * Zero on success, positive it holds the value `errno` had + * when the reading failed, otherwise (negative) the value + * of an error identifier provided by this library. + */ + int gamma_error; + + }; + + + +#ifdef __GNUC__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Weffc++" + /* Lets ignore that we do not override the copy constructor + * and the copy operator. */ +#endif + + /** + * One single Gamma ramp. + */ + template + class Ramp + { + public: + /** + * Constructor. + * + * @param native_ramp The ramp. + * @param ramp_size The size of the ramp. + */ + Ramp(T* native_ramp, size_t ramp_size) + { + this->ramp = native_ramp; + this->size = ramp_size; + } + + /** + * Destructor. + */ + ~Ramp() + { + /* Do nothing */ + } + + /** + * Subscript operator. + * + * @param index The index of the stop to set or get. + * @return A reference to the stop's value. + */ + T& operator [](size_t index) + { + return this->ramp[index]; + } + + /** + * Subscript operator. + * + * @param index The index of the stop to get. + * @return The value of the stop. + */ + const T& operator [](size_t index) const + { + return this->ramp[index]; + } + + + + /** + * The size of the ramp. + */ + size_t size; + + /** + * The ramp (internal data). + */ + T* ramp; + + }; + + + /** + * Gamma ramp structure. + */ + template + class GammaRamps + { + public: + /** + * Constructor. + */ + GammaRamps() : + red(Ramp(nullptr, 0)), + green(Ramp(nullptr, 0)), + blue(Ramp(nullptr, 0)), + depth(0) + { + /* Do nothing. */ + } + + /** + * Constructor. + * + * @param red_ramp The red gamma ramp. + * @param green_ramp The green gamma ramp. + * @param blue_ramp The blue gamma ramp. + * @param red_size The size of the gamma ramp for the red channel. + * @param green_size The size of the gamma ramp for the green channel. + * @param blue_size The size of the gamma ramp for the blue channel. + * @param gamma_depth The bit-depth of the gamma ramps, -1 for single precision + * floating point, and -2 for double precision floating point. + */ + GammaRamps(T* red_ramp, T* green_ramp, T* blue_ramp, + size_t red_size, size_t green_size, size_t blue_size, signed gamma_depth) : + red(Ramp(red_ramp, red_size)), + green(Ramp(green_ramp, green_size)), + blue(Ramp(blue_ramp, blue_size)), + depth(gamma_depth) + { + /* Do nothing. */ + } + + /** + * Destructor. + */ + ~GammaRamps() + { + free(this->red.ramp); + } + + + + /** + * The red gamma ramp. + */ + Ramp red; + + /** + * The green gamma ramp. + */ + Ramp green; + + /** + * The blue gamma ramp. + */ + Ramp blue; + + /** + * The bit-depth of the gamma ramps, -1 for single precision + * floating point, and -2 for double precision floating point. + */ + signed depth; + + }; + + + + /** + * Site state. + * + * On operating systems that integrate a graphical environment + * there is usually just one site. However, one systems with + * pluggable graphics, like Unix-like systems such as GNU/Linux + * and the BSD:s, there can usually be any (feasible) number of + * sites. In X.org parlance they are called displays. + */ + class Site + { + public: + /** + * Constructor. + */ + Site(); + + /** + * Constructor. + * + * @param method The adjustment method of the site. + * @param site The site identifier, will be moved into + * the structure, must be `delete`:able. + */ + Site(int method, std::string* site = nullptr); + + /** + * Destructor. + */ + ~Site(); + + /** + * Restore the gamma ramps all CRTC:s with a site to + * the system settings. + */ + void restore(); + + + + /** + * This field specifies, for the methods if this library, + * which adjustment method (display server and protocol) + * is used to adjust the gamma ramps. + */ + int method; + + /** + * The site identifier. It can either be `nullptr` or a string. + * `nullptr` indicates the default site. On systems like the + * Unix-like systems, where the graphics are pluggable, this + * is usually resolved by an environment variable, such as + * "DISPLAY" for X.org. + */ + std::string* site; + + /** + * The number of partitions that is available on this site. + * Probably the majority of display server only one partition + * per site. However, X.org can, and traditional used to have + * on multi-headed environments, multiple partitions per site. + * In X.org partitions are called 'screens'. It is not to be + * confused with monitor. A screen is a collection of monitors, + * and the mapping from monitors to screens is a surjection. + * On hardware-level adjustment methods, such as Direct + * Rendering Manager, a partition is a graphics card. + */ + size_t partitions_available; + + /** + * The state in the native structure. + */ + libgamma_site_state_t* native; + + }; + + + + /** + * Partition state. + * + * Probably the majority of display server only one partition + * per site. However, X.org can, and traditional used to have + * on multi-headed environments, multiple partitions per site. + * In X.org partitions are called 'screens'. It is not to be + * confused with monitor. A screen is a collection of monitors, + * and the mapping from monitors to screens is a surjection. + * On hardware-level adjustment methods, such as Direct + * Rendering Manager, a partition is a graphics card. + */ + class Partition + { + public: + /** + * Constructor. + */ + Partition(); + + /** + * Constructor. + * + * @param site The site of the partition. + * @param partition The index of the partition. + */ + Partition(Site* site, size_t partition); + + /** + * Destructor. + */ + ~Partition(); + + /** + * Restore the gamma ramps all CRTC:s with a partition + * to the system settings. + */ + void restore(); + + + + /** + * The site this partition belongs to. + */ + Site* site; + + /** + * The index of the partition. + */ + size_t partition; + + /** + * The number of CRTC:s that are available under this + * partition. Note that the CRTC:s are not necessarily + * online. + */ + size_t crtcs_available; + + /** + * The state in the native structure. + */ + libgamma_partition_state_t* native; + + }; + + + + /** + * Cathode ray tube controller state. + * + * The CRTC controls the gamma ramps for the + * monitor that is plugged in to the connector + * that the CRTC belongs to. + */ + class CRTC + { + public: + /** + * Constructor. + */ + CRTC(); + + /** + * Constructor. + * + * @param partition The partition of the CRTC. + * @param crtc The index of the CRTC. + */ + CRTC(Partition* partition, size_t crtc); + + /** + * Destructor. + */ + ~CRTC(); + + /** + * Restore the gamma ramps for a CRTC to the system + * settings for that CRTC. + */ + void restore(); + + /** + * Read information about a CRTC. + * + * @param output Instance of a data structure to fill with the information about the CRTC. + * @param fields OR:ed identifiers for the information about the CRTC that should be read. + * @return Whether an error has occurred and is stored in a `*_error` field. + */ + bool information(CRTCInformation* output, int32_t fields); + +#define __LIBGAMMA_GET_GAMMA(AFFIX) \ + libgamma_gamma_ramps ## AFFIX ## _t ramps_; \ + int r; \ + ramps_.red = ramps->red.ramp; \ + ramps_.green = ramps->green.ramp; \ + ramps_.blue = ramps->blue.ramp; \ + ramps_.red_size = ramps->red.size; \ + ramps_.green_size = ramps->green.size; \ + ramps_.blue_size = ramps->blue.size; \ + r = libgamma_crtc_get_gamma_ramps ## AFFIX(this->native, &ramps_); \ + if (r != 0) \ + throw create_error(r) + + /** + * Get the current gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void get_gamma(GammaRamps* ramps) + { + __LIBGAMMA_GET_GAMMA(8); + } + + /** + * Get the current gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void get_gamma(GammaRamps* ramps) + { + __LIBGAMMA_GET_GAMMA(16); + } + + /** + * Get the current gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void get_gamma(GammaRamps* ramps) + { + __LIBGAMMA_GET_GAMMA(32); + } + + /** + * Get the current gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void get_gamma(GammaRamps* ramps) + { + __LIBGAMMA_GET_GAMMA(64); + } + + /** + * Get the current gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void get_gamma(GammaRamps* ramps) + { + __LIBGAMMA_GET_GAMMA(f); + } + + /** + * Get the current gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void get_gamma(GammaRamps* ramps) + { + __LIBGAMMA_GET_GAMMA(d); + } + +#undef __LIBGAMMA_GET_GAMMA + +#define __LIBGAMMA_SET_GAMMA(AFFIX) \ + libgamma_gamma_ramps ## AFFIX ## _t ramps_; \ + int r; \ + ramps_.red = ramps->red.ramp; \ + ramps_.green = ramps->green.ramp; \ + ramps_.blue = ramps->blue.ramp; \ + ramps_.red_size = ramps->red.size; \ + ramps_.green_size = ramps->green.size; \ + ramps_.blue_size = ramps->blue.size; \ + r = libgamma_crtc_set_gamma_ramps ## AFFIX(this->native, ramps_); \ + if (r != 0) \ + throw create_error(r) + + /** + * Set gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void set_gamma(GammaRamps* ramps) + { + __LIBGAMMA_SET_GAMMA(8); + } + + /** + * Set gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void set_gamma(GammaRamps* ramps) + { + __LIBGAMMA_SET_GAMMA(16); + } + + /** + * Set gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void set_gamma(GammaRamps* ramps) + { + __LIBGAMMA_SET_GAMMA(32); + } + + /** + * Set gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void set_gamma(GammaRamps* ramps) + { + __LIBGAMMA_SET_GAMMA(64); + } + + /** + * Set gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void set_gamma(GammaRamps* ramps) + { + __LIBGAMMA_SET_GAMMA(f); + } + + /** + * Set gamma ramps for the CRTC. + * + * @param ramps The gamma ramps to fill with the current values. + */ + void set_gamma(GammaRamps* ramps) + { + __LIBGAMMA_SET_GAMMA(d); + } + +#undef __LIBGAMMA_SET_GAMMA + + + + /** + * The partition this CRTC belongs to. + */ + Partition* partition; + + /** + * The index of the CRTC within its partition. + */ + size_t crtc; + + /** + * The state in the native structure. + */ + libgamma_crtc_state_t* native; + + }; + +#ifdef __GNUC__ +# pragma GCC diagnostic pop +#endif + +} + + +#ifndef __GNUC__ +# undef __attribute__ +#endif + +#endif + diff --git a/libgamma-native.hh b/libgamma-native.hh new file mode 100644 index 0000000..f9ded22 --- /dev/null +++ b/libgamma-native.hh @@ -0,0 +1,26 @@ +/* See LICENSE file for copyright and license details. */ +#ifndef LIBGAMMA_NATIVE_HH +#define LIBGAMMA_NATIVE_HH + + +extern "C" +{ +# ifdef __GNUC__ +# define restrict __restrict__ +# else +# define restrict /* remove */ +# endif +# define this self +# include +# undef this +# undef restrict +# ifndef __GNUC__ +# ifdef __attribute__ +# undef __attribute__ +# endif +# endif +} + + +#endif + diff --git a/libgamma.hh b/libgamma.hh new file mode 100644 index 0000000..0577902 --- /dev/null +++ b/libgamma.hh @@ -0,0 +1,12 @@ +/* See LICENSE file for copyright and license details. */ +#ifndef LIBGAMMA_HH +#define LIBGAMMA_HH + + +#include "libgamma-error.hh" +#include "libgamma-method.hh" +#include "libgamma-facade.hh" + + +#endif + diff --git a/libgammamm.a b/libgammamm.a new file mode 100644 index 0000000..46f7a87 Binary files /dev/null and b/libgammamm.a differ diff --git a/libgammamm.pc b/libgammamm.pc index e9fff52..6fbd033 100644 --- a/libgammamm.pc +++ b/libgammamm.pc @@ -8,4 +8,3 @@ Description: Display server abstraction layer for gamma ramps for C++ Version: 1.0 Libs: -L${libdir} -lgammamm -lgamma Cflags: -I${includedir} - diff --git a/mk/linux.mk b/mk/linux.mk new file mode 100644 index 0000000..ad58f69 --- /dev/null +++ b/mk/linux.mk @@ -0,0 +1,6 @@ +LIBEXT = so +LIBFLAGS = -shared -Wl,-soname,lib$(LIB_NAME).$(LIBEXT).$(LIB_MAJOR) +LIBMAJOREXT = $(LIBEXT).$(LIB_MAJOR) +LIBMINOREXT = $(LIBEXT).$(LIB_VERSION) + +FIX_INSTALL_NAME = : diff --git a/mk/macos.mk b/mk/macos.mk new file mode 100644 index 0000000..0ce0453 --- /dev/null +++ b/mk/macos.mk @@ -0,0 +1,6 @@ +LIBEXT = dylib +LIBFLAGS = -dynamiclib +LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT) +LIBMINOREXT = $(LIB_VERSION).$(LIBEXT) + +FIX_INSTALL_NAME = install_name_tool -id "$(PREFIX)/lib/libgammamm.$(LIBMAJOREXT)" diff --git a/mk/windows.mk b/mk/windows.mk new file mode 100644 index 0000000..ed5ec8d --- /dev/null +++ b/mk/windows.mk @@ -0,0 +1,6 @@ +LIBEXT = dll +LIBFLAGS = -shared +LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT) +LIBMINOREXT = $(LIB_VERSION).$(LIBEXT) + +FIX_INSTALL_NAME = : diff --git a/src/libgamma-error.cc b/src/libgamma-error.cc deleted file mode 100644 index 1d5caaa..0000000 --- a/src/libgamma-error.cc +++ /dev/null @@ -1,150 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library 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 3 of the License, or - * (at your option) any later version. - * - * This library 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 library. If not, see . - */ -#include "libgamma-error.hh" - -#include -#include - - -namespace libgamma -{ - /** - * Prints an error to stderr in a `perror` fashion, - * however this function will not translate the `libgamma` - * errors into human-readable strings, it will simply - * print the name of the error. If the value `error_code` - * is the value of `LIBGAMMA_ERRNO_SET`, `perror` will be - * used to print the current error stored in `errno`. - * If `error_code` is non-negative (an `errno` value`), that - * value will be stored in `errno` and `perror` will be - * used to print it. Additionally, if the `error_code` is - * the value of `LIBGAMMA_DEVICE_REQUIRE_GROUP` the - * required group will be printed with its numerical value - * and, if known, its name. - * - * @param name The text to add at the beginning. - * @param value The error code, may be an `errno` value. - */ - void perror(const std::string name, int error_code) - { - libgamma_perror(name.c_str(), error_code); - } - - /** - * Returns the name of the definition associated with a `nullptr` error code. - * - * @param value The error code. - * @return The name of the definition associated with the error code, - * `nullptr` if the error code does not exist. - */ - std::string* name_of_error(int value) - { - const char* cstr = libgamma_name_of_error(value); - if (cstr == nullptr) - return nullptr; - return new std::string(cstr); - } - - /** - * Return the value of a `libgamma` error definition refered to by name. - * - * @param name The name of the definition associated with the error code. - * @return The error code, zero if the name is `nullptr` - * or does not refer to a `libgamma` error. - */ - int value_of_error(const std::string* name) - { - const char* cstr = nullptr; - if (name != nullptr) - cstr = name->c_str(); - return libgamma_value_of_error(cstr); - } - - -#ifdef __GCC__ -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wshadow" -#endif - - /** - * Constructor. - * - * @param error_code The error code. - */ - LibgammaException::LibgammaException(int error_code) throw() : - error_code(error_code) - { - /* Do nothing. */ - } - - /** - * Destructor. - */ - LibgammaException::~LibgammaException() throw() - { - /* Do nothing. */ - } - - /** - * Get the error as a string. - */ - const char* LibgammaException::what() const throw() - { - if (this->error_code < 0) - return libgamma_name_of_error(this->error_code); - else - return strerror(this->error_code); - } - -#ifdef __GCC__ -# pragma GCC diagnostic pop -#endif - - - /** - * Create an exception from an error code - * that may come from `errno.h` or be a - * `libgamma` error code. - * - * @param error_code The error code. - * @return The error object. - */ - LibgammaException create_error(int error_code) - { - if (error_code == LIBGAMMA_ERRNO_SET) - error_code = errno; - return LibgammaException(error_code); - } - - - /** - * Group that the user needs to be a member of if - * `LIBGAMMA_DEVICE_REQUIRE_GROUP` is returned. - */ - GroupGid group_gid; - - /** - * Group that the user needs to be a member of if - * `LIBGAMMA_DEVICE_REQUIRE_GROUP` is returned, - * `nullptr` if the name of the group - * `libgamma::group_gid` cannot be determined. - */ - GroupName group_name; - -} - diff --git a/src/libgamma-error.hh b/src/libgamma-error.hh deleted file mode 100644 index feb3e04..0000000 --- a/src/libgamma-error.hh +++ /dev/null @@ -1,193 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library 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 3 of the License, or - * (at your option) any later version. - * - * This library 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 library. If not, see . - */ -#ifndef LIBGAMMA_ERROR_HH -#define LIBGAMMA_ERROR_HH - - -#include -#include - -#include "libgamma-native.hh" - - -#ifndef __GCC__ -# define __attribute__(X) /* emtpy */ -#endif - - -#ifndef __WIN32__ -# define libgamma_gid_t gid_t -#else -# define libgamma_gid_t short -#endif - - - -namespace libgamma -{ - /** - * Class for `group_gid`. - */ - class GroupGid; - - /** - * Class for `group_name`. - */ - class GroupName; - - - /** - * Prints an error to stderr in a `perror` fashion, - * however this function will not translate the `libgamma` - * errors into human-readable strings, it will simply - * print the name of the error. If the value `error_code` - * is the value of `LIBGAMMA_ERRNO_SET`, `perror` will be - * used to print the current error stored in `errno`. - * If `error_code` is non-negative (an `errno` value`), that - * value will be stored in `errno` and `perror` will be - * used to print it. Additionally, if the `error_code` is - * the value of `LIBGAMMA_DEVICE_REQUIRE_GROUP` the - * required group will be printed with its numerical value - * and, if known, its name. - * - * @param name The text to add at the beginning. - * @param value The error code, may be an `errno` value. - */ - void perror(const std::string name, int error_code); - - /** - * Returns the name of the definition associated with a `nullptr` error code. - * - * @param value The error code. - * @return The name of the definition associated with the error code, - * `nullptr` if the error code does not exist. - */ - std::string* name_of_error(int value); - - /** - * Return the value of a `libgamma` error definition refered to by name. - * - * @param name The name of the definition associated with the error code. - * @return The error code, zero if the name is `nullptr` - * or does not refer to a `libgamma` error. - */ - int value_of_error(const std::string* name) __attribute__((pure)); - - - /** - * Class for `group_gid`. - */ - class GroupGid - { - public: - const GroupGid& operator =(const libgamma_gid_t& value) const - { - libgamma_group_gid = value; - return *this; - } - - operator libgamma_gid_t() const - { - return libgamma_group_gid; - } - }; - - /** - * Group that the user needs to be a member of if - * `LIBGAMMA_DEVICE_REQUIRE_GROUP` is returned. - */ - extern GroupGid group_gid; - - - /** - * Class for `group_name`. - */ - class GroupName - { - public: - const GroupName& operator =(const char* value) const - { - libgamma_group_name = value; - return *this; - } - - operator const char*() const - { - return libgamma_group_name; - } - }; - - /** - * Group that the user needs to be a member of if - * `LIBGAMMA_DEVICE_REQUIRE_GROUP` is returned, - * `nullptr` if the name of the group - * `libgamma::group_gid` cannot be determined. - */ - extern GroupName group_name; - - - /** - * Libgamma exception class. - */ - class LibgammaException : public std::exception - { - public: - /** - * Constructor. - * - * @param error_code The error code. - */ - LibgammaException(int error_code) throw(); - - /** - * Destructor. - */ - virtual ~LibgammaException() throw(); - - /** - * Get the error as a string. - */ - virtual const char* what() const throw(); - - /** - * The error code. - */ - int error_code; - - }; - - - /** - * Create an exception from an error code - * that may come from `errno.h` or be a - * `libgamma` error code. - * - * @param error_code The error code. - * @return The error object. - */ - LibgammaException create_error(int error_code); - -} - - -#ifndef __GCC__ -# undef __attribute__ -#endif - -#endif - diff --git a/src/libgamma-facade.cc b/src/libgamma-facade.cc deleted file mode 100644 index bd6ee28..0000000 --- a/src/libgamma-facade.cc +++ /dev/null @@ -1,459 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library 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 3 of the License, or - * (at your option) any later version. - * - * This library 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 library. If not, see . - */ -#include "libgamma-facade.hh" - -#include "libgamma-error.hh" - -#include - - -namespace libgamma -{ - /** - * List available adjustment methods by their order of preference based on the environment. - * - * @param operation Allowed values: - * 0: Methods that the environment suggests will work, excluding fake. - * 1: Methods that the environment suggests will work, including fake. - * 2: All real non-fake methods. - * 3: All real methods. - * 4: All methods. - * Other values invoke undefined behaviour. - * @return Array of methods. - */ - std::vector list_methods(int operation) - { - int* methods = (int*)malloc(LIBGAMMA_METHOD_COUNT * sizeof(int)); - size_t n, i; - std::vector rc; - - n = libgamma_list_methods(methods, LIBGAMMA_METHOD_COUNT, operation); - if (n > LIBGAMMA_METHOD_COUNT) - { - free(methods); - methods = (int*)malloc(n * sizeof(int)); - libgamma_list_methods(methods, n, operation); - } - - for (i = 0; i < n; i++) - rc.push_back(methods[i]); - - free(methods); - return rc; - } - - /** - * Check whether an adjustment method is available, non-existing (invalid) methods will be - * identified as not available under the rationale that the library may be out of date. - * - * @param method The adjustment method. - * @return Whether the adjustment method is available. - */ - int is_method_available(int method) - { - return libgamma_is_method_available(method); - } - - /** - * Return the capabilities of an adjustment method. - * - * @param output The data structure to fill with the method's capabilities, - * @param method The adjustment method (display server and protocol). - */ - void method_capabilities(MethodCapabilities* output, int method) - { - libgamma_method_capabilities_t caps; - libgamma_method_capabilities(&caps, method); - *output = MethodCapabilities(&caps); - } - - /** - * Return the default site for an adjustment method. - * - * @param method The adjustment method (display server and protocol.) - * @return The default site, `nullptr` if it cannot be determined or if - * multiple sites are not supported by the adjustment method. - */ - std::string* method_default_site(int method) - { - char* cstr = libgamma_method_default_site(method); - if (cstr == nullptr) - return nullptr; - return new std::string(cstr); - } - - /** - * Return the default variable that determines - * the default site for an adjustment method. - * - * @param method The adjustment method (display server and protocol.) - * @return The environ variables that is used to determine the - * default site. `nullptr` if there is none, that is, if - * the method does not support multiple sites. - * This value should not be `free`:d. - */ - std::string* method_default_site_variable(int method) - { - const char* cstr = libgamma_method_default_site_variable(method); - if (cstr == nullptr) - return nullptr; - return new std::string(cstr); - } - - - /** - * Convert a raw representation of an EDID to a lowercase hexadecimal representation. - * - * @param edid The EDID in raw representation. - * @param length The length of `edid`. - * @return The EDID in lowercase hexadecimal representation. - */ - std::string behex_edid(const unsigned char* edid, size_t length) - { - return behex_edid_lowercase(edid, length); - } - - /** - * Convert a raw representation of an EDID to a lowercase hexadecimal representation. - * - * @param edid The EDID in raw representation. - * @param length The length of `edid`. - * @return The EDID in lowercase hexadecimal representation. - */ - std::string behex_edid_lowercase(const unsigned char* edid, size_t length) - { - char* cstr = libgamma_behex_edid_lowercase(edid, length); - std::string rc = std::string(cstr); - free(cstr); - return rc; - } - - /** - * Convert a raw representation of an EDID to an uppercase hexadecimal representation. - * - * @param edid The EDID in raw representation. - * @param length The length of `edid`. - * @return The EDID in uppercase hexadecimal representation. - */ - std::string behex_edid_uppercase(const unsigned char* edid, size_t length) - { - char* cstr = libgamma_behex_edid_uppercase(edid, length); - std::string rc = std::string(cstr); - free(cstr); - return rc; - } - - /** - * Convert an hexadecimal representation of an EDID to a raw representation. - * - * @param edid The EDID in hexadecimal representation. - * @return The EDID in raw representation, it will be half the length - * of `edid` (the input value). - */ - unsigned char* unhex_edid(const std::string edid) - { - const char* cstr = edid.c_str(); - return libgamma_unhex_edid(cstr); - } - - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_ramps8_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) - { - libgamma_gamma_ramps8_t native; - int r; - native.red_size = ramps->red.size = red; - native.green_size = ramps->green.size = green; - native.blue_size = ramps->blue.size = blue; - ramps->depth = 8; - r = libgamma_gamma_ramps8_initialise(&native); - if (r != 0) - throw create_error(r); - ramps->red.ramp = native.red; - ramps->green.ramp = native.green; - ramps->blue.ramp = native.blue; - } - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_ramps16_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) - { - libgamma_gamma_ramps16_t native; - int r; - native.red_size = ramps->red.size = red; - native.green_size = ramps->green.size = green; - native.blue_size = ramps->blue.size = blue; - ramps->depth = 16; - r = libgamma_gamma_ramps16_initialise(&native); - if (r != 0) - throw create_error(r); - ramps->red.ramp = native.red; - ramps->green.ramp = native.green; - ramps->blue.ramp = native.blue; - } - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_ramps32_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) - { - libgamma_gamma_ramps32_t native; - int r; - native.red_size = ramps->red.size = red; - native.green_size = ramps->green.size = green; - native.blue_size = ramps->blue.size = blue; - ramps->depth = 32; - r = libgamma_gamma_ramps32_initialise(&native); - if (r != 0) - throw create_error(r); - ramps->red.ramp = native.red; - ramps->green.ramp = native.green; - ramps->blue.ramp = native.blue; - } - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_ramps64_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) - { - libgamma_gamma_ramps64_t native; - int r; - native.red_size = ramps->red.size = red; - native.green_size = ramps->green.size = green; - native.blue_size = ramps->blue.size = blue; - ramps->depth = 64; - r = libgamma_gamma_ramps64_initialise(&native); - if (r != 0) - throw create_error(r); - ramps->red.ramp = native.red; - ramps->green.ramp = native.green; - ramps->blue.ramp = native.blue; - } - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_rampsf_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) - { - libgamma_gamma_rampsf_t native; - int r; - native.red_size = ramps->red.size = red; - native.green_size = ramps->green.size = green; - native.blue_size = ramps->blue.size = blue; - ramps->depth = -1; - r = libgamma_gamma_rampsf_initialise(&native); - if (r != 0) - throw create_error(r); - ramps->red.ramp = native.red; - ramps->green.ramp = native.green; - ramps->blue.ramp = native.blue; - } - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_rampsd_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green) - { - libgamma_gamma_rampsd_t native; - int r; - native.red_size = ramps->red.size = red; - native.green_size = ramps->green.size = green; - native.blue_size = ramps->blue.size = blue; - ramps->depth = -2; - r = libgamma_gamma_rampsd_initialise(&native); - if (r != 0) - throw create_error(r); - ramps->red.ramp = native.red; - ramps->green.ramp = native.green; - ramps->blue.ramp = native.blue; - } - - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_ramps8_create(size_t red, size_t blue, size_t green) - { - libgamma_gamma_ramps8_t ramps; - int r; - ramps.red_size = red; - ramps.green_size = green; - ramps.blue_size = blue; - r = libgamma_gamma_ramps8_initialise(&ramps); - if (r != 0) - throw create_error(r); - return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, 8); - } - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_ramps16_create(size_t red, size_t blue, size_t green) - { - libgamma_gamma_ramps16_t ramps; - int r; - ramps.red_size = red; - ramps.green_size = green; - ramps.blue_size = blue; - r = libgamma_gamma_ramps16_initialise(&ramps); - if (r != 0) - throw create_error(r); - return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, 16); - } - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_ramps32_create(size_t red, size_t blue, size_t green) - { - libgamma_gamma_ramps32_t ramps; - int r; - ramps.red_size = red; - ramps.green_size = green; - ramps.blue_size = blue; - r = libgamma_gamma_ramps32_initialise(&ramps); - if (r != 0) - throw create_error(r); - return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, 32); - } - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_ramps64_create(size_t red, size_t blue, size_t green) - { - libgamma_gamma_ramps64_t ramps; - int r; - ramps.red_size = red; - ramps.green_size = green; - ramps.blue_size = blue; - r = libgamma_gamma_ramps64_initialise(&ramps); - if (r != 0) - throw create_error(r); - return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, 64); - } - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_rampsf_create(size_t red, size_t blue, size_t green) - { - libgamma_gamma_rampsf_t ramps; - int r; - ramps.red_size = red; - ramps.green_size = green; - ramps.blue_size = blue; - r = libgamma_gamma_rampsf_initialise(&ramps); - if (r != 0) - throw create_error(r); - return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, -1); - } - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_rampsd_create(size_t red, size_t blue, size_t green) - { - libgamma_gamma_rampsd_t ramps; - int r; - ramps.red_size = red; - ramps.green_size = green; - ramps.blue_size = blue; - r = libgamma_gamma_rampsd_initialise(&ramps); - if (r != 0) - throw create_error(r); - return new GammaRamps(ramps.red, ramps.green, ramps.blue, red, green, blue, -2); - } - -} - diff --git a/src/libgamma-facade.hh b/src/libgamma-facade.hh deleted file mode 100644 index a2e235e..0000000 --- a/src/libgamma-facade.hh +++ /dev/null @@ -1,267 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library 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 3 of the License, or - * (at your option) any later version. - * - * This library 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 library. If not, see . - */ -#ifndef LIBGAMMA_FACADE_HH -#define LIBGAMMA_FACADE_HH - - -#include -#include - -#include "libgamma-native.hh" -#include "libgamma-method.hh" - - -#ifndef __GCC__ -# define __attribute__(X) /* emtpy */ -#endif - - - -namespace libgamma -{ - /** - * List available adjustment methods by their order of preference based on the environment. - * - * @param operation Allowed values: - * 0: Methods that the environment suggests will work, excluding fake. - * 1: Methods that the environment suggests will work, including fake. - * 2: All real non-fake methods. - * 3: All real methods. - * 4: All methods. - * Other values invoke undefined behaviour. - * @return Array of methods. - */ - std::vector list_methods(int operation); - - /** - * Check whether an adjustment method is available, non-existing (invalid) methods will be - * identified as not available under the rationale that the library may be out of date. - * - * @param method The adjustment method. - * @return Whether the adjustment method is available. - */ - int is_method_available(int method) __attribute__((const)); - - /** - * Return the capabilities of an adjustment method. - * - * @param output The data structure to fill with the method's capabilities, - * @param method The adjustment method (display server and protocol). - */ - void method_capabilities(MethodCapabilities* output, int method); - - /** - * Return the default site for an adjustment method. - * - * @param method The adjustment method (display server and protocol.) - * @return The default site, `nullptr` if it cannot be determined or if - * multiple sites are not supported by the adjustment method. - */ - std::string* method_default_site(int method); - - /** - * Return the default variable that determines - * the default site for an adjustment method. - * - * @param method The adjustment method (display server and protocol.) - * @return The environ variables that is used to determine the - * default site. `nullptr` if there is none, that is, if - * the method does not support multiple sites. - */ - std::string* method_default_site_variable(int method); - - - /** - * Convert a raw representation of an EDID to a lowercase hexadecimal representation. - * - * @param edid The EDID in raw representation. - * @param length The length of `edid`. - * @return The EDID in lowercase hexadecimal representation. - */ - std::string behex_edid(const unsigned char* edid, size_t length); - - /** - * Convert a raw representation of an EDID to a lowercase hexadecimal representation. - * - * @param edid The EDID in raw representation. - * @param length The length of `edid`. - * @return The EDID in lowercase hexadecimal representation. - */ - std::string behex_edid_lowercase(const unsigned char* edid, size_t length); - - /** - * Convert a raw representation of an EDID to an uppercase hexadecimal representation. - * - * @param edid The EDID in raw representation. - * @param length The length of `edid`. - * @return The EDID in uppercase hexadecimal representation. - */ - std::string behex_edid_uppercase(const unsigned char* edid, size_t length); - - /** - * Convert an hexadecimal representation of an EDID to a raw representation. - * - * @param edid The EDID in hexadecimal representation. - * @return The EDID in raw representation, it will be half the length - * of `edid` (the input value). - */ - unsigned char* unhex_edid(const std::string edid); - - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_ramps8_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_ramps16_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_ramps32_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_ramps64_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_rampsf_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); - - /** - * Initialise a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param ramps The gamma ramp to initialise. - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - */ - void gamma_rampsd_initialise(GammaRamps* ramps, size_t red, size_t blue, size_t green); - - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_ramps8_create(size_t red, size_t blue, size_t green); - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_ramps16_create(size_t red, size_t blue, size_t green); - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_ramps32_create(size_t red, size_t blue, size_t green); - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_ramps64_create(size_t red, size_t blue, size_t green); - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_rampsf_create(size_t red, size_t blue, size_t green); - - /** - * Create a gamma ramp in the proper way that allows all adjustment - * methods to read from and write to it without causing segmentation violation. - * - * @param red The size of the gamma ramp for the red channel. - * @param green The size of the gamma ramp for the green channel. - * @param blue The size of the gamma ramp for the blue channel. - * @return The gamma ramp. - */ - GammaRamps* gamma_rampsd_create(size_t red, size_t blue, size_t green); - -} - - -#ifndef __GCC__ -# undef __attribute__ -#endif - -#endif - diff --git a/src/libgamma-method.cc b/src/libgamma-method.cc deleted file mode 100644 index dae9929..0000000 --- a/src/libgamma-method.cc +++ /dev/null @@ -1,551 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library 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 3 of the License, or - * (at your option) any later version. - * - * This library 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 library. If not, see . - */ -#include "libgamma-method.hh" - -#include "libgamma-error.hh" - -#include -#include -#include - - -namespace libgamma -{ - /** - * Constructor. - */ - MethodCapabilities::MethodCapabilities() : - crtc_information(0), - default_site_known(false), - multiple_sites(false), - multiple_partitions(false), - multiple_crtcs(false), - partitions_are_graphics_cards(false), - site_restore(false), - partition_restore(false), - crtc_restore(false), - identical_gamma_sizes(false), - fixed_gamma_size(false), - fixed_gamma_depth(false), - real(false), - fake(false) - { - /* Do nothing. */ - } - - - /** - * Constructor. - * - * @param caps The information in the native structure. - */ - MethodCapabilities::MethodCapabilities(libgamma_method_capabilities_t* caps) : - crtc_information(caps->crtc_information), - default_site_known(caps->default_site_known), - multiple_sites(caps->multiple_sites), - multiple_partitions(caps->multiple_partitions), - multiple_crtcs(caps->multiple_crtcs), - partitions_are_graphics_cards(caps->partitions_are_graphics_cards), - site_restore(caps->site_restore), - partition_restore(caps->partition_restore), - crtc_restore(caps->crtc_restore), - identical_gamma_sizes(caps->identical_gamma_sizes), - fixed_gamma_size(caps->fixed_gamma_size), - fixed_gamma_depth(caps->fixed_gamma_depth), - real(caps->real), - fake(caps->fake) - { - /* Do nothing. */ - } - - - /** - * Copy constructor. - * - * @param other The information to copy. - */ - MethodCapabilities::MethodCapabilities(const MethodCapabilities& other) : - crtc_information(other.crtc_information), - default_site_known(other.default_site_known), - multiple_sites(other.multiple_sites), - multiple_partitions(other.multiple_partitions), - multiple_crtcs(other.multiple_crtcs), - partitions_are_graphics_cards(other.partitions_are_graphics_cards), - site_restore(other.site_restore), - partition_restore(other.partition_restore), - crtc_restore(other.crtc_restore), - identical_gamma_sizes(other.identical_gamma_sizes), - fixed_gamma_size(other.fixed_gamma_size), - fixed_gamma_depth(other.fixed_gamma_depth), - real(other.real), - fake(other.fake) - { - /* Do nothing. */ - } - - - /** - * Destructor. - */ - MethodCapabilities::~MethodCapabilities() - { - /* Do nothing. */ - } - - - /** - * Copy operator. - * - * @param other The information to copy. - */ - MethodCapabilities& MethodCapabilities::operator =(const MethodCapabilities& other) - { - this->crtc_information = other.crtc_information; - this->default_site_known = other.default_site_known; - this->multiple_sites = other.multiple_sites; - this->multiple_partitions = other.multiple_partitions; - this->multiple_crtcs = other.multiple_crtcs; - this->partitions_are_graphics_cards = other.partitions_are_graphics_cards; - this->site_restore = other.site_restore; - this->partition_restore = other.partition_restore; - this->crtc_restore = other.crtc_restore; - this->identical_gamma_sizes = other.identical_gamma_sizes; - this->fixed_gamma_size = other.fixed_gamma_size; - this->fixed_gamma_depth = other.fixed_gamma_depth; - this->real = other.real; - this->fake = other.fake; - - return *this; - } - - - - - - /** - * Constructor. - */ - CRTCInformation::CRTCInformation() : - edid(nullptr), - edid_length(0), - edid_error(0), - width_mm(0), - width_mm_error(0), - height_mm(0), - height_mm_error(0), - width_mm_edid(0), - width_mm_edid_error(0), - height_mm_edid(0), - height_mm_edid_error(0), - red_gamma_size(0), - green_gamma_size(0), - blue_gamma_size(0), - gamma_size_error(0), - gamma_depth(0), - gamma_depth_error(0), - gamma_support(0), - gamma_support_error(0), - subpixel_order((SubpixelOrder)0), - subpixel_order_error(0), - active(0), - active_error(0), - connector_name(nullptr), - connector_name_error(0), - connector_type((ConnectorType)0), - connector_type_error(0), - gamma_red(0), - gamma_green(0), - gamma_blue(0), - gamma_error(0) - { - /* Do nothing. */ - } - - - /** - * Constructor. - * - * @param info The information in the native structure. - */ - CRTCInformation::CRTCInformation(libgamma_crtc_information_t* info) : - edid(info->edid), - edid_length(info->edid_length), - edid_error(info->edid_error), - width_mm(info->width_mm), - width_mm_error(info->width_mm_error), - height_mm(info->height_mm), - height_mm_error(info->height_mm_error), - width_mm_edid(info->width_mm_edid), - width_mm_edid_error(info->width_mm_edid_error), - height_mm_edid(info->height_mm_edid), - height_mm_edid_error(info->height_mm_edid_error), - red_gamma_size(info->red_gamma_size), - green_gamma_size(info->green_gamma_size), - blue_gamma_size(info->blue_gamma_size), - gamma_size_error(info->gamma_size_error), - gamma_depth(info->gamma_depth), - gamma_depth_error(info->gamma_depth_error), - gamma_support(info->gamma_support), - gamma_support_error(info->gamma_support_error), - subpixel_order(info->subpixel_order), - subpixel_order_error(info->subpixel_order_error), - active(info->active), - active_error(info->active_error), - connector_name(nullptr), - connector_name_error(info->connector_name_error), - connector_type(info->connector_type), - connector_type_error(info->connector_type_error), - gamma_red(info->gamma_red), - gamma_green(info->gamma_green), - gamma_blue(info->gamma_blue), - gamma_error(info->gamma_error) - { - if (info->connector_name != nullptr) - { - this->connector_name = new std::string(info->connector_name); - free(info->connector_name); - } - } - - - /** - * Copy constructor. - * - * @param other The information to copy. - */ - CRTCInformation::CRTCInformation(const CRTCInformation& other) : - edid(nullptr), - edid_length(other.edid_length), - edid_error(other.edid_error), - width_mm(other.width_mm), - width_mm_error(other.width_mm_error), - height_mm(other.height_mm), - height_mm_error(other.height_mm_error), - width_mm_edid(other.width_mm_edid), - width_mm_edid_error(other.width_mm_edid_error), - height_mm_edid(other.height_mm_edid), - height_mm_edid_error(other.height_mm_edid_error), - red_gamma_size(other.red_gamma_size), - green_gamma_size(other.green_gamma_size), - blue_gamma_size(other.blue_gamma_size), - gamma_size_error(other.gamma_size_error), - gamma_depth(other.gamma_depth), - gamma_depth_error(other.gamma_depth_error), - gamma_support(other.gamma_support), - gamma_support_error(other.gamma_support_error), - subpixel_order(other.subpixel_order), - subpixel_order_error(other.subpixel_order_error), - active(other.active), - active_error(other.active_error), - connector_name(nullptr), - connector_name_error(other.connector_name_error), - connector_type(other.connector_type), - connector_type_error(other.connector_type_error), - gamma_red(other.gamma_red), - gamma_green(other.gamma_green), - gamma_blue(other.gamma_blue), - gamma_error(other.gamma_error) - { - if (other.edid != nullptr) - { - this->edid = (unsigned char*)malloc(this->edid_length * sizeof(unsigned char)); - memcpy(this->edid, other.edid, this->edid_length * sizeof(unsigned char)); - } - if (other.connector_name != nullptr) - this->connector_name = new std::string(*(other.connector_name)); - } - - - /** - * Destructor. - */ - CRTCInformation::~CRTCInformation() - { - if (this->connector_name != nullptr) - delete this->connector_name; - free(this->edid); - } - - - /** - * Copy operator. - * - * @param other The information to copy. - */ - CRTCInformation& CRTCInformation::operator =(const CRTCInformation& other) - { - this->edid = nullptr; - this->edid_length = other.edid_length; - this->edid_error = other.edid_error; - this->width_mm = other.width_mm; - this->width_mm_error = other.width_mm_error; - this->height_mm = other.height_mm; - this->height_mm_error = other.height_mm_error; - this->width_mm_edid = other.width_mm_edid; - this->width_mm_edid_error = other.width_mm_edid_error; - this->height_mm_edid = other.height_mm_edid; - this->height_mm_edid_error = other.height_mm_edid_error; - this->red_gamma_size = other.red_gamma_size; - this->green_gamma_size = other.green_gamma_size; - this->blue_gamma_size = other.blue_gamma_size; - this->gamma_size_error = other.gamma_size_error; - this->gamma_depth = other.gamma_depth; - this->gamma_depth_error = other.gamma_depth_error; - this->gamma_support = other.gamma_support; - this->gamma_support_error = other.gamma_support_error; - this->subpixel_order = other.subpixel_order; - this->subpixel_order_error = other.subpixel_order_error; - this->active = other.active; - this->active_error = other.active_error; - this->connector_name = nullptr; - this->connector_name_error = other.connector_name_error; - this->connector_type = other.connector_type; - this->connector_type_error = other.connector_type_error; - this->gamma_red = other.gamma_red; - this->gamma_green = other.gamma_green; - this->gamma_blue = other.gamma_blue; - this->gamma_error = other.gamma_error; - - if (other.edid != nullptr) - { - this->edid = (unsigned char*)malloc(this->edid_length * sizeof(unsigned char)); - memcpy(this->edid, other.edid, this->edid_length * sizeof(unsigned char)); - } - if (other.connector_name != nullptr) - this->connector_name = new std::string(*(other.connector_name)); - - return *this; - } - -#ifdef __GCC__ -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wshadow" -#endif - - /** - * Constructor. - */ - Site::Site() : - method(0), - site(nullptr), - partitions_available(0), - native(nullptr) - { - /* Do nothing. */ - } - - /** - * Constructor. - * - * @param method The adjustment method of the site. - * @param site The site identifier, will be moved into - * the structure, must be `delete`:able. - */ - Site::Site(int method, std::string* site) : - method(method), - site(site), - partitions_available(0), - native(nullptr) - { - char* cstr = nullptr; - int r; - - if (site != nullptr) - { - const char* cstr_ = site->c_str(); - cstr = (char*)malloc((strlen(cstr_) + 1) * sizeof(char)); - memcpy(cstr, cstr_, (strlen(cstr_) + 1) * sizeof(char)); - } - this->native = (libgamma_site_state_t*)malloc(sizeof(libgamma_site_state_t)); - r = libgamma_site_initialise(this->native, method, cstr); - if (r < 0) - { - int saved_errno = errno; - free(this->native); - this->native = nullptr; - errno = saved_errno; - throw create_error(r); - } - this->partitions_available = this->native->partitions_available; - } - - /** - * Destructor. - */ - Site::~Site() - { - if (this->site != nullptr) - delete this->site; - if (this->native != nullptr) - libgamma_site_free(this->native); - } - - /** - * Restore the gamma ramps all CRTC:s with a site to - * the system settings. - */ - void Site::restore() - { - int r; - r = libgamma_site_restore(this->native); - if (r != 0) - throw create_error(r); - } - - - - /** - * Constructor. - */ - Partition::Partition() : - site(nullptr), - partition(0), - crtcs_available(0), - native(nullptr) - { - /* Do nothing. */ - } - - /** - * Constructor. - * - * @param site The site of the partition. - * @param partition The index of the partition. - */ - Partition::Partition(Site* site, size_t partition) : - site(site), - partition(partition), - crtcs_available(0), - native(nullptr) - { - int r; - this->native = (libgamma_partition_state_t*)malloc(sizeof(libgamma_partition_state_t)); - r = libgamma_partition_initialise(this->native, site->native, partition); - if (r < 0) - { - int saved_errno = errno; - free(this->native); - this->native = nullptr; - errno = saved_errno; - throw create_error(r); - } - this->crtcs_available = this->native->crtcs_available; - } - - /** - * Destructor. - */ - Partition::~Partition() - { - if (this->native != nullptr) - libgamma_partition_free(this->native); - } - - /** - * Restore the gamma ramps all CRTC:s with a partition - * to the system settings. - */ - void Partition::restore() - { - int r; - r = libgamma_partition_restore(this->native); - if (r != 0) - throw create_error(r); - } - - - - /** - * Constructor. - */ - CRTC::CRTC() : - partition(nullptr), - crtc(0), - native(nullptr) - { - /* Do nothing. */ - } - - /** - * Constructor. - * - * @param partition The partition of the CRTC. - * @param crtc The index of the CRTC. - */ - CRTC::CRTC(Partition* partition, size_t crtc) : - partition(partition), - crtc(crtc), - native(nullptr) - { - int r; - this->native = (libgamma_crtc_state_t*)malloc(sizeof(libgamma_crtc_state_t)); - r = libgamma_crtc_initialise(this->native, partition->native, crtc); - if (r < 0) - { - int saved_errno = errno; - free(this->native); - this->native = nullptr; - errno = saved_errno; - throw create_error(r); - } - } - - /** - * Destructor. - */ - CRTC::~CRTC() - { - if (this->native != nullptr) - libgamma_crtc_free(this->native); - } - - /** - * Restore the gamma ramps for a CRTC to the system - * settings for that CRTC. - */ - void CRTC::restore() - { - int r; - r = libgamma_crtc_restore(this->native); - if (r != 0) - throw create_error(r); - } - - /** - * Read information about a CRTC. - * - * @param output Instance of a data structure to fill with the information about the CRTC. - * @param fields OR:ed identifiers for the information about the CRTC that should be read. - * @return Whether an error has occurred and is stored in a `*_error` field. - */ - bool CRTC::information(CRTCInformation* output, int32_t fields) - { - libgamma_crtc_information_t info; - int r; - - r = libgamma_get_crtc_information(&info, this->native, fields); - *output = CRTCInformation(&info); - return r != 0; - } - -#ifdef __GCC__ -# pragma GCC diagnostic pop -#endif - -} - diff --git a/src/libgamma-method.hh b/src/libgamma-method.hh deleted file mode 100644 index 1ad8be5..0000000 --- a/src/libgamma-method.hh +++ /dev/null @@ -1,1022 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library 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 3 of the License, or - * (at your option) any later version. - * - * This library 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 library. If not, see . - */ -#ifndef LIBGAMMA_METHOD_HH -#define LIBGAMMA_METHOD_HH - - -#include -#include - -#include "libgamma-native.hh" -#include "libgamma-error.hh" - - -#ifndef __GCC__ -# define __attribute__(X) /* emtpy */ -#endif - - - -namespace libgamma -{ - /** - * Cathode ray tube controller information data structure. - */ - class CRTCInformation; - - /** - * Capabilities of adjustment methods. - */ - class MethodCapabilities; - - /** - * Site state. - * - * On operating systems that integrate a graphical environment - * there is usually just one site. However, one systems with - * pluggable graphics, like Unix-like systems such as GNU/Linux - * and the BSD:s, there can usually be any (feasible) number of - * sites. In X.org parlance they are called displays. - */ - class Site; - - /** - * Partition state. - * - * Probably the majority of display server only one partition - * per site. However, X.org can, and traditional used to have - * on multi-headed environments, multiple partitions per site. - * In X.org partitions are called 'screens'. It is not to be - * confused with monitor. A screen is a collection of monitors, - * and the mapping from monitors to screens is a surjection. - * On hardware-level adjustment methods, such as Direct - * Rendering Manager, a partition is a graphics card. - */ - class Partition; - - /** - * Cathode ray tube controller state. - * - * The CRTC controls the gamma ramps for the - * monitor that is plugged in to the connector - * that the CRTC belongs to. - */ - class CRTC; - - - - /** - * Capabilities of adjustment methods. - */ - class MethodCapabilities - { - public: - /** - * Constructor. - */ - MethodCapabilities(); - - /** - * Constructor. - * - * @param caps The information in the native structure. - */ - MethodCapabilities(libgamma_method_capabilities_t* caps); - - /** - * Copy constructor. - * - * @param other The information to copy. - */ - MethodCapabilities(const MethodCapabilities& other); - - /** - * Destructor. - */ - ~MethodCapabilities() __attribute__((const)); - - /** - * Copy operator. - * - * @param other The information to copy. - */ - MethodCapabilities& operator =(const MethodCapabilities& other); - - - - - /** - * OR of the CRTC information fields in `libgamma_crtc_information_t` - * that may (but can fail) be read successfully. - */ - int32_t crtc_information; - - /** - * Whether the default site is known, if true the site is integrated - * to the system or can be determined using environment variables. - */ - bool default_site_known; - - /** - * Whether the adjustment method supports multiple sites rather - * than just the default site. - */ - bool multiple_sites; - - /** - * Whether the adjustment method supports multiple partitions - * per site. - */ - bool multiple_partitions; - - /** - * Whether the adjustment method supports multiple CRTC:s - * per partition per site. - */ - bool multiple_crtcs; - - /** - * Whether the partition to graphics card is a bijection. - */ - bool partitions_are_graphics_cards; - - /** - * Whether the adjustment method supports `libgamma_site_restore`. - */ - bool site_restore; - - /** - * Whether the adjustment method supports `libgamma_partition_restore`. - */ - bool partition_restore; - - /** - * Whether the adjustment method supports `libgamma_crtc_restore`. - */ - bool crtc_restore; - - /** - * Whether the `red_gamma_size`, `green_gamma_size` and `blue_gamma_size` - * fields in `libgamma_crtc_information_t` will always have the same - * values as each other for the adjustment method. - */ - bool identical_gamma_sizes; - - /** - * Whether the `red_gamma_size`, `green_gamma_size` and `blue_gamma_size` - * fields in `libgamma_crtc_information_t` will always be filled with the - * same value for the adjustment method. - */ - bool fixed_gamma_size; - - /** - * Whether the `gamma_depth` field in `libgamma_crtc_information_t` - * will always be filled with the same value for the adjustment method. - */ - bool fixed_gamma_depth; - - /** - * Whether the adjustment method will actually perform adjustments. - */ - bool real; - - /** - * Whether the adjustment method is implement using a translation layer. - */ - bool fake; - - }; - - - /** - * Types for connectors. - */ - typedef libgamma_connector_type_t ConnectorType; - - /** - * Orders for subpixels. Currently the possible values are - * very biased to LCD, Plasma and monochrome monitors. - */ - typedef libgamma_subpixel_order_t SubpixelOrder; - - - /** - * Cathode ray tube controller information data structure. - */ - class CRTCInformation - { - public: - /** - * Constructor. - */ - CRTCInformation(); - - /** - * Constructor. - * - * @param info The information in the native structure. - */ - CRTCInformation(libgamma_crtc_information_t* info); - - /** - * Copy constructor. - * - * @param other The information to copy. - */ - CRTCInformation(const CRTCInformation& other); - - /** - * Destructor. - */ - ~CRTCInformation(); - - /** - * Copy operator. - * - * @param other The information to copy. - */ - CRTCInformation& operator =(const CRTCInformation& other); - - - - /** - * The Extended Display Identification Data associated with - * the attached monitor. This is raw byte array that is usually - * 128 bytes long. It is not NUL-terminate, rather its length - * is stored in `edid_length`. - */ - unsigned char* edid; - - /** - * The length of `edid`. - */ - size_t edid_length; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int edid_error; - - - /** - * The phyical width, in millimetres, of the viewport of the - * attached monitor, as reported by the adjustment method. This - * value may be incorrect, which is a known issue with the X - * server where it is the result of the X server attempting - * the estimate the size on its own. - * Zero means that its is not applicable, which is the case - * for projectors. - */ - size_t width_mm; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int width_mm_error; - - - /** - * The phyical height, in millimetres, of the viewport of the - * attached monitor, as reported by the adjustment method. This - * value may be incorrect, which is a known issue with the X - * server where it is the result of the X server attempting - * the estimate the size on its own. - * Zero means that its is not applicable, which is the case - * for projectors. - */ - size_t height_mm; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int height_mm_error; - - - /** - * The phyical width, in millimetres, of the viewport of the - * attached monitor, as reported by it the monitor's Extended - * Display Information Data. This value can only contain whole - * centimetres, which means that the result is always zero - * modulus ten. However, this could change with revisions of - * the EDID structure. - * Zero means that its is not applicable, which is the case - * for projectors. - */ - size_t width_mm_edid; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int width_mm_edid_error; - - - /** - * The phyical height, in millimetres, of the viewport of the - * attached monitor, as reported by it the monitor's Extended - * Display Information Data. This value can only contain whole - * centimetres, which means that the result is always zero - * modulus ten. However, this could change with revisions of - * the EDID structure. - * Zero means that its is not applicable, which is the case - * for projectors. - */ - size_t height_mm_edid; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int height_mm_edid_error; - - - /** - * The size of the encoding axis of the red gamma ramp. - */ - size_t red_gamma_size; - - /** - * The size of the encoding axis of the green gamma ramp. - */ - size_t green_gamma_size; - - /** - * The size of the encoding axis of the blue gamma ramp. - */ - size_t blue_gamma_size; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int gamma_size_error; - - - /** - * The bit-depth of the value axes of gamma ramps, - * -1 for single precision floating point, and -2 for - * double precision floating point. - */ - signed gamma_depth; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int gamma_depth_error; - - - /** - * Non-zero gamma ramp adjustments are supported. - */ - int gamma_support; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int gamma_support_error; - - - /** - * The layout of the subpixels. - * You cannot count on this value --- especially for CRT:s --- - * but it is provided anyway as a means of distinguishing monitors. - */ - SubpixelOrder subpixel_order; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int subpixel_order_error; - - - /** - * Whether there is a monitors connected to the CRTC. - */ - int active; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int active_error; - - - /** - * The name of the connector as designated by the display - * server or as give by this library in case the display - * server lacks this feature. - */ - std::string* connector_name; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int connector_name_error; - - - /** - * The type of the connector that is associated with the CRTC. - */ - ConnectorType connector_type; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int connector_type_error; - - - /** - * The gamma characteristics of the monitor as reported - * in its Extended Display Information Data. The value - * holds the value for the red channel. If you do not have - * and more accurate measurement of the gamma for the - * monitor this could be used to give a rought gamma - * correction; simply divide the value with 2.2 and use - * the result for the red channel in the gamma correction. - */ - float gamma_red; - - /** - * The gamma characteristics of the monitor as reported - * in its Extended Display Information Data. The value - * holds the value for the green channel. If you do not have - * and more accurate measurement of the gamma for the - * monitor this could be used to give a rought gamma - * correction; simply divide the value with 2.2 and use - * the result for the green channel in the gamma correction. - */ - float gamma_green; - - /** - * The gamma characteristics of the monitor as reported - * in its Extended Display Information Data. The value - * holds the value for the blue channel. If you do not have - * and more accurate measurement of the gamma for the - * monitor this could be used to give a rought gamma - * correction; simply divide the value with 2.2 and use - * the result for the blue channel in the gamma correction. - */ - float gamma_blue; - - /** - * Zero on success, positive it holds the value `errno` had - * when the reading failed, otherwise (negative) the value - * of an error identifier provided by this library. - */ - int gamma_error; - - }; - - - -#ifdef __GCC__ -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Weffc++" - /* Lets ignore that we do not override the copy constructor - * and the copy operator. */ -#endif - - /** - * One single Gamma ramp. - */ - template - class Ramp - { - public: - /** - * Constructor. - * - * @param native_ramp The ramp. - * @param ramp_size The size of the ramp. - */ - Ramp(T* native_ramp, size_t ramp_size) - { - this->ramp = native_ramp; - this->size = ramp_size; - } - - /** - * Destructor. - */ - ~Ramp() - { - /* Do nothing */ - } - - /** - * Subscript operator. - * - * @param index The index of the stop to set or get. - * @return A reference to the stop's value. - */ - T& operator [](size_t index) - { - return this->ramp[index]; - } - - /** - * Subscript operator. - * - * @param index The index of the stop to get. - * @return The value of the stop. - */ - const T& operator [](size_t index) const - { - return this->ramp[index]; - } - - - - /** - * The size of the ramp. - */ - size_t size; - - /** - * The ramp (internal data). - */ - T* ramp; - - }; - - - /** - * Gamma ramp structure. - */ - template - class GammaRamps - { - public: - /** - * Constructor. - */ - GammaRamps() : - red(Ramp(nullptr, 0)), - green(Ramp(nullptr, 0)), - blue(Ramp(nullptr, 0)), - depth(0) - { - /* Do nothing. */ - } - - /** - * Constructor. - * - * @param red_ramp The red gamma ramp. - * @param green_ramp The green gamma ramp. - * @param blue_ramp The blue gamma ramp. - * @param red_size The size of the gamma ramp for the red channel. - * @param green_size The size of the gamma ramp for the green channel. - * @param blue_size The size of the gamma ramp for the blue channel. - * @param gamma_depth The bit-depth of the gamma ramps, -1 for single precision - * floating point, and -2 for double precision floating point. - */ - GammaRamps(T* red_ramp, T* green_ramp, T* blue_ramp, - size_t red_size, size_t green_size, size_t blue_size, signed gamma_depth) : - red(Ramp(red_ramp, red_size)), - green(Ramp(green_ramp, green_size)), - blue(Ramp(blue_ramp, blue_size)), - depth(gamma_depth) - { - /* Do nothing. */ - } - - /** - * Destructor. - */ - ~GammaRamps() - { - free(this->red.ramp); - } - - - - /** - * The red gamma ramp. - */ - Ramp red; - - /** - * The green gamma ramp. - */ - Ramp green; - - /** - * The blue gamma ramp. - */ - Ramp blue; - - /** - * The bit-depth of the gamma ramps, -1 for single precision - * floating point, and -2 for double precision floating point. - */ - signed depth; - - }; - - - - /** - * Site state. - * - * On operating systems that integrate a graphical environment - * there is usually just one site. However, one systems with - * pluggable graphics, like Unix-like systems such as GNU/Linux - * and the BSD:s, there can usually be any (feasible) number of - * sites. In X.org parlance they are called displays. - */ - class Site - { - public: - /** - * Constructor. - */ - Site(); - - /** - * Constructor. - * - * @param method The adjustment method of the site. - * @param site The site identifier, will be moved into - * the structure, must be `delete`:able. - */ - Site(int method, std::string* site = nullptr); - - /** - * Destructor. - */ - ~Site(); - - /** - * Restore the gamma ramps all CRTC:s with a site to - * the system settings. - */ - void restore(); - - - - /** - * This field specifies, for the methods if this library, - * which adjustment method (display server and protocol) - * is used to adjust the gamma ramps. - */ - int method; - - /** - * The site identifier. It can either be `nullptr` or a string. - * `nullptr` indicates the default site. On systems like the - * Unix-like systems, where the graphics are pluggable, this - * is usually resolved by an environment variable, such as - * "DISPLAY" for X.org. - */ - std::string* site; - - /** - * The number of partitions that is available on this site. - * Probably the majority of display server only one partition - * per site. However, X.org can, and traditional used to have - * on multi-headed environments, multiple partitions per site. - * In X.org partitions are called 'screens'. It is not to be - * confused with monitor. A screen is a collection of monitors, - * and the mapping from monitors to screens is a surjection. - * On hardware-level adjustment methods, such as Direct - * Rendering Manager, a partition is a graphics card. - */ - size_t partitions_available; - - /** - * The state in the native structure. - */ - libgamma_site_state_t* native; - - }; - - - - /** - * Partition state. - * - * Probably the majority of display server only one partition - * per site. However, X.org can, and traditional used to have - * on multi-headed environments, multiple partitions per site. - * In X.org partitions are called 'screens'. It is not to be - * confused with monitor. A screen is a collection of monitors, - * and the mapping from monitors to screens is a surjection. - * On hardware-level adjustment methods, such as Direct - * Rendering Manager, a partition is a graphics card. - */ - class Partition - { - public: - /** - * Constructor. - */ - Partition(); - - /** - * Constructor. - * - * @param site The site of the partition. - * @param partition The index of the partition. - */ - Partition(Site* site, size_t partition); - - /** - * Destructor. - */ - ~Partition(); - - /** - * Restore the gamma ramps all CRTC:s with a partition - * to the system settings. - */ - void restore(); - - - - /** - * The site this partition belongs to. - */ - Site* site; - - /** - * The index of the partition. - */ - size_t partition; - - /** - * The number of CRTC:s that are available under this - * partition. Note that the CRTC:s are not necessarily - * online. - */ - size_t crtcs_available; - - /** - * The state in the native structure. - */ - libgamma_partition_state_t* native; - - }; - - - - /** - * Cathode ray tube controller state. - * - * The CRTC controls the gamma ramps for the - * monitor that is plugged in to the connector - * that the CRTC belongs to. - */ - class CRTC - { - public: - /** - * Constructor. - */ - CRTC(); - - /** - * Constructor. - * - * @param partition The partition of the CRTC. - * @param crtc The index of the CRTC. - */ - CRTC(Partition* partition, size_t crtc); - - /** - * Destructor. - */ - ~CRTC(); - - /** - * Restore the gamma ramps for a CRTC to the system - * settings for that CRTC. - */ - void restore(); - - /** - * Read information about a CRTC. - * - * @param output Instance of a data structure to fill with the information about the CRTC. - * @param fields OR:ed identifiers for the information about the CRTC that should be read. - * @return Whether an error has occurred and is stored in a `*_error` field. - */ - bool information(CRTCInformation* output, int32_t fields); - -#define __LIBGAMMA_GET_GAMMA(AFFIX) \ - libgamma_gamma_ramps ## AFFIX ## _t ramps_; \ - int r; \ - ramps_.red = ramps->red.ramp; \ - ramps_.green = ramps->green.ramp; \ - ramps_.blue = ramps->blue.ramp; \ - ramps_.red_size = ramps->red.size; \ - ramps_.green_size = ramps->green.size; \ - ramps_.blue_size = ramps->blue.size; \ - r = libgamma_crtc_get_gamma_ramps ## AFFIX(this->native, &ramps_); \ - if (r != 0) \ - throw create_error(r) - - /** - * Get the current gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void get_gamma(GammaRamps* ramps) - { - __LIBGAMMA_GET_GAMMA(8); - } - - /** - * Get the current gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void get_gamma(GammaRamps* ramps) - { - __LIBGAMMA_GET_GAMMA(16); - } - - /** - * Get the current gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void get_gamma(GammaRamps* ramps) - { - __LIBGAMMA_GET_GAMMA(32); - } - - /** - * Get the current gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void get_gamma(GammaRamps* ramps) - { - __LIBGAMMA_GET_GAMMA(64); - } - - /** - * Get the current gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void get_gamma(GammaRamps* ramps) - { - __LIBGAMMA_GET_GAMMA(f); - } - - /** - * Get the current gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void get_gamma(GammaRamps* ramps) - { - __LIBGAMMA_GET_GAMMA(d); - } - -#undef __LIBGAMMA_GET_GAMMA - -#define __LIBGAMMA_SET_GAMMA(AFFIX) \ - libgamma_gamma_ramps ## AFFIX ## _t ramps_; \ - int r; \ - ramps_.red = ramps->red.ramp; \ - ramps_.green = ramps->green.ramp; \ - ramps_.blue = ramps->blue.ramp; \ - ramps_.red_size = ramps->red.size; \ - ramps_.green_size = ramps->green.size; \ - ramps_.blue_size = ramps->blue.size; \ - r = libgamma_crtc_set_gamma_ramps ## AFFIX(this->native, ramps_); \ - if (r != 0) \ - throw create_error(r) - - /** - * Set gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void set_gamma(GammaRamps* ramps) - { - __LIBGAMMA_SET_GAMMA(8); - } - - /** - * Set gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void set_gamma(GammaRamps* ramps) - { - __LIBGAMMA_SET_GAMMA(16); - } - - /** - * Set gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void set_gamma(GammaRamps* ramps) - { - __LIBGAMMA_SET_GAMMA(32); - } - - /** - * Set gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void set_gamma(GammaRamps* ramps) - { - __LIBGAMMA_SET_GAMMA(64); - } - - /** - * Set gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void set_gamma(GammaRamps* ramps) - { - __LIBGAMMA_SET_GAMMA(f); - } - - /** - * Set gamma ramps for the CRTC. - * - * @param ramps The gamma ramps to fill with the current values. - */ - void set_gamma(GammaRamps* ramps) - { - __LIBGAMMA_SET_GAMMA(d); - } - -#undef __LIBGAMMA_SET_GAMMA - - - - /** - * The partition this CRTC belongs to. - */ - Partition* partition; - - /** - * The index of the CRTC within its partition. - */ - size_t crtc; - - /** - * The state in the native structure. - */ - libgamma_crtc_state_t* native; - - }; - -#ifdef __GCC__ -# pragma GCC diagnostic pop -#endif - -} - - -#ifndef __GCC__ -# undef __attribute__ -#endif - -#endif - diff --git a/src/libgamma-native.hh b/src/libgamma-native.hh deleted file mode 100644 index be86743..0000000 --- a/src/libgamma-native.hh +++ /dev/null @@ -1,42 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library 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 3 of the License, or - * (at your option) any later version. - * - * This library 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 library. If not, see . - */ -#ifndef LIBGAMMA_NATIVE_HH -#define LIBGAMMA_NATIVE_HH - - -extern "C" -{ -# ifdef __GCC__ -# define restrict __restrict__ -# else -# define restrict /* remove */ -# endif -# define this self -# include -# undef this -# undef restrict -# ifndef __GCC__ -# ifdef __attribute__ -# undef __attribute__ -# endif -# endif -} - - -#endif - diff --git a/src/libgamma.hh b/src/libgamma.hh deleted file mode 100644 index 2a2666c..0000000 --- a/src/libgamma.hh +++ /dev/null @@ -1,28 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library 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 3 of the License, or - * (at your option) any later version. - * - * This library 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 library. If not, see . - */ -#ifndef LIBGAMMA_HH -#define LIBGAMMA_HH - - -#include "libgamma-error.hh" -#include "libgamma-method.hh" -#include "libgamma-facade.hh" - - -#endif - diff --git a/src/test.cc b/src/test.cc deleted file mode 100644 index 3ad9af9..0000000 --- a/src/test.cc +++ /dev/null @@ -1,323 +0,0 @@ -/** - * libgammamm -- C++ wrapper for libgamma - * Copyright (C) 2014 Mattias Andrée (maandree@member.fsf.org) - * - * This library 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 3 of the License, or - * (at your option) any later version. - * - * This library 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 library. If not, see . - */ -#include "libgamma.hh" - -#include -#include -#include - - -int main(void) -{ - libgamma::Site* site; - libgamma::Partition* partition; - libgamma::CRTC* crtc; - libgamma::CRTCInformation info; - libgamma::MethodCapabilities caps; - libgamma::GammaRamps* ramps; - int method; - size_t i; - - uint16_t* saved_red; - uint16_t* saved_green; - uint16_t* saved_blue; - - std::string* str; - char* cstr; - unsigned char* edid; - - libgamma::perror("test", 0); - libgamma::perror("test", 2); - libgamma::perror("test", -2); - libgamma::perror("test", LIBGAMMA_ERRNO_SET); - std::cout << std::endl; - - str = libgamma::name_of_error(-2); - std::cout << *str << std::endl; - std::cout << libgamma::value_of_error(str) << std::endl; - delete str; - str = new std::string("LIBGAMMA_NO_SUCH_ADJUSTMENT_METHOD"); - std::cout << libgamma::value_of_error(str) << std::endl; - delete str; - std::cout << std::endl; - - for (int m : libgamma::list_methods(0)) - std::cout << m << " "; - std::cout << std::endl; - for (int m : libgamma::list_methods(1)) - std::cout << m << " "; - std::cout << std::endl; - for (int m : libgamma::list_methods(2)) - std::cout << m << " "; - std::cout << std::endl; - for (int m : libgamma::list_methods(3)) - std::cout << m << " "; - std::cout << std::endl; - for (int m : libgamma::list_methods(4)) - std::cout << m << " "; - std::cout << std::endl; - std::cout << std::endl; - method = libgamma::list_methods(0)[0]; - - std::cout << libgamma::is_method_available(LIBGAMMA_METHOD_X_RANDR) << std::endl; - str = libgamma::method_default_site(LIBGAMMA_METHOD_X_RANDR); - if (str == nullptr) - std::cout << "(nullptr)" << std::endl; - else - std::cout << *str << std::endl; - delete str; - str = libgamma::method_default_site_variable(LIBGAMMA_METHOD_X_RANDR); - if (str == nullptr) - std::cout << "(nullptr)" << std::endl; - else - std::cout << *str << std::endl; - delete str; - std::cout << std::endl; - - edid = libgamma::unhex_edid("0123456789abcdef"); - cstr = libgamma_behex_edid(edid, 8); - std::cout << cstr << std::endl; - free(cstr); - std::cout << libgamma::behex_edid(edid, 8) << std::endl; - std::cout << libgamma::behex_edid_lowercase(edid, 8) << std::endl; - std::cout << libgamma::behex_edid_uppercase(edid, 8) << std::endl; - free(edid); - std::cout << std::endl; - - site = new libgamma::Site(method, new std::string(":0")); - std::cout << site->partitions_available << std::endl; - partition = new libgamma::Partition(site, 0); - std::cout << partition->crtcs_available << std::endl; - crtc = new libgamma::CRTC(partition, 0); - std::cout << crtc->information(&info, ~0) << std::endl; - std::cout << std::endl; - - cstr = libgamma_behex_edid(info.edid, info.edid_length); - std::cout << "edid: " << cstr << std::endl; - free(cstr); - std::cout << "edid_length: " << info.edid_length << std::endl; - std::cout << "edid_error: " << info.edid_error << std::endl; - std::cout << "width_mm: " << info.width_mm << std::endl; - std::cout << "width_mm_error: " << info.width_mm_error << std::endl; - std::cout << "height_mm: " << info.height_mm << std::endl; - std::cout << "height_mm_error: " << info.height_mm_error << std::endl; - std::cout << "width_mm_edid: " << info.width_mm_edid << std::endl; - std::cout << "width_mm_edid_error: " << info.width_mm_edid_error << std::endl; - std::cout << "height_mm_edid: " << info.height_mm_edid << std::endl; - std::cout << "height_mm_edid_error: " << info.height_mm_edid_error << std::endl; - std::cout << "red_gamma_size: " << info.red_gamma_size << std::endl; - std::cout << "green_gamma_size: " << info.green_gamma_size << std::endl; - std::cout << "blue_gamma_size: " << info.blue_gamma_size << std::endl; - std::cout << "gamma_size_error: " << info.gamma_size_error << std::endl; - std::cout << "gamma_depth: " << info.gamma_depth << std::endl; - std::cout << "gamma_depth_error: " << info.gamma_depth_error << std::endl; - std::cout << "gamma_support: " << info.gamma_support << std::endl; - std::cout << "gamma_support_error: " << info.gamma_support_error << std::endl; - std::cout << "subpixel_order: " << info.subpixel_order << std::endl; - std::cout << "subpixel_order_error: " << info.subpixel_order_error << std::endl; - std::cout << "active: " << info.active << std::endl; - std::cout << "active_error: " << info.active_error << std::endl; - if (info.connector_name == nullptr) - std::cout << "connector_name: " << "(nullptr)" << std::endl; - else - std::cout << "connector_name: " << *(info.connector_name) << std::endl; - std::cout << "connector_name_error: " << info.connector_name_error << std::endl; - std::cout << "connector_type: " << info.connector_type << std::endl; - std::cout << "connector_type_error: " << info.connector_type_error << std::endl; - std::cout << "gamma_red: " << info.gamma_red << std::endl; - std::cout << "gamma_green: " << info.gamma_green << std::endl; - std::cout << "gamma_blue: " << info.gamma_blue << std::endl; - std::cout << "gamma_error: " << info.gamma_error << std::endl; - std::cout << std::endl; - - libgamma::method_capabilities(&caps, method); - std::cout << "crtc_information: " << caps.crtc_information << std::endl; - std::cout << "default_site_known: " << caps.default_site_known << std::endl; - std::cout << "multiple_sites: " << caps.multiple_sites << std::endl; - std::cout << "multiple_partitions: " << caps.multiple_partitions << std::endl; - std::cout << "multiple_crtcs: " << caps.multiple_crtcs << std::endl; - std::cout << "partitions_are_graphics_cards: " << caps.partitions_are_graphics_cards << std::endl; - std::cout << "site_restore: " << caps.site_restore << std::endl; - std::cout << "partition_restore: " << caps.partition_restore << std::endl; - std::cout << "crtc_restore: " << caps.crtc_restore << std::endl; - std::cout << "identical_gamma_sizes: " << caps.identical_gamma_sizes << std::endl; - std::cout << "fixed_gamma_size: " << caps.fixed_gamma_size << std::endl; - std::cout << "fixed_gamma_depth: " << caps.fixed_gamma_depth << std::endl; - std::cout << "real: " << caps.real << std::endl; - std::cout << "fake: " << caps.fake << std::endl; - std::cout << std::endl; - - std::cout << libgamma::group_gid << std::endl; - libgamma::group_gid = 10; - std::cout << libgamma::group_gid << std::endl; - std::cout << std::endl; - - if (libgamma::group_name == nullptr) - std::cout << "(nullptr)" << std::endl; - else - std::cout << libgamma::group_name << std::endl; - libgamma::group_name = "test-group"; - if (libgamma::group_name == nullptr) - std::cout << "(nullptr)" << std::endl; - else - std::cout << libgamma::group_name << std::endl; - std::cout << std::endl; - - ramps = libgamma::gamma_ramps16_create(info.red_gamma_size, info.green_gamma_size, info.blue_gamma_size); - std::cout << ramps->red.size << " " - << ramps->green.size << " " - << ramps->blue.size << std::endl; - std::cout << ramps->depth << std::endl; - std::cout << std::endl; - - saved_red = new uint16_t[ramps->red.size]; - saved_green = new uint16_t[ramps->green.size]; - saved_blue = new uint16_t[ramps->blue.size]; - - crtc->get_gamma(ramps); - - for (i = 0; i < ramps->red.size; i++) - { - std::cout << ramps->red[i] << " "; - saved_red[i] = ramps->red[i]; - ramps->red[i] /= 2; - } - std::cout << std::endl; - std::cout << std::endl; - - for (i = 0; i < ramps->green.size; i++) - { - std::cout << ramps->green[i] << " "; - saved_green[i] = ramps->green[i]; - ramps->green[i] /= 2; - } - std::cout << std::endl; - std::cout << std::endl; - - for (i = 0; i < ramps->blue.size; i++) - { - std::cout << ramps->blue[i] << " "; - saved_blue[i] = ramps->blue[i]; - ramps->blue[i] /= 2; - } - std::cout << std::endl; - std::cout << std::endl; - - crtc->set_gamma(ramps); - - sleep(1); - - for (i = 0; i < ramps->red.size; i++) - ramps->red[i] = saved_red[i]; - for (i = 0; i < ramps->green.size; i++) - ramps->green[i] = saved_green[i]; - for (i = 0; i < ramps->blue.size; i++) - ramps->blue[i] = saved_blue[i]; - - crtc->set_gamma(ramps); - - delete [] saved_red; - delete [] saved_green; - delete [] saved_blue; - delete ramps; - - sleep(1); - - ramps = new libgamma::GammaRamps(); - libgamma::gamma_ramps16_initialise(ramps, info.red_gamma_size, info.green_gamma_size, info.blue_gamma_size); - std::cout << ramps->red.size << " " - << ramps->green.size << " " - << ramps->blue.size << std::endl; - std::cout << ramps->depth << std::endl; - std::cout << std::endl; - - saved_red = new uint16_t[ramps->red.size]; - saved_green = new uint16_t[ramps->green.size]; - saved_blue = new uint16_t[ramps->blue.size]; - - crtc->get_gamma(ramps); - - for (i = 0; i < ramps->red.size; i++) - { - std::cout << ramps->red[i] << " "; - saved_red[i] = ramps->red[i]; - ramps->red[i] /= 2; - } - std::cout << std::endl; - std::cout << std::endl; - - for (i = 0; i < ramps->green.size; i++) - { - std::cout << ramps->green[i] << " "; - saved_green[i] = ramps->green[i]; - ramps->green[i] /= 2; - } - std::cout << std::endl; - std::cout << std::endl; - - for (i = 0; i < ramps->blue.size; i++) - { - std::cout << ramps->blue[i] << " "; - saved_blue[i] = ramps->blue[i]; - ramps->blue[i] /= 2; - } - std::cout << std::endl; - std::cout << std::endl; - - crtc->set_gamma(ramps); - - sleep(1); - - for (i = 0; i < ramps->red.size; i++) - ramps->red[i] = saved_red[i]; - for (i = 0; i < ramps->green.size; i++) - ramps->green[i] = saved_green[i]; - for (i = 0; i < ramps->blue.size; i++) - ramps->blue[i] = saved_blue[i]; - - crtc->set_gamma(ramps); - - delete [] saved_red; - delete [] saved_green; - delete [] saved_blue; - delete ramps; - - delete crtc; - delete partition; - delete site; - - try - { - throw libgamma::create_error(EIO); - } - catch (const libgamma::LibgammaException& err) - { - std::cout << err.what() << std::endl; - } - try - { - throw libgamma::create_error(LIBGAMMA_NO_SUCH_ADJUSTMENT_METHOD); - } - catch (const libgamma::LibgammaException& err) - { - std::cout << err.what() << std::endl; - } - - return 0; -} - diff --git a/test.cc b/test.cc new file mode 100644 index 0000000..b8984fb --- /dev/null +++ b/test.cc @@ -0,0 +1,307 @@ +/* See LICENSE file for copyright and license details. */ +#include "libgamma.hh" + +#include +#include +#include + + +int main(void) +{ + libgamma::Site* site; + libgamma::Partition* partition; + libgamma::CRTC* crtc; + libgamma::CRTCInformation info; + libgamma::MethodCapabilities caps; + libgamma::GammaRamps* ramps; + int method; + size_t i; + + uint16_t* saved_red; + uint16_t* saved_green; + uint16_t* saved_blue; + + std::string* str; + char* cstr; + unsigned char* edid; + + libgamma::perror("test", 0); + libgamma::perror("test", 2); + libgamma::perror("test", -2); + libgamma::perror("test", LIBGAMMA_ERRNO_SET); + std::cout << std::endl; + + str = libgamma::name_of_error(-2); + std::cout << *str << std::endl; + std::cout << libgamma::value_of_error(str) << std::endl; + delete str; + str = new std::string("LIBGAMMA_NO_SUCH_ADJUSTMENT_METHOD"); + std::cout << libgamma::value_of_error(str) << std::endl; + delete str; + std::cout << std::endl; + + for (int m : libgamma::list_methods(0)) + std::cout << m << " "; + std::cout << std::endl; + for (int m : libgamma::list_methods(1)) + std::cout << m << " "; + std::cout << std::endl; + for (int m : libgamma::list_methods(2)) + std::cout << m << " "; + std::cout << std::endl; + for (int m : libgamma::list_methods(3)) + std::cout << m << " "; + std::cout << std::endl; + for (int m : libgamma::list_methods(4)) + std::cout << m << " "; + std::cout << std::endl; + std::cout << std::endl; + method = libgamma::list_methods(0)[0]; + + std::cout << libgamma::is_method_available(LIBGAMMA_METHOD_X_RANDR) << std::endl; + str = libgamma::method_default_site(LIBGAMMA_METHOD_X_RANDR); + if (str == nullptr) + std::cout << "(nullptr)" << std::endl; + else + std::cout << *str << std::endl; + delete str; + str = libgamma::method_default_site_variable(LIBGAMMA_METHOD_X_RANDR); + if (str == nullptr) + std::cout << "(nullptr)" << std::endl; + else + std::cout << *str << std::endl; + delete str; + std::cout << std::endl; + + edid = libgamma::unhex_edid("0123456789abcdef"); + cstr = libgamma_behex_edid(edid, 8); + std::cout << cstr << std::endl; + free(cstr); + std::cout << libgamma::behex_edid(edid, 8) << std::endl; + std::cout << libgamma::behex_edid_lowercase(edid, 8) << std::endl; + std::cout << libgamma::behex_edid_uppercase(edid, 8) << std::endl; + free(edid); + std::cout << std::endl; + + site = new libgamma::Site(method, new std::string(":0")); + std::cout << site->partitions_available << std::endl; + partition = new libgamma::Partition(site, 0); + std::cout << partition->crtcs_available << std::endl; + crtc = new libgamma::CRTC(partition, 0); + std::cout << crtc->information(&info, ~0) << std::endl; + std::cout << std::endl; + + cstr = libgamma_behex_edid(info.edid, info.edid_length); + std::cout << "edid: " << cstr << std::endl; + free(cstr); + std::cout << "edid_length: " << info.edid_length << std::endl; + std::cout << "edid_error: " << info.edid_error << std::endl; + std::cout << "width_mm: " << info.width_mm << std::endl; + std::cout << "width_mm_error: " << info.width_mm_error << std::endl; + std::cout << "height_mm: " << info.height_mm << std::endl; + std::cout << "height_mm_error: " << info.height_mm_error << std::endl; + std::cout << "width_mm_edid: " << info.width_mm_edid << std::endl; + std::cout << "width_mm_edid_error: " << info.width_mm_edid_error << std::endl; + std::cout << "height_mm_edid: " << info.height_mm_edid << std::endl; + std::cout << "height_mm_edid_error: " << info.height_mm_edid_error << std::endl; + std::cout << "red_gamma_size: " << info.red_gamma_size << std::endl; + std::cout << "green_gamma_size: " << info.green_gamma_size << std::endl; + std::cout << "blue_gamma_size: " << info.blue_gamma_size << std::endl; + std::cout << "gamma_size_error: " << info.gamma_size_error << std::endl; + std::cout << "gamma_depth: " << info.gamma_depth << std::endl; + std::cout << "gamma_depth_error: " << info.gamma_depth_error << std::endl; + std::cout << "gamma_support: " << info.gamma_support << std::endl; + std::cout << "gamma_support_error: " << info.gamma_support_error << std::endl; + std::cout << "subpixel_order: " << info.subpixel_order << std::endl; + std::cout << "subpixel_order_error: " << info.subpixel_order_error << std::endl; + std::cout << "active: " << info.active << std::endl; + std::cout << "active_error: " << info.active_error << std::endl; + if (info.connector_name == nullptr) + std::cout << "connector_name: " << "(nullptr)" << std::endl; + else + std::cout << "connector_name: " << *(info.connector_name) << std::endl; + std::cout << "connector_name_error: " << info.connector_name_error << std::endl; + std::cout << "connector_type: " << info.connector_type << std::endl; + std::cout << "connector_type_error: " << info.connector_type_error << std::endl; + std::cout << "gamma_red: " << info.gamma_red << std::endl; + std::cout << "gamma_green: " << info.gamma_green << std::endl; + std::cout << "gamma_blue: " << info.gamma_blue << std::endl; + std::cout << "gamma_error: " << info.gamma_error << std::endl; + std::cout << std::endl; + + libgamma::method_capabilities(&caps, method); + std::cout << "crtc_information: " << caps.crtc_information << std::endl; + std::cout << "default_site_known: " << caps.default_site_known << std::endl; + std::cout << "multiple_sites: " << caps.multiple_sites << std::endl; + std::cout << "multiple_partitions: " << caps.multiple_partitions << std::endl; + std::cout << "multiple_crtcs: " << caps.multiple_crtcs << std::endl; + std::cout << "partitions_are_graphics_cards: " << caps.partitions_are_graphics_cards << std::endl; + std::cout << "site_restore: " << caps.site_restore << std::endl; + std::cout << "partition_restore: " << caps.partition_restore << std::endl; + std::cout << "crtc_restore: " << caps.crtc_restore << std::endl; + std::cout << "identical_gamma_sizes: " << caps.identical_gamma_sizes << std::endl; + std::cout << "fixed_gamma_size: " << caps.fixed_gamma_size << std::endl; + std::cout << "fixed_gamma_depth: " << caps.fixed_gamma_depth << std::endl; + std::cout << "real: " << caps.real << std::endl; + std::cout << "fake: " << caps.fake << std::endl; + std::cout << std::endl; + + std::cout << libgamma::group_gid << std::endl; + libgamma::group_gid = 10; + std::cout << libgamma::group_gid << std::endl; + std::cout << std::endl; + + if (libgamma::group_name == nullptr) + std::cout << "(nullptr)" << std::endl; + else + std::cout << libgamma::group_name << std::endl; + libgamma::group_name = "test-group"; + if (libgamma::group_name == nullptr) + std::cout << "(nullptr)" << std::endl; + else + std::cout << libgamma::group_name << std::endl; + std::cout << std::endl; + + ramps = libgamma::gamma_ramps16_create(info.red_gamma_size, info.green_gamma_size, info.blue_gamma_size); + std::cout << ramps->red.size << " " + << ramps->green.size << " " + << ramps->blue.size << std::endl; + std::cout << ramps->depth << std::endl; + std::cout << std::endl; + + saved_red = new uint16_t[ramps->red.size]; + saved_green = new uint16_t[ramps->green.size]; + saved_blue = new uint16_t[ramps->blue.size]; + + crtc->get_gamma(ramps); + + for (i = 0; i < ramps->red.size; i++) + { + std::cout << ramps->red[i] << " "; + saved_red[i] = ramps->red[i]; + ramps->red[i] /= 2; + } + std::cout << std::endl; + std::cout << std::endl; + + for (i = 0; i < ramps->green.size; i++) + { + std::cout << ramps->green[i] << " "; + saved_green[i] = ramps->green[i]; + ramps->green[i] /= 2; + } + std::cout << std::endl; + std::cout << std::endl; + + for (i = 0; i < ramps->blue.size; i++) + { + std::cout << ramps->blue[i] << " "; + saved_blue[i] = ramps->blue[i]; + ramps->blue[i] /= 2; + } + std::cout << std::endl; + std::cout << std::endl; + + crtc->set_gamma(ramps); + + sleep(1); + + for (i = 0; i < ramps->red.size; i++) + ramps->red[i] = saved_red[i]; + for (i = 0; i < ramps->green.size; i++) + ramps->green[i] = saved_green[i]; + for (i = 0; i < ramps->blue.size; i++) + ramps->blue[i] = saved_blue[i]; + + crtc->set_gamma(ramps); + + delete [] saved_red; + delete [] saved_green; + delete [] saved_blue; + delete ramps; + + sleep(1); + + ramps = new libgamma::GammaRamps(); + libgamma::gamma_ramps16_initialise(ramps, info.red_gamma_size, info.green_gamma_size, info.blue_gamma_size); + std::cout << ramps->red.size << " " + << ramps->green.size << " " + << ramps->blue.size << std::endl; + std::cout << ramps->depth << std::endl; + std::cout << std::endl; + + saved_red = new uint16_t[ramps->red.size]; + saved_green = new uint16_t[ramps->green.size]; + saved_blue = new uint16_t[ramps->blue.size]; + + crtc->get_gamma(ramps); + + for (i = 0; i < ramps->red.size; i++) + { + std::cout << ramps->red[i] << " "; + saved_red[i] = ramps->red[i]; + ramps->red[i] /= 2; + } + std::cout << std::endl; + std::cout << std::endl; + + for (i = 0; i < ramps->green.size; i++) + { + std::cout << ramps->green[i] << " "; + saved_green[i] = ramps->green[i]; + ramps->green[i] /= 2; + } + std::cout << std::endl; + std::cout << std::endl; + + for (i = 0; i < ramps->blue.size; i++) + { + std::cout << ramps->blue[i] << " "; + saved_blue[i] = ramps->blue[i]; + ramps->blue[i] /= 2; + } + std::cout << std::endl; + std::cout << std::endl; + + crtc->set_gamma(ramps); + + sleep(1); + + for (i = 0; i < ramps->red.size; i++) + ramps->red[i] = saved_red[i]; + for (i = 0; i < ramps->green.size; i++) + ramps->green[i] = saved_green[i]; + for (i = 0; i < ramps->blue.size; i++) + ramps->blue[i] = saved_blue[i]; + + crtc->set_gamma(ramps); + + delete [] saved_red; + delete [] saved_green; + delete [] saved_blue; + delete ramps; + + delete crtc; + delete partition; + delete site; + + try + { + throw libgamma::create_error(EIO); + } + catch (const libgamma::LibgammaException& err) + { + std::cout << err.what() << std::endl; + } + try + { + throw libgamma::create_error(LIBGAMMA_NO_SUCH_ADJUSTMENT_METHOD); + } + catch (const libgamma::LibgammaException& err) + { + std::cout << err.what() << std::endl; + } + + return 0; +} + -- cgit v1.2.3-70-g09d2