Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nwg-drawer for openSUSE:Factory checked in at 2025-05-15 17:01:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nwg-drawer (Old) and /work/SRC/openSUSE:Factory/.nwg-drawer.new.30101 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nwg-drawer" Thu May 15 17:01:04 2025 rev:7 rq:1277512 version:0.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nwg-drawer/nwg-drawer.changes 2025-03-19 22:32:56.404146432 +0100 +++ /work/SRC/openSUSE:Factory/.nwg-drawer.new.30101/nwg-drawer.changes 2025-05-15 17:01:16.477945681 +0200 @@ -1,0 +2,13 @@ +Wed May 14 21:12:28 UTC 2025 - Lukas Müller <[email protected]> + +- Update to version 0.7.0. + Changelog: https://github.com/nwg-piotr/nwg-drawer/releases/tag/v0.7.0 + - Added program crash protection in `restoreStateAndHide` by checking GTK widget validity; closes #162; + - license changed back to MIT; #162; + - dependencies updated. +- Changes from version 0.6.5: + Changelog: https://github.com/nwg-piotr/nwg-drawer/releases/tag/v0.6.5 + - License changed to AGPLv3, as the gotk4 library uses it; + - dependencies updated. + +------------------------------------------------------------------- Old: ---- nwg-drawer-0.6.4.tar.gz New: ---- nwg-drawer-0.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nwg-drawer.spec ++++++ --- /var/tmp/diff_new_pack.jGwhlo/_old 2025-05-15 17:01:18.478029588 +0200 +++ /var/tmp/diff_new_pack.jGwhlo/_new 2025-05-15 17:01:18.494030259 +0200 @@ -17,7 +17,7 @@ Name: nwg-drawer -Version: 0.6.4 +Version: 0.7.0 Release: 0 Summary: Wlroots application drawer License: MIT ++++++ nwg-drawer-0.6.4.tar.gz -> nwg-drawer-0.7.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-drawer-0.6.4/LICENSE new/nwg-drawer-0.7.0/LICENSE --- old/nwg-drawer-0.6.4/LICENSE 2025-03-17 23:51:07.000000000 +0100 +++ new/nwg-drawer-0.7.0/LICENSE 2025-05-14 21:58:50.000000000 +0200 @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 Piotr Miller +Copyright (c) 2021-2025 Piotr Miller & Contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,3 +19,15 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +This project includes the use of the `gotk4` library by @diamondburned, +available at https://github.com/diamondburned/gotk4. + +gotk4/pkg is licensed under the Mozilla Public License 2.0 (MPL-2.0). +You may obtain a copy of the MPL-2.0 license at: + + https://www.mozilla.org/MPL/2.0/ + +In accordance with the MPL-2.0, the source code of the `gotk4` library +is made available at the above URL. +No modifications to `gotk4` have been made as part of this project. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-drawer-0.6.4/LICENSE-gotk4 new/nwg-drawer-0.7.0/LICENSE-gotk4 --- old/nwg-drawer-0.6.4/LICENSE-gotk4 1970-01-01 01:00:00.000000000 +0100 +++ new/nwg-drawer-0.7.0/LICENSE-gotk4 2025-05-14 21:58:50.000000000 +0200 @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-drawer-0.6.4/README.md new/nwg-drawer-0.7.0/README.md --- old/nwg-drawer-0.6.4/README.md 2025-03-17 23:51:07.000000000 +0100 +++ new/nwg-drawer-0.7.0/README.md 2025-05-14 21:58:50.000000000 +0200 @@ -154,14 +154,17 @@ ## Logging -In case you encounter an issue, you may need debug messages. If you use the resident instance, you'll see nothing -in the terminal. Please edit your sway config file: +Over the last few years, I've become certain that the program will never be 100% stable, due to the imperfect working +of GTK3 bindings in golang. Random crashes will always happen. In case you encounter a __repeatable issue__, please attach +a log to the bug report. If you use the resident instance, you'll see nothing in the terminal. Please edit your sway +config file: ```text exec nwg-drawer -r -d 2> ~/drawer.log ``` -exit sway, launch it again and include the `drawer.log` content in the GitHub issue. Do not use `exec_always` here: it'll destroy the log file content on sway reload. +exit sway, launch it again and include the `drawer.log` content in the GitHub issue. Do not use `exec_always` here: +it'll destroy the log file content on sway reload. ## Styling @@ -232,3 +235,13 @@ - [logrus](https://github.com/sirupsen/logrus) Copyright (c) 2014 Simon Eskildsen - [fsnotify](https://github.com/fsnotify/fsnotify) Copyright (c) 2012-2019 fsnotify Authors - [expr](https://github.com/expr-lang/expr) Copyright (c) 2018 Anton Medvedev + +## License + +nwg-drawer is licensed under the GNU Affero General Public License v3.0 or later (AGPLv3+). +Copyright (C) 2001-2025 Piotr Miller & Contributors. + +You should have received a copy of the GNU Affero General Public License along with this program. +If not, see [https://www.gnu.org/licenses/agpl-3.0.html](https://www.gnu.org/licenses/agpl-3.0.html). + +See the [LICENSE](./LICENSE) file for full license text. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-drawer-0.6.4/drawer.css new/nwg-drawer-0.7.0/drawer.css --- old/nwg-drawer-0.6.4/drawer.css 2025-03-17 23:51:07.000000000 +0100 +++ new/nwg-drawer-0.7.0/drawer.css 2025-05-14 21:58:50.000000000 +0200 @@ -5,7 +5,7 @@ /* search entry */ entry { - background-color: rgba (0, 0, 0, 0.2) + background-color: rgba(0, 0, 0, 0.2) } button, image { @@ -14,7 +14,7 @@ } button:hover { - background-color: rgba (255, 255, 255, 0.1) + background-color: rgba(255, 255, 255, 0.1) } /* in case you wanted to give category buttons a different look */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-drawer-0.6.4/go.mod new/nwg-drawer-0.7.0/go.mod --- old/nwg-drawer-0.6.4/go.mod 2025-03-17 23:51:07.000000000 +0100 +++ new/nwg-drawer-0.7.0/go.mod 2025-05-14 21:58:50.000000000 +0200 @@ -8,8 +8,8 @@ github.com/allan-simon/go-singleinstance v0.0.0-20210120080615-d0997106ab37 github.com/diamondburned/gotk4-layer-shell/pkg v0.0.0-20240109211357-6efa9f6dc438 github.com/diamondburned/gotk4/pkg v0.3.1 - github.com/expr-lang/expr v1.17.0 - github.com/fsnotify/fsnotify v1.8.0 + github.com/expr-lang/expr v1.17.2 + github.com/fsnotify/fsnotify v1.9.0 github.com/joshuarubin/go-sway v1.2.0 github.com/sirupsen/logrus v1.9.3 ) @@ -19,6 +19,6 @@ github.com/joshuarubin/lifecycle v1.1.4 // indirect go.uber.org/multierr v1.11.0 // indirect go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect - golang.org/x/sync v0.12.0 // indirect - golang.org/x/sys v0.31.0 // indirect + golang.org/x/sync v0.14.0 // indirect + golang.org/x/sys v0.33.0 // indirect ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-drawer-0.6.4/go.sum new/nwg-drawer-0.7.0/go.sum --- old/nwg-drawer-0.6.4/go.sum 2025-03-17 23:51:07.000000000 +0100 +++ new/nwg-drawer-0.7.0/go.sum 2025-05-14 21:58:50.000000000 +0200 @@ -13,10 +13,14 @@ github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4= github.com/expr-lang/expr v1.17.0 h1:+vpszOyzKLQXC9VF+wA8cVA0tlA984/Wabc/1hF9Whg= github.com/expr-lang/expr v1.17.0/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4= +github.com/expr-lang/expr v1.17.2 h1:o0A99O/Px+/DTjEnQiodAgOIK9PPxL8DtXhBRKC+Iso= +github.com/expr-lang/expr v1.17.2/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/joshuarubin/go-sway v1.2.0 h1:t3eqW504//uj9PDwFf0+IVfkD+WoOGaDX5gYIe0BHyM= github.com/joshuarubin/go-sway v1.2.0/go.mod h1:qcDd6f25vJ0++wICwA1BainIcRC67p2Mb4lsrZ0k3/k= github.com/joshuarubin/lifecycle v1.0.0/go.mod h1:sRy++ATvR9Ee21tkRdFkQeywAWvDsue66V70K0Dnl54= @@ -45,6 +49,10 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= +golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= +golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= @@ -54,6 +62,10 @@ golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= +golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-drawer-0.6.4/main.go new/nwg-drawer-0.7.0/main.go --- old/nwg-drawer-0.6.4/main.go 2025-03-17 23:51:07.000000000 +0100 +++ new/nwg-drawer-0.7.0/main.go 2025-05-14 21:58:50.000000000 +0200 @@ -1,3 +1,9 @@ +// Application drawer for wlroots-based Wayland compositors +// Copyright (C) 2021-2025 Piotr Miller & Contributors +// https://github.com/nwg-piotr/nwg-drawer +// +// This program is licensed under the MIT License. + package main import ( @@ -22,7 +28,7 @@ "github.com/diamondburned/gotk4/pkg/gtk/v3" ) -const version = "0.6.4" +const version = "0.7.0" var ( appDirs []string @@ -115,6 +121,7 @@ win *gtk.Window resultWindow *gtk.ScrolledWindow fileSearchResults []string + mathResultWindow *gtk.Window searchEntry *gtk.SearchEntry phrase string fileSearchResultFlowBox *gtk.FlowBox @@ -132,6 +139,7 @@ ignore string desktopTrigger bool pinnedItemsChanged chan interface{} = make(chan interface{}, 1) + inRestore bool ) func defaultTermIfBlank(s, fallback string) string { @@ -417,8 +425,10 @@ } win = gtk.NewWindow(gtk.WindowToplevel) - if err != nil { - log.Fatal("Unable to create window:", err) + if win != nil { + log.Debugf("win addr: %p native: %x", win, win.Native()) + } else { + log.Panic("Failed creating window") } if wayland() { @@ -466,8 +476,12 @@ } + //win.Connect("destroy", func() { + // gtk.MainQuit() + //}) win.Connect("destroy", func() { - gtk.MainQuit() + shuttingDown = true + win = nil }) win.Connect("key-release-event", func(_ *gtk.Window, event *gdk.Event) bool { @@ -507,7 +521,7 @@ result, e := expr.Eval(s, nil) if e == nil { log.Debugf("Setting up mathemathical operation result window. Operation: %s, result: %v", s, result) - setUpOperationResultWindow(s, fmt.Sprintf("%v", result)) + mathResultWindow = setUpOperationResultWindow(s, fmt.Sprintf("%v", result)) } } } @@ -632,6 +646,9 @@ if !*noFS { wrapper := gtk.NewBox(gtk.OrientationHorizontal, 0) fileSearchResultWrapper = gtk.NewBox(gtk.OrientationHorizontal, 0) + if fileSearchResultWrapper != nil { + log.Debugf("fileSearchResultWrapper addr: %p native: %x", fileSearchResultWrapper, fileSearchResultWrapper.Native()) + } fileSearchResultWrapper.SetObjectProperty("name", "files-box") wrapper.PackStart(fileSearchResultWrapper, true, false, 0) resultsWrapper.PackEnd(wrapper, false, false, 10) @@ -719,7 +736,7 @@ if powerButtonsWrapper != nil { powerButtonsWrapper.SetSizeRequest(300, 1) } - if *resident { + if *resident && win.IsVisible() { win.Hide() } @@ -782,27 +799,67 @@ gtk.Main() } +var shuttingDown bool + func restoreStateAndHide() { - timeStart1 := time.Now() + if inRestore { + log.Warn("restoreStateAndHide already in progress") + return + } + inRestore = true + defer func() { inRestore = false }() + + if shuttingDown { + log.Warn("restoreStateAndHide skipped — shutting down") + return + } + + defer func() { + if r := recover(); r != nil { + log.Errorf("restoreStateAndHide panic: %v", r) + } + }() + + timeStart := time.Now() + + if mathResultWindow != nil { + mathResultWindow.Destroy() + mathResultWindow = nil + } + + // Hide the window via glib.IdleAdd to avoid calling Hide() outside the main thread if win != nil { - win.Hide() + winPtr := win + glib.IdleAdd(func() { + if shuttingDown || winPtr == nil { + log.Debug("IdleAdd: skip win.Hide() — win destroyed or shutting down") + return + } + log.Debugf("IdleAdd: hiding win: native=%x", winPtr.Native()) + winPtr.Hide() + }) } - // clear search - searchEntry.SetText("") + // Reset search entry + if searchEntry != nil && searchEntry.Native() != 0 { + searchEntry.SetText("") + } - // One day or another we'll add SetFilterFunction here; it was impossible on the gotk3 library + // Rebuild FlowBox appFlowBox = setUpAppsFlowBox(nil, "") + + // Reset category buttons for _, btn := range catButtons { - btn.SetImagePosition(gtk.PosLeft) - btn.SetSizeRequest(0, 0) + if btn != nil && btn.Native() != 0 { + btn.SetImagePosition(gtk.PosLeft) + btn.SetSizeRequest(0, 0) + } } - // scroll to the top - if resultWindow != nil { + // Scroll up + if resultWindow != nil && resultWindow.Native() != 0 { resultWindow.VAdjustment().SetValue(0) } - t := time.Now() - log.Debugf(fmt.Sprintf("UI hidden and restored in the background in %v ms", t.Sub(timeStart1).Milliseconds())) + log.Debugf("UI hidden and restored in %d ms", time.Since(timeStart).Milliseconds()) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nwg-drawer-0.6.4/uicomponents.go new/nwg-drawer-0.7.0/uicomponents.go --- old/nwg-drawer-0.6.4/uicomponents.go 2025-03-17 23:51:07.000000000 +0100 +++ new/nwg-drawer-0.7.0/uicomponents.go 2025-05-14 21:58:50.000000000 +0200 @@ -17,6 +17,7 @@ func setUpPinnedFlowBox() *gtk.FlowBox { if pinnedFlowBox != nil { pinnedFlowBox.Destroy() + pinnedFlowBox = nil } flowBox := gtk.NewFlowBox() if uint(len(pinned)) >= *columnsNumber { @@ -181,8 +182,13 @@ } func setUpAppsFlowBox(categoryList []string, searchPhrase string) *gtk.FlowBox { - if appFlowBox != nil { + if appFlowBox != nil && appFlowBox.Widget.Native() != 0 { + log.Debugf("Destroying appFlowBox (native=%x)", appFlowBox.Widget.Native()) appFlowBox.Destroy() + appFlowBox = nil + } else { + log.Debugf("Skipping appFlowBox.Destroy(); already invalid or nil") + appFlowBox = nil // to make sure } flowBox := gtk.NewFlowBox() flowBox.SetMinChildrenPerLine(*columnsNumber) @@ -233,16 +239,19 @@ var pixbuf *gdkpixbuf.Pixbuf var img *gtk.Image var err error + if entry.Icon != "" { pixbuf, err = createPixbuf(entry.Icon, *iconSize) + if err != nil || pixbuf == nil { + log.Warnf("Cannot load icon %q for %q: %v", entry.Icon, entry.Name, err) + img = gtk.NewImageFromIconName("image-missing", int(gtk.IconSizeDialog)) + } else { + img = gtk.NewImageFromPixbuf(pixbuf) + } } else { log.Warnf("Undefined icon for %s", entry.Name) - pixbuf, err = createPixbuf("image-missing", *iconSize) - } - if err != nil { - pixbuf, _ = createPixbuf("unknown", *iconSize) + img = gtk.NewImageFromIconName("image-missing", int(gtk.IconSizeDialog)) } - img = gtk.NewImageFromPixbuf(pixbuf) button.SetImage(img) button.SetImagePosition(gtk.PosTop) @@ -367,6 +376,7 @@ func setUpFileSearchResultContainer() *gtk.FlowBox { if fileSearchResultFlowBox != nil { fileSearchResultFlowBox.Destroy() + fileSearchResultFlowBox = nil } flowBox := gtk.NewFlowBox() flowBox.SetObjectProperty("orientation", gtk.OrientationVertical) @@ -420,8 +430,13 @@ // Check if command input if phrase[0] == ':' { // Hide/Destroy everything except "execute command" - if appFlowBox != nil { + if appFlowBox != nil && appFlowBox.Widget.Native() != 0 { + log.Debugf("Destroying appFlowBox (native=%x)", appFlowBox.Widget.Native()) appFlowBox.Destroy() + appFlowBox = nil + } else { + log.Debugf("Skipping appFlowBox.Destroy(); already invalid or nil") + appFlowBox = nil } if pinnedFlowBox != nil && pinnedFlowBox.Visible() { pinnedFlowBox.Hide() @@ -446,6 +461,7 @@ if !*noFS && len(phrase) > 2 { if fileSearchResultFlowBox != nil { fileSearchResultFlowBox.Destroy() + fileSearchResultFlowBox = nil } fileSearchResultFlowBox = setUpFileSearchResultContainer() @@ -464,6 +480,7 @@ // search phrase too short if fileSearchResultFlowBox != nil { fileSearchResultFlowBox.Destroy() + fileSearchResultFlowBox = nil } if fileSearchResultWrapper != nil { fileSearchResultWrapper.Hide() @@ -494,6 +511,7 @@ if fileSearchResultFlowBox != nil { fileSearchResultFlowBox.Destroy() + fileSearchResultFlowBox = nil } if fileSearchResultWrapper != nil { @@ -538,7 +556,9 @@ if partOfPathToShow != "" { if !(strings.HasPrefix(path, "#is_dir#") && isExcluded(path)) { button := setUpUserFileSearchResultButton(partOfPathToShow, path) - fileSearchResultFlowBox.Add(button) + if button != nil { + fileSearchResultFlowBox.Add(button) + } button.Parent().(*gtk.FlowBoxChild).SetCanFocus(false) } @@ -609,6 +629,12 @@ tooltipText = fileName fileName = fmt.Sprintf("%s…", fileName[:*nameLimit-3]) } + + if button == nil || button.Native() == 0 { + log.Warn("Failed to create button or native pointer invalid") + return nil + } + button.SetLabel(fileName) if tooltipText != "" { button.SetTooltipText(tooltipText) @@ -633,7 +659,7 @@ return box } -func setUpOperationResultWindow(operation string, result string) { +func setUpOperationResultWindow(operation string, result string) *gtk.Window { window := gtk.NewWindow(gtk.WindowToplevel) window.SetModal(true) @@ -645,13 +671,15 @@ // any key to close the window window.Connect("key-release-event", func(_ *gtk.Window, event *gdk.Event) bool { - window.Destroy() + resultWindow.Destroy() + resultWindow = nil return true }) // any button to close the window window.Connect("button-release-event", func(_ *gtk.Window, event *gdk.Event) bool { - window.Destroy() + resultWindow.Destroy() + resultWindow = nil return true }) @@ -679,4 +707,5 @@ cmd := fmt.Sprintf("wl-copy %v", result) launch(cmd, false, false) } + return window } ++++++ vendor.tar.gz ++++++ ++++ 2786 lines of diff (skipped)
