From 8795f39f08afacb09c35e5f1057b75e47f69642f Mon Sep 17 00:00:00 2001 From: Votre Nom Date: Thu, 14 May 2026 20:46:07 +0200 Subject: [PATCH] =?UTF-8?q?Sprint=200=20=E2=80=94=20industrialisation=20:?= =?UTF-8?q?=20CI,=20tracing,=20tests=20xdg-shell,=20GPLv3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5 livrables d'industrialisation posés avant la phase 13 (client réel). - .gitlab-ci.yml : pipeline minimal (fmt-check + tests core + tests frontend nightly). Pas de cross-compile Redox dans le MVP. - rustfmt.toml + fmt.sh : config formatter racine + boucle sur les 23 crates ; fmt sweep appliqué (d'où les diffs cosmétiques). - tracing dans wayland-frontend : 22 println/eprintln remplacés par debug/info/warn/error selon sévérité. Préfixe "[frontend]" supprimé (le target tracing le fournit). - tracing-subscriber dans le compositor : TeeWriter écrit sur stdout + /scheme/debug, filtre via RUST_LOG (défaut info). DebugSink/dlog supprimés. - 15 tests unitaires xdg-shell après extraction de 2 helpers libres (clamp_to_min_max + should_throttle_configure). Couvre compute_resize_geom, contraintes min/max et throttling configure. - LICENSE (GPLv3 texte officiel FSF) + .editorconfig. Total tests : 27 → 42 automatisés (compositor-core + frontend). Leyoda 2026 – GPLv3 --- .editorconfig | 18 + .gitlab-ci.yml | 71 ++ LICENSE | 674 ++++++++++++++++++ crates/redox-wl-compositor-core/src/lib.rs | 50 +- crates/redox-wl-compositor/Cargo.toml | 2 + crates/redox-wl-compositor/src/main.rs | 123 +++- crates/redox-wl-display/src/lib.rs | 14 +- crates/redox-wl-fullscreen-paint/src/main.rs | 4 +- crates/redox-wl-input/src/lib.rs | 5 +- crates/redox-wl-poc-pixels/src/main.rs | 30 +- crates/redox-wl-test-client-input/src/main.rs | 16 +- .../redox-wl-test-client-resize/src/main.rs | 16 +- .../redox-wl-test-client-shm-two/src/main.rs | 16 +- crates/redox-wl-test-client-shm/src/main.rs | 9 +- .../redox-wl-test-compose-static/src/main.rs | 4 +- .../redox-wl-test-display-backend/src/main.rs | 10 +- .../redox-wl-test-fd-passing-fork/src/main.rs | 14 +- crates/redox-wl-test-fd-passing/src/main.rs | 21 +- .../redox-wl-test-fuzz-protocol/src/main.rs | 12 +- crates/redox-wl-test-handshake/src/main.rs | 21 +- crates/redox-wl-test-input/src/main.rs | 16 +- crates/redox-wl-test-introspect/src/main.rs | 10 +- crates/redox-wl-test-poll-multifd/src/main.rs | 51 +- crates/redox-wl-test-shm-open/src/main.rs | 10 +- crates/redox-wl-test-shm-pipeline/src/main.rs | 43 +- crates/redox-wl-test-unix-socket/src/main.rs | 16 +- crates/redox-wl-wayland-frontend/Cargo.toml | 1 + crates/redox-wl-wayland-frontend/src/lib.rs | 360 +++++++--- fmt.sh | 27 + rustfmt.toml | 7 + 30 files changed, 1373 insertions(+), 298 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitlab-ci.yml create mode 100644 LICENSE create mode 100755 fmt.sh create mode 100644 rustfmt.toml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..e30df1d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +indent_style = space +indent_size = 4 + +[*.{md,markdown}] +trim_trailing_whitespace = false + +[*.{yml,yaml,toml}] +indent_size = 2 + +[Makefile] +indent_style = tab diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..91bfd00 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,71 @@ +# Pipeline minimal redox-wayland-compositor. +# +# Le repo n'a pas de Cargo workspace racine (chaque crate dans crates/ est +# autonome — cf README pour la raison). Les jobs ci-dessous compilent et +# testent les crates qui sont indépendantes du target x86_64-unknown-redox +# (host-buildable). Pour valider la cross-compile Redox il faut redoxer + +# le sysroot Redox (~500 Mo) : volontairement laissé hors du MVP CI, à +# activer plus tard via un job `build-redox` avec image custom. + +stages: + - lint + - test + +# Cache partagé : évite de re-télécharger les deps wayland-rs/tracing/etc. +# à chaque push. +.cargo-cache: &cargo-cache + cache: + key: cargo-shared + paths: + - .cargo/registry/cache/ + - .cargo/registry/index/ + +variables: + CARGO_HOME: $CI_PROJECT_DIR/.cargo + CARGO_TERM_COLOR: always + # Build wayland-rs depuis le clone local. La CI a besoin d'un clone + # frère ../wayland-rs (cf paths relatifs dans les Cargo.toml). On le + # provisionne explicitement dans le before_script de chaque job qui en + # a besoin. + WAYLAND_RS_REV: master + +# --------------------------------------------------------------------------- +# Lint : formatage uniforme sur les 23 crates. +# --------------------------------------------------------------------------- +fmt-check: + stage: lint + image: rust:latest + <<: *cargo-cache + script: + - rustup component add rustfmt + - ./fmt.sh --check + +# --------------------------------------------------------------------------- +# Tests compositor-core : pure Rust, zéro dep, stable suffit. +# 27 tests unitaires de la logique de composition / Z-order / hit-test. +# --------------------------------------------------------------------------- +test-core: + stage: test + image: rust:latest + <<: *cargo-cache + script: + - cd crates/redox-wl-compositor-core + - cargo test --release + +# --------------------------------------------------------------------------- +# Tests wayland-frontend : 15 tests xdg-shell (compute_resize_geom, +# clamp_to_min_max, should_throttle_configure). Nightly requis à cause de +# redox-scheme (deps transitive via redox-wl-input) qui utilise +# #![feature(linked_list_cursors)]. +# --------------------------------------------------------------------------- +test-frontend: + stage: test + image: rustlang/rust:nightly + <<: *cargo-cache + before_script: + # wayland-rs est référencé en path relatif (../../../wayland-rs/...). + # Le clone frère doit exister pour que cargo résolve les deps. + - git clone --depth 1 https://github.com/Smithay/wayland-rs.git ../wayland-rs + script: + - cd crates/redox-wl-wayland-frontend + - cargo test --lib diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + 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. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/crates/redox-wl-compositor-core/src/lib.rs b/crates/redox-wl-compositor-core/src/lib.rs index abaf6ac..58cda4d 100644 --- a/crates/redox-wl-compositor-core/src/lib.rs +++ b/crates/redox-wl-compositor-core/src/lib.rs @@ -187,9 +187,7 @@ impl SurfaceRegistry { /// C'est l'ordre de composition : on peint d'abord le fond, puis /// chaque surface au-dessus. pub fn iter_z_order_back_to_front(&self) -> impl Iterator { - self.z_order - .iter() - .filter_map(|id| self.surfaces.get(id)) + self.z_order.iter().filter_map(|id| self.surfaces.get(id)) } /// Itérer les surfaces dans l'ordre Z, du premier plan vers le fond. @@ -248,11 +246,7 @@ impl SurfaceRegistry { /// Convenience : modifie le pending state via une closure. /// Pratique pour `set_position`, `set_buffer` etc. dans les tests. - pub fn modify_pending( - &mut self, - id: SurfaceId, - f: F, - ) -> bool { + pub fn modify_pending(&mut self, id: SurfaceId, f: F) -> bool { match self.surfaces.get_mut(&id) { Some(s) => { f(&mut s.pending); @@ -385,10 +379,7 @@ mod tests { let a = r.create(); let b = r.create(); let c = r.create(); - let order: Vec = r - .iter_z_order_back_to_front() - .map(|s| s.id()) - .collect(); + let order: Vec = r.iter_z_order_back_to_front().map(|s| s.id()).collect(); assert_eq!(order, vec![a, b, c]); // a au fond, c devant } @@ -399,10 +390,7 @@ mod tests { let b = r.create(); let c = r.create(); r.raise(a); // a passe au-dessus - let order: Vec = r - .iter_z_order_back_to_front() - .map(|s| s.id()) - .collect(); + let order: Vec = r.iter_z_order_back_to_front().map(|s| s.id()).collect(); assert_eq!(order, vec![b, c, a]); } @@ -413,10 +401,7 @@ mod tests { let b = r.create(); r.raise(b); r.raise(b); // déjà au top - let order: Vec = r - .iter_z_order_back_to_front() - .map(|s| s.id()) - .collect(); + let order: Vec = r.iter_z_order_back_to_front().map(|s| s.id()).collect(); assert_eq!(order, vec![a, b]); } @@ -426,10 +411,7 @@ mod tests { let a = r.create(); let bogus = SurfaceId(999); r.raise(bogus); // ne doit pas paniquer ni modifier z_order - let order: Vec = r - .iter_z_order_back_to_front() - .map(|s| s.id()) - .collect(); + let order: Vec = r.iter_z_order_back_to_front().map(|s| s.id()).collect(); assert_eq!(order, vec![a]); } @@ -495,10 +477,7 @@ mod tests { let b = r.create(); let c = r.create(); r.destroy(b); - let ids: Vec = r - .iter_z_order_back_to_front() - .map(|s| s.id()) - .collect(); + let ids: Vec = r.iter_z_order_back_to_front().map(|s| s.id()).collect(); assert_eq!(ids, vec![a, c]); } @@ -748,10 +727,7 @@ mod tests { let a = r.create(); let b = r.create(); let c = r.create(); - let order: Vec = r - .iter_z_order_front_to_back() - .map(|s| s.id()) - .collect(); + let order: Vec = r.iter_z_order_front_to_back().map(|s| s.id()).collect(); assert_eq!(order, vec![c, b, a]); } @@ -845,18 +821,12 @@ mod tests { r.commit(fg2); // L'ordre attendu pour la composition : bg → fg1 → fg2 (vert au-dessus) - let ids: Vec = r - .iter_z_order_back_to_front() - .map(|s| s.id()) - .collect(); + let ids: Vec = r.iter_z_order_back_to_front().map(|s| s.id()).collect(); assert_eq!(ids, vec![bg, fg1, fg2]); // Click sur fg1 → raise → fg1 passe au-dessus r.raise(fg1); - let ids: Vec = r - .iter_z_order_back_to_front() - .map(|s| s.id()) - .collect(); + let ids: Vec = r.iter_z_order_back_to_front().map(|s| s.id()).collect(); assert_eq!(ids, vec![bg, fg2, fg1]); // Vérifie que le current state est bien défini après les commits diff --git a/crates/redox-wl-compositor/Cargo.toml b/crates/redox-wl-compositor/Cargo.toml index 880857b..db1f517 100644 --- a/crates/redox-wl-compositor/Cargo.toml +++ b/crates/redox-wl-compositor/Cargo.toml @@ -9,3 +9,5 @@ redox-wl-display = { path = "../redox-wl-display" } redox-wl-input = { path = "../redox-wl-input" } redox-wl-compositor-core = { path = "../redox-wl-compositor-core" } redox-wl-wayland-frontend = { path = "../redox-wl-wayland-frontend" } +tracing = { version = "0.1", default-features = false, features = ["std", "attributes"] } +tracing-subscriber = { version = "0.3", default-features = false, features = ["fmt", "env-filter"] } diff --git a/crates/redox-wl-compositor/src/main.rs b/crates/redox-wl-compositor/src/main.rs index 126ee26..0e8cfee 100644 --- a/crates/redox-wl-compositor/src/main.rs +++ b/crates/redox-wl-compositor/src/main.rs @@ -14,16 +14,27 @@ //! - sleep ~16ms //! //! Tourne 60 secondes max, exit propre. +//! +//! Logs : `tracing` + `tracing-subscriber`. Configurable via `RUST_LOG` +//! (cf. `EnvFilter::from_default_env`). Par défaut : `info`. Sortie +//! tee'd sur stdout ET sur `/scheme/debug` (= serial sous Redox/QEMU). +//! Exemples : +//! RUST_LOG=info → events lifecycle (focus, drag, garbage_collect) +//! RUST_LOG=debug → idem + détails protocole (set_min_size, hit_test…) +//! RUST_LOG=warn → uniquement anomalies (refused, rejected, mismatch) use std::env; -use std::fs::OpenOptions; -use std::io::Write; +use std::fs::{File, OpenOptions}; +use std::io::{self, Write}; use std::path::PathBuf; use std::process::{Command, ExitCode}; -use std::sync::{Mutex, OnceLock}; +use std::sync::{Arc, Mutex}; use std::thread; use std::time::{Duration, Instant}; +use tracing::{error, info}; +use tracing_subscriber::{fmt::MakeWriter, EnvFilter}; + use redox_wl_compositor_core::Framebuffer; use redox_wl_display::RedoxOutput; use redox_wl_input::{InputBackend, InputEvent}; @@ -32,36 +43,77 @@ use redox_wl_wayland_frontend::WaylandFrontend; const SOCKET_PATH: &str = "/tmp/redox-wl-comp.sock"; const BG_COLOR: u32 = 0xFF101820; -struct DebugSink(Mutex>); -impl DebugSink { +/// MakeWriter qui tee chaque ligne de log vers stdout ET, si disponible, +/// vers `/scheme/debug` (serial console côté host quand on tourne sous +/// `make qemu`). +#[derive(Clone)] +struct TeeWriter { + debug_scheme: Arc>>, +} + +impl TeeWriter { fn new() -> Self { - Self(Mutex::new( - OpenOptions::new().write(true).open("/scheme/debug").ok(), - )) - } - fn writeln(&self, s: &str) { - println!("{s}"); - if let Ok(mut g) = self.0.lock() { - if let Some(f) = g.as_mut() { - let _ = writeln!(f, "{s}"); - } + let f = OpenOptions::new().write(true).open("/scheme/debug").ok(); + Self { + debug_scheme: Arc::new(Mutex::new(f)), } } } -fn dlog(s: &str) { - static SINK: OnceLock = OnceLock::new(); - SINK.get_or_init(DebugSink::new).writeln(s); + +struct TeeWriterGuard { + debug_scheme: Arc>>, +} + +impl Write for TeeWriterGuard { + fn write(&mut self, buf: &[u8]) -> io::Result { + let _ = io::stdout().write_all(buf); + if let Ok(mut g) = self.debug_scheme.lock() { + if let Some(f) = g.as_mut() { + let _ = f.write_all(buf); + } + } + Ok(buf.len()) + } + fn flush(&mut self) -> io::Result<()> { + let _ = io::stdout().flush(); + if let Ok(mut g) = self.debug_scheme.lock() { + if let Some(f) = g.as_mut() { + let _ = f.flush(); + } + } + Ok(()) + } +} + +impl<'a> MakeWriter<'a> for TeeWriter { + type Writer = TeeWriterGuard; + fn make_writer(&'a self) -> Self::Writer { + TeeWriterGuard { + debug_scheme: Arc::clone(&self.debug_scheme), + } + } +} + +fn init_tracing() { + let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info")); + tracing_subscriber::fmt() + .with_env_filter(filter) + .with_writer(TeeWriter::new()) + .with_target(true) + .with_ansi(false) + .without_time() + .init(); } fn run() -> Result<(), Box> { - dlog("[comp] Phase 6.4 — compositor Wayland démarrage"); + info!("Phase 6.4 — compositor Wayland démarrage"); // Display let mut output = RedoxOutput::open()?; let our_vt = output.vt(); let fb_w = output.width(); let fb_h = output.height(); - dlog(&format!("[comp] display {fb_w}x{fb_h}, VT={our_vt}")); + info!("display {fb_w}x{fb_h}, VT={our_vt}"); let _ = Command::new("inputd") .arg("-A") @@ -69,7 +121,7 @@ fn run() -> Result<(), Box> { .status(); thread::sleep(Duration::from_millis(300)); output.take_crtc()?; - dlog("[comp] CRTC pris"); + info!("CRTC pris"); // Clear initial → fond bleu nuit pour signaler "compositor up" { @@ -88,7 +140,7 @@ fn run() -> Result<(), Box> { let mut frontend = WaylandFrontend::bind_absolute(&socket_path)?; // Phase 7.3 : curseur visible dès le démarrage, placé au centre du fb. frontend.set_cursor_initial_position((fb_w as i32) / 2, (fb_h as i32) / 2); - dlog(&format!("[comp] Wayland socket : {SOCKET_PATH}")); + info!("Wayland socket : {SOCKET_PATH}"); // Exporter WAYLAND_DISPLAY pour les clients lancés par l'OS qui regarderaient // l'env. (Notre client de test va connecter explicitement au path.) @@ -108,12 +160,12 @@ fn run() -> Result<(), Box> { // 1. Accepter nouveaux clients Wayland if let Err(e) = frontend.accept_pending_clients() { - dlog(&format!("[comp] accept err: {e}")); + error!("accept err: {e}"); } // 2. Dispatch des requêtes Wayland en attente if let Err(e) = frontend.dispatch_clients() { - dlog(&format!("[comp] dispatch err: {e}")); + error!("dispatch err: {e}"); } // 2.5. Phase 7.6 : nettoyer les surfaces des clients déconnectés. @@ -124,7 +176,7 @@ fn run() -> Result<(), Box> { // 3. Input if let Ok(events) = input.poll() { if !events.is_empty() { - dlog(&format!("[comp] {} input events from inputd", events.len())); + tracing::debug!("{} input events from inputd", events.len()); } for ev in events { match &ev { @@ -132,13 +184,13 @@ fn run() -> Result<(), Box> { scancode, pressed, .. } if *pressed && *scancode == 0x01 => { // Esc → exit - dlog("[comp] Esc → exit"); + info!("Esc → exit"); let _ = frontend.flush_clients(); let _ = std::fs::remove_file(SOCKET_PATH); return Ok(()); } InputEvent::Quit => { - dlog("[comp] Quit reçu"); + info!("Quit reçu"); let _ = frontend.flush_clients(); let _ = std::fs::remove_file(SOCKET_PATH); return Ok(()); @@ -164,7 +216,7 @@ fn run() -> Result<(), Box> { // Phase 7.3 : curseur software par-dessus la composition. frontend.draw_cursor(&mut output); if let Err(e) = output.present_with_takeover() { - dlog(&format!("[comp] present err: {e}")); + error!("present err: {e}"); } // 5. Frame callbacks done après le present @@ -174,33 +226,34 @@ fn run() -> Result<(), Box> { // 6. Flush vers les clients if let Err(e) = frontend.flush_clients() { - dlog(&format!("[comp] flush err: {e}")); + error!("flush err: {e}"); } // Log occasionnel if tick % 30 == 0 { - dlog(&format!( - "[comp] tick={tick} surfaces={nb} elapsed={:.1}s", + info!( + "tick={tick} surfaces={nb} elapsed={:.1}s", start.elapsed().as_secs_f32() - )); + ); } thread::sleep(frame_period); } - dlog("[comp] timeout atteint, exit"); + info!("timeout atteint, exit"); let _ = std::fs::remove_file(SOCKET_PATH); Ok(()) } fn main() -> ExitCode { + init_tracing(); match run() { Ok(()) => { - dlog("[comp] PASS"); + info!("PASS"); ExitCode::SUCCESS } Err(e) => { - dlog(&format!("[comp] FAIL: {e}")); + error!("FAIL: {e}"); ExitCode::FAILURE } } diff --git a/crates/redox-wl-display/src/lib.rs b/crates/redox-wl-display/src/lib.rs index 691f4b4..a7999e5 100644 --- a/crates/redox-wl-display/src/lib.rs +++ b/crates/redox-wl-display/src/lib.rs @@ -20,12 +20,9 @@ use std::os::fd::AsRawFd; use std::slice; use std::sync::Arc; -use drm::Device as _; use drm::buffer::{Buffer as _, DrmFourcc}; -use drm::control::{ - ClipRect, Device as _, Mode, connector, - crtc as drm_crtc, framebuffer, -}; +use drm::control::{connector, crtc as drm_crtc, framebuffer, ClipRect, Device as _, Mode}; +use drm::Device as _; use graphics_ipc::{CpuBackedBuffer, V2GraphicsHandle}; use inputd::ConsumerHandle; @@ -82,8 +79,7 @@ impl RedoxOutput { break; } } - let (connector, info) = - chosen.ok_or_else(|| io::Error::other("no connected display"))?; + let (connector, info) = chosen.ok_or_else(|| io::Error::other("no connected display"))?; let mode = info .modes() @@ -180,9 +176,7 @@ impl RedoxOutput { let bytes = buffer.shadow_buf(); let (w, h) = (self.width as usize, self.height as usize); // SAFETY: alignment 4 garantie par DumbBuffer ARGB8888 + len % 4 == 0 - let pixels = unsafe { - slice::from_raw_parts_mut(bytes.as_mut_ptr() as *mut u32, w * h) - }; + let pixels = unsafe { slice::from_raw_parts_mut(bytes.as_mut_ptr() as *mut u32, w * h) }; Ok(pixels) } diff --git a/crates/redox-wl-fullscreen-paint/src/main.rs b/crates/redox-wl-fullscreen-paint/src/main.rs index e8408e5..2a6369d 100644 --- a/crates/redox-wl-fullscreen-paint/src/main.rs +++ b/crates/redox-wl-fullscreen-paint/src/main.rs @@ -112,7 +112,9 @@ fn run() -> Result<(), Box> { thread::sleep(frame_period); } - dlog(&format!("[paint] {total_frames} frames terminées, exit propre")); + dlog(&format!( + "[paint] {total_frames} frames terminées, exit propre" + )); drop(output); // libère framebuffer + buffer explicitement thread::sleep(Duration::from_millis(500)); // laisser le serial flush Ok(()) diff --git a/crates/redox-wl-input/src/lib.rs b/crates/redox-wl-input/src/lib.rs index de909b7..ae3a9be 100644 --- a/crates/redox-wl-input/src/lib.rs +++ b/crates/redox-wl-input/src/lib.rs @@ -114,10 +114,7 @@ fn translate(ev: &Event) -> InputEvent { character: t.character, }, EventOption::Mouse(m) => InputEvent::PointerMotion { x: m.x, y: m.y }, - EventOption::MouseRelative(m) => InputEvent::PointerMotionRelative { - dx: m.dx, - dy: m.dy, - }, + EventOption::MouseRelative(m) => InputEvent::PointerMotionRelative { dx: m.dx, dy: m.dy }, EventOption::Button(b) => InputEvent::PointerButton { left: b.left, middle: b.middle, diff --git a/crates/redox-wl-poc-pixels/src/main.rs b/crates/redox-wl-poc-pixels/src/main.rs index 11e7f7f..4ddc5fc 100644 --- a/crates/redox-wl-poc-pixels/src/main.rs +++ b/crates/redox-wl-poc-pixels/src/main.rs @@ -157,7 +157,10 @@ unsafe fn child_main(child_sock: OwnedFd) -> ! { }; eprintln!( "[poc CLIENT] shm '{}' size={} mapped at {:p} fd={}", - SHM_NAME, SHM_BYTES, map, shm_fd.as_raw_fd() + SHM_NAME, + SHM_BYTES, + map, + shm_fd.as_raw_fd() ); // Dessine le pattern ARGB déterministe @@ -188,7 +191,11 @@ unsafe fn child_main(child_sock: OwnedFd) -> ! { } unsafe fn parent_main(parent_sock: OwnedFd, child_pid: libc::pid_t) -> Result<(), String> { - eprintln!("[poc SERVER pid={}] waiting for fd from child {}", libc::getpid(), child_pid); + eprintln!( + "[poc SERVER pid={}] waiting for fd from child {}", + libc::getpid(), + child_pid + ); let received = recv_fd_from(parent_sock.as_raw_fd())?; let recv_raw = received.as_raw_fd(); @@ -213,16 +220,15 @@ unsafe fn parent_main(parent_sock: OwnedFd, child_pid: libc::pid_t) -> Result<() } if !mismatches.is_empty() { for (x, y, got, want) in &mismatches { - eprintln!( - "[poc SERVER] MISMATCH at ({x},{y}): got {got:#010x} want {want:#010x}" - ); + eprintln!("[poc SERVER] MISMATCH at ({x},{y}): got {got:#010x} want {want:#010x}"); } - return Err(format!("{} pixel mismatches over {}", mismatches.len(), W * H)); + return Err(format!( + "{} pixel mismatches over {}", + mismatches.len(), + W * H + )); } - eprintln!( - "[poc SERVER] all {} pixels match expected pattern", - W * H - ); + eprintln!("[poc SERVER] all {} pixels match expected pattern", W * H); // Bonus : dump en PPM pour visualisation (P6 binaire RGB) match write_ppm(PPM_OUTPUT, pixels, W, H) { @@ -240,9 +246,7 @@ unsafe fn parent_main(parent_sock: OwnedFd, child_pid: libc::pid_t) -> Result<() return Err(format!("waitpid: {}", errno_str())); } if !libc::WIFEXITED(status) || libc::WEXITSTATUS(status) != 0 { - return Err(format!( - "child exited abnormally: status={status}" - )); + return Err(format!("child exited abnormally: status={status}")); } eprintln!("[poc SERVER] child reaped cleanly"); diff --git a/crates/redox-wl-test-client-input/src/main.rs b/crates/redox-wl-test-client-input/src/main.rs index da56e49..b01ab1c 100644 --- a/crates/redox-wl-test-client-input/src/main.rs +++ b/crates/redox-wl-test-client-input/src/main.rs @@ -20,7 +20,6 @@ use std::thread; use std::time::Duration; use wayland_client::{ - Connection, Dispatch, EventQueue, Proxy, QueueHandle, backend::Backend, protocol::{ wl_buffer::WlBuffer, @@ -33,6 +32,7 @@ use wayland_client::{ wl_shm_pool::WlShmPool, wl_surface::WlSurface, }, + Connection, Dispatch, EventQueue, Proxy, QueueHandle, }; use wayland_protocols::xdg::shell::client::{ xdg_surface::{self, XdgSurface}, @@ -86,7 +86,12 @@ impl Dispatch for ClientState { _conn: &Connection, qh: &QueueHandle, ) { - if let wl_registry::Event::Global { name, interface, version } = event { + if let wl_registry::Event::Global { + name, + interface, + version, + } = event + { match interface.as_str() { "wl_compositor" => { state.compositor = Some(registry.bind(name, version.min(5), qh, ())); @@ -258,7 +263,12 @@ impl Dispatch for ClientState { _qh: &QueueHandle, ) { match event { - wl_pointer::Event::Enter { serial, surface_x, surface_y, .. } => { + wl_pointer::Event::Enter { + serial, + surface_x, + surface_y, + .. + } => { dlog(&format!( "[client-input] wl_pointer.enter serial={serial} ({surface_x},{surface_y})" )); diff --git a/crates/redox-wl-test-client-resize/src/main.rs b/crates/redox-wl-test-client-resize/src/main.rs index f93ce12..14a29a9 100644 --- a/crates/redox-wl-test-client-resize/src/main.rs +++ b/crates/redox-wl-test-client-resize/src/main.rs @@ -19,12 +19,12 @@ use std::thread; use std::time::Duration; use wayland_client::{ - Connection, Dispatch, EventQueue, Proxy, QueueHandle, backend::Backend, protocol::{ wl_buffer::WlBuffer, wl_compositor::WlCompositor, wl_registry, wl_seat::WlSeat, wl_shm::WlShm, wl_shm_pool::WlShmPool, wl_surface::WlSurface, }, + Connection, Dispatch, EventQueue, Proxy, QueueHandle, }; use wayland_protocols::xdg::shell::client::{ xdg_surface::{self, XdgSurface}, @@ -82,7 +82,12 @@ impl Dispatch for ClientState { _conn: &Connection, qh: &QueueHandle, ) { - if let wl_registry::Event::Global { name, interface, version } = event { + if let wl_registry::Event::Global { + name, + interface, + version, + } = event + { match interface.as_str() { "wl_compositor" => { state.compositor = Some(registry.bind(name, version.min(5), qh, ())); @@ -176,12 +181,7 @@ impl Dispatch for ClientState { } /// Crée un shm fd + buffer 32-bit ARGB rempli en `color` + bordure noire 2px. -unsafe fn alloc_buffer( - name: &str, - w: i32, - h: i32, - color: u32, -) -> Result<(OwnedFd, i32), String> { +unsafe fn alloc_buffer(name: &str, w: i32, h: i32, color: u32) -> Result<(OwnedFd, i32), String> { let stride = w * 4; let size = stride * h; let cname = CString::new(name).unwrap(); diff --git a/crates/redox-wl-test-client-shm-two/src/main.rs b/crates/redox-wl-test-client-shm-two/src/main.rs index f56237f..26ceec5 100644 --- a/crates/redox-wl-test-client-shm-two/src/main.rs +++ b/crates/redox-wl-test-client-shm-two/src/main.rs @@ -26,12 +26,12 @@ use std::thread; use std::time::Duration; use wayland_client::{ - Connection, Dispatch, EventQueue, Proxy, QueueHandle, backend::Backend, protocol::{ wl_buffer::WlBuffer, wl_compositor::WlCompositor, wl_registry, wl_seat::WlSeat, wl_shm::WlShm, wl_shm_pool::WlShmPool, wl_surface::WlSurface, }, + Connection, Dispatch, EventQueue, Proxy, QueueHandle, }; use wayland_protocols::xdg::shell::client::{ xdg_surface::{self, XdgSurface}, @@ -86,7 +86,12 @@ impl Dispatch for ClientState { _conn: &Connection, qh: &QueueHandle, ) { - if let wl_registry::Event::Global { name, interface, version } = event { + if let wl_registry::Event::Global { + name, + interface, + version, + } = event + { match interface.as_str() { "wl_compositor" => { state.compositor = Some(registry.bind(name, version.min(5), qh, ())); @@ -252,7 +257,12 @@ unsafe fn create_shm_pattern(name: &str, base: u32, letter: char) -> Result Result<(), Box> { +fn run_one( + label: &str, + base_color: u32, + letter: char, + shm_name: &str, +) -> Result<(), Box> { dlog(&format!("[{label}] connect to compositor")); for i in 0..50 { diff --git a/crates/redox-wl-test-client-shm/src/main.rs b/crates/redox-wl-test-client-shm/src/main.rs index 1b7801c..185f8fc 100644 --- a/crates/redox-wl-test-client-shm/src/main.rs +++ b/crates/redox-wl-test-client-shm/src/main.rs @@ -19,12 +19,12 @@ use std::thread; use std::time::Duration; use wayland_client::{ - Connection, Dispatch, EventQueue, Proxy, QueueHandle, backend::Backend, protocol::{ wl_buffer::WlBuffer, wl_compositor::WlCompositor, wl_registry, wl_shm::WlShm, wl_shm_pool::WlShmPool, wl_surface::WlSurface, }, + Connection, Dispatch, EventQueue, Proxy, QueueHandle, }; use wayland_protocols::xdg::shell::client::{ xdg_surface::{self, XdgSurface}, @@ -78,7 +78,12 @@ impl Dispatch for ClientState { _conn: &Connection, qh: &QueueHandle, ) { - if let wl_registry::Event::Global { name, interface, version } = event { + if let wl_registry::Event::Global { + name, + interface, + version, + } = event + { match interface.as_str() { "wl_compositor" => { state.compositor = Some(registry.bind(name, version.min(5), qh, ())); diff --git a/crates/redox-wl-test-compose-static/src/main.rs b/crates/redox-wl-test-compose-static/src/main.rs index b77e3db..d121fbf 100644 --- a/crates/redox-wl-test-compose-static/src/main.rs +++ b/crates/redox-wl-test-compose-static/src/main.rs @@ -62,9 +62,7 @@ fn run() -> Result<(), Box> { .status(); thread::sleep(Duration::from_millis(300)); - output - .take_crtc() - .map_err(|e| format!("take_crtc: {e}"))?; + output.take_crtc().map_err(|e| format!("take_crtc: {e}"))?; dlog("[compose] CRTC pris"); // Input setup ----------------------------------------------------------- diff --git a/crates/redox-wl-test-display-backend/src/main.rs b/crates/redox-wl-test-display-backend/src/main.rs index bfbd2f5..e6bc8c7 100644 --- a/crates/redox-wl-test-display-backend/src/main.rs +++ b/crates/redox-wl-test-display-backend/src/main.rs @@ -27,8 +27,8 @@ use std::io::{self, Write}; use std::process::{Command, ExitCode}; use std::sync::OnceLock; +use drm::control::{connector::State, Device as _}; use drm::Device as _; -use drm::control::{Device as _, connector::State}; use graphics_ipc::V2GraphicsHandle; use inputd::ConsumerHandle; @@ -149,8 +149,12 @@ fn run() -> Result<(), Box> { dlog(&format!( "[disp] driver caps: dumb_buffer={:?} cursor={}x{}", dumb, - cursor_w.map(|v| v.to_string()).unwrap_or_else(|_| "?".into()), - cursor_h.map(|v| v.to_string()).unwrap_or_else(|_| "?".into()), + cursor_w + .map(|v| v.to_string()) + .unwrap_or_else(|_| "?".into()), + cursor_h + .map(|v| v.to_string()) + .unwrap_or_else(|_| "?".into()), )); // Step 7: allocate a small CpuBackedBuffer, paint a pattern, destroy. diff --git a/crates/redox-wl-test-fd-passing-fork/src/main.rs b/crates/redox-wl-test-fd-passing-fork/src/main.rs index d7b5fed..94056d1 100644 --- a/crates/redox-wl-test-fd-passing-fork/src/main.rs +++ b/crates/redox-wl-test-fd-passing-fork/src/main.rs @@ -118,7 +118,11 @@ unsafe fn recv_fd_from(socket: RawFd) -> Result { unsafe fn child_main(child_sock: OwnedFd) -> ! { let raw_sock = child_sock.as_raw_fd(); - eprintln!("[test-02b CHILD pid={}] recvmsg on sock {}", libc::getpid(), raw_sock); + eprintln!( + "[test-02b CHILD pid={}] recvmsg on sock {}", + libc::getpid(), + raw_sock + ); let received = match recv_fd_from(raw_sock) { Ok(fd) => fd, Err(e) => { @@ -156,8 +160,12 @@ fn run() -> Result<(), String> { unsafe { let (sock_parent, sock_child) = make_socketpair()?; let tmp_fd = open_tmp_with_marker()?; - println!("[test-02b PARENT] tmp fd={}, sockets {}/{}", - tmp_fd.as_raw_fd(), sock_parent.as_raw_fd(), sock_child.as_raw_fd()); + println!( + "[test-02b PARENT] tmp fd={}, sockets {}/{}", + tmp_fd.as_raw_fd(), + sock_parent.as_raw_fd(), + sock_child.as_raw_fd() + ); let pid = libc::fork(); if pid < 0 { diff --git a/crates/redox-wl-test-fd-passing/src/main.rs b/crates/redox-wl-test-fd-passing/src/main.rs index 86c479a..db58adf 100644 --- a/crates/redox-wl-test-fd-passing/src/main.rs +++ b/crates/redox-wl-test-fd-passing/src/main.rs @@ -111,7 +111,10 @@ unsafe fn recv_fd_from(socket: RawFd) -> Result { if n < 0 { return Err(format!("recvmsg: {}", errno_str())); } - println!("[test-02] recvmsg got {n} bytes + control of {} bytes", msg.msg_controllen); + println!( + "[test-02] recvmsg got {n} bytes + control of {} bytes", + msg.msg_controllen + ); let cmsg = libc::CMSG_FIRSTHDR(&msg); if cmsg.is_null() { @@ -147,7 +150,10 @@ fn run() -> Result<(), String> { if dup_fd < 0 { return Err(format!("dup: {}", errno_str())); } - println!("[test-02] dup'd tmp_fd ({}) -> {dup_fd}", tmp_fd.as_raw_fd()); + println!( + "[test-02] dup'd tmp_fd ({}) -> {dup_fd}", + tmp_fd.as_raw_fd() + ); send_fd_over(sock_a.as_raw_fd(), dup_fd)?; let received = recv_fd_from(sock_b.as_raw_fd())?; @@ -165,11 +171,16 @@ fn run() -> Result<(), String> { let mut readback = vec![0u8; MARKER.len()]; let n = libc::read(recv_raw, readback.as_mut_ptr() as *mut _, readback.len()); if n != MARKER.len() as isize { - return Err(format!("read from received fd: only {n} bytes (errno {})", - io::Error::last_os_error().raw_os_error().unwrap_or(0))); + return Err(format!( + "read from received fd: only {n} bytes (errno {})", + io::Error::last_os_error().raw_os_error().unwrap_or(0) + )); } if readback != MARKER { - return Err(format!("marker mismatch: got {:?}", String::from_utf8_lossy(&readback))); + return Err(format!( + "marker mismatch: got {:?}", + String::from_utf8_lossy(&readback) + )); } println!("[test-02] read {} bytes via received fd: marker matches", n); diff --git a/crates/redox-wl-test-fuzz-protocol/src/main.rs b/crates/redox-wl-test-fuzz-protocol/src/main.rs index 38ca1e5..1f8af58 100644 --- a/crates/redox-wl-test-fuzz-protocol/src/main.rs +++ b/crates/redox-wl-test-fuzz-protocol/src/main.rs @@ -37,12 +37,12 @@ use std::thread; use std::time::Duration; use wayland_client::{ - Connection, Dispatch, EventQueue, Proxy, QueueHandle, backend::Backend, protocol::{ wl_buffer::WlBuffer, wl_compositor::WlCompositor, wl_registry, wl_shm::WlShm, wl_shm_pool::WlShmPool, wl_surface::WlSurface, }, + Connection, Dispatch, EventQueue, Proxy, QueueHandle, }; use wayland_protocols::xdg::shell::client::{ xdg_surface::{self, XdgSurface}, @@ -91,7 +91,12 @@ impl Dispatch for ClientState { _conn: &Connection, qh: &QueueHandle, ) { - if let wl_registry::Event::Global { name, interface, version } = event { + if let wl_registry::Event::Global { + name, + interface, + version, + } = event + { match interface.as_str() { "wl_compositor" => { state.compositor = Some(registry.bind(name, version.min(5), qh, ())); @@ -171,7 +176,8 @@ fn wait_socket() -> Result<(), String> { Err("compositor socket missing".into()) } -fn connect() -> Result<(Connection, EventQueue, ClientState), Box> { +fn connect( +) -> Result<(Connection, EventQueue, ClientState), Box> { wait_socket()?; let stream = UnixStream::connect(SOCKET_PATH)?; let backend = Backend::connect(stream)?; diff --git a/crates/redox-wl-test-handshake/src/main.rs b/crates/redox-wl-test-handshake/src/main.rs index 904410f..c28c9d4 100644 --- a/crates/redox-wl-test-handshake/src/main.rs +++ b/crates/redox-wl-test-handshake/src/main.rs @@ -17,14 +17,13 @@ use std::process::ExitCode; use std::sync::Arc; use wayland_client::{ - Connection as ClientConnection, Dispatch as ClientDispatch, EventQueue, - backend::Backend as ClientBackend, - protocol::wl_registry, + backend::Backend as ClientBackend, protocol::wl_registry, Connection as ClientConnection, + Dispatch as ClientDispatch, EventQueue, }; use wayland_server::{ - Display as ServerDisplay, GlobalDispatch, New, backend::ClientData, protocol::{wl_compositor, wl_shm}, + Display as ServerDisplay, GlobalDispatch, New, }; // ---- Server side ---- @@ -102,7 +101,12 @@ impl ClientDispatch for ClientState { _conn: &ClientConnection, _qhandle: &wayland_client::QueueHandle, ) { - if let wl_registry::Event::Global { name, interface, version } = event { + if let wl_registry::Event::Global { + name, + interface, + version, + } = event + { println!("[test-05 CLIENT] global #{name}: {interface} v{version}"); state.globals.push((name, interface, version)); } @@ -168,7 +172,11 @@ fn run() -> Result<(), Box> { .into()); } - let names: Vec<&str> = client_state.globals.iter().map(|(_, n, _)| n.as_str()).collect(); + let names: Vec<&str> = client_state + .globals + .iter() + .map(|(_, n, _)| n.as_str()) + .collect(); let has_compositor = names.contains(&"wl_compositor"); let has_shm = names.contains(&"wl_shm"); @@ -197,4 +205,3 @@ fn main() -> ExitCode { } } } - diff --git a/crates/redox-wl-test-input/src/main.rs b/crates/redox-wl-test-input/src/main.rs index 820121a..fdc59a3 100644 --- a/crates/redox-wl-test-input/src/main.rs +++ b/crates/redox-wl-test-input/src/main.rs @@ -63,9 +63,7 @@ fn run() -> Result<(), Box> { thread::sleep(Duration::from_millis(300)); // Prend le CRTC, peint un fond bleu marine pour signaler "on est là" - output - .take_crtc() - .map_err(|e| format!("take_crtc: {e}"))?; + output.take_crtc().map_err(|e| format!("take_crtc: {e}"))?; { let pixels = output.pixels_mut()?; for p in pixels.iter_mut() { @@ -111,10 +109,14 @@ fn run() -> Result<(), Box> { )); } InputEvent::TextInput { character } => { - dlog(&format!("[input] #{event_count:04} TextInput '{character}'")); + dlog(&format!( + "[input] #{event_count:04} TextInput '{character}'" + )); } InputEvent::PointerMotion { x, y } => { - dlog(&format!("[input] #{event_count:04} PointerMotion abs=({x},{y})")); + dlog(&format!( + "[input] #{event_count:04} PointerMotion abs=({x},{y})" + )); } InputEvent::PointerMotionRelative { dx, dy } => { dlog(&format!( @@ -131,7 +133,9 @@ fn run() -> Result<(), Box> { )); } InputEvent::PointerScroll { dx, dy } => { - dlog(&format!("[input] #{event_count:04} PointerScroll d=({dx},{dy})")); + dlog(&format!( + "[input] #{event_count:04} PointerScroll d=({dx},{dy})" + )); } InputEvent::Quit => { dlog(&format!("[input] #{event_count:04} Quit demandé")); diff --git a/crates/redox-wl-test-introspect/src/main.rs b/crates/redox-wl-test-introspect/src/main.rs index b19fa67..fae861e 100644 --- a/crates/redox-wl-test-introspect/src/main.rs +++ b/crates/redox-wl-test-introspect/src/main.rs @@ -18,9 +18,7 @@ use std::thread; use std::time::Duration; use wayland_client::{ - Connection, Dispatch, EventQueue, QueueHandle, - backend::Backend, - protocol::wl_registry, + backend::Backend, protocol::wl_registry, Connection, Dispatch, EventQueue, QueueHandle, }; const SOCKET_PATH: &str = "/tmp/redox-wl-comp.sock"; @@ -82,7 +80,11 @@ const EXPECTED: &[(&str, &str, &str)] = &[ ("wl_output", "core", "monitors info (geometry, scale, mode)"), ("wl_data_device_manager", "core", "clipboard + DnD"), // --- xdg-shell --- - ("xdg_wm_base", "stable", "window management (toplevel + popup)"), + ( + "xdg_wm_base", + "stable", + "window management (toplevel + popup)", + ), // --- protocoles externes très demandés --- ( "zxdg_decoration_manager_v1", diff --git a/crates/redox-wl-test-poll-multifd/src/main.rs b/crates/redox-wl-test-poll-multifd/src/main.rs index 43d2f44..e1a1db2 100644 --- a/crates/redox-wl-test-poll-multifd/src/main.rs +++ b/crates/redox-wl-test-poll-multifd/src/main.rs @@ -45,9 +45,21 @@ fn run() -> Result<(), String> { // ---- Subtest A: timeout-only, no fd ready ---- let mut pfds = [ - libc::pollfd { fd: ra, events: libc::POLLIN, revents: 0 }, - libc::pollfd { fd: rb, events: libc::POLLIN, revents: 0 }, - libc::pollfd { fd: rc, events: libc::POLLIN, revents: 0 }, + libc::pollfd { + fd: ra, + events: libc::POLLIN, + revents: 0, + }, + libc::pollfd { + fd: rb, + events: libc::POLLIN, + revents: 0, + }, + libc::pollfd { + fd: rc, + events: libc::POLLIN, + revents: 0, + }, ]; let n = poll_revents(&mut pfds, 50)?; if n != 0 { @@ -62,12 +74,16 @@ fn run() -> Result<(), String> { return Err(format!("write to wb: {}", errno_str())); } - for p in pfds.iter_mut() { p.revents = 0; } + for p in pfds.iter_mut() { + p.revents = 0; + } let n = poll_revents(&mut pfds, 1000)?; if n != 1 { return Err(format!("expected 1 ready fd, got {n}")); } - let ready: Vec<_> = pfds.iter().enumerate() + let ready: Vec<_> = pfds + .iter() + .enumerate() .filter(|(_, p)| p.revents & libc::POLLIN != 0) .map(|(i, _)| i) .collect(); @@ -85,22 +101,33 @@ fn run() -> Result<(), String> { // ---- Subtest C: close write end of A, expect HUP on read end ---- libc::close(wa); - for p in pfds.iter_mut() { p.revents = 0; } + for p in pfds.iter_mut() { + p.revents = 0; + } let n = poll_revents(&mut pfds, 100)?; if n < 1 { - return Err(format!("expected at least 1 ready (POLLHUP on ra), got {n}")); + return Err(format!( + "expected at least 1 ready (POLLHUP on ra), got {n}" + )); } let hup_a = pfds[0].revents & (libc::POLLHUP | libc::POLLIN) != 0; if !hup_a { - return Err(format!("expected HUP/IN on ra, revents={:#x}", pfds[0].revents)); + return Err(format!( + "expected HUP/IN on ra, revents={:#x}", + pfds[0].revents + )); } - println!("[test-04] C: closing wa caused POLLHUP/POLLIN on ra (revents={:#x})", - pfds[0].revents); + println!( + "[test-04] C: closing wa caused POLLHUP/POLLIN on ra (revents={:#x})", + pfds[0].revents + ); // Cleanup libc::close(ra); - libc::close(rb); libc::close(wb); - libc::close(rc); libc::close(wc); + libc::close(rb); + libc::close(wb); + libc::close(rc); + libc::close(wc); } Ok(()) diff --git a/crates/redox-wl-test-shm-open/src/main.rs b/crates/redox-wl-test-shm-open/src/main.rs index 395b51d..4d9667b 100644 --- a/crates/redox-wl-test-shm-open/src/main.rs +++ b/crates/redox-wl-test-shm-open/src/main.rs @@ -30,11 +30,7 @@ fn errno_str() -> String { unsafe fn shm_open_rw_create(name: &str, mode: libc::mode_t) -> Result { let cname = CString::new(name).unwrap(); - let fd = libc::shm_open( - cname.as_ptr(), - libc::O_RDWR | libc::O_CREAT, - mode as _, - ); + let fd = libc::shm_open(cname.as_ptr(), libc::O_RDWR | libc::O_CREAT, mode as _); if fd < 0 { return Err(format!("shm_open({name}): {}", errno_str())); } @@ -107,7 +103,9 @@ fn run() -> Result<(), String> { libc::close(fd2); let cname = CString::new(SHM_NAME).unwrap(); libc::shm_unlink(cname.as_ptr()); - return Err(format!("pixel {i} mismatch: got {p:#x}, expected {expected:#x}")); + return Err(format!( + "pixel {i} mismatch: got {p:#x}, expected {expected:#x}" + )); } } println!("[test-03] phase2: pattern verified across close/reopen"); diff --git a/crates/redox-wl-test-shm-pipeline/src/main.rs b/crates/redox-wl-test-shm-pipeline/src/main.rs index 0927315..32125bb 100644 --- a/crates/redox-wl-test-shm-pipeline/src/main.rs +++ b/crates/redox-wl-test-shm-pipeline/src/main.rs @@ -23,21 +23,19 @@ use std::sync::{Arc, Mutex}; use std::time::{Duration, Instant}; use wayland_client::{ - Connection as ClientConnection, Dispatch as ClientDispatch, EventQueue, Proxy as _, - QueueHandle as ClientQueueHandle, backend::Backend as ClientBackend, protocol::{ wl_buffer::WlBuffer as ClientBuffer, wl_compositor::WlCompositor as ClientCompositor, wl_registry, wl_shm::WlShm as ClientShm, wl_shm_pool::WlShmPool as ClientShmPool, wl_surface::WlSurface as ClientSurface, }, + Connection as ClientConnection, Dispatch as ClientDispatch, EventQueue, Proxy as _, + QueueHandle as ClientQueueHandle, }; use wayland_server::{ - Client, DataInit, Display as ServerDisplay, DisplayHandle, GlobalDispatch, backend::ClientData, - protocol::{ - wl_buffer, wl_callback, wl_compositor, wl_shm, wl_shm_pool, wl_surface, - }, + protocol::{wl_buffer, wl_callback, wl_compositor, wl_shm, wl_shm_pool, wl_surface}, + Client, DataInit, Display as ServerDisplay, DisplayHandle, GlobalDispatch, }; const W: i32 = 100; @@ -215,8 +213,7 @@ impl wayland_server::Dispatch for ServerState { state.obs.lock().unwrap().surface_attached = true; eprintln!("[server] wl_surface.attach"); } - wl_surface::Request::Damage { .. } - | wl_surface::Request::DamageBuffer { .. } => { + wl_surface::Request::Damage { .. } | wl_surface::Request::DamageBuffer { .. } => { eprintln!("[server] wl_surface.damage"); } wl_surface::Request::Commit => { @@ -260,7 +257,12 @@ impl ClientDispatch for ClientState { _conn: &ClientConnection, qh: &ClientQueueHandle, ) { - if let wl_registry::Event::Global { name, interface, version } = event { + if let wl_registry::Event::Global { + name, + interface, + version, + } = event + { eprintln!("[client] global #{name}: {interface} v{version}"); match interface.as_str() { "wl_compositor" => { @@ -332,7 +334,10 @@ unsafe fn create_shm_buffer(name: &str, size: usize) -> Result<(OwnedFd, *mut u8 use std::os::fd::FromRawFd; unsafe fn child_main(server_path: &str) -> ! { - eprintln!("[client pid={}] connecting to {server_path}", libc::getpid()); + eprintln!( + "[client pid={}] connecting to {server_path}", + libc::getpid() + ); // Connect to the server socket let stream = match UnixStream::connect(server_path) { @@ -393,9 +398,13 @@ unsafe fn child_main(server_path: &str) -> ! { // Create wl_buffer let buffer = pool.create_buffer( - 0, W, H, STRIDE, + 0, + W, + H, + STRIDE, wayland_client::protocol::wl_shm::Format::Argb8888, - &qh, (), + &qh, + (), ); // Create wl_surface @@ -439,8 +448,8 @@ fn run() -> Result<(), String> { let obs = Arc::new(Mutex::new(ServerObservation::default())); - let mut display: ServerDisplay = ServerDisplay::new() - .map_err(|e| format!("Display::new: {e:?}"))?; + let mut display: ServerDisplay = + ServerDisplay::new().map_err(|e| format!("Display::new: {e:?}"))?; let mut dh = display.handle(); dh.create_global::(5, ()); dh.create_global::(1, ()); @@ -549,7 +558,11 @@ fn run() -> Result<(), String> { for (x, y, got, want) in &mismatches { eprintln!("[server] mismatch at ({x},{y}): got {got:#010x} want {want:#010x}"); } - return Err(format!("{} pixel mismatches in {} total", mismatches.len(), W * H)); + return Err(format!( + "{} pixel mismatches in {} total", + mismatches.len(), + W * H + )); } println!( diff --git a/crates/redox-wl-test-unix-socket/src/main.rs b/crates/redox-wl-test-unix-socket/src/main.rs index 3c8164e..213c1da 100644 --- a/crates/redox-wl-test-unix-socket/src/main.rs +++ b/crates/redox-wl-test-unix-socket/src/main.rs @@ -44,8 +44,10 @@ fn main() -> ExitCode { eprintln!("[test-01] FAIL: write_all: {e}"); return ExitCode::FAILURE; } - println!("[test-01] sent {} bytes (header 8 + payload {} aligned to {})", - total_size, payload_len, aligned_len); + println!( + "[test-01] sent {} bytes (header 8 + payload {} aligned to {})", + total_size, payload_len, aligned_len + ); let mut header = [0u8; 8]; if let Err(e) = b.read_exact(&mut header) { @@ -58,7 +60,9 @@ fn main() -> ExitCode { let recv_op = (recv_so & 0xFFFF) as u16; if recv_oid != OBJECT_ID || recv_op != OPCODE || recv_size != total_size { - eprintln!("[test-01] FAIL: header mismatch oid={recv_oid:#x} op={recv_op:#x} size={recv_size}"); + eprintln!( + "[test-01] FAIL: header mismatch oid={recv_oid:#x} op={recv_op:#x} size={recv_size}" + ); return ExitCode::FAILURE; } @@ -72,7 +76,9 @@ fn main() -> ExitCode { return ExitCode::FAILURE; } - println!("[test-01] PASS: roundtrip OK, {} bytes recv, oid={:#x} op={:#x}", - total_size, recv_oid, recv_op); + println!( + "[test-01] PASS: roundtrip OK, {} bytes recv, oid={:#x} op={:#x}", + total_size, recv_oid, recv_op + ); ExitCode::SUCCESS } diff --git a/crates/redox-wl-wayland-frontend/Cargo.toml b/crates/redox-wl-wayland-frontend/Cargo.toml index 0f0691d..9d43ef8 100644 --- a/crates/redox-wl-wayland-frontend/Cargo.toml +++ b/crates/redox-wl-wayland-frontend/Cargo.toml @@ -11,3 +11,4 @@ wayland-server = { path = "../../../wayland-rs/wayland-server", default-features wayland-backend = { path = "../../../wayland-rs/wayland-backend", default-features = false } wayland-protocols = { path = "../../../wayland-rs/wayland-protocols", default-features = false, features = ["server"] } libc = "0.2" +tracing = { version = "0.1", default-features = false, features = ["std", "attributes"] } diff --git a/crates/redox-wl-wayland-frontend/src/lib.rs b/crates/redox-wl-wayland-frontend/src/lib.rs index 4f7952f..2e08dab 100644 --- a/crates/redox-wl-wayland-frontend/src/lib.rs +++ b/crates/redox-wl-wayland-frontend/src/lib.rs @@ -27,17 +27,19 @@ use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::{Arc, Mutex}; use std::time::{Duration, Instant}; +use tracing::{debug, error, info, warn}; + use redox_wl_compositor_core::{Framebuffer, SurfaceBuffer, SurfaceId, SurfaceRegistry}; use wayland_protocols::xdg::shell::server::{ xdg_popup, xdg_positioner, xdg_surface, xdg_toplevel, xdg_wm_base, }; use wayland_server::{ - Client, DataInit, Display as WlDisplay, DisplayHandle, GlobalDispatch, Resource, backend::{ClientData, ClientId, DisconnectReason}, protocol::{ - wl_buffer, wl_callback, wl_compositor, wl_keyboard, wl_pointer, wl_region, wl_seat, - wl_shm, wl_shm_pool, wl_surface, + wl_buffer, wl_callback, wl_compositor, wl_keyboard, wl_pointer, wl_region, wl_seat, wl_shm, + wl_shm_pool, wl_surface, }, + Client, DataInit, Display as WlDisplay, DisplayHandle, GlobalDispatch, Resource, }; use redox_wl_input::InputEvent as RedoxInputEvent; @@ -259,6 +261,40 @@ fn compute_resize_geom( (new_x, new_y, new_w, new_h) } +/// Phase 7.9 : applique les contraintes `set_min_size` / `set_max_size`. +/// Convention spec wayland-protocols : `(0, 0)` = pas de contrainte +/// active (axe par axe). Une dimension `min > 0` impose `w >= min`, +/// une dimension `max > 0` impose `w <= max`. +fn clamp_to_min_max(w: u32, h: u32, min: (i32, i32), max: (i32, i32)) -> (u32, u32) { + let mut w = w; + let mut h = h; + if min.0 > 0 { + w = w.max(min.0 as u32); + } + if min.1 > 0 { + h = h.max(min.1 as u32); + } + if max.0 > 0 { + w = w.min(max.0 as u32); + } + if max.1 > 0 { + h = h.min(max.1 as u32); + } + (w, h) +} + +/// Phase 7.9 : décide si un `xdg_toplevel.configure` doit être envoyé +/// pendant un drag de resize. Skip si la taille n'a pas bougé OU si +/// le dernier configure date de moins de `min_interval` (~60 fps). +fn should_throttle_configure( + new_size: (u32, u32), + last_size: (u32, u32), + elapsed: Duration, + min_interval: Duration, +) -> bool { + new_size == last_size || elapsed < min_interval +} + /// Phase 7.7 : état d'un drag interactif en cours. Posé par le handler /// `xdg_toplevel.Move`/`Resize`, lu par `forward_input` pour appliquer /// les deltas, retiré au release du bouton gauche. @@ -432,10 +468,7 @@ impl WaylandFrontend { let cd = DumbClientData { dead_clients: Arc::clone(&self.dead_clients), }; - let _ = self - .display - .handle() - .insert_client(stream, Arc::new(cd)); + let _ = self.display.handle().insert_client(stream, Arc::new(cd)); } Ok(None) => break, // pas de client en attente Err(e) if e.kind() == std::io::ErrorKind::WouldBlock => break, @@ -497,8 +530,8 @@ impl WaylandFrontend { // déjà déconnecté. self.pointers.retain(|p| p.client().is_some()); self.keyboards.retain(|k| k.client().is_some()); - println!( - "[frontend] garbage_collect: client {cid:?} → destroyed {} surfaces", + info!( + "garbage_collect: client {cid:?} → destroyed {} surfaces", to_destroy.len() ); } @@ -571,19 +604,12 @@ impl WaylandFrontend { .as_ref() .and_then(|s| s.data::>()) .and_then(|d| *d.id.lock().unwrap()); - println!( - "[frontend] focus change: {old_sid:?} → {new_sid:?}" - ); + info!("focus change: {old_sid:?} → {new_sid:?}"); // Phase 7.9 : envoyer configure(w, h, [Activated]) au nouveau // focused toplevel et configure(w, h, []) à l'ancien, pour que // les toolkits puissent styler le focus (titlebar active, etc.). let empty_state: Vec = vec![]; - let activated_state: Vec = vec![ - (xdg_toplevel::State::Activated as u32) as u8, - 0, - 0, - 0, - ]; + let activated_state: Vec = vec![(xdg_toplevel::State::Activated as u32) as u8, 0, 0, 0]; if let Some(sid) = old_sid { if let Some(tl) = self.toplevels_by_id.get(&sid).cloned() { self.send_focus_configure(&tl, sid, empty_state); @@ -616,12 +642,7 @@ impl WaylandFrontend { // surface_x, surface_y : on prend la position relative // simple basée sur cursor - surface origin let (sx, sy) = self.surface_local_cursor(new); - ptr.enter( - serial_enter, - new, - fixed_from_int(sx), - fixed_from_int(sy), - ); + ptr.enter(serial_enter, new, fixed_from_int(sx), fixed_from_int(sy)); if SEAT_VERSION >= 5 { ptr.frame(); } @@ -658,7 +679,12 @@ impl WaylandFrontend { let (w, h) = self .registry .get(sid) - .and_then(|s| s.current().buffer.as_ref().map(|b| (b.width as i32, b.height as i32))) + .and_then(|s| { + s.current() + .buffer + .as_ref() + .map(|b| (b.width as i32, b.height as i32)) + }) .unwrap_or(DEFAULT_TOPLEVEL_SIZE); toplevel.configure(w, h, states); if let Some(td) = toplevel.data::>() { @@ -709,22 +735,12 @@ impl WaylandFrontend { ); // Phase 7.9 : clamp aux contraintes min/max envoyées // par le client via xdg_toplevel.set_min/max_size. - // (0, 0) = pas de contrainte. if let Some(td) = drag.xdg_toplevel_res.data::>() { - let (min_w, min_h) = *td.min_size.lock().unwrap(); - let (max_w, max_h) = *td.max_size.lock().unwrap(); - if min_w > 0 { - new_w = new_w.max(min_w as u32); - } - if min_h > 0 { - new_h = new_h.max(min_h as u32); - } - if max_w > 0 { - new_w = new_w.min(max_w as u32); - } - if max_h > 0 { - new_h = new_h.min(max_h as u32); - } + let min = *td.min_size.lock().unwrap(); + let max = *td.max_size.lock().unwrap(); + let clamped = clamp_to_min_max(new_w, new_h, min, max); + new_w = clamped.0; + new_h = clamped.1; } // Mettre à jour la position côté compositor immédiatement // (la taille effective dépendra du prochain commit du client). @@ -738,22 +754,20 @@ impl WaylandFrontend { // (re)allocations côté client : skip si la taille n'a // pas changé OU si moins de 16ms depuis le dernier // configure (~60fps max). - let same_size = (new_w, new_h) == drag.last_configure_size; - let too_soon = - drag.last_configure_at.elapsed() < Duration::from_millis(16); - if same_size || too_soon { + if should_throttle_configure( + (new_w, new_h), + drag.last_configure_size, + drag.last_configure_at.elapsed(), + Duration::from_millis(16), + ) { return true; } // Annoncer la nouvelle taille au client. Le state // `Resizing` (3) indique au toolkit qu'il est en train // d'être redimensionné. - let resizing_state: Vec = vec![ - (xdg_toplevel::State::Resizing as u32) as u8, - 0, - 0, - 0, - ]; + let resizing_state: Vec = + vec![(xdg_toplevel::State::Resizing as u32) as u8, 0, 0, 0]; drag.xdg_toplevel_res .configure(new_w as i32, new_h as i32, resizing_state); let serial = self.next_xdg_serial; @@ -876,14 +890,14 @@ impl WaylandFrontend { // Phase 7.7 : si drag actif et le bouton gauche est relâché, // sortir du mode drag avant l'envoi du button au client. if !*left && self.interactive_drag.is_some() { - println!("[frontend] left-release → exit interactive drag"); + info!("left-release → exit interactive drag"); self.interactive_drag = None; } if *left { let hit = self.registry.hit_test(self.cursor_x, self.cursor_y); - println!( - "[frontend] left-click @ ({}, {}) → hit_test = {:?}", + debug!( + "left-click @ ({}, {}) → hit_test = {:?}", self.cursor_x, self.cursor_y, hit ); if let Some(sid) = hit { @@ -959,11 +973,7 @@ impl WaylandFrontend { continue; } if *dy != 0 { - ptr.axis( - time, - wl_pointer::Axis::VerticalScroll, - fixed_from_int(*dy), - ); + ptr.axis(time, wl_pointer::Axis::VerticalScroll, fixed_from_int(*dy)); } if *dx != 0 { ptr.axis( @@ -1271,7 +1281,7 @@ impl wayland_server::Dispatch for WaylandFrontend { data_init.init(id, Arc::new(Mutex::new(p))); } Err(e) => { - eprintln!("[frontend] shm CreatePool mmap failed: {e}"); + error!("shm CreatePool mmap failed: {e}"); // En cas d'échec on ne peut pas init le pool. Le client va // probablement avoir un fd resource leaked, mais c'est // moins grave qu'un crash. Implementation simple pour 6.4. @@ -1321,7 +1331,8 @@ impl wayland_server::Dispatch>> for W if valid { let pool_size = pool.lock().unwrap().size as i64; let needed = (offset as i64).saturating_add( - (stride as i64).saturating_mul((height as i64).saturating_sub(1)) + (stride as i64) + .saturating_mul((height as i64).saturating_sub(1)) .saturating_add((width as i64).saturating_mul(4)), ); if needed > pool_size { @@ -1329,8 +1340,8 @@ impl wayland_server::Dispatch>> for W } } if !valid { - println!( - "[frontend] wl_shm_pool.create_buffer rejected: \ + warn!( + "wl_shm_pool.create_buffer rejected: \ offset={offset} width={width} height={height} stride={stride}" ); } @@ -1431,17 +1442,11 @@ impl wayland_server::Dispatch> for Wayla } else { let pool = bd.pool.lock().unwrap(); let pixels_opt = unsafe { - pool.read_argb( - bd.offset as usize, - bd.width, - bd.height, - bd.stride, - ) + pool.read_argb(bd.offset as usize, bd.width, bd.height, bd.stride) }; drop(pool); if let Some(pixels) = pixels_opt { - let sb = - SurfaceBuffer::from_pixels(bd.width, bd.height, pixels); + let sb = SurfaceBuffer::from_pixels(bd.width, bd.height, pixels); // Pour une surface curseur, on stocke le buffer // mais visible=false (cf draw_cursor). state.registry.modify_pending(id, |s| { @@ -1449,9 +1454,7 @@ impl wayland_server::Dispatch> for Wayla s.visible = !is_cursor; }); } else { - println!( - "[frontend] commit: read_argb refused buffer (overrun guard)" - ); + warn!("commit: read_argb refused buffer (overrun guard)"); } } } @@ -1683,8 +1686,8 @@ impl wayland_server::Dispatch> for // abus délibérés. let last = *data.last_serial.lock().unwrap(); if serial > last { - println!( - "[frontend] xdg_surface.ack_configure: serial {serial} > last_sent {last}, ignoring" + warn!( + "xdg_surface.ack_configure: serial {serial} > last_sent {last}, ignoring" ); return; } @@ -1901,9 +1904,7 @@ fn send_keymap_no_keymap(kb: &wl_keyboard::WlKeyboard) { use std::os::fd::AsFd; // ---- xdg_toplevel ---- -impl wayland_server::Dispatch> - for WaylandFrontend -{ +impl wayland_server::Dispatch> for WaylandFrontend { fn request( state: &mut Self, _client: &Client, @@ -1922,19 +1923,16 @@ impl wayland_server::Dispatch> } xdg_toplevel::Request::SetMinSize { width, height } => { *data.min_size.lock().unwrap() = (width, height); - println!("[frontend] xdg_toplevel.set_min_size({width}, {height})"); + debug!("xdg_toplevel.set_min_size({width}, {height})"); } xdg_toplevel::Request::SetMaxSize { width, height } => { *data.max_size.lock().unwrap() = (width, height); - println!("[frontend] xdg_toplevel.set_max_size({width}, {height})"); + debug!("xdg_toplevel.set_max_size({width}, {height})"); } - xdg_toplevel::Request::Move { - seat: _, - serial, - } => { + xdg_toplevel::Request::Move { seat: _, serial } => { // Phase 7.7/7.8 : entrer en mode drag-move. if serial == 0 { - println!("[frontend] xdg_toplevel.move: serial=0 refused"); + warn!("xdg_toplevel.move: serial=0 refused"); return; } // Phase 7.8 : validation soft du serial — log warning si @@ -1942,17 +1940,17 @@ impl wayland_server::Dispatch> // tous les clients utiliseront un vrai serial capté // depuis pointer.button). if state.last_button_serial != 0 && serial != state.last_button_serial { - println!( - "[frontend] xdg_toplevel.move: serial {serial} ≠ last_button {} (accepting)", + debug!( + "xdg_toplevel.move: serial {serial} ≠ last_button {} (accepting)", state.last_button_serial ); } if state.interactive_drag.is_some() { - println!("[frontend] xdg_toplevel.move: drag already in progress"); + warn!("xdg_toplevel.move: drag already in progress"); return; } let Some(xdg_surf) = data.xdg_surface.lock().unwrap().clone() else { - println!("[frontend] xdg_toplevel.move: no parent xdg_surface"); + warn!("xdg_toplevel.move: no parent xdg_surface"); return; }; let Some(xdg_data) = xdg_surf.data::>() else { @@ -1966,8 +1964,8 @@ impl wayland_server::Dispatch> let caller_cid = resource.client().map(|c| c.id()); let owner_cid = surf_data.client_id.lock().unwrap().clone(); if caller_cid != owner_cid { - println!( - "[frontend] xdg_toplevel.move: caller={caller_cid:?} ≠ owner={owner_cid:?} → REJECTED" + warn!( + "xdg_toplevel.move: caller={caller_cid:?} ≠ owner={owner_cid:?} → REJECTED" ); return; } @@ -1997,8 +1995,8 @@ impl wayland_server::Dispatch> last_configure_size: (start_w, start_h), last_configure_at: Instant::now(), }; - println!( - "[frontend] xdg_toplevel.move: enter drag sid={:?} start=({},{}) cursor=({},{})", + info!( + "xdg_toplevel.move: enter drag sid={:?} start=({},{}) cursor=({},{})", sid, st.x, st.y, state.cursor_x, state.cursor_y ); state.interactive_drag = Some(drag); @@ -2014,21 +2012,21 @@ impl wayland_server::Dispatch> Err(_) => 0, }; if serial == 0 { - println!("[frontend] xdg_toplevel.resize: serial=0 refused"); + warn!("xdg_toplevel.resize: serial=0 refused"); return; } if edges_raw == 0 { - println!("[frontend] xdg_toplevel.resize: edges=None, ignoring"); + warn!("xdg_toplevel.resize: edges=None, ignoring"); return; } if state.last_button_serial != 0 && serial != state.last_button_serial { - println!( - "[frontend] xdg_toplevel.resize: serial {serial} ≠ last_button {} (accepting, durcir 7.9)", + debug!( + "xdg_toplevel.resize: serial {serial} ≠ last_button {} (accepting, durcir 7.9)", state.last_button_serial ); } if state.interactive_drag.is_some() { - println!("[frontend] xdg_toplevel.resize: drag already in progress"); + warn!("xdg_toplevel.resize: drag already in progress"); return; } let Some(xdg_surf) = data.xdg_surface.lock().unwrap().clone() else { @@ -2045,8 +2043,8 @@ impl wayland_server::Dispatch> let caller_cid = resource.client().map(|c| c.id()); let owner_cid = surf_data.client_id.lock().unwrap().clone(); if caller_cid != owner_cid { - println!( - "[frontend] xdg_toplevel.resize: caller={caller_cid:?} ≠ owner={owner_cid:?} → REJECTED" + warn!( + "xdg_toplevel.resize: caller={caller_cid:?} ≠ owner={owner_cid:?} → REJECTED" ); return; } @@ -2057,11 +2055,11 @@ impl wayland_server::Dispatch> return; }; let st = s.current(); - let (start_w, start_h) = st - .buffer - .as_ref() - .map(|b| (b.width, b.height)) - .unwrap_or((DEFAULT_TOPLEVEL_SIZE.0 as u32, DEFAULT_TOPLEVEL_SIZE.1 as u32)); + let (start_w, start_h) = + st.buffer.as_ref().map(|b| (b.width, b.height)).unwrap_or(( + DEFAULT_TOPLEVEL_SIZE.0 as u32, + DEFAULT_TOPLEVEL_SIZE.1 as u32, + )); let drag = InteractiveDrag { surface_id: sid, xdg_toplevel_res: resource.clone(), @@ -2076,8 +2074,8 @@ impl wayland_server::Dispatch> last_configure_size: (start_w, start_h), last_configure_at: Instant::now(), }; - println!( - "[frontend] xdg_toplevel.resize: enter drag sid={sid:?} edges={edges_raw} start_geom=({},{},{},{}) cursor=({},{})", + info!( + "xdg_toplevel.resize: enter drag sid={sid:?} edges={edges_raw} start_geom=({},{},{},{}) cursor=({},{})", st.x, st.y, start_w, start_h, state.cursor_x, state.cursor_y ); state.interactive_drag = Some(drag); @@ -2098,3 +2096,151 @@ impl wayland_server::Dispatch> } } } + +// --------------------------------------------------------------------------- +// Tests unitaires xdg-shell (sprint 0 point 4). +// +// Couverture : la logique pure extraite des handlers Dispatch — c.-à-d. +// `compute_resize_geom`, `clamp_to_min_max`, `should_throttle_configure`. +// Pas de Wayland-server runtime ici : ces fns sont libres et déterministes, +// donc isolables. Les tests "protocole" (ack_configure serial, set_focus +// configure) nécessitent un vrai client + Display et sont reportés à une +// future phase d'intégration. +// --------------------------------------------------------------------------- +#[cfg(test)] +mod tests { + use super::*; + + // ---- compute_resize_geom : bord Right (8) ---- + #[test] + fn resize_right_grows_width_keeps_origin() { + let (x, y, w, h) = compute_resize_geom(8, 100, 200, 300, 150, 50, 0); + assert_eq!((x, y), (100, 200)); + assert_eq!((w, h), (350, 150)); + } + + // ---- compute_resize_geom : bord Left (4) ---- + #[test] + fn resize_left_moves_origin_and_shrinks_on_positive_dx() { + let (x, y, w, h) = compute_resize_geom(4, 100, 200, 300, 150, 40, 0); + assert_eq!((x, y), (140, 200)); + assert_eq!((w, h), (260, 150)); + } + + // ---- compute_resize_geom : bord Bottom (2) ---- + #[test] + fn resize_bottom_grows_height_keeps_origin() { + let (x, y, w, h) = compute_resize_geom(2, 100, 200, 300, 150, 0, 70); + assert_eq!((x, y), (100, 200)); + assert_eq!((w, h), (300, 220)); + } + + // ---- compute_resize_geom : bord Top (1) ---- + #[test] + fn resize_top_moves_origin_and_shrinks_on_positive_dy() { + let (x, y, w, h) = compute_resize_geom(1, 100, 200, 300, 150, 0, 60); + assert_eq!((x, y), (100, 260)); + assert_eq!((w, h), (300, 90)); + } + + // ---- compute_resize_geom : coin BottomRight (Bottom|Right = 10) ---- + #[test] + fn resize_bottom_right_corner_grows_both_axes() { + let (x, y, w, h) = compute_resize_geom(10, 100, 200, 300, 150, 25, 35); + assert_eq!((x, y), (100, 200)); + assert_eq!((w, h), (325, 185)); + } + + // ---- compute_resize_geom : delta trop négatif clamp à MIN_RESIZE_DIM ---- + #[test] + fn resize_clamps_to_min_resize_dim_on_extreme_shrink() { + let (_x, _y, w, h) = compute_resize_geom(10, 0, 0, 300, 150, -10_000, -10_000); + assert_eq!((w, h), (MIN_RESIZE_DIM, MIN_RESIZE_DIM)); + } + + // ---- compute_resize_geom : edges=0 (aucun bord) → géom inchangée ---- + #[test] + fn resize_with_no_edges_returns_starting_geometry() { + let (x, y, w, h) = compute_resize_geom(0, 50, 60, 200, 100, 999, 999); + assert_eq!((x, y, w, h), (50, 60, 200, 100)); + } + + // ---- clamp_to_min_max : (0, 0) = pas de contrainte ---- + #[test] + fn clamp_with_zero_constraints_is_identity() { + let (w, h) = clamp_to_min_max(320, 200, (0, 0), (0, 0)); + assert_eq!((w, h), (320, 200)); + } + + // ---- clamp_to_min_max : min seul force le plancher ---- + #[test] + fn clamp_applies_min_floor() { + let (w, h) = clamp_to_min_max(50, 30, (150, 80), (0, 0)); + assert_eq!((w, h), (150, 80)); + } + + // ---- clamp_to_min_max : max seul force le plafond ---- + #[test] + fn clamp_applies_max_ceiling() { + let (w, h) = clamp_to_min_max(900, 500, (0, 0), (600, 400)); + assert_eq!((w, h), (600, 400)); + } + + // ---- clamp_to_min_max : min + max coexistent ---- + #[test] + fn clamp_applies_both_min_and_max() { + // size dans la fenêtre → identique + let (w, h) = clamp_to_min_max(320, 200, (150, 80), (600, 400)); + assert_eq!((w, h), (320, 200)); + // size sous le plancher → remontée + let (w, h) = clamp_to_min_max(10, 10, (150, 80), (600, 400)); + assert_eq!((w, h), (150, 80)); + // size au-dessus du plafond → descente + let (w, h) = clamp_to_min_max(9999, 9999, (150, 80), (600, 400)); + assert_eq!((w, h), (600, 400)); + } + + // ---- clamp_to_min_max : axes indépendants ---- + #[test] + fn clamp_constraints_are_independent_per_axis() { + // min sur width seulement + let (w, h) = clamp_to_min_max(10, 200, (150, 0), (0, 0)); + assert_eq!((w, h), (150, 200)); + // max sur height seulement + let (w, h) = clamp_to_min_max(300, 9999, (0, 0), (0, 400)); + assert_eq!((w, h), (300, 400)); + } + + // ---- should_throttle_configure : même taille → skip ---- + #[test] + fn throttle_skips_when_size_unchanged() { + assert!(should_throttle_configure( + (320, 200), + (320, 200), + Duration::from_secs(10), + Duration::from_millis(16), + )); + } + + // ---- should_throttle_configure : trop tôt → skip ---- + #[test] + fn throttle_skips_when_elapsed_below_min_interval() { + assert!(should_throttle_configure( + (321, 200), + (320, 200), + Duration::from_millis(8), + Duration::from_millis(16), + )); + } + + // ---- should_throttle_configure : taille différente + délai OK → envoie ---- + #[test] + fn throttle_allows_configure_when_size_changed_and_interval_elapsed() { + assert!(!should_throttle_configure( + (321, 200), + (320, 200), + Duration::from_millis(20), + Duration::from_millis(16), + )); + } +} diff --git a/fmt.sh b/fmt.sh new file mode 100755 index 0000000..756b52b --- /dev/null +++ b/fmt.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +# Format toutes les crates du workspace logique (chacune autonome, pas de +# Cargo.toml racine — voir README pour la raison). +# +# Usage : +# ./fmt.sh # format +# ./fmt.sh --check # CI mode : exit 1 si non formatté +set -euo pipefail + +cd "$(dirname "$0")" + +CHECK_FLAG="" +if [[ "${1:-}" == "--check" ]]; then + CHECK_FLAG="--check" +fi + +fail=0 +for crate in crates/*/; do + if [[ -f "$crate/Cargo.toml" ]]; then + echo "==> $crate" + if ! cargo fmt --manifest-path "$crate/Cargo.toml" -- $CHECK_FLAG; then + fail=1 + fi + fi +done + +exit $fail diff --git a/rustfmt.toml b/rustfmt.toml new file mode 100644 index 0000000..c62ffbb --- /dev/null +++ b/rustfmt.toml @@ -0,0 +1,7 @@ +edition = "2021" +max_width = 100 +hard_tabs = false +tab_spaces = 4 +newline_style = "Unix" +use_field_init_shorthand = true +use_try_shorthand = true