Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package screenkey for openSUSE:Factory checked in at 2021-12-14 22:02:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/screenkey (Old) and /work/SRC/openSUSE:Factory/.screenkey.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "screenkey" Tue Dec 14 22:02:21 2021 rev:3 rq:940557 version:1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/screenkey/screenkey.changes 2021-02-01 13:29:35.742233048 +0100 +++ /work/SRC/openSUSE:Factory/.screenkey.new.2520/screenkey.changes 2021-12-14 22:02:47.567168334 +0100 @@ -1,0 +2,25 @@ +Sat Dec 11 12:43:58 UTC 2021 - Andreas Stieger <andreas.stie...@gmx.de> + +- update to 1.5: + * New LockScreen detection prevents passwords from being shown + right after unlocking the screen when possible + * Keypad number keys are now displayed correctly + * Additional mouse buttons are now shown as "M[x]" instead of + being incorrectly displayed as Ctrl/Alt modifiers + * The new --window command line flag allows to display screenkey + as a regular window instead of an overlay. This can be useful + for recording screenkey as an independent overlay during + screencasts and/or to manage the window position through the + window manager. + * New German translation + * Fix regression that would keep the overlay visible when using + Ctrl sequences with the mouse visualization disabled. + * Fix regression causing a backtrace instead of a proper error + message during initialization errors. + * Fix crash happening due to screen size and/or resolution + changes while screenkey is running. + *Prettify JSON configuration file +- add upstream signing key to verify source signature +- Correct license is GPL-3.0-or-later, package license text + +------------------------------------------------------------------- Old: ---- screenkey-1.4.tar.gz screenkey-1.4.tar.gz.asc New: ---- screenkey-1.5.tar.gz screenkey-1.5.tar.gz.asc screenkey.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ screenkey.spec ++++++ --- /var/tmp/diff_new_pack.u6DX2E/_old 2021-12-14 22:02:48.023168594 +0100 +++ /var/tmp/diff_new_pack.u6DX2E/_new 2021-12-14 22:02:48.027168596 +0100 @@ -17,14 +17,15 @@ Name: screenkey -Version: 1.4 +Version: 1.5 Release: 0 Summary: A screen-cast tool to show keys -License: GPL-3.0-only +License: GPL-3.0-or-later Group: Productivity/Graphics/Other URL: https://www.thregr.org/~wavexx/software/screenkey/ Source0: https://www.thregr.org/~wavexx/software/screenkey/releases/%{name}-%{version}.tar.gz Source1: https://www.thregr.org/~wavexx/software/screenkey/releases/%{name}-%{version}.tar.gz.asc +Source2: https://www.thregr.org/~wavexx/files/wavexx.asc#/%{name}.keyring BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: intltool @@ -33,13 +34,13 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools Requires: python3 +Requires: python3-dbus-python Requires: python3-gobject Requires: python3-gobject-Gdk Requires: python3-pycairo Requires: slop Requires: typelib(Gtk) = 3.0 Recommends: fontawesome-fonts - BuildArch: noarch %description @@ -58,6 +59,7 @@ %fdupes -s %{buildroot} %files -f %{name}.lang +%license COPYING.txt %{_bindir}/%{name} %{python3_sitelib}/Screenkey/ %{python3_sitelib}/%{name}-%{version}-*.egg-info/ ++++++ screenkey-1.4.tar.gz -> screenkey-1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/COPYING.txt new/screenkey-1.5/COPYING.txt --- old/screenkey-1.4/COPYING.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/screenkey-1.5/COPYING.txt 2015-04-12 15:20:48.000000000 +0200 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + 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. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 <http://www.gnu.org/licenses/>. + +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: + + <program> Copyright (C) <year> <name of author> + 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 +<http://www.gnu.org/licenses/>. + + 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 +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/NEWS.rst new/screenkey-1.5/NEWS.rst --- old/screenkey-1.4/NEWS.rst 2021-01-23 17:53:06.000000000 +0100 +++ new/screenkey-1.5/NEWS.rst 2021-12-09 19:24:48.000000000 +0100 @@ -1,3 +1,26 @@ +screenkey 1.5 +------------- + +- New LockScreen detection from Marc Lavall??e prevents passwords from + being shown right after unlocking the screen when possible (new + ``dbus`` dependency required). +- Keypad number keys are now displayed correctly (thanks to @Gordin508). +- Additional mouse buttons are now shown as "M[x]" instead of being + incorrectly displayed as Ctrl/Alt modifiers (@Gordin508). +- The new ``--window`` command line flag allows to display screenkey as + a regular window instead of an overlay. This can be useful for + recording screenkey as an independent overlay during screencasts + and/or to manage the window position through the window manager. +- New German translation thanks to Maik Schmalle. +- Fix regression that would keep the overlay visible when using Ctrl + sequences with the mouse visualization disabled. +- Fix regression causing a backtrace instead of a proper error message + during initialization errors. +- Fix crash happening due to screen size and/or resolution changes while + screenkey is running. +- Prettify JSON configuration file (thanks to Mehrad Mahmoudian). + + screenkey 1.4 ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/PKG-INFO new/screenkey-1.5/PKG-INFO --- old/screenkey-1.4/PKG-INFO 2021-01-23 17:57:11.790167600 +0100 +++ new/screenkey-1.5/PKG-INFO 2021-12-09 19:33:26.598776800 +0100 @@ -1,6 +1,6 @@ -Metadata-Version: 1.2 +Metadata-Version: 2.1 Name: screenkey -Version: 1.4 +Version: 1.5 Summary: A screencast tool to display keys Home-page: http://www.thregr.org/~wavexx/software/screenkey/ Author: Pablo Seminario @@ -8,10 +8,6 @@ Maintainer: Yuri D'Elia Maintainer-email: wav...@thregr.org License: GPLv3+ -Description: - Screenkey is a useful tool for presentations or screencasts. - Inspired by ScreenFlick and initially based on the key-mon project code. - Keywords: screencast keyboard presentation keys Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable @@ -24,3 +20,10 @@ Classifier: Topic :: Education Classifier: Topic :: Multimedia :: Graphics :: Presentation Classifier: Topic :: Multimedia :: Video :: Capture +License-File: COPYING.txt + + + Screenkey is a useful tool for presentations or screencasts. + Inspired by ScreenFlick and initially based on the key-mon project code. + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/README.rst new/screenkey-1.5/README.rst --- old/screenkey-1.4/README.rst 2021-01-02 00:14:49.000000000 +0100 +++ new/screenkey-1.5/README.rst 2021-12-09 19:27:14.000000000 +0100 @@ -37,6 +37,13 @@ Fedora / EPEL: `Fedora package <https://src.fedoraproject.org/rpms/screenkey>`_ ``sudo dnf install screenkey`` +Gentoo: `Gentoo package <https://packages.gentoo.org/packages/x11-misc/screenkey>`_ + ``sudo emerge -av x11-misc/screenkey`` + +Screenkey is available on `other distributions +<https://repology.org/project/screenkey/versions>`_ too. + + From source ~~~~~~~~~~~ @@ -54,6 +61,8 @@ - PyGObject (python3-gi) - GTK 3 (via GI bindings) - Pycairo (python3-cairo) +- Cairo GI bindings (python3-gi-cairo) +- Python DBUS (python3-dbus) - setuptools (python3-setuptools, build only) - babel (python3-babel, build only) - slop (https://github.com/naelstrof/slop) @@ -62,9 +71,10 @@ Install dependencies (on Debian/Ubuntu):: - sudo apt-get install python3-gi gir1.2-gtk-3.0 python3-cairo + sudo apt-get install python3-gi gir1.2-gtk-3.0 + sudo apt-get install python3-gi-cairo python3-cairo sudo apt-get install python3-setuptools python3-babel - sudo apt-get install fonts-font-awesome slop + sudo apt-get install python3-dbus fonts-font-awesome slop When using GNOME also install:: @@ -450,6 +460,52 @@ another X11 terminal emulator such as xterm, urxvt, mlterm, ... +Localization +------------ + +Adding a new language translation +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +After cloning the source repository, initialize a fresh new localization +as following:: + + ./setup.py extract_messages + ./setup.py init_catalog -l <locale> + +Where ``<locale>`` is the locale name such as ``de_DE``. + +The generated template is located in +``Screenkey/locale/<locale>/LC_MESSAGES/screenkey.po`` and can be edited +with a text editor or using a PO editing tool such as poedit_. + +.. _poedit: https://poedit.net/ + + +Updating an existing translation +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +To update a pre-exiting language translation, execute:: + + ./setup.py extract_messages + ./setup.py update_catalog -l <locale> + +then review the updated localization in +``Screenkey/locale/<locale>/LC_MESSAGES/screenkey.po``. + + +Testing a translation +~~~~~~~~~~~~~~~~~~~~~ + +Localization can be tested by compiling the language catalog and running +``screenkey`` from the source directory:: + + ./setup.py compile_catalog -l <locale> + ./screenkey + +The catalog needs to be compiled every time the localization has been +changed to reflect the newest changes. + + Authors and Copyright --------------------- @@ -457,7 +513,7 @@ | "screenkey" is distributed under GNU GPLv3+, WITHOUT ANY WARRANTY. | Copyright(c) 2010-2012: Pablo Seminario <pab...@gmail.com> -| Copyright(c) 2015-2020: wave++ "Yuri D'Elia" <wav...@thregr.org> +| Copyright(c) 2015-2021: wave++ "Yuri D'Elia" <wav...@thregr.org> | Copyright(c) 2019-2020: Yuto Tokunaga <yuntan.s...@gmail.com> screenkey's GIT repository is publicly accessible at: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/Screenkey/__init__.py new/screenkey-1.5/Screenkey/__init__.py --- old/screenkey-1.4/Screenkey/__init__.py 2021-01-23 17:51:57.000000000 +0100 +++ new/screenkey-1.5/Screenkey/__init__.py 2021-05-15 13:23:38.000000000 +0200 @@ -16,7 +16,7 @@ APP_NAME = "Screenkey" APP_DESC = _("Screencast your keys") APP_URL = 'https://www.thregr.org/~wavexx/software/screenkey/' -VERSION = '1.4' +VERSION = '1.5' SLOP_URL = 'https://github.com/naelstrof/slop' ERROR_URL = 'https://www.thregr.org/~wavexx/software/screenkey/#troubleshooting' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/Screenkey/inputlistener.py new/screenkey-1.5/Screenkey/inputlistener.py --- old/screenkey-1.4/Screenkey/inputlistener.py 2021-01-01 21:27:07.000000000 +0100 +++ new/screenkey-1.5/Screenkey/inputlistener.py 2021-05-15 13:11:42.000000000 +0200 @@ -169,11 +169,10 @@ class InputListener(threading.Thread): - def __init__(self, kbd_callback, btn_callback, input_types=InputType.all, + def __init__(self, event_callback, input_types=InputType.all, kbd_compose=True, kbd_translate=True): super().__init__() - self.kbd_callback = kbd_callback - self.btn_callback = btn_callback + self.event_callback = event_callback self.input_types = input_types self.kbd_compose = kbd_compose self.kbd_translate = kbd_translate @@ -196,19 +195,15 @@ xlib.XSendEvent(self.replay_dpy, self.replay_win, False, 0, fwd_ev) - def _kbd_event_callback(self, data): - self.kbd_callback(data) - return False - - def _btn_event_callback(self, data): - self.btn_callback(data) + def _event_callback(self, data): + self.event_callback(data) return False def _event_processed(self, data): data.symbol = xlib.XKeysymToString(data.keysym) if data.string is None: data.string = keysym_to_unicode(data.keysym) - glib.idle_add(self._kbd_event_callback, data) + glib.idle_add(self._event_callback, data) def _event_modifiers(self, kev, data): @@ -328,7 +323,7 @@ def _btn_process(self, ev): if ev.type in [xlib.ButtonPress, xlib.ButtonRelease]: data = ButtonData(ev.xbutton.button, ev.type) - glib.idle_add(self._btn_event_callback, data) + glib.idle_add(self._event_callback, data) def run(self): @@ -353,8 +348,7 @@ xlib.XCloseDisplay(self.replay_dpy) # cheap wakeup() equivalent for compatibility - glib.idle_add(self._kbd_event_callback, None) - glib.idle_add(self._btn_event_callback, None) + glib.idle_add(self._event_callback, None) self.stopped = True self.lock.release() @@ -433,7 +427,6 @@ values[k] = getattr(data, k) print(values) - glib.threads_init() kl = InputListener(callback) try: # keep running only while the listener is alive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/Screenkey/labelmanager.py new/screenkey-1.5/Screenkey/labelmanager.py --- old/screenkey-1.4/Screenkey/labelmanager.py 2021-01-01 21:27:07.000000000 +0100 +++ new/screenkey-1.5/Screenkey/labelmanager.py 2021-12-09 18:53:31.000000000 +0100 @@ -3,6 +3,7 @@ # Copyright(c) 2015-2016: wave++ "Yuri D'Elia" <wav...@thregr.org> # Copyright(c) 2019-2020: Yuto Tokunaga <yuntan.s...@gmail.com> +from . import inputlistener from .inputlistener import InputListener, InputType from gi.repository import GLib @@ -54,22 +55,32 @@ 'End': KeyRepl(True, True, True, _('End')), 'Insert': KeyRepl(False, True, True, _('Ins')), 'Delete': KeyRepl(True, False, True, _('Del')), - 'KP_End': KeyRepl(False, False, True, _('(1)')), - 'KP_Down': KeyRepl(False, False, True, _('(2)')), - 'KP_Next': KeyRepl(False, False, True, _('(3)')), - 'KP_Left': KeyRepl(False, False, True, _('(4)')), - 'KP_Begin': KeyRepl(False, False, True, _('(5)')), - 'KP_Right': KeyRepl(False, False, True, _('(6)')), - 'KP_Home': KeyRepl(False, False, True, _('(7)')), - 'KP_Up': KeyRepl(False, False, True, _('(8)')), - 'KP_Prior': KeyRepl(False, False, True, _('(9)')), - 'KP_Insert': KeyRepl(False, False, True, _('(0)')), + 'KP_End': KeyRepl(False, False, True, _('1??????')), + 'KP_Down': KeyRepl(False, False, True, _('2??????')), + 'KP_Next': KeyRepl(False, False, True, _('3??????')), + 'KP_Left': KeyRepl(False, False, True, _('4??????')), + 'KP_Begin': KeyRepl(False, False, True, _('5??????')), + 'KP_Right': KeyRepl(False, False, True, _('6??????')), + 'KP_Home': KeyRepl(False, False, True, _('7??????')), + 'KP_Up': KeyRepl(False, False, True, _('8??????')), + 'KP_Prior': KeyRepl(False, False, True, _('9??????')), + 'KP_Insert': KeyRepl(False, False, True, _('0??????')), 'KP_Delete': KeyRepl(False, False, True, _('(.)')), 'KP_Add': KeyRepl(False, False, True, _('(+)')), 'KP_Subtract': KeyRepl(False, False, True, _('(-)')), 'KP_Multiply': KeyRepl(False, False, True, _('(*)')), 'KP_Divide': KeyRepl(False, False, True, _('(/)')), 'KP_Enter': KeyRepl(True, False, False, _('???')), + 'KP_1': KeyRepl(False, False, True, _('1??????')), + 'KP_2': KeyRepl(False, False, True, _('2??????')), + 'KP_3': KeyRepl(False, False, True, _('3??????')), + 'KP_4': KeyRepl(False, False, True, _('4??????')), + 'KP_5': KeyRepl(False, False, True, _('5??????')), + 'KP_6': KeyRepl(False, False, True, _('6??????')), + 'KP_7': KeyRepl(False, False, True, _('7??????')), + 'KP_8': KeyRepl(False, False, True, _('8??????')), + 'KP_9': KeyRepl(False, False, True, _('9??????')), + 'KP_0': KeyRepl(False, False, True, _('0??????')), 'Num_Lock': KeyRepl(False, True, True, _('NumLck')), 'Scroll_Lock': KeyRepl(False, True, True, _('ScrLck')), 'Pause': KeyRepl(False, True, True, _('Pause')), @@ -197,9 +208,9 @@ self.stop() compose = (self.key_mode == 'composed') translate = (self.key_mode in ['composed', 'translated']) - self.kl = InputListener(self.key_press, self.btn_press, - InputType.keyboard | InputType.button, compose, - translate) + self.kl = InputListener(self.event_handler, + InputType.keyboard | InputType.button, + compose, translate) self.kl.start() self.logger.debug("Thread started.") @@ -315,11 +326,21 @@ self.update_text(True) - def key_press(self, event): + def event_handler(self, event): if event is None: self.logger.debug("inputlistener failure: {}".format(str(self.kl.error))) self.label_listener(None, None) return + + if isinstance(event, inputlistener.KeyData): + self.key_press(event) + elif isinstance(event, inputlistener.ButtonData): + self.btn_press(event) + else: + self.logger.error("unhandled event type {}".format(type(event))) + + + def key_press(self, event): if event.symbol is None: # TODO: Investigate what causes this to happen. # I caught it once in pdb, but in this function, not in inputlistener, @@ -513,17 +534,33 @@ self.data.append(KeyData(datetime.now(), True, True, True, True, value)) return True - + # callback for mouse button presses def btn_press(self, event): if not self.enabled: return False - if event.pressed: action = "pressed" else: action = "released" self.logger.debug("Mouse button %d %s" % (event.btn, action)) - self.image_listener( - ButtonData(datetime.now(), event.btn, event.pressed) - ) + # possible event.btn values: + # 1 = LMB, 2 = MMB (wheel click), 3 = RMB, 4/5 = wheel up/down, + # 6/7 = wheel left/right, 8+ extra buttons (e. g. thumb buttons) + if event.btn > 7: + # image_listener can only handle common buttons, redirect thumb buttons etc. to label + if not event.pressed: + return False + # what we refer to as "Mouse 4" has an internal value of 8, + # so we subtract 4 from the btn value + markup = GLib.markup_escape_text("M{}".format(event.btn - 4)) + + # show as label, treated the same as keyboard button presses + self.data.append(KeyData(datetime.now(), False, True, + True, True, markup)) + self.update_text() + else: + # show event in image + self.image_listener( + ButtonData(datetime.now(), event.btn, event.pressed) + ) Binary files old/screenkey-1.4/Screenkey/locale/de/LC_MESSAGES/screenkey.mo and new/screenkey-1.5/Screenkey/locale/de/LC_MESSAGES/screenkey.mo differ Binary files old/screenkey-1.4/Screenkey/locale/de_DE/LC_MESSAGES/screenkey.mo and new/screenkey-1.5/Screenkey/locale/de_DE/LC_MESSAGES/screenkey.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/Screenkey/screenkey.py new/screenkey-1.5/Screenkey/screenkey.py --- old/screenkey-1.4/Screenkey/screenkey.py 2021-01-23 17:39:13.000000000 +0100 +++ new/screenkey-1.5/Screenkey/screenkey.py 2021-12-09 18:53:31.000000000 +0100 @@ -17,10 +17,7 @@ gi.require_version('Gtk', '3.0') gi.require_version('Pango', '1.0') -from gi.repository import GLib -GLib.threads_init() - -from gi.repository import Gtk, Gdk, GdkPixbuf, Pango, GObject +from gi.repository import GLib, Gtk, Gdk, GdkPixbuf, Pango, GObject import cairo @@ -89,8 +86,6 @@ STATE_FILE = os.path.join(GLib.get_user_config_dir(), 'screenkey.json') def __init__(self, logger, options, show_settings=False): - Gtk.Window.__init__(self, Gtk.WindowType.POPUP) - self.logger = logger self.logger.debug("{} {}".format(APP_NAME, VERSION)) @@ -105,6 +100,7 @@ 'ignore': [], 'position': 'bottom', 'persist': False, + 'window': False, 'font_desc': 'Sans Bold', 'font_size': 'medium', 'font_color': 'white', @@ -136,6 +132,13 @@ if v is not None: self.options[k] = v + + if not self.options.window: + Gtk.Window.__init__(self, Gtk.WindowType.POPUP) + else: + self.options.persist = True + Gtk.Window.__init__(self, Gtk.WindowType.TOPLEVEL) + self.set_keep_above(True) self.set_accept_focus(False) self.set_focus_on_map(False) @@ -165,7 +168,7 @@ self.connect("draw", self.on_draw) scr = self.get_screen() - scr.connect("size-changed", self.on_size_changed) + scr.connect("size-changed", self.on_screen_size_changed) scr.connect("monitors-changed", self.on_monitors_changed) self.set_active_monitor(self.options.screen) @@ -226,7 +229,7 @@ """Store options""" try: with open(self.STATE_FILE, 'w') as f: - json.dump(options._store, f) + json.dump(options._store, f, indent=4) self.logger.debug("Options saved.") except OSError: self.logger.debug("Cannot open %s." % self.STATE_FILE) @@ -241,7 +244,7 @@ self.update_geometry() - def on_monitors_changed(self, *_): + def on_monitors_changed(self, monitor): self.set_active_monitor(self.monitor) @@ -336,12 +339,12 @@ return False - def on_configure(self, *_): + def on_configure(self, event, data): # set event mask for click-through self.input_shape_combine_region(cairo.Region(cairo.RectangleInt(0, 0, 0, 0))) - def on_size_changed(self): + def on_screen_size_changed(self, screen): self.width, self.height = self.get_size() self.update_font() self.update_image() @@ -431,8 +434,13 @@ if self.timer_hide is not None: GObject.source_remove(self.timer_hide) self.timer_hide = None - if self.options.timeout > 0 and not any(b and b.pressed for b in self.button_states): - self.timer_hide = GObject.timeout_add(self.options.timeout * 1000, self.on_timeout_main) + if self.options.timeout > 0: + # hide automatically if mouse mode is disabled. keep the + # window around otherwise as long as any of the visible keys + # (mouse or modifiers) is still held + if not self.options.mouse or \ + not any(b and b.pressed for b in self.button_states): + self.timer_hide = GObject.timeout_add(self.options.timeout * 1000, self.on_timeout_main) def on_label_change(self, markup, synthetic): @@ -1023,6 +1031,56 @@ self.about.show() + def start_lockscreen_detection(self): + from re import match + from threading import Thread + from dbus import SessionBus + from dbus.mainloop.glib import DBusGMainLoop + + def filter_bus_message(bus, message): + message_member = message.get_member() + + if not self.enabled or message_member != "ActiveChanged": + return + + args_list = message.get_args_list() + if args_list[0]: + self.labelmngr.stop() + self.logger.debug("Lock Screen; Screenkey disabled.") + else: + self.restart_labelmanager() + self.logger.debug("Unlock Screen; Screenkey enabled.") + + def lockscreen_detection_loop(): + DBusGMainLoop(set_as_default=True) + session_bus = SessionBus() + + signal_interface = None + + for dbus_string in session_bus.list_names(): + bus_name = str(dbus_string) + if match(r"org\.(\w+)\.ScreenSaver", bus_name): + signal_interface = bus_name + self.logger.debug(f"DBUS signal interface found: \"{signal_interface}\" ; password should not show when unlocking the screen.") + break + + if not signal_interface: + self.logger.debug("ScreenSaver DBUS signal interface not found; beware: password may show when unlocking the screen!") + del(session_bus) + DBusGMainLoop(set_as_default=False) + return + + session_bus.add_match_string(f"type='signal',interface='{signal_interface}'") + session_bus.add_message_filter(filter_bus_message) + mainloop = GLib.MainLoop() + mainloop.run() + + thread = Thread(target=lockscreen_detection_loop) + thread.daemon = True + thread.start() + + def run(self): + self.start_lockscreen_detection() Gtk.main() return self.exit_status diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/screenkey new/screenkey-1.5/screenkey --- old/screenkey-1.4/screenkey 2021-01-01 21:27:07.000000000 +0100 +++ new/screenkey-1.5/screenkey 2021-12-09 19:28:36.000000000 +0100 @@ -46,6 +46,8 @@ help=_("set vertical position")) ap.add_argument("--persist", action='store_true', default=None, help=_("make window persistent")) + ap.add_argument("--window", action='store_true', default=None, + help=_("use a regular window for display (implies --persist)")) ap.add_argument("-s", "--font-size", choices=FONT_SIZES, help=_("set font size")) ap.add_argument("-g", "--geometry", type=geometry, @@ -92,10 +94,12 @@ # Set options options = Options() - for arg in ['timeout', 'position', 'persist', 'font_desc', 'font_color', 'bg_color', - 'font_size', 'geometry', 'key_mode', 'bak_mode', 'mods_mode', 'mods_only', - 'multiline', 'vis_shift', 'vis_space', 'screen', 'no_systray', - 'opacity', 'ignore', 'compr_cnt', 'start_disabled', 'mouse', 'button_hide_duration']: + for arg in ['timeout', 'position', 'persist', 'window', 'font_desc', + 'font_color', 'bg_color', 'font_size', 'geometry', + 'key_mode', 'bak_mode', 'mods_mode', 'mods_only', + 'multiline', 'vis_shift', 'vis_space', 'screen', + 'no_systray', 'opacity', 'ignore', 'compr_cnt', + 'start_disabled', 'mouse', 'button_hide_duration']: if getattr(args, arg) is not None: options[arg] = getattr(args, arg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/screenkey.egg-info/PKG-INFO new/screenkey-1.5/screenkey.egg-info/PKG-INFO --- old/screenkey-1.4/screenkey.egg-info/PKG-INFO 2021-01-23 17:57:11.000000000 +0100 +++ new/screenkey-1.5/screenkey.egg-info/PKG-INFO 2021-12-09 19:33:26.000000000 +0100 @@ -1,6 +1,6 @@ -Metadata-Version: 1.2 +Metadata-Version: 2.1 Name: screenkey -Version: 1.4 +Version: 1.5 Summary: A screencast tool to display keys Home-page: http://www.thregr.org/~wavexx/software/screenkey/ Author: Pablo Seminario @@ -8,10 +8,6 @@ Maintainer: Yuri D'Elia Maintainer-email: wav...@thregr.org License: GPLv3+ -Description: - Screenkey is a useful tool for presentations or screencasts. - Inspired by ScreenFlick and initially based on the key-mon project code. - Keywords: screencast keyboard presentation keys Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable @@ -24,3 +20,10 @@ Classifier: Topic :: Education Classifier: Topic :: Multimedia :: Graphics :: Presentation Classifier: Topic :: Multimedia :: Video :: Capture +License-File: COPYING.txt + + + Screenkey is a useful tool for presentations or screencasts. + Inspired by ScreenFlick and initially based on the key-mon project code. + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/screenkey.egg-info/SOURCES.txt new/screenkey-1.5/screenkey.egg-info/SOURCES.txt --- old/screenkey-1.4/screenkey.egg-info/SOURCES.txt 2021-01-23 17:57:11.000000000 +0100 +++ new/screenkey-1.5/screenkey.egg-info/SOURCES.txt 2021-12-09 19:33:26.000000000 +0100 @@ -1,3 +1,4 @@ +COPYING.txt NEWS.rst README.rst screenkey @@ -12,6 +13,8 @@ Screenkey/images/mouse.svg Screenkey/locale/ca/LC_MESSAGES/screenkey.mo Screenkey/locale/ca/LC_MESSAGES/screenkey.po +Screenkey/locale/de/LC_MESSAGES/screenkey.mo +Screenkey/locale/de_DE/LC_MESSAGES/screenkey.mo Screenkey/locale/es/LC_MESSAGES/screenkey.mo Screenkey/locale/es/LC_MESSAGES/screenkey.po Screenkey/locale/fr/LC_MESSAGES/screenkey.mo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/screenkey.egg-info/requires.txt new/screenkey-1.5/screenkey.egg-info/requires.txt --- old/screenkey-1.4/screenkey.egg-info/requires.txt 2021-01-23 17:57:11.000000000 +0100 +++ new/screenkey-1.5/screenkey.egg-info/requires.txt 2021-12-09 19:33:26.000000000 +0100 @@ -1,2 +1,3 @@ PyGObject +dbus-python pycairo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/screenkey-1.4/setup.py new/screenkey-1.5/setup.py --- old/screenkey-1.4/setup.py 2021-01-23 17:51:39.000000000 +0100 +++ new/screenkey-1.5/setup.py 2021-05-16 20:28:50.000000000 +0200 @@ -5,7 +5,7 @@ class BuildWithCompile(build): sub_commands = [('compile_catalog', None)] + build.sub_commands -setup(name='screenkey', version='1.4', +setup(name='screenkey', version='1.5', description='A screencast tool to display keys', author='Pablo Seminario', @@ -35,7 +35,7 @@ scripts=['screenkey'], packages=['Screenkey'], setup_requires=['setuptools', 'babel'], - install_requires=['PyGObject', 'pycairo'], + install_requires=['PyGObject', 'pycairo', 'dbus-python'], package_data={'': [ 'images/mouse.svg', 'locale/*/LC_MESSAGES/screenkey.mo'
