Moving repo to github

Licensing changes
add github sponsor yml file
2023-10-09 17:23:54 +02:00 · 2023-10-08 18:29:58 +02:00 · 2023-10-08 18:27:43 +02:00 · 2023-10-03 21:31:22 -07:00 · 2023-10-03 21:19:36 -07:00 · 2023-09-29 22:09:31 -04:00
26 changed files with 341 additions and 5975 deletions
--- a/FUNDING.yml
+++ b/FUNDING.yml
@ -0,0 +1,2 @@
 github: orca-app
 custom: "https://orca-app.dev/sponsor.html"
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,678 +1,207 @@
-Orca
+                                    Orca
-Copyright (C) 2023 Martin Fouilleul and the Orca project contributors
+Copyright (C) 2023 Martin Fouilleul
-This program is free software: you can redistribute it and/or modify
+Orca is distributed under the MIT license or the Apache License version 2.0,
-it under the terms of the GNU Affero General Public License as
+at your option.
 published by the Free Software Foundation version 3, with additional
 terms under section 7 of the GNU Affero General Public License version
 3, as published at the end of this document.
 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 Affero General Public License for more details.
 -------------------------------------------------------------------------------
-                               AGPLv3 LICENSE
+
                                MIT License
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 -------------------------------------------------------------------------------
-                    GNU AFFERO GENERAL PUBLIC LICENSE
+                              Apache License
-                       Version 3, 19 November 2007
+                        Version 2.0, January 2004
-
+                     http://www.apache.org/licenses/
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+
- Everyone is permitted to copy and distribute verbatim copies
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- of this license document, but changing it is not allowed.
+
-
+1. Definitions.
-                            Preamble
+
-
+   "License" shall mean the terms and conditions for use, reproduction,
-  The GNU Affero General Public License is a free, copyleft license for
+   and distribution as defined by Sections 1 through 9 of this document.
-software and other kinds of works, specifically designed to ensure
+
-cooperation with the community in the case of network server software.
+   "Licensor" shall mean the copyright owner or entity authorized by
-
+   the copyright owner that is granting the License.
-  The licenses for most software and other practical works are designed
+
-to take away your freedom to share and change the works.  By contrast,
+   "Legal Entity" shall mean the union of the acting entity and all
-our General Public Licenses are intended to guarantee your freedom to
+   other entities that control, are controlled by, or are under common
-share and change all versions of a program--to make sure it remains free
+   control with that entity. For the purposes of this definition,
-software for all its users.
+   "control" means (i) the power, direct or indirect, to cause the
-
+   direction or management of such entity, whether by contract or
-  When we speak of free software, we are referring to freedom, not
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-price.  Our General Public Licenses are designed to make sure that you
+   outstanding shares, or (iii) beneficial ownership of such entity.
-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
+   "You" (or "Your") shall mean an individual or Legal Entity
-want it, that you can change the software or use pieces of it in new
+   exercising permissions granted by this License.
-free programs, and that you know you can do these things.
+
-
+   "Source" form shall mean the preferred form for making modifications,
-  Developers that use our General Public Licenses protect your rights
+   including but not limited to software source code, documentation
-with two steps: (1) assert copyright on the software, and (2) offer
+   source, and configuration files.
-you this License which gives you legal permission to copy, distribute
+
-and/or modify the software.
+   "Object" form shall mean any form resulting from mechanical
-
+   transformation or translation of a Source form, including but
-  A secondary benefit of defending all users' freedom is that
+   not limited to compiled object code, generated documentation,
-improvements made in alternate versions of the program, if they
+   and conversions to other media types.
-receive widespread use, become available for other developers to
+
-incorporate.  Many developers of free software are heartened and
+   "Work" shall mean the work of authorship, whether in Source or
-encouraged by the resulting cooperation.  However, in the case of
+   Object form, made available under the License, as indicated by a
-software used on network servers, this result may fail to come about.
+   copyright notice that is included in or attached to the work
-The GNU General Public License permits making a modified version and
+   (an example is provided in the Appendix below).
-letting the public access it on a server without ever releasing its
+
-source code to the public.
+   "Derivative Works" shall mean any work, whether in Source or Object
-
+   form, that is based on (or derived from) the Work and for which the
-  The GNU Affero General Public License is designed specifically to
+   editorial revisions, annotations, elaborations, or other modifications
-ensure that, in such cases, the modified source code becomes available
+   represent, as a whole, an original work of authorship. For the purposes
-to the community.  It requires the operator of a network server to
+   of this License, Derivative Works shall not include works that remain
-provide the source code of the modified version running there to the
+   separable from, or merely link (or bind by name) to the interfaces of,
-users of that server.  Therefore, public use of a modified version, on
+   the Work and Derivative Works thereof.
-a publicly accessible server, gives the public access to the source
+
-code of the modified version.
+   "Contribution" shall mean any work of authorship, including
-
+   the original version of the Work and any modifications or additions
-  An older license, called the Affero General Public License and
+   to that Work or Derivative Works thereof, that is intentionally
-published by Affero, was designed to accomplish similar goals.  This is
+   submitted to Licensor for inclusion in the Work by the copyright owner
-a different license, not a version of the Affero GPL, but Affero has
+   or by an individual or Legal Entity authorized to submit on behalf of
-released a new version of the Affero GPL which permits relicensing under
+   the copyright owner. For the purposes of this definition, "submitted"
-this license.
+   means any form of electronic, verbal, or written communication sent
-
+   to the Licensor or its representatives, including but not limited to
-  The precise terms and conditions for copying, distribution and
+   communication on electronic mailing lists, source code control systems,
-modification follow.
+   and issue tracking systems that are managed by, or on behalf of, the
-
+   Licensor for the purpose of discussing and improving the Work, but
-                       TERMS AND CONDITIONS
+   excluding communication that is conspicuously marked or otherwise
-
+   designated in writing by the copyright owner as "Not a Contribution."
-  0. Definitions.
+
-
+   "Contributor" shall mean Licensor and any individual or Legal Entity
-  "This License" refers to version 3 of the GNU Affero General Public License.
+   on behalf of whom a Contribution has been received by Licensor and
-
+   subsequently incorporated within the Work.
-  "Copyright" also means copyright-like laws that apply to other kinds of
+
-works, such as semiconductor masks.
+2. Grant of Copyright License. Subject to the terms and conditions of
-
+   this License, each Contributor hereby grants to You a perpetual,
-  "The Program" refers to any copyrightable work licensed under this
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-License.  Each licensee is addressed as "you".  "Licensees" and
+   copyright license to reproduce, prepare Derivative Works of,
-"recipients" may be individuals or organizations.
+   publicly display, publicly perform, sublicense, and distribute the
-
+   Work and such Derivative Works in Source or Object form.
-  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
+3. Grant of Patent License. Subject to the terms and conditions of
-exact copy.  The resulting work is called a "modified version" of the
+   this License, each Contributor hereby grants to You a perpetual,
-earlier work or a work "based on" the earlier work.
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-
+   (except as stated in this section) patent license to make, have made,
-  A "covered work" means either the unmodified Program or a work based
+   use, offer to sell, sell, import, and otherwise transfer the Work,
-on the Program.
+   where such license applies only to those patent claims licensable
-
+   by such Contributor that are necessarily infringed by their
-  To "propagate" a work means to do anything with it that, without
+   Contribution(s) alone or by combination of their Contribution(s)
-permission, would make you directly or secondarily liable for
+   with the Work to which such Contribution(s) was submitted. If You
-infringement under applicable copyright law, except executing it on a
+   institute patent litigation against any entity (including a
-computer or modifying a private copy.  Propagation includes copying,
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
-distribution (with or without modification), making available to the
+   or a Contribution incorporated within the Work constitutes direct
-public, and in some countries other activities as well.
+   or contributory patent infringement, then any patent licenses
-
+   granted to You under this License for that Work shall terminate
-  To "convey" a work means any kind of propagation that enables other
+   as of the date such litigation is filed.
-parties to make or receive copies.  Mere interaction with a user through
+
-a computer network, with no transfer of a copy, is not conveying.
+4. Redistribution. You may reproduce and distribute copies of the
-
+   Work or Derivative Works thereof in any medium, with or without
-  An interactive user interface displays "Appropriate Legal Notices"
+   modifications, and in Source or Object form, provided that You
-to the extent that it includes a convenient and prominently visible
+   meet the following conditions:
-feature that (1) displays an appropriate copyright notice, and (2)
+
-tells the user that there is no warranty for the work (except to the
+   (a) You must give any other recipients of the Work or
-extent that warranties are provided), that licensees may convey the
+       Derivative Works a copy of this License; and
-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
+   (b) You must cause any modified files to carry prominent notices
-menu, a prominent item in the list meets this criterion.
+       stating that You changed the files; and
-
+
-  1. Source Code.
+   (c) You must retain, in the Source form of any Derivative Works
-
+       that You distribute, all copyright, patent, trademark, and
-  The "source code" for a work means the preferred form of the work
+       attribution notices from the Source form of the Work,
-for making modifications to it.  "Object code" means any non-source
+       excluding those notices that do not pertain to any part of
-form of a work.
+       the Derivative Works; and
-
+
-  A "Standard Interface" means an interface that either is an official
+   (d) If the Work includes a "NOTICE" text file as part of its
-standard defined by a recognized standards body, or, in the case of
+       distribution, then any Derivative Works that You distribute must
-interfaces specified for a particular programming language, one that
+       include a readable copy of the attribution notices contained
-is widely used among developers working in that language.
+       within such NOTICE file, excluding those notices that do not
-
+       pertain to any part of the Derivative Works, in at least one
-  The "System Libraries" of an executable work include anything, other
+       of the following places: within a NOTICE text file distributed
-than the work as a whole, that (a) is included in the normal form of
+       as part of the Derivative Works; within the Source form or
-packaging a Major Component, but which is not part of that Major
+       documentation, if provided along with the Derivative Works; or,
-Component, and (b) serves only to enable use of the work with that
+       within a display generated by the Derivative Works, if and
-Major Component, or to implement a Standard Interface for which an
+       wherever such third-party notices normally appear. The contents
-implementation is available to the public in source code form.  A
+       of the NOTICE file are for informational purposes only and
-"Major Component", in this context, means a major essential component
+       do not modify the License. You may add Your own attribution
-(kernel, window system, and so on) of the specific operating system
+       notices within Derivative Works that You distribute, alongside
-(if any) on which the executable work runs, or a compiler used to
+       or as an addendum to the NOTICE text from the Work, provided
-produce the work, or an object code interpreter used to run it.
+       that such additional attribution notices cannot be construed
-
+       as modifying the License.
-  The "Corresponding Source" for a work in object code form means all
+
-the source code needed to generate, install, and (for an executable
+   You may add Your own copyright statement to Your modifications and
-work) run the object code and to modify the work, including scripts to
+   may provide additional or different license terms and conditions
-control those activities.  However, it does not include the work's
+   for use, reproduction, or distribution of Your modifications, or
-System Libraries, or general-purpose tools or generally available free
+   for any such Derivative Works as a whole, provided Your use,
-programs which are used unmodified in performing those activities but
+   reproduction, and distribution of the Work otherwise complies with
-which are not part of the work.  For example, Corresponding Source
+   the conditions stated in this License.
-includes interface definition files associated with source files for
+
-the work, and the source code for shared libraries and dynamically
+5. Submission of Contributions. Unless You explicitly state otherwise,
-linked subprograms that the work is specifically designed to require,
+   any Contribution intentionally submitted for inclusion in the Work
-such as by intimate data communication or control flow between those
+   by You to the Licensor shall be under the terms and conditions of
-subprograms and other parts of the work.
+   this License, without any additional terms or conditions.
-
+   Notwithstanding the above, nothing herein shall supersede or modify
-  The Corresponding Source need not include anything that users
+   the terms of any separate license agreement you may have executed
-can regenerate automatically from other parts of the Corresponding
+   with Licensor regarding such Contributions.
-Source.
+
-
+6. Trademarks. This License does not grant permission to use the trade
-  The Corresponding Source for a work in source code form is that
+   names, trademarks, service marks, or product names of the Licensor,
-same work.
+   except as required for reasonable and customary use in describing the
-
+   origin of the Work and reproducing the content of the NOTICE file.
-  2. Basic Permissions.
+
-
+7. Disclaimer of Warranty. Unless required by applicable law or
-  All rights granted under this License are granted for the term of
+   agreed to in writing, Licensor provides the Work (and each
-copyright on the Program, and are irrevocable provided the stated
+   Contributor provides its Contributions) on an "AS IS" BASIS,
-conditions are met.  This License explicitly affirms your unlimited
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-permission to run the unmodified Program.  The output from running a
+   implied, including, without limitation, any warranties or conditions
-covered work is covered by this License only if the output, given its
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-content, constitutes a covered work.  This License acknowledges your
+   PARTICULAR PURPOSE. You are solely responsible for determining the
-rights of fair use or other equivalent, as provided by copyright law.
+   appropriateness of using or redistributing the Work and assume any
-
+   risks associated with Your exercise of permissions under this License.
-  You may make, run and propagate covered works that you do not
+
-convey, without conditions so long as your license otherwise remains
+8. Limitation of Liability. In no event and under no legal theory,
-in force.  You may convey covered works to others for the sole purpose
+   whether in tort (including negligence), contract, or otherwise,
-of having them make modifications exclusively for you, or provide you
+   unless required by applicable law (such as deliberate and grossly
-with facilities for running those works, provided that you comply with
+   negligent acts) or agreed to in writing, shall any Contributor be
-the terms of this License in conveying all material for which you do
+   liable to You for damages, including any direct, indirect, special,
-not control copyright.  Those thus making or running the covered works
+   incidental, or consequential damages of any character arising as a
-for you must do so exclusively on your behalf, under your direction
+   result of this License or out of the use or inability to use the
-and control, on terms that prohibit them from making any copies of
+   Work (including but not limited to damages for loss of goodwill,
-your copyrighted material outside their relationship with you.
+   work stoppage, computer failure or malfunction, or any and all
-
+   other commercial damages or losses), even if such Contributor
-  Conveying under any other circumstances is permitted solely under
+   has been advised of the possibility of such damages.
-the conditions stated below.  Sublicensing is not allowed; section 10
+
-makes it unnecessary.
+9. Accepting Warranty or Additional Liability. While redistributing
-
+   the Work or Derivative Works thereof, You may choose to offer,
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+   and charge a fee for, acceptance of support, warranty, indemnity,
-
+   or other liability obligations and/or rights consistent with this
-  No covered work shall be deemed part of an effective technological
+   License. However, in accepting such obligations, You may act only
-measure under any applicable law fulfilling obligations under article
+   on Your own behalf and on Your sole responsibility, not on behalf
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
+   of any other Contributor, and only if You agree to indemnify,
-similar laws prohibiting or restricting circumvention of such
+   defend, and hold each Contributor harmless for any liability
-measures.
+   incurred by, or claims asserted against, such Contributor by reason
-
+   of your accepting any such warranty or additional liability.
-  When you convey a covered work, you waive any legal power to forbid
+
-circumvention of technological measures to the extent such circumvention
+END OF TERMS AND CONDITIONS
 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. Remote Network Interaction; Use with the GNU General Public License.
  Notwithstanding any other provision of this License, if you modify the
 Program, your modified version must prominently offer all users
 interacting with it remotely through a computer network (if your version
 supports such interaction) an opportunity to receive the Corresponding
 Source of your version by providing access to the Corresponding Source
 from a network server at no charge, through some standard or customary
 means of facilitating copying of software.  This Corresponding Source
 shall include the Corresponding Source for any work covered by version 3
 of the GNU General Public License that is incorporated pursuant to the
 following paragraph.
  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 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 work with which it is combined will remain governed by version
 3 of the GNU General Public License.
  14. Revised Versions of this License.
  The Free Software Foundation may publish revised and/or new versions of
 the GNU Affero 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 Affero 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 Affero 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 Affero 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
 --------------------------------------------------------------------------------
                          ADDITIONAL TERMS
 --------------------------------------------------------------------------------
 1. Pursuant to section 7(b) of the AGPLv3, we require the preservation of the legal
 notices, copyright notices and author attributions in the program and in its
 documentation and in the Appropriate Legal Notices displayed by works containing
 it.
 2. Pursuant to Section 7(c) of the AGPLv3, we require that modified versions of the
 material should be marked in a reasonable way as different from the official
 version.
 Any modified material being redistributed must include a prominent and conveniently
 accessible feature for the display of a Modified Material Notice including the statement
 "This program is using a modified version of the Orca Runtime version VERSION_NUMBER
 released on RELEASE_DATE.
 The string VERSION_NUMBER should be replaced with the exact version number of
 the Program on which the modified material is based.
 The string RELEASE_DATE should be replaced with the full date of the release of
 the version VERSION_NUMBER of the Program on which the
 modified material is based.
 The Modified Material Notice must be clearly visible with size of the fonts
 and icons proportionate to the user interface being used.
 The Modified Material Notice must be in the same language of the user interface.
 3. Additional permission for WebAssembly modules used by the Program.
 The Program works by loading and running WebAssembly modules written by third parties.
 To make this work, portions of the Program must be compiled into these WebAssembly modules,
 making them covered work under the terms of this license.
 As an additional permission, WebAssembly modules including unmodified portions of
 the Program to the sole purpose of being bundled with and run by an unmodified version
 of the Program can be distributed under the terms of their author's choice, without being
 bound by the requirements of this license. This permission does not extend to modifications
 of the Program itself or its development libraries.
--- a/Readme.md
+++ b/Readme.md
@ -1,146 +1,2 @@
------
+**This repository is not used anymore. Development of Orca was moved here: [https://github.com/orca-app/orca](https://github.com/orca-app/orca)**
 **DISCLAIMER: This project is very much a Work In Progress. We are making it accessible in this very early state so that participants in the [2023 Wheel Reinvention Jam](https://handmade.network/jam/2023) can try it out and possibly use it as their jamming platform. Expect bugs, missing and/or incomplete features, unstable APIs, and sparse documentation. Some current issues might be a show stopper for you, so make sure you can build and run the sample apps before jumping in.**
 **If you do choose to try out Orca anyway, thank you! We'll do our best to answer your questions, and we'd really appreciate your feedback!**
 ------
 # Orca
 ![Example Orca apps](doc/images/orca-apps-lg.webp)
 Orca is a development platform and runtime environment for cross-platform, sandboxed graphical WebAssembly applications. In this early MVP you can:
 - Receive mouse and keyboard input.
 - Draw paths, images and text using a 2D vector graphics API.
 - Draw 2D/3D graphics using OpenGL ES 3.1 (minus a few features)
 - Build user interfaces using our UI API and default widgets.
 - Read and write files using a capability-based API.
 To learn more about the project and its goals, read the [announcement post](https://orca-app.dev/posts/230607/orca_announcement.html).
 ## Installing
 The Orca command-line tools must be installed to your system in order to use them in your own projects.
 **At this early stage, you must build Orca yourself - in the future, there will be fewer dependencies and this installation process will be streamlined.**
 ### Requirements
 - Windows or Mac (Linux is not yet supported)
 - [Python 3.8](https://www.python.org/) or newer (for command line tools)
 - Clang (version 11.0 or newer)
 	- **Windows users:** `clang` can be installed via the Visual Studio installer. Search for "C++ Clang Compiler".
 	- **Mac users:** Apple's built-in `clang` does not support WebAssembly. We recommend installing `clang` via [Homebrew](https://brew.sh/) with `brew install llvm`.
 - MSVC (Visual Studio 2022 17.5 or newer) (Windows only)
 	- This can be installed through the [Visual Studio Community](https://visualstudio.microsoft.com/) installer. Ensure that your Visual Studio installation includes "Desktop development with C++".
 	- Please note the version requirement! Orca requires C11 atomics, which were only added to MSVC in late 2022.
 - Xcode command-line tools (Mac only)
 	- These can be installed with `xcode-select --install`.
 ### Installation instructions
 **Windows users:** You must perform all the following actions from a 64-bit Visual Studio command prompt. We recommend searching for "x64 Native Tools Command Prompt".
 Clone the repo, then `cd` into the `orca` directory:
 ```
 git clone https://git.handmade.network/hmn/orca.git
 cd orca
 ```
 Build the Orca runtime:
 ```
 python orca dev build-runtime
 ```
 Install the Orca dev tools. If on Windows, the tool can automatically add `orca` to your PATH. Otherwise, you must manually add the Orca install directory to your PATH, e.g. by updating `.zshrc` or `.bashrc`.
 ```
 python orca dev install
 ```
 Finally, verify that Orca is successfully installed by running the `orca version` command. Note the lack of `./`!
 ```
 orca version
 ```
 If you encounter any errors, see the FAQ below.
 Once the `orca` tools are installed and on your PATH, you can use them from anywhere.
 ### Building the sample Orca apps
 The `samples` directory contains several sample apps that demonstrate various Orca features. To build one, `cd` to a sample project's directory and run its build script. For example, for the `breakout` sample:
 ```
 cd samples/breakout
 # Windows
 build.bat
 # Mac
 ./build.sh
 ```
 On Windows this creates a `Breakout` directory in `samples/breakout`. You can launch the app by running `Breakout/bin/Breakout.exe`. On macOS this creates a `Breakout.app` bundle in `samples/breakout` that you can double-click to run.
 ## Writing an Orca app
 Orca apps are WebAssembly modules that use the Orca APIs. The process for creating an Orca application is:
 1. Compile a WebAssembly module using your language and toolchain of choice.
 2. Bundle the WebAssembly module into a native executable using the Orca command-line tools.
 For a more thorough overview, please read the [Quick Start Guide](./doc/QuickStart.md), which will walk you through building a simple application.
 The following additional resources may also help you familiarize yourself with Orca and its APIs:
 - The [samples folder](./samples) contains sample applications that show various aspects of the Orca API and core library:
 	- [`breakout`](./samples/breakout) is a small breakout game making use of the vector graphics API.
 	- [`clock`](./samples/clock) is a simple clock showcasing vector graphics and the time API.
 	- [`triangle`](./samples/triangle) shows how to draw a spinning triangle using the GLES API.
 	- [`fluid`](./samples/fluid) is a fluid simulation using a more complex GLES setup.
 	- [`ui`](./samples/ui) showcases the UI API and Orca's default UI widgets.  
 - The [API Cheatsheets](./doc/cheatsheets) provide a list of Orca API functions, grouped by topic.
 ## FAQ
 **What platforms does Orca support?**
 We currently support Windows 10 and up, and macOS 10.15 and up. We plan to expand to more platforms in the future.
 **What languages can I use with Orca?**
 In principle, you can use any language and toolchain that can produce a WebAssembly module and bind to the Orca APIs. However, several important parts of Orca, such as the UI, are provided as part of the core library, which must be compiled to WebAssembly with your app, and is written in C. Therefore, at this early stage, it may be difficult to use any language other than C.
 C-style C++ is possible but requires compiling the core library in C as a separate object file, and then adding that object to your compile command when building your app.
 We're currently working with contributors to add support for Odin and Zig, and we look forward to expanding the number of officially-supported languages in the future. 
 **Which WebAssembly features does Orca support?**
 We currently use [wasm3](https://github.com/wasm3/wasm3) for our interpreter. We therefore support whatever features wasm3 supports. In practice this means all WebAssembly 1.0 features, bulk memory operations, and a couple other small features.
 **I am getting "unsupported OS" errors when building on Windows.**
 You are likely running from the wrong kind of Visual Studio command prompt. Search for "x64 Native Tools Command Prompt" or run `vcvarsall.bat` with `x64` for the architecture.
 To verify that you are in the correct type of command prompt, simply run `cl` with no arguments, and verify that you are building for x64.
 **I am getting errors about atomics when building the runtime on Windows.**
 Please ensure that you have the latest version of Visual Studio and MSVC installed. The Orca runtime requires the use of C11 atomics, which were not added to MSVC until late 2022.
 **I am getting errors saying that `orca` is not found.**
 Please ensure that you have installed Orca to your system per the installation instructions above. Please also ensure that the Orca install directory is on your PATH. The installation path is printed when running `./orca dev install`.
 ## License
 Orca is distributed under the terms of the GNU Affero General Public License version 3, with additional terms in accordance with section 7 of AGPLv3. These additional terms ensure that:
 - Modified versions of Orca must reasonably inform users that they are modified.
 - You can distribute your application's WebAssembly modules under the terms of your choice, and are not required to license them under the terms of the AGPLv3.
 Copyright and License details can be found in [LICENSE.txt](./LICENSE.txt)
--- a/doc/cheatsheets/cheatsheet_ui.h
+++ b/doc/cheatsheets/cheatsheet_ui.h
@ -29,17 +29,15 @@ oc_ui_sig oc_ui_label(const char* label);
 oc_ui_sig oc_ui_label_str8(oc_str8 label);
 oc_ui_sig oc_ui_button(const char* label);
 oc_ui_sig oc_ui_checkbox(const char* name, bool* checked);
-oc_ui_box* oc_ui_slider(const char* name, f32* value);
+oc_ui_box* oc_ui_slider(const char* label, f32 thumbRatio, f32* scrollValue);
 oc_ui_box* oc_ui_scrollbar(const char* name, f32 thumbRatio, f32* scrollValue);
 oc_ui_text_box_result oc_ui_text_box(const char* name, oc_arena* arena, oc_str8 text);
 oc_ui_select_popup_info oc_ui_select_popup(const char* name, oc_ui_select_popup_info* info);
 oc_ui_radio_group_info oc_ui_radio_group(const char* name, oc_ui_radio_group_info* info);
 void oc_ui_panel_begin(const char* name, oc_ui_flags flags);
 void oc_ui_panel_end(void);
 #define oc_ui_panel(s, f)
-void oc_ui_menu_bar_begin(const char* name);
+void oc_ui_menu_bar_begin(const char* label);
 void oc_ui_menu_bar_end(void);
 #define oc_ui_menu_bar(name)
@ -47,11 +45,11 @@ void oc_ui_menu_begin(const char* label);
 void oc_ui_menu_end(void);
 #define oc_ui_menu(name)
-oc_ui_sig oc_ui_menu_button(const char* label);
+oc_ui_sig oc_ui_menu_button(const char* name);
-oc_ui_sig oc_ui_tooltip_begin(const char* label);
+oc_ui_sig oc_ui_tooltip_begin(const char* name);
 void oc_ui_tooltip_end(void);
-#define oc_ui_tooltip(label)
+#define oc_ui_tooltip(name)
 //-------------------------------------------------------------------------------------
 // Styling
--- a/samples/fluid/src/main.c
+++ b/samples/fluid/src/main.c
@ -140,6 +140,7 @@ frame_buffer divBuffer[4];
 GLuint vertexBuffer;
 oc_surface surface;
 f64 startTime;
 //----------------------------------------------------------------
 //NOTE(martin): initialization
@ -403,6 +404,7 @@ typedef struct mouse_input
 } mouse_input;
 mouse_input mouseInput = { 0 };
 bool mouseWasDown = false;
 int frameWidth = 800;
 int frameHeight = 600;
@ -410,6 +412,7 @@ int frameHeight = 600;
 ORCA_EXPORT void oc_on_mouse_down(int button)
 {
    mouseInput.down = true;
    mouseWasDown = true;
 }
 ORCA_EXPORT void oc_on_mouse_up(int button)
@ -577,23 +580,56 @@ void multigrid_clear(frame_buffer* error)
 void input_splat(float t)
 {
-    //NOTE: apply force and dye
+    bool applySplat = false;
-    if(mouseInput.down && (mouseInput.deltaX || mouseInput.deltaY))
+    float x, y, deltaX, deltaY;
    static f64 lastFrameTime = 0;
    if (lastFrameTime == 0)
    {
        lastFrameTime = startTime;
    }
    f64 now = oc_clock_time(OC_CLOCK_MONOTONIC);
    float frameDuration = now - lastFrameTime;
    lastFrameTime = now;
    if (mouseInput.down && (mouseInput.deltaX || mouseInput.deltaY))
    {
        oc_vec2 scaling = oc_surface_contents_scaling(surface);
        applySplat = true;
        x = mouseInput.x * scaling.x / frameWidth;
        y = mouseInput.y * scaling.y / frameHeight;
        deltaX = 1. / 60 / frameDuration * mouseInput.deltaX * scaling.x / frameWidth;
        deltaY = 1. / 60 / frameDuration * mouseInput.deltaY * scaling.y / frameHeight;
        mouseInput.deltaX = 0;
        mouseInput.deltaY = 0;
    }
    f64 timeSinceStart = now - startTime;
    if (!mouseWasDown && timeSinceStart < 1)
    {
        applySplat = true;
        float totalDeltaX = 0.5;
        x = 0.1 + totalDeltaX * timeSinceStart;
        y = 0.5;
        deltaX = totalDeltaX / 180;
        deltaY = 0;
    }
    //NOTE: apply force and dye
    if(applySplat)
    {
        // account for margin
        float margin = 32;
        float offset = margin / texWidth;
        float ratio = 1 - 2 * margin / texWidth;
-        float splatPosX = (mouseInput.x * scaling.x / frameWidth) * ratio + offset;
+        float splatPosX = x * ratio + offset;
-        float splatPosY = (1 - mouseInput.y * scaling.y / frameHeight) * ratio + offset;
+        float splatPosY = (1 - y) * ratio + offset;
-        float splatVelX = (10000. * DELTA * mouseInput.deltaX * scaling.x / frameWidth) * ratio;
+        float splatVelX = (10000. * DELTA * deltaX) * ratio;
-        float splatVelY = (-10000. * DELTA * mouseInput.deltaY * scaling.y / frameWidth) * ratio;
+        float splatVelY = (-10000. * DELTA * deltaY) * ratio;
-        float intensity = 100 * sqrtf(square(ratio * mouseInput.deltaX * scaling.x / frameWidth) + square(ratio * mouseInput.deltaY * scaling.y / frameHeight));
+        float intensity = 100 * sqrtf(square(ratio * deltaX) + square(ratio * deltaY));
        float r = intensity * (sinf(2 * M_PI * 0.1 * t) + 1);
        float g = 0.5 * intensity * (cosf(2 * M_PI * 0.1 / M_E * t + 654) + 1);
@ -602,9 +638,6 @@ void input_splat(float t)
        float radius = 0.005;
        apply_splat(splatPosX, splatPosY, radius, splatVelX, splatVelY, r, g, b, false);
        mouseInput.deltaX = 0;
        mouseInput.deltaY = 0;
    }
 }
@ -677,6 +710,8 @@ ORCA_EXPORT void oc_on_init()
            testDiv[i][j][0] = 0.5 + 0.5 * cosf(j / 100. * 3.14159 + i / 100. * 1.2139);
        }
    }
    startTime = oc_clock_time(OC_CLOCK_MONOTONIC);
 }
 ORCA_EXPORT void oc_on_resize(u32 width, u32 height)
--- a/samples/ui/src/main.c
+++ b/samples/ui/src/main.c
@ -73,12 +73,6 @@ ORCA_EXPORT void oc_on_raw_event(oc_event* event)
    oc_ui_process_event(event);
 }
 ORCA_EXPORT void oc_on_resize(u32 width, u32 height)
 {
    frameSize.x = width;
    frameSize.y = height;
 }
 void log_push(const char* line)
 {
    oc_str8_list_push(&logArena, &logLines, (oc_str8)OC_STR8(line));
@ -164,6 +158,12 @@ void labeled_slider(const char* label, f32* value)
    }
 }
 ORCA_EXPORT void oc_on_resize(u32 width, u32 height)
 {
    frameSize.x = width;
    frameSize.y = height;
 }
 void reset_next_radio_group_to_dark_theme(oc_arena* arena);
 ORCA_EXPORT void oc_on_frame_refresh(void)
@ -330,7 +330,7 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
                            radioSelected = result.selectedIndex;
                            if(result.changed)
                            {
-                                log_pushf("Selected %s", options[result.selectedIndex].ptr);
+                                log_pushf("Selected Radio %i", result.selectedIndex + 1);
                            }
                            //-----------------------------------------------------------------------------
@ -359,13 +359,13 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
                                                     .size.height = { OC_UI_SIZE_TEXT } },
                                     OC_UI_STYLE_SIZE);
                    static oc_str8 text = OC_STR8_LIT("Text box");
-                    oc_ui_text_box_result result = oc_ui_text_box("text", scratch.arena, text);
+                    oc_ui_text_box_result res = oc_ui_text_box("text", scratch.arena, text);
-                    if(result.changed)
+                    if(res.changed)
                    {
                        oc_arena_clear(&textArena);
-                        text = oc_str8_push_copy(&textArena, result.text);
+                        text = oc_str8_push_copy(&textArena, res.text);
                    }
-                    if(result.accepted)
+                    if(res.accepted)
                    {
                        log_pushf("Entered text \"%s\"", text.ptr);
                    }
@ -465,7 +465,7 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
                    oc_ui_style_next(&(oc_ui_style){ .size.width = { OC_UI_SIZE_PARENT, 1 },
                                                     .size.height = { OC_UI_SIZE_PIXELS, 152 },
-                                                     .layout.margin.x = 310,
+                                                     .layout.margin.x = 320,
                                                     .layout.margin.y = 16,
                                                     .bgColor = OC_UI_DARK_THEME.bg0,
                                                     .roundness = OC_UI_DARK_THEME.roundnessSmall },
@ -527,8 +527,8 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
                                                    | OC_UI_STYLE_BG_COLOR
                                                    | OC_UI_STYLE_ROUNDNESS);
                        oc_ui_tag labelTag = oc_ui_tag_make("label");
                        oc_ui_pattern labelPattern = { 0 };
                        oc_ui_tag labelTag = oc_ui_tag_make("label");
                        oc_ui_pattern_push(scratch.arena, &labelPattern, (oc_ui_selector){ .kind = OC_UI_SEL_TAG, .tag = labelTag });
                        oc_ui_style_match_after(labelPattern,
                                                &(oc_ui_style){ .color = labelFontColor,
@ -818,32 +818,32 @@ ORCA_EXPORT void oc_on_frame_refresh(void)
 // You won't need it in a real program as long as your colors come from ui.theme or ui.theme->palette
 void reset_next_radio_group_to_dark_theme(oc_arena* arena)
 {
-    oc_ui_tag unselectedTag = oc_ui_tag_make("radio");
+    oc_ui_tag defaultTag = oc_ui_tag_make("radio");
-    oc_ui_pattern unselectedPattern = { 0 };
+    oc_ui_pattern defaultPattern = { 0 };
-    oc_ui_pattern_push(arena, &unselectedPattern, (oc_ui_selector){ .kind = OC_UI_SEL_TAG, .tag = unselectedTag });
+    oc_ui_pattern_push(arena, &defaultPattern, (oc_ui_selector){ .kind = OC_UI_SEL_TAG, .tag = defaultTag });
-    oc_ui_style unselectedStyle = { .borderColor = OC_UI_DARK_THEME.text3,
+    oc_ui_style defaultStyle = { .borderColor = OC_UI_DARK_THEME.text3,
-                                    .borderSize = 1 };
+                                 .borderSize = 1 };
-    oc_ui_style_mask unselectedMask = OC_UI_STYLE_BORDER_COLOR
+    oc_ui_style_mask defaultMask = OC_UI_STYLE_BORDER_COLOR
-                                    | OC_UI_STYLE_BORDER_SIZE;
+                                 | OC_UI_STYLE_BORDER_SIZE;
-    oc_ui_style_match_after(unselectedPattern, &unselectedStyle, unselectedMask);
+    oc_ui_style_match_after(defaultPattern, &defaultStyle, defaultMask);
-    oc_ui_pattern unselectedHoverPattern = { 0 };
+    oc_ui_pattern hoverPattern = { 0 };
-    oc_ui_pattern_push(arena, &unselectedHoverPattern, (oc_ui_selector){ .kind = OC_UI_SEL_TAG, .tag = unselectedTag });
+    oc_ui_pattern_push(arena, &hoverPattern, (oc_ui_selector){ .kind = OC_UI_SEL_TAG, .tag = defaultTag });
-    oc_ui_pattern_push(arena, &unselectedHoverPattern, (oc_ui_selector){ .op = OC_UI_SEL_AND, .kind = OC_UI_SEL_STATUS, .status = OC_UI_HOVER });
+    oc_ui_pattern_push(arena, &hoverPattern, (oc_ui_selector){ .op = OC_UI_SEL_AND, .kind = OC_UI_SEL_STATUS, .status = OC_UI_HOVER });
    oc_ui_style hoverStyle = { .bgColor = OC_UI_DARK_THEME.fill0,
                               .borderColor = OC_UI_DARK_THEME.primary };
    oc_ui_style_mask hoverMask = OC_UI_STYLE_BG_COLOR
                               | OC_UI_STYLE_BORDER_COLOR;
-    oc_ui_style_match_after(unselectedHoverPattern, &hoverStyle, hoverMask);
+    oc_ui_style_match_after(hoverPattern, &hoverStyle, hoverMask);
-    oc_ui_pattern unselectedActivePattern = { 0 };
+    oc_ui_pattern activePattern = { 0 };
-    oc_ui_pattern_push(arena, &unselectedActivePattern, (oc_ui_selector){ .kind = OC_UI_SEL_TAG, .tag = unselectedTag });
+    oc_ui_pattern_push(arena, &activePattern, (oc_ui_selector){ .kind = OC_UI_SEL_TAG, .tag = defaultTag });
-    oc_ui_pattern_push(arena, &unselectedActivePattern, (oc_ui_selector){ .op = OC_UI_SEL_AND, .kind = OC_UI_SEL_STATUS, .status = OC_UI_ACTIVE });
+    oc_ui_pattern_push(arena, &activePattern, (oc_ui_selector){ .op = OC_UI_SEL_AND, .kind = OC_UI_SEL_STATUS, .status = OC_UI_ACTIVE });
    oc_ui_style activeStyle = { .bgColor = OC_UI_DARK_THEME.fill1,
                                .borderColor = OC_UI_DARK_THEME.primary };
    oc_ui_style_mask activeMask = OC_UI_STYLE_BG_COLOR
                                | OC_UI_STYLE_BORDER_COLOR;
-    oc_ui_style_match_after(unselectedActivePattern, &activeStyle, activeMask);
+    oc_ui_style_match_after(activePattern, &activeStyle, activeMask);
    oc_ui_tag selectedTag = oc_ui_tag_make("radio_selected");
    oc_ui_pattern selectedPattern = { 0 };
--- a/samples/zig-sample/.gitignore
+++ b/samples/zig-sample/.gitignore
@ -1,6 +0,0 @@
 Sample
 zig-out
 zig-cache
 liborca.a
 profile.dtrace
 profile.spall
--- a/samples/zig-sample/README.md
+++ b/samples/zig-sample/README.md
@ -1,13 +0,0 @@
 ### Build and run
 Zig version `0.11.0` or greater is required for this sample. To build and run:
 ```
 orca dev build-runtime
 zig build run
 ```
 These two commands build the runtime - the native host executable - and the sample as a loadable wasm library, then runs it. To only build the sample without running it, use `zig build bundle`.
 ### Warning
 Zig bindings for Orca are in-progress and experimental. You may encounter bugs since not all the bound APIs have been tested extensively - this sample is currently the only code doing so! Additionally, not all APIs have zig coverage yet, notably:
 * `gles`
 As more APIs get tested, there is a possibility of breaking changes. Please report any bugs you find on the Handmade discord in the #orca channel.
--- a/samples/zig-sample/build.zig
+++ b/samples/zig-sample/build.zig
@ -1,107 +0,0 @@
 const std = @import("std");
 const builtin = @import("builtin");
 fn addSourceString(str: []const u8, strings: *std.ArrayList(u8), sources: *std.ArrayList([]const u8)) !void {
    var begin = strings.items.len;
    try strings.appendSlice(str);
    var realstring = strings.items[begin..];
    try sources.append(realstring);
 }
 pub fn build(b: *std.Build) !void {
    const optimize = b.standardOptimizeOption(.{});
    var wasm_target = std.zig.CrossTarget{
        .cpu_arch = .wasm32,
        .os_tag = .freestanding,
    };
    wasm_target.cpu_features_add.addFeature(@intFromEnum(std.Target.wasm.Feature.bulk_memory));
    var orca_source_strings = try std.ArrayList(u8).initCapacity(b.allocator, 1024 * 4);
    var orca_sources = try std.ArrayList([]const u8).initCapacity(b.allocator, 128);
    defer orca_source_strings.deinit();
    defer orca_sources.deinit();
    {
        try addSourceString("../../src/orca.c", &orca_source_strings, &orca_sources);
        var libc_shim_dir = try std.fs.cwd().openIterableDir("../../src/libc-shim/src", .{});
        var walker = try libc_shim_dir.walk(b.allocator);
        defer walker.deinit();
        while (try walker.next()) |entry| {
            const extension = std.fs.path.extension(entry.path);
            if (std.mem.eql(u8, extension, ".c")) {
                var path_buffer: [std.fs.MAX_PATH_BYTES]u8 = undefined;
                var abs_path = try libc_shim_dir.dir.realpath(entry.path, &path_buffer);
                try addSourceString(abs_path, &orca_source_strings, &orca_sources);
            }
        }
    }
    const orca_compile_opts = [_][]const u8{
        "-D__ORCA__",
        "--no-standard-libraries",
        "-fno-builtin",
        "-g",
        "-O2",
        "-mexec-model=reactor",
        "-fno-sanitize=undefined",
        "-isystem ../../src/libc-shim/include",
        "-I../../src",
        "-I../../src/ext",
        "-Wl,--export-dynamic",
    };
    var orca_lib = b.addStaticLibrary(.{
        .name = "orca",
        .target = wasm_target,
        .optimize = optimize,
    });
    orca_lib.rdynamic = true;
    orca_lib.addIncludePath(.{ .path = "../../src" });
    orca_lib.addIncludePath(.{ .path = "../../src/libc-shim/include" });
    orca_lib.addIncludePath(.{ .path = "../../src/ext" });
    orca_lib.addCSourceFiles(orca_sources.items, &orca_compile_opts);
    // builds the wasm module out of the orca C sources and main.zig
    const orca_module: *std.Build.Module = b.createModule(.{
        .source_file = .{ .path = "../../src/orca.zig" },
    });
    const wasm_lib = b.addSharedLibrary(.{
        .name = "module",
        .root_source_file = .{ .path = "src/main.zig" },
        .target = wasm_target,
        .optimize = optimize,
    });
    wasm_lib.rdynamic = true;
    wasm_lib.addIncludePath(.{ .path = "../../src" });
    wasm_lib.addIncludePath(.{ .path = "../../src/libc-shim/include" });
    wasm_lib.addIncludePath(.{ .path = "../../ext" });
    wasm_lib.addModule("orca", orca_module);
    wasm_lib.linkLibrary(orca_lib);
    // copies the wasm module into zig-out/wasm_lib
    b.installArtifact(wasm_lib);
    // Runs the orca build command
    const bundle_cmd_str = [_][]const u8{ "orca", "bundle", "--orca-dir", "../..", "--name", "Sample", "--icon", "icon.png", "--resource-dir", "data", "zig-out/lib/module.wasm" };
    var bundle_cmd = b.addSystemCommand(&bundle_cmd_str);
    bundle_cmd.step.dependOn(b.getInstallStep());
    const bundle_step = b.step("bundle", "Runs the orca toolchain to bundle the wasm module into an orca app.");
    bundle_step.dependOn(&bundle_cmd.step);
    // Runs the app
    const run_cmd_windows = [_][]const u8{"Sample/bin/Sample.exe"};
    const run_cmd_macos = [_][]const u8{ "open", "Sample.app" };
    const run_cmd_str: []const []const u8 = switch (builtin.os.tag) {
        .windows => &run_cmd_windows,
        .macos => &run_cmd_macos,
        else => @compileError("unsupported platform"),
    };
    var run_cmd = b.addSystemCommand(run_cmd_str);
    run_cmd.step.dependOn(&bundle_cmd.step);
    const run_step = b.step("run", "Runs the bundled app using the Orca runtime.");
    run_step.dependOn(&run_cmd.step);
 }
--- a/samples/zig-sample/data/ZigFontReadMe.txt
+++ b/samples/zig-sample/data/ZigFontReadMe.txt
@ -1,29 +0,0 @@
 T E P I D   M O N K E Y   F O N T S
 freeware fonts for a freeware world
 Site:   http://www.tepidmonkey.com/
 E-mail: brandon@tepidmonkey.com
 Thanks for your interest in my fonts!
 For help on how to unzip, unstuff or install one of my 
 fonts, please visit my site at 
 www.tepidmonkey.com and go to the Help section.
 If you have any comments or questions, you can e-mail 
 me at brandon@tepidmonkey.com and I'll try to reply as 
 soon as possible.
 Every week, I present a brand new original font for 
 your downloading pleasure, so be sure to visit my web 
 site every Sunday.
 You may use this font(s) for non-commercial and 
 commercial purposes. You are not allowed to sell this 
 font for any fee at all. You are allowed to 
 redistribute it as long as you don't charge ANYTHING 
 for it (at all) and if you include this unaltered 
 Read Me file. You may not change any aspect of the font 
 file or this file.
 For the full set of terms of use (which override what 
 is listed here), go to www.tepidmonkey.com 
 and visit the Terms section.
--- a/samples/zig-sample/data/orca_jumping.jpg
+++ b/samples/zig-sample/data/orca_jumping.jpg
--- a/samples/zig-sample/data/zig.ttf
+++ b/samples/zig-sample/data/zig.ttf
--- a/samples/zig-sample/icon.png
+++ b/samples/zig-sample/icon.png
--- a/samples/zig-sample/src/main.zig
+++ b/samples/zig-sample/src/main.zig
@ -1,289 +0,0 @@
 const std = @import("std");
 const oc = @import("orca");
 const lerp = std.math.lerp;
 const Vec2 = oc.Vec2;
 const Mat2x3 = oc.Mat2x3;
 const Str8 = oc.Str8;
 var surface: oc.Surface = undefined;
 var canvas: oc.Canvas = undefined;
 var font: oc.Font = undefined;
 var orca_image: oc.Image = undefined;
 var gradient_image: oc.Image = undefined;
 var counter: u32 = 0;
 var last_seconds: f64 = 0;
 var frame_size: Vec2 = .{ .x = 0, .y = 0 };
 var rotation_demo: f32 = 0;
 export fn oc_on_init() void {
    oc.windowSetTitle("zig sample");
    oc.windowSetSize(Vec2{ .x = 480, .y = 640 });
    oc.log.info("current platform: {}", .{oc.getHostPlatform()}, @src());
    surface = oc.Surface.canvas();
    canvas = oc.Canvas.create();
    oc.assert(oc.Canvas.nil().isNil() == true, "nil canvas should be nil", .{}, @src());
    oc.assert(canvas.isNil() == false, "created canvas should not be nil", .{}, @src());
    const ranges = oc.UnicodeRange.range(&[_]oc.UnicodeRange.Enum{
        .BasicLatin,
        .C1ControlsAndLatin1Supplement,
        .LatinExtendedA,
        .LatinExtendedB,
        .Specials,
    });
    font = oc.Font.createFromPath("/zig.ttf", &ranges);
    oc.assert(oc.Font.nil().isNil() == true, "nil font should be nil", .{}, @src());
    oc.assert(font.isNil() == false, "created font should not be nil", .{}, @src());
    orca_image = oc.Image.createFromPath(surface, Str8.fromSlice("/orca_jumping.jpg"), false);
    oc.assert(oc.Image.nil().isNil() == true, "nil image should be nil", .{}, @src());
    oc.assert(orca_image.isNil() == false, "created image should not be nil", .{}, @src());
    // generate a gradient and upload it to an image
    {
        const width = 256;
        const height = 128;
        const tl = oc.Color{ .r = 70.0 / 255.0, .g = 13.0 / 255.0, .b = 108.0 / 255.0 };
        const bl = oc.Color{ .r = 251.0 / 255.0, .g = 167.0 / 255.0, .b = 87.0 / 255.0 };
        const tr = oc.Color{ .r = 48.0 / 255.0, .g = 164.0 / 255.0, .b = 219.0 / 255.0 };
        const br = oc.Color{ .r = 151.0 / 255.0, .g = 222.0 / 255.0, .b = 150.0 / 255.0 };
        var pixels: [width * height]u32 = undefined;
        for (0..height) |y| {
            for (0..width) |x| {
                const h: f32 = @floatFromInt(height - 1);
                const w: f32 = @floatFromInt(width - 1);
                const y_norm: f32 = @as(f32, @floatFromInt(y)) / h;
                const x_norm: f32 = @as(f32, @floatFromInt(x)) / w;
                const tl_weight = (1 - x_norm) * (1 - y_norm);
                const bl_weight = (1 - x_norm) * y_norm;
                const tr_weight = x_norm * (1 - y_norm);
                const br_weight = x_norm * y_norm;
                const r: f32 = tl_weight * tl.r + bl_weight * bl.r + tr_weight * tr.r + br_weight * br.r;
                const g: f32 = tl_weight * tl.g + bl_weight * bl.g + tr_weight * tr.g + br_weight * br.g;
                const b: f32 = tl_weight * tl.b + bl_weight * bl.b + tr_weight * tr.b + br_weight * br.b;
                const color = oc.Color{ .r = r, .g = g, .b = b, .a = 1.0 };
                pixels[y * width + x] = color.toRgba8();
            }
        }
        gradient_image = oc.Image.create(surface, width, height);
        gradient_image.uploadRegionRgba8(oc.Rect.xywh(0, 0, width, height), @ptrCast((&pixels).ptr));
    }
 }
 export fn oc_on_resize(width: u32, height: u32) void {
    frame_size = Vec2{ .x = @floatFromInt(width), .y = @floatFromInt(height) };
    oc.log.info("frame resize: {d:.2}, {d:.2}", .{ frame_size.x, frame_size.y }, @src());
 }
 export fn oc_on_mouse_down(button: oc.MouseButton) void {
    oc.log.info("mouse down! {}", .{button}, @src());
 }
 export fn oc_on_mouse_up(button: oc.MouseButton) void {
    oc.log.info("mouse up! {}", .{button}, @src());
 }
 export fn oc_on_mouse_wheel(dx: f32, dy: f32) void {
    oc.log.info("mouse wheel! dx: {d:.2}, dy: {d:.2}", .{ dx, dy }, @src());
 }
 export fn oc_on_key_down(scan: oc.ScanCode, key: oc.KeyCode) void {
    oc.log.info("key down: {} {}", .{ scan, key }, @src());
 }
 export fn oc_on_key_up(scan: oc.ScanCode, key: oc.KeyCode) void {
    oc.log.info("key up: {} {}", .{ scan, key }, @src());
    switch (key) {
        oc.KeyCode.Escape => oc.requestQuit(),
        oc.KeyCode.B => oc.abort("aborting", .{}, @src()),
        oc.KeyCode.A => oc.assert(false, "test assert failed", .{}, @src()),
        oc.KeyCode.W => oc.log.warn("logging a test warning", .{}, @src()),
        oc.KeyCode.E => oc.log.err("logging a test error", .{}, @src()),
        else => {},
    }
 }
 export fn oc_on_frame_refresh() void {
    counter += 1;
    const secs: f64 = oc.clock.time(.Date);
    if (last_seconds != @floor(secs)) {
        last_seconds = @floor(secs);
        oc.log.info("seconds since Jan 1, 1970: {d:.0}", .{secs}, @src());
    }
    _ = canvas.select();
    oc.Canvas.setColorRgba(0.05, 0.05, 0.05, 1.0);
    oc.Canvas.clear();
    oc.Canvas.setColorRgba(1.0, 0.05, 0.05, 1.0);
    {
        const translation: Mat2x3 = .{ .m = [_]f32{ 1, 0, 50, 0, 1, 50 } };
        Mat2x3.push(translation);
        defer Mat2x3.pop();
        oc.assert(std.meta.eql(Mat2x3.top(), translation), "top of matrix stack should be what we pushed", .{}, @src());
        oc.Canvas.setWidth(1);
        oc.Canvas.rectangleFill(50, 0, 10, 10);
        oc.Canvas.rectangleStroke(70, 0, 10, 10);
        oc.Canvas.roundedRectangleFill(90, 0, 10, 10, 3);
        oc.Canvas.roundedRectangleStroke(110, 0, 10, 10, 3);
        const green = oc.Color{ .r = 0.05, .g = 1, .b = 0.05, .a = 1 };
        oc.Canvas.setColor(green);
        oc.assert(std.meta.eql(oc.Canvas.getColor(), green), "color should be green", .{}, @src());
        oc.Canvas.setTolerance(1);
        oc.Canvas.setJoint(.Bevel);
        oc.Canvas.ellipseFill(140, 5, 10, 5);
        oc.Canvas.ellipseStroke(170, 5, 10, 5);
        oc.Canvas.circleFill(195, 5, 5);
        oc.Canvas.circleStroke(215, 5, 5);
        oc.Canvas.arc(230, 5, 5, 0, std.math.pi);
    }
    {
        rotation_demo += 0.03;
        const rot = Mat2x3.rotate(rotation_demo);
        const trans = Mat2x3.translate(285, 55);
        Mat2x3.push(Mat2x3.mul_m(trans, rot));
        defer Mat2x3.pop();
        oc.Canvas.rectangleFill(-5, -5, 10, 10);
    }
    {
        var scratch_scope = oc.Arena.scratchBegin();
        defer scratch_scope.end();
        var scratch: *oc.Arena = scratch_scope.arena;
        var str1: Str8 = Str8.collate(scratch, &[_][]const u8{ "Hello", "from", "Zig!" }, ">> ", " ", " <<") catch |e| fatal(e, @src());
        var str2_list = oc.Str8List.init();
        str2_list.push(scratch, Str8.fromSlice("All")) catch |e| fatal(e, @src());
        str2_list.pushf(scratch, "your", .{}) catch |e| fatal(e, @src());
        str2_list.pushSlice(scratch, "base!!") catch |e| fatal(e, @src());
        oc.assert(str2_list.containsSlice("All"), "str2_list should have the string we just pushed", .{}, @src());
        {
            var elt_first = str2_list.list.first;
            var elt_last = str2_list.list.last;
            oc.assert(elt_first != null, "list checks", .{}, @src());
            oc.assert(elt_last != null, "list checks", .{}, @src());
            oc.assert(elt_first != elt_last, "list checks", .{}, @src());
            oc.assert(elt_first.?.next != null, "list checks", .{}, @src());
            oc.assert(elt_first.?.prev == null, "list checks", .{}, @src());
            oc.assert(elt_last.?.next == null, "list checks", .{}, @src());
            oc.assert(elt_last.?.prev != null, "list checks", .{}, @src());
            oc.assert(elt_first.?.next != elt_last, "list checks", .{}, @src());
            oc.assert(elt_last.?.prev != elt_first, "list checks", .{}, @src());
        }
        var str2: Str8 = str2_list.collate(scratch, Str8.fromSlice("<< "), Str8.fromSlice("-"), Str8.fromSlice(" >>")) catch |e| fatal(e, @src());
        const font_size = 18;
        const text_metrics = font.textMetrics(font_size, str1);
        const text_rect = text_metrics.ink;
        const center_x = frame_size.x / 2;
        const text_begin_x = center_x - text_rect.w / 2;
        Mat2x3.push(Mat2x3.translate(text_begin_x, 100));
        defer Mat2x3.pop();
        oc.Canvas.setColorRgba(1.0, 0.05, 0.05, 1.0);
        oc.Canvas.setFont(font);
        oc.Canvas.setFontSize(font_size);
        oc.Canvas.moveTo(0, 0);
        oc.Canvas.textOutlines(str1);
        oc.Canvas.moveTo(0, 35);
        oc.Canvas.textOutlines(str2);
        oc.Canvas.fill();
    }
    {
        var scratch_scope = oc.Arena.scratchBegin();
        defer scratch_scope.end();
        var scratch: *oc.Arena = scratch_scope.arena;
        var separators = oc.Str8List.init();
        separators.pushSlice(scratch, " ") catch |e| fatal(e, @src());
        separators.pushSlice(scratch, "|") catch |e| fatal(e, @src());
        separators.pushSlice(scratch, "-") catch |e| fatal(e, @src());
        const big_string = Str8.fromSlice("This is |a one-word string that  |  has no      spaces in it");
        var strings: oc.Str8List = big_string.split(scratch, separators) catch |e| fatal(e, @src());
        var collated = strings.join(scratch) catch |e| fatal(e, @src());
        oc.Canvas.setFontSize(12);
        oc.Canvas.moveTo(0, 170);
        oc.Canvas.textOutlines(collated);
        oc.Canvas.fill();
    }
    {
        const orca_size = orca_image.size();
        {
            const trans = Mat2x3.translate(0, 200);
            const scale = Mat2x3.scaleUniform(0.25);
            Mat2x3.push(Mat2x3.mul_m(trans, scale));
            defer Mat2x3.pop();
            orca_image.draw(oc.Rect.xywh(0, 0, orca_size.x, orca_size.y));
            var half_size = orca_size;
            half_size.x /= 2;
            orca_image.drawRegion(oc.Rect.xywh(0, 0, half_size.x, half_size.y), oc.Rect.xywh(orca_size.x + 10, 0, half_size.x, half_size.y));
        }
        {
            const x_offset = orca_size.x * 0.25 + orca_size.x * 0.25 * 0.5 + 5;
            const gradient_size = gradient_image.size();
            const trans = Mat2x3.translate(x_offset, 200);
            const scale = Mat2x3.scaleUniform((orca_size.y * 0.25) / gradient_size.y);
            Mat2x3.push(Mat2x3.mul_m(trans, scale));
            defer Mat2x3.pop();
            gradient_image.draw(oc.Rect.xywh(0, 0, gradient_size.x, gradient_size.y));
        }
    }
    surface.select();
    canvas.render();
    surface.present();
 }
 export fn oc_on_terminate() void {
    oc.log.info("byebye {}", .{counter}, @src());
 }
 fn fatal(err: anyerror, source: std.builtin.SourceLocation) noreturn {
    oc.abort("Caught fatal {}", .{err}, source);
    unreachable;
 }
 fn oneMinusLerp(a: anytype, b: anytype, t: anytype) @TypeOf(a, b, t) {
    return 1.0 - lerp(a, b, t);
 }
--- a/samples/zig-ui/.gitignore
+++ b/samples/zig-ui/.gitignore
@ -1,6 +0,0 @@
 UI
 zig-out
 zig-cache
 liborca.a
 profile.dtrace
 profile.spall
--- a/samples/zig-ui/README.md
+++ b/samples/zig-ui/README.md
@ -1,13 +0,0 @@
 ### Build and run
 Zig version `0.11.0` or greater is required for this sample. To build and run:
 ```
 orca dev build-runtime
 zig build run
 ```
 These two commands build the runtime - the native host executable - and the sample as a loadable wasm library, then runs it. To only build the sample without running it, use `zig build bundle`.
 ### Warning
 Zig bindings for Orca are in-progress and experimental. You may encounter bugs since not all the bound APIs have been tested extensively - this sample is currently the only code doing so! Additionally, not all APIs have zig coverage yet, notably:
 * `gles`
 As more APIs get tested, there is a possibility of breaking changes. Please report any bugs you find on the Handmade discord in the #orca channel.
--- a/samples/zig-ui/build.zig
+++ b/samples/zig-ui/build.zig
@ -1,107 +0,0 @@
 const std = @import("std");
 const builtin = @import("builtin");
 fn addSourceString(str: []const u8, strings: *std.ArrayList(u8), sources: *std.ArrayList([]const u8)) !void {
    var begin = strings.items.len;
    try strings.appendSlice(str);
    var realstring = strings.items[begin..];
    try sources.append(realstring);
 }
 pub fn build(b: *std.Build) !void {
    const optimize = b.standardOptimizeOption(.{});
    var wasm_target = std.zig.CrossTarget{
        .cpu_arch = .wasm32,
        .os_tag = .freestanding,
    };
    wasm_target.cpu_features_add.addFeature(@intFromEnum(std.Target.wasm.Feature.bulk_memory));
    var orca_source_strings = try std.ArrayList(u8).initCapacity(b.allocator, 1024 * 4);
    var orca_sources = try std.ArrayList([]const u8).initCapacity(b.allocator, 128);
    defer orca_source_strings.deinit();
    defer orca_sources.deinit();
    {
        try addSourceString("../../src/orca.c", &orca_source_strings, &orca_sources);
        var libc_shim_dir = try std.fs.cwd().openIterableDir("../../src/libc-shim/src", .{});
        var walker = try libc_shim_dir.walk(b.allocator);
        defer walker.deinit();
        while (try walker.next()) |entry| {
            const extension = std.fs.path.extension(entry.path);
            if (std.mem.eql(u8, extension, ".c")) {
                var path_buffer: [std.fs.MAX_PATH_BYTES]u8 = undefined;
                var abs_path = try libc_shim_dir.dir.realpath(entry.path, &path_buffer);
                try addSourceString(abs_path, &orca_source_strings, &orca_sources);
            }
        }
    }
    const orca_compile_opts = [_][]const u8{
        "-D__ORCA__",
        "--no-standard-libraries",
        "-fno-builtin",
        "-g",
        "-O2",
        "-mexec-model=reactor",
        "-fno-sanitize=undefined",
        "-isystem ../../src/libc-shim/include",
        "-I../../src",
        "-I../../src/ext",
        "-Wl,--export-dynamic",
    };
    var orca_lib = b.addStaticLibrary(.{
        .name = "orca",
        .target = wasm_target,
        .optimize = optimize,
    });
    orca_lib.rdynamic = true;
    orca_lib.addIncludePath(.{ .path = "../../src" });
    orca_lib.addIncludePath(.{ .path = "../../src/libc-shim/include" });
    orca_lib.addIncludePath(.{ .path = "../../src/ext" });
    orca_lib.addCSourceFiles(orca_sources.items, &orca_compile_opts);
    // builds the wasm module out of the orca C sources and main.zig
    const orca_module: *std.Build.Module = b.createModule(.{
        .source_file = .{ .path = "../../src/orca.zig" },
    });
    const wasm_lib = b.addSharedLibrary(.{
        .name = "module",
        .root_source_file = .{ .path = "src/main.zig" },
        .target = wasm_target,
        .optimize = optimize,
    });
    wasm_lib.rdynamic = true;
    wasm_lib.addIncludePath(.{ .path = "../../src" });
    wasm_lib.addIncludePath(.{ .path = "../../src/libc-shim/include" });
    wasm_lib.addIncludePath(.{ .path = "../../ext" });
    wasm_lib.addModule("orca", orca_module);
    wasm_lib.linkLibrary(orca_lib);
    // copies the wasm module into zig-out/wasm_lib
    b.installArtifact(wasm_lib);
    // Runs the orca build command
    const bundle_cmd_str = [_][]const u8{ "orca", "bundle", "--orca-dir", "../..", "--name", "UI", "--resource-dir", "data", "zig-out/lib/module.wasm" };
    var bundle_cmd = b.addSystemCommand(&bundle_cmd_str);
    bundle_cmd.step.dependOn(b.getInstallStep());
    const bundle_step = b.step("bundle", "Runs the orca toolchain to bundle the wasm module into an orca app.");
    bundle_step.dependOn(&bundle_cmd.step);
    // Runs the app
    const run_cmd_windows = [_][]const u8{"UI/bin/UI.exe"};
    const run_cmd_macos = [_][]const u8{ "open", "UI.app" };
    const run_cmd_str: []const []const u8 = switch (builtin.os.tag) {
        .windows => &run_cmd_windows,
        .macos => &run_cmd_macos,
        else => @compileError("unsupported platform"),
    };
    var run_cmd = b.addSystemCommand(run_cmd_str);
    run_cmd.step.dependOn(&bundle_cmd.step);
    const run_step = b.step("run", "Runs the bundled app using the Orca runtime.");
    run_step.dependOn(&run_cmd.step);
 }
--- a/samples/zig-ui/data/OpenSans-Bold.ttf
+++ b/samples/zig-ui/data/OpenSans-Bold.ttf
--- a/samples/zig-ui/data/OpenSans-Regular.ttf
+++ b/samples/zig-ui/data/OpenSans-Regular.ttf
--- a/samples/zig-ui/src/main.zig
+++ b/samples/zig-ui/src/main.zig
@ -1,871 +0,0 @@
 const std = @import("std");
 const oc = @import("orca");
 const ui = oc.ui;
 var frame_size: oc.Vec2 = .{ .x = 1200, .y = 838 };
 var surface: oc.Surface = undefined;
 var canvas: oc.Canvas = undefined;
 var font_regular: oc.Font = undefined;
 var font_bold: oc.Font = undefined;
 var ui_ctx: ui.Context = undefined;
 var text_arena: oc.Arena = undefined;
 var log_arena: oc.Arena = undefined;
 var log_lines: oc.Str8List = undefined;
 const Cmd = enum {
    None,
    SetDarkTheme,
    SetLightTheme,
 };
 var cmd: Cmd = .None;
 export fn oc_on_init() void {
    oc.windowSetTitle("Orca Zig UI Demo");
    oc.windowSetSize(frame_size);
    surface = oc.Surface.canvas();
    canvas = oc.Canvas.create();
    ui.init(&ui_ctx);
    var fonts = [_]*oc.Font{ &font_regular, &font_bold };
    var font_names = [_][]const u8{ "/OpenSans-Regular.ttf", "/OpenSans-Bold.ttf" };
    for (fonts, font_names) |font, name| {
        var scratch = oc.Arena.scratchBegin();
        defer scratch.end();
        var file = oc.File.open(oc.Str8.fromSlice(name), .{ .read = true }, .{});
        if (file.lastError() != oc.io.Error.Ok) {
            oc.log.err("Couldn't open file {s}", .{name}, @src());
        }
        var size = file.getSize();
        var buffer = scratch.arena.push(size) catch {
            oc.log.err("Out of memory", .{}, @src());
            return;
        };
        _ = file.read(size, buffer);
        file.close();
        var ranges = oc.UnicodeRange.range(&[_]oc.UnicodeRange.Enum{
            .BasicLatin,
            .C1ControlsAndLatin1Supplement,
            .LatinExtendedA,
            .LatinExtendedB,
            .Specials,
        });
        font.* = oc.Font.createFromMemory(buffer[0..size], &ranges);
    }
    text_arena = oc.Arena.init();
    log_arena = oc.Arena.init();
    log_lines = oc.Str8List.init();
 }
 export fn oc_on_raw_event(event: *oc.CEvent) void {
    ui.processCEvent(event);
 }
 export fn oc_on_resize(width: u32, height: u32) void {
    frame_size.x = @floatFromInt(width);
    frame_size.y = @floatFromInt(height);
 }
 export fn oc_on_frame_refresh() void {
    var scratch = oc.Arena.scratchBegin();
    defer scratch.end();
    switch (cmd) {
        .SetDarkTheme => ui.setTheme(ui.dark_theme),
        .SetLightTheme => ui.setTheme(ui.light_theme),
        .None => {},
    }
    cmd = .None;
    var default_style = ui.Style{ .font = font_regular };
    {
        ui.beginFrame(frame_size, &default_style);
        defer ui.endFrame();
        //--------------------------------------------------------------------------------------------
        // Menu bar
        //--------------------------------------------------------------------------------------------
        {
            ui.menuBarBegin("menu_bar");
            defer ui.menuBarEnd();
            {
                ui.menuBegin("File");
                defer ui.menuEnd();
                if (ui.menuButton("Quit").pressed) {
                    oc.requestQuit();
                }
            }
            {
                ui.menuBegin("Theme");
                defer ui.menuEnd();
                if (ui.menuButton("Dark theme").pressed) {
                    cmd = .SetDarkTheme;
                }
                if (ui.menuButton("Light theme").pressed) {
                    cmd = .SetLightTheme;
                }
            }
        }
        {
            ui.panelBegin("main panel", .{});
            defer ui.panelEnd();
            {
                ui.styleNext(.{
                    .size = .{
                        .width = .fill_parent,
                        .height = .{ .custom = .{ .kind = .Parent, .value = 1, .relax = 1 } },
                    },
                    .layout = .{
                        .axis = .X,
                        .margin = .{ .x = 16, .y = 16 },
                        .spacing = 16,
                    },
                });
                _ = ui.boxBegin("Background", .{ .draw_background = true });
                defer _ = ui.boxEnd();
                widgets(scratch.arena);
                styling(scratch.arena);
            }
        }
    }
    _ = canvas.select();
    surface.select();
    oc.Canvas.setColor(ui_ctx.theme.bg0);
    oc.Canvas.clear();
    ui.draw();
    canvas.render();
    surface.present();
 }
 var checkbox_checked: bool = false;
 var v_slider_value: f32 = 0;
 var v_slider_logged_value: f32 = 0;
 var v_slider_log_time: f64 = 0;
 var radio_selected: usize = 0;
 var h_slider_value: f32 = 0;
 var h_slider_logged_value: f32 = 0;
 var h_slider_log_time: f64 = 0;
 var text: []const u8 = "Text box";
 var selected: ?usize = null;
 fn widgets(arena: *oc.Arena) void {
    columnBegin("Widgets", 1.0 / 3.0);
    defer columnEnd();
    {
        ui.styleNext(.{
            .size = .{
                .width = .fill_parent,
            },
            .layout = .{
                .axis = .X,
                .spacing = 32,
            },
        });
        _ = ui.boxBegin("top", .{});
        defer _ = ui.boxEnd();
        {
            ui.styleNext(.{
                .layout = .{
                    .axis = .Y,
                    .spacing = 24,
                },
            });
            _ = ui.boxBegin("top_left", .{});
            defer _ = ui.boxEnd();
            //-----------------------------------------------------------------------------
            // Label
            //-----------------------------------------------------------------------------
            _ = ui.makeLabel("Label");
            //-----------------------------------------------------------------------------
            // Button
            //-----------------------------------------------------------------------------
            if (ui.button("Button").clicked) {
                logPush("Button clicked");
            }
            {
                ui.styleNext(.{
                    .layout = .{
                        .axis = .X,
                        .alignment = .{ .y = .Center },
                        .spacing = 8,
                    },
                });
                _ = ui.boxBegin("checkbox", .{});
                defer _ = ui.boxEnd();
                //-------------------------------------------------------------------------
                // Checkbox
                //-------------------------------------------------------------------------
                if (ui.checkbox("checkbox", &checkbox_checked).clicked) {
                    if (checkbox_checked) {
                        logPush("Checkbox checked");
                    } else {
                        logPush("Checkbox unhecked");
                    }
                }
                _ = ui.makeLabel("Checkbox");
            }
        }
        //---------------------------------------------------------------------------------
        // Vertical slider
        //---------------------------------------------------------------------------------
        ui.styleNext(.{ .size = .{ .height = .{ .pixels = 130 } } });
        _ = ui.slider("v_slider", &v_slider_value);
        var now = oc.clock.time(.Monotonic);
        if ((now - v_slider_log_time) >= 0.2 and v_slider_value != v_slider_logged_value) {
            logPushf("Vertical slider moved to {d:.3}", .{v_slider_value});
            v_slider_logged_value = v_slider_value;
            v_slider_log_time = now;
        }
        {
            ui.styleNext(.{
                .layout = .{
                    .axis = .Y,
                    .spacing = 24,
                },
            });
            _ = ui.boxBegin("top right", .{});
            defer _ = ui.boxEnd();
            //-----------------------------------------------------------------------------
            // Tooltip
            //-----------------------------------------------------------------------------
            if (ui.makeLabel("Tooltip").hovering) {
                ui.tooltip("Hi");
            }
            //-----------------------------------------------------------------------------
            // Radio group
            //-----------------------------------------------------------------------------
            var options = [_][]const u8{
                "Radio 1",
                "Radio 2",
            };
            var radio_group_info = ui.RadioGroupInfo{
                .selected_index = radio_selected,
                .options = &options,
            };
            var result = ui.radioGroup("radio_group", &radio_group_info);
            radio_selected = result.selected_index.?;
            if (result.changed) {
                logPushf("Selected {s}", .{options[radio_selected]});
            }
            //-----------------------------------------------------------------------------
            // Horizontal slider
            //-----------------------------------------------------------------------------
            ui.styleNext(.{ .size = .{ .width = .{ .pixels = 130 } } });
            _ = ui.slider("h_slider", &h_slider_value);
            if ((now - h_slider_log_time) >= 0.2 and h_slider_value != h_slider_logged_value) {
                logPushf("Slider moved to {d:.3}", .{h_slider_value});
                h_slider_logged_value = h_slider_value;
                h_slider_log_time = now;
            }
        }
    }
    //-------------------------------------------------------------------------------------
    // Text box
    //-------------------------------------------------------------------------------------
    ui.styleNext(.{
        .size = .{
            .width = .{ .pixels = 305 },
            .height = .text,
        },
    });
    var textResult = ui.textBox("text", arena, text);
    if (textResult.changed) {
        text_arena.clear();
        text = text_arena.pushStr(textResult.text) catch {
            oc.log.err("Out of memory", .{}, @src());
            oc.requestQuit();
            return;
        };
    }
    if (textResult.accepted) {
        logPushf("Entered text {s}", .{text});
    }
    //-------------------------------------------------------------------------------------
    // Select
    //-------------------------------------------------------------------------------------
    var options = [_][]const u8{
        "Option 1",
        "Option 2",
    };
    var select_popup_info = ui.SelectPopupInfo{
        .selected_index = selected,
        .options = &options,
        .placeholder = "Select",
    };
    var selectResult = ui.selectPopup("select", &select_popup_info);
    if (selectResult.selected_index != selected) {
        logPushf("Selected {s}", .{options[selectResult.selected_index.?]});
    }
    selected = selectResult.selected_index;
    //-------------------------------------------------------------------------------------
    // Scrollable panel
    //-------------------------------------------------------------------------------------
    {
        ui.styleNext(.{
            .size = .{
                .width = .fill_parent,
                .height = .{
                    .custom = .{ .kind = .Parent, .value = 1, .relax = 1, .min_size = 200 },
                },
            },
            .bg_color = ui_ctx.theme.bg2,
            .border_color = ui_ctx.theme.border,
            .border_size = 1,
            .roundness = ui_ctx.theme.roundness_small,
        });
        _ = ui.panelBegin("log", .{ .draw_background = true, .draw_border = true });
        defer ui.panelEnd();
        {
            ui.styleNext(.{
                .layout = .{
                    .margin = .{ .x = 16, .y = 16 },
                },
            });
            _ = ui.boxBegin("contents", .{});
            defer _ = ui.boxEnd();
            if (log_lines.list.empty()) {
                ui.styleNext(.{ .color = ui_ctx.theme.text2 });
                _ = ui.makeLabel("Log");
            }
            var i: i32 = 0;
            var log_lines_iter = log_lines.iter();
            while (log_lines_iter.next()) |log_line| {
                var buf: [15]u8 = undefined;
                var id = std.fmt.bufPrint(&buf, "{d}", .{i}) catch unreachable;
                _ = ui.boxBegin(id, .{});
                defer _ = ui.boxEnd();
                _ = ui.makeLabel(log_line.string.slice());
                i += 1;
            }
        }
    }
 }
 var styling_selected_radio: ?usize = 0;
 var unselected_width: f32 = 16;
 var unselected_height: f32 = 16;
 var unselected_roundness: f32 = 8;
 var unselected_bg_color: oc.Color = oc.Color.rgba(0.086, 0.086, 0.102, 1);
 var unselected_border_color: oc.Color = oc.Color.rgba(0.976, 0.976, 0.976, 0.35);
 var unselected_border_size: f32 = 1;
 var unselected_when_status: ui.Status = .{};
 var unselected_status_index: ?usize = 0;
 var selected_width: f32 = 16;
 var selected_height: f32 = 16;
 var selected_roundness: f32 = 8;
 var selected_center_color: oc.Color = oc.Color.rgba(1, 1, 1, 1);
 var selected_bg_color: oc.Color = oc.Color.rgba(0.33, 0.66, 1, 1);
 var selected_when_status: ui.Status = .{};
 var selected_status_index: ?usize = 0;
 var label_font_color: oc.Color = oc.Color.rgba(0.976, 0.976, 0.976, 1);
 var label_font_color_selected: ?usize = 0;
 var label_font: *oc.Font = &font_regular;
 var label_font_selected: ?usize = 0;
 var label_font_size: f32 = 14;
 fn styling(arena: *oc.Arena) void {
    //-----------------------------------------------------------------------------------------
    // Styling
    //-----------------------------------------------------------------------------------------
    // Initial values here are hardcoded from the dark theme and everything is overridden all
    // the time. In a real program you'd only override what you need and supply the values from
    // ui_ctx.theme or ui_ctx.theme.palette.
    //
    // Rule-based styling is described at
    // https://www.forkingpaths.dev/posts/23-03-10/rule_based_styling_imgui_ctx.html
    columnBegin("Styling", 2.0 / 3.0);
    defer columnEnd();
    {
        ui.styleNext(.{
            .size = .{
                .width = .fill_parent,
                .height = .{ .pixels = 152 },
            },
            .layout = .{
                .margin = .{ .x = 310, .y = 16 },
            },
            .bg_color = ui.dark_theme.bg0,
            .roundness = ui.dark_theme.roundness_small,
        });
        _ = ui.boxBegin("styled_radios", .{ .draw_background = true, .draw_border = true });
        defer _ = ui.boxEnd();
        resetNextRadioGroupToDarkTheme(arena);
        var unselected_tag = ui.Tag.make("radio");
        var unselected_pattern = ui.Pattern.init();
        unselected_pattern.push(arena, .{ .sel = .{ .tag = unselected_tag } });
        if (!unselected_when_status.empty()) {
            unselected_pattern.push(arena, .{ .op = .And, .sel = .{ .status = unselected_when_status } });
        }
        ui.styleMatchAfter(unselected_pattern, .{
            .size = .{
                .width = .{ .pixels = unselected_width },
                .height = .{ .pixels = unselected_height },
            },
            .bg_color = unselected_bg_color,
            .border_color = unselected_border_color,
            .border_size = unselected_border_size,
            .roundness = unselected_roundness,
        });
        var selected_tag = ui.Tag.make("radio_selected");
        var selected_pattern = ui.Pattern.init();
        selected_pattern.push(arena, .{ .sel = .{ .tag = selected_tag } });
        if (!selected_when_status.empty()) {
            selected_pattern.push(arena, .{ .op = .And, .sel = .{ .status = selected_when_status } });
        }
        ui.styleMatchAfter(selected_pattern, .{
            .size = .{
                .width = .{ .pixels = selected_width },
                .height = .{ .pixels = selected_height },
            },
            .color = selected_center_color,
            .bg_color = selected_bg_color,
            .roundness = selected_roundness,
        });
        var label_tag = ui.Tag.make("label");
        var label_pattern = ui.Pattern.init();
        label_pattern.push(arena, .{ .sel = .{ .tag = label_tag } });
        ui.styleMatchAfter(label_pattern, .{
            .color = label_font_color,
            .font = label_font.*,
            .font_size = label_font_size,
        });
        var options = [_][]const u8{
            "I",
            "Am",
            "Stylish",
        };
        var radio_group_info = ui.RadioGroupInfo{
            .selected_index = styling_selected_radio,
            .options = &options,
        };
        var result = ui.radioGroup("radio_group", &radio_group_info);
        styling_selected_radio = result.selected_index;
    }
    {
        ui.styleNext(.{ .layout = .{ .axis = .X, .spacing = 32 } });
        _ = ui.boxBegin("controls", .{});
        defer _ = ui.boxEnd();
        {
            ui.styleNext(.{ .layout = .{ .axis = .Y, .spacing = 16 } });
            _ = ui.boxBegin("unselected", .{});
            defer _ = ui.boxEnd();
            ui.styleNext(.{ .font_size = 16 });
            _ = ui.makeLabel("Radio style");
            {
                ui.styleNext(.{ .layout = .{ .spacing = 4 } });
                _ = ui.boxBegin("size", .{});
                defer _ = ui.boxEnd();
                var width_slider = (unselected_width - 8) / 16;
                labeledSlider("Width", &width_slider);
                unselected_width = 8 + width_slider * 16;
                var height_slider = (unselected_height - 8) / 16;
                labeledSlider("Height", &height_slider);
                unselected_height = 8 + height_slider * 16;
                var roundness_slider = (unselected_roundness - 4) / 8;
                labeledSlider("Roundness", &roundness_slider);
                unselected_roundness = 4 + roundness_slider * 8;
            }
            {
                ui.styleNext(.{ .layout = .{ .spacing = 4 } });
                _ = ui.boxBegin("background", .{});
                defer _ = ui.boxEnd();
                labeledSlider("Background R", &unselected_bg_color.r);
                labeledSlider("Background G", &unselected_bg_color.g);
                labeledSlider("Background B", &unselected_bg_color.b);
                labeledSlider("Background A", &unselected_bg_color.a);
            }
            {
                ui.styleNext(.{ .layout = .{ .spacing = 4 } });
                _ = ui.boxBegin("border", .{});
                defer _ = ui.boxEnd();
                labeledSlider("Border R", &unselected_border_color.r);
                labeledSlider("Border G", &unselected_border_color.g);
                labeledSlider("Border B", &unselected_border_color.b);
                labeledSlider("Border A", &unselected_border_color.a);
            }
            var border_size_slider = unselected_border_size / 5;
            labeledSlider("Border size", &border_size_slider);
            unselected_border_size = border_size_slider * 5;
            {
                ui.styleNext(.{ .layout = .{ .spacing = 10 } });
                _ = ui.boxBegin("status_override", .{});
                defer _ = ui.boxEnd();
                _ = ui.makeLabel("Override");
                var status_options = [_][]const u8{
                    "Always",
                    "When hovering",
                    "When active",
                };
                var status_info = ui.RadioGroupInfo{
                    .selected_index = unselected_status_index,
                    .options = &status_options,
                };
                var status_result = ui.radioGroup("status", &status_info);
                unselected_status_index = status_result.selected_index;
                unselected_when_status = switch (unselected_status_index.?) {
                    0 => .{},
                    1 => .{ .hover = true },
                    2 => .{ .active = true },
                    else => unreachable,
                };
            }
        }
        {
            ui.styleNext(.{ .layout = .{ .axis = .Y, .spacing = 16 } });
            _ = ui.boxBegin("selected", .{});
            defer _ = ui.boxEnd();
            ui.styleNext(.{ .font_size = 16 });
            _ = ui.makeLabel("Radio selected style");
            {
                ui.styleNext(.{ .layout = .{ .spacing = 4 } });
                _ = ui.boxBegin("size", .{});
                defer _ = ui.boxEnd();
                var width_slider = (selected_width - 8) / 16;
                labeledSlider("Width", &width_slider);
                selected_width = 8 + width_slider * 16;
                var height_slider = (selected_height - 8) / 16;
                labeledSlider("Height", &height_slider);
                selected_height = 8 + height_slider * 16;
                var roundness_slider = (selected_roundness - 4) / 8;
                labeledSlider("Roundness", &roundness_slider);
                selected_roundness = 4 + roundness_slider * 8;
            }
            {
                ui.styleNext(.{ .layout = .{ .spacing = 4 } });
                _ = ui.boxBegin("color", .{});
                defer _ = ui.boxEnd();
                labeledSlider("Center R", &selected_center_color.r);
                labeledSlider("Center G", &selected_center_color.g);
                labeledSlider("Center B", &selected_center_color.b);
                labeledSlider("Center A", &selected_center_color.a);
            }
            {
                ui.styleNext(.{ .layout = .{ .spacing = 4 } });
                _ = ui.boxBegin("background", .{});
                defer _ = ui.boxEnd();
                labeledSlider("Background R", &selected_bg_color.r);
                labeledSlider("Background G", &selected_bg_color.g);
                labeledSlider("Background B", &selected_bg_color.b);
                labeledSlider("Background A", &selected_bg_color.a);
            }
            {
                ui.styleNext(.{ .layout = .{ .spacing = 10 } });
                _ = ui.boxBegin("status_override", .{});
                defer _ = ui.boxEnd();
                ui.styleNext(.{ .size = .{ .height = .{ .pixels = 30 } } });
                _ = ui.boxMake("spacer", .{});
                _ = ui.makeLabel("Override");
                var status_options = [_][]const u8{
                    "Always",
                    "When hovering",
                    "When active",
                };
                var status_info = ui.RadioGroupInfo{
                    .selected_index = selected_status_index,
                    .options = &status_options,
                };
                var status_result = ui.radioGroup("status", &status_info);
                selected_status_index = status_result.selected_index;
                selected_when_status = switch (selected_status_index.?) {
                    0 => .{},
                    1 => .{ .hover = true },
                    2 => .{ .active = true },
                    else => unreachable,
                };
            }
        }
        {
            ui.styleNext(.{ .layout = .{ .axis = .Y, .spacing = 10 } });
            _ = ui.boxBegin("label", .{});
            defer _ = ui.boxEnd();
            ui.styleNext(.{ .font_size = 16 });
            _ = ui.makeLabel("Label style");
            {
                ui.styleNext(.{ .layout = .{ .axis = .X, .spacing = 8 } });
                _ = ui.boxBegin("font_color", .{});
                defer _ = ui.boxEnd();
                ui.styleMatchAfter(ui.Pattern.owner(), .{
                    .size = .{ .width = .{ .pixels = 100 } },
                });
                _ = ui.makeLabel("Font color");
                var color_names = [_][]const u8{
                    "Default",
                    "Red",
                    "Orange",
                    "Amber",
                    "Yellow",
                    "Lime",
                    "Light green",
                    "Green",
                };
                var colors = [_]oc.Color{
                    ui.dark_theme.text0,
                    ui.dark_theme.palette.red5,
                    ui.dark_theme.palette.orange5,
                    ui.dark_theme.palette.amber5,
                    ui.dark_theme.palette.yellow5,
                    ui.dark_theme.palette.lime5,
                    ui.dark_theme.palette.light_green5,
                    ui.dark_theme.palette.green5,
                };
                var color_info = ui.SelectPopupInfo{
                    .selected_index = label_font_color_selected,
                    .options = &color_names,
                };
                var color_result = ui.selectPopup("color", &color_info);
                label_font_color_selected = color_result.selected_index;
                label_font_color = colors[label_font_color_selected.?];
            }
            {
                ui.styleNext(.{ .layout = .{ .axis = .X, .spacing = 8 } });
                _ = ui.boxBegin("font", .{});
                defer _ = ui.boxEnd();
                ui.styleMatchAfter(ui.Pattern.owner(), .{
                    .size = .{ .width = .{ .pixels = 100 } },
                });
                _ = ui.makeLabel("Font");
                var font_names = [_][]const u8{
                    "Regular",
                    "Bold",
                };
                var fonts = [_]*oc.Font{
                    &font_regular,
                    &font_bold,
                };
                var font_info = ui.SelectPopupInfo{
                    .selected_index = label_font_selected,
                    .options = &font_names,
                };
                var font_result = ui.selectPopup("font_style", &font_info);
                label_font_selected = font_result.selected_index;
                label_font = fonts[label_font_selected.?];
            }
            var font_size_slider = (label_font_size - 8) / 16;
            labeledSlider("Font size", &font_size_slider);
            label_font_size = 8 + font_size_slider * 16;
        }
    }
 }
 fn columnBegin(header: []const u8, widthFraction: f32) void {
    ui.styleNext(.{
        .size = .{
            .width = .{
                .custom = .{ .kind = .Parent, .value = widthFraction, .relax = 1 },
            },
            .height = .fill_parent,
        },
        .layout = .{
            .axis = .Y,
            .margin = .{ .y = 8 },
            .spacing = 24,
        },
        .bg_color = ui_ctx.theme.bg1,
        .border_color = ui_ctx.theme.border,
        .border_size = 1,
        .roundness = ui_ctx.theme.roundness_small,
    });
    _ = ui.boxBegin(header, .{ .draw_background = true, .draw_border = true });
    {
        ui.styleNext(.{
            .size = .{ .width = .fill_parent },
            .layout = .{ .alignment = .{ .x = .Center } },
        });
        _ = ui.boxBegin("header", .{});
        defer _ = ui.boxEnd();
        ui.styleNext(.{ .font_size = 18 });
        _ = ui.makeLabel(header);
    }
    ui.styleNext(.{
        .size = .{
            .width = .fill_parent,
            .height = .{
                .custom = .{ .kind = .Parent, .value = 1, .relax = 1 },
            },
        },
        .layout = .{
            .alignment = .{ .x = .Start },
            .margin = .{ .x = 16 },
            .spacing = 24,
        },
    });
    _ = ui.boxBegin("contents", .{});
 }
 fn columnEnd() void {
    _ = ui.boxEnd(); // contents
    _ = ui.boxEnd(); // column
 }
 fn labeledSlider(label: []const u8, value: *f32) void {
    ui.styleNext(.{ .layout = .{ .axis = .X, .spacing = 8 } });
    _ = ui.boxBegin(label, .{});
    defer _ = ui.boxEnd();
    ui.styleMatchAfter(ui.Pattern.owner(), .{
        .size = .{ .width = .{ .pixels = 100 } },
    });
    _ = ui.makeLabel(label);
    ui.styleNext(.{
        .size = .{ .width = .{ .pixels = 100 } },
    });
    _ = ui.slider("slider", value);
 }
 fn logPush(line: []const u8) void {
    log_lines.push(&log_arena, oc.Str8.fromSlice(line)) catch {
        oc.log.err("Out of memory", .{}, @src());
        oc.requestQuit();
        return;
    };
 }
 fn logPushf(comptime fmt: []const u8, args: anytype) void {
    var str = oc.Str8.pushf(&log_arena, fmt, args) catch {
        oc.log.err("Out of memory", .{}, @src());
        oc.requestQuit();
        return;
    };
    log_lines.push(&log_arena, str) catch {
        oc.log.err("Out of memory", .{}, @src());
        oc.requestQuit();
        return;
    };
 }
 /// This makes sure the light theme doesn't break the styling overrides
 /// You won't need it in a real program as long as your colors come from ui_ctx.theme or ui_ctx.theme.palette
 fn resetNextRadioGroupToDarkTheme(arena: *oc.Arena) void {
    var unselected_tag = ui.Tag.make("radio");
    var unselected_pattern = ui.Pattern.init();
    unselected_pattern.push(arena, .{ .sel = .{ .tag = unselected_tag } });
    ui.styleMatchAfter(unselected_pattern, .{
        .border_color = ui.dark_theme.text3,
        .border_size = 1,
    });
    var unselected_hover_pattern = ui.Pattern.init();
    unselected_hover_pattern.push(arena, .{ .sel = .{ .tag = unselected_tag } });
    unselected_hover_pattern.push(arena, .{ .op = .And, .sel = .{ .status = .{ .hover = true } } });
    ui.styleMatchAfter(unselected_hover_pattern, .{
        .bg_color = ui.dark_theme.fill0,
        .border_color = ui.dark_theme.primary,
    });
    var unselected_active_pattern = ui.Pattern.init();
    unselected_active_pattern.push(arena, .{ .sel = .{ .tag = unselected_tag } });
    unselected_active_pattern.push(arena, .{ .op = .And, .sel = .{ .status = .{ .active = true } } });
    ui.styleMatchAfter(unselected_active_pattern, .{
        .bg_color = ui.dark_theme.fill1,
        .border_color = ui.dark_theme.primary,
    });
    var selected_tag = ui.Tag.make("radio_selected");
    var selected_pattern = ui.Pattern.init();
    selected_pattern.push(arena, .{ .sel = .{ .tag = selected_tag } });
    ui.styleMatchAfter(selected_pattern, .{
        .color = ui.dark_theme.palette.white,
        .bg_color = ui.dark_theme.primary,
    });
    var selected_hover_pattern = ui.Pattern.init();
    selected_hover_pattern.push(arena, .{ .sel = .{ .tag = selected_tag } });
    selected_hover_pattern.push(arena, .{ .op = .And, .sel = .{ .status = .{ .hover = true } } });
    ui.styleMatchAfter(selected_hover_pattern, .{
        .bg_color = ui.dark_theme.primary_hover,
    });
    var selected_active_pattern = ui.Pattern.init();
    selected_active_pattern.push(arena, .{ .sel = .{ .tag = selected_tag } });
    selected_active_pattern.push(arena, .{ .op = .And, .sel = .{ .status = .{ .active = true } } });
    ui.styleMatchAfter(selected_active_pattern, .{
        .bg_color = ui.dark_theme.primary_active,
    });
 }
--- a/src/orca.zig
+++ b/src/orca.zig
--- a/src/platform/osx_platform.c
+++ b/src/platform/osx_platform.c
@ -8,13 +8,14 @@
 #include "platform.h"
 #ifdef __cplusplus
-extern "C" {
+extern "C"
 {
 #endif
-oc_host_platform oc_get_host_platform(void)
+	oc_host_platform oc_get_host_platform()
-{
+	{
-    return OC_HOST_PLATFORM_MACOS;
+		return OC_HOST_PLATFORM_MACOS;
-}
+	}
 #ifdef __cplusplus
 } // extern "C"
--- a/src/platform/platform.h
+++ b/src/platform/platform.h
@ -121,7 +121,7 @@ typedef enum
    OC_HOST_PLATFORM_WINDOWS,
 } oc_host_platform;
-ORCA_API oc_host_platform oc_get_host_platform(void);
+ORCA_API oc_host_platform oc_get_host_platform();
 #ifdef __cplusplus
 } // extern "C"
--- a/src/platform/win32_platform.c
+++ b/src/platform/win32_platform.c
@ -8,13 +8,14 @@
 #include "platform.h"
 #ifdef __cplusplus
-extern "C" {
+extern "C"
 {
 #endif
-oc_host_platform oc_get_host_platform(void)
+	oc_host_platform oc_get_host_platform()
-{
+	{
-    return OC_HOST_PLATFORM_WINDOWS;
+		return OC_HOST_PLATFORM_WINDOWS;
-}
+	}
 #ifdef __cplusplus
 } // extern "C"
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@ -1778,7 +1778,7 @@ oc_ui_sig oc_ui_button_behavior(oc_ui_box* box)
    {
        oc_ui_box_set_hot(box, false);
    }
-    if(!sig.hovering || !sig.dragging)
+    if(!sig.hovering && !sig.dragging)
    {
        oc_ui_box_deactivate(box);
    }
@ -1873,7 +1873,7 @@ void oc_ui_checkbox_draw(oc_ui_box* box, void* data)
    oc_matrix_pop();
 }
-oc_ui_sig oc_ui_checkbox_str8(oc_str8 name, bool* checked)
+oc_ui_sig oc_ui_checkbox(const char* name, bool* checked)
 {
    oc_ui_context* ui = oc_ui_get_context();
    oc_ui_theme* theme = ui->theme;
@ -1918,7 +1918,7 @@ oc_ui_sig oc_ui_checkbox_str8(oc_str8 name, bool* checked)
                          | OC_UI_FLAG_HOT_ANIMATION
                          | OC_UI_FLAG_ACTIVE_ANIMATION;
-        box = oc_ui_box_make_str8(name, flags);
+        box = oc_ui_box_make(name, flags);
        oc_ui_tag_box(box, "checkbox");
        oc_ui_box_set_draw_proc(box, oc_ui_checkbox_draw, 0);
@ -1968,7 +1968,7 @@ oc_ui_sig oc_ui_checkbox_str8(oc_str8 name, bool* checked)
                          | OC_UI_FLAG_HOT_ANIMATION
                          | OC_UI_FLAG_ACTIVE_ANIMATION;
-        box = oc_ui_box_make_str8(name, flags);
+        box = oc_ui_box_make(name, flags);
        oc_ui_tag_box(box, "checkbox");
    }
@ -1981,21 +1981,16 @@ oc_ui_sig oc_ui_checkbox_str8(oc_str8 name, bool* checked)
    return (sig);
 }
 oc_ui_sig oc_ui_checkbox(const char* name, bool* checked)
 {
    return oc_ui_checkbox_str8(OC_STR8(name), checked);
 }
 //------------------------------------------------------------------------------
 // slider / scrollbar
 //------------------------------------------------------------------------------
-oc_ui_box* oc_ui_slider_str8(oc_str8 name, f32* value)
+oc_ui_box* oc_ui_slider(const char* label, f32* value)
 {
    oc_ui_context* ui = oc_ui_get_context();
    oc_ui_theme* theme = ui->theme;
    oc_ui_style_match_before(oc_ui_pattern_all(), &(oc_ui_style){ 0 }, OC_UI_STYLE_LAYOUT);
-    oc_ui_box* frame = oc_ui_box_begin_str8(name, 0);
+    oc_ui_box* frame = oc_ui_box_begin(label, 0);
    {
        oc_ui_axis trackAxis = (frame->rect.w > frame->rect.h) ? OC_UI_AXIS_X : OC_UI_AXIS_Y;
        oc_ui_axis secondAxis = (trackAxis == OC_UI_AXIS_Y) ? OC_UI_AXIS_X : OC_UI_AXIS_Y;
@ -2166,17 +2161,12 @@ oc_ui_box* oc_ui_slider_str8(oc_str8 name, f32* value)
    return (frame);
 }
-oc_ui_box* oc_ui_slider(const char* name, f32* value)
+oc_ui_box* oc_ui_scrollbar(const char* label, f32 thumbRatio, f32* scrollValue)
 {
    return oc_ui_slider_str8(OC_STR8(name), value);
 }
 oc_ui_box* oc_ui_scrollbar_str8(oc_str8 name, f32 thumbRatio, f32* scrollValue)
 {
    oc_ui_context* ui = oc_ui_get_context();
    oc_ui_theme* theme = ui->theme;
    oc_ui_style_match_before(oc_ui_pattern_all(), &(oc_ui_style){ 0 }, OC_UI_STYLE_LAYOUT);
-    oc_ui_box* frame = oc_ui_box_begin_str8(name, 0);
+    oc_ui_box* frame = oc_ui_box_begin(label, 0);
    {
        f32 minThumbRatio = 17. / oc_max(frame->rect.w, frame->rect.h);
        thumbRatio = oc_min(oc_max(thumbRatio, minThumbRatio), 1.);
@ -2302,15 +2292,10 @@ oc_ui_box* oc_ui_scrollbar_str8(oc_str8 name, f32 thumbRatio, f32* scrollValue)
    return (frame);
 }
 oc_ui_box* oc_ui_scrollbar(const char* name, f32 thumbRatio, f32* scrollValue)
 {
    return oc_ui_scrollbar_str8(OC_STR8(name), thumbRatio, scrollValue);
 }
 //------------------------------------------------------------------------------
 // panels
 //------------------------------------------------------------------------------
-void oc_ui_panel_begin_str8(oc_str8 str, oc_ui_flags flags)
+void oc_ui_panel_begin(const char* str, oc_ui_flags flags)
 {
    flags = flags
          | OC_UI_FLAG_CLIP
@ -2326,7 +2311,7 @@ void oc_ui_panel_begin_str8(oc_str8 str, oc_ui_flags flags)
                                     .layout.margin.y = 0 },
                     OC_UI_STYLE_SIZE
                         | OC_UI_STYLE_LAYOUT_MARGINS);
-    oc_ui_box_begin_str8(str, flags);
+    oc_ui_box_begin(str, flags);
    oc_ui_style_next(&(oc_ui_style){ .size.width = { OC_UI_SIZE_PARENT, 1 },
                                     .size.height = { OC_UI_SIZE_PARENT, 1 } },
@ -2335,11 +2320,6 @@ void oc_ui_panel_begin_str8(oc_str8 str, oc_ui_flags flags)
    oc_ui_box_begin("contents", 0);
 }
 void oc_ui_panel_begin(const char* str, oc_ui_flags flags)
 {
    oc_ui_panel_begin_str8(OC_STR8(str), flags);
 }
 void oc_ui_panel_end(void)
 {
    oc_ui_box_end(); // contents
@ -2433,7 +2413,7 @@ void oc_ui_tooltip_arrow_draw(oc_ui_box* box, void* data)
    oc_matrix_pop();
 }
-void oc_ui_tooltip_str8(oc_str8 label)
+void oc_ui_tooltip(const char* label)
 {
    oc_ui_context* ui = oc_ui_get_context();
    oc_ui_theme* theme = ui->theme;
@ -2444,7 +2424,7 @@ void oc_ui_tooltip_str8(oc_str8 label)
                                   .floatTarget.x = p.x,
                                   .floatTarget.y = p.y };
    oc_ui_style_next(&containerStyle, OC_UI_STYLE_FLOAT);
-    oc_ui_container_str8(label, OC_UI_FLAG_OVERLAY)
+    oc_ui_container(label, OC_UI_FLAG_OVERLAY)
    {
        oc_ui_style arrowStyle = { .size.width = { OC_UI_SIZE_PIXELS, 24 },
                                   .size.height = { OC_UI_SIZE_PIXELS, 24 },
@ -2480,22 +2460,17 @@ void oc_ui_tooltip_str8(oc_str8 label)
        oc_ui_box* contents = oc_ui_box_begin("contents", OC_UI_FLAG_DRAW_BACKGROUND);
-        oc_ui_label_str8(label);
+        oc_ui_label(label);
        oc_ui_box_end();
    }
 }
 void oc_ui_tooltip(const char* label)
 {
    oc_ui_tooltip_str8(OC_STR8(label));
 }
 //------------------------------------------------------------------------------
 // Menus
 //------------------------------------------------------------------------------
-void oc_ui_menu_bar_begin_str8(oc_str8 name)
+void oc_ui_menu_bar_begin(const char* name)
 {
    oc_ui_style style = {
        .size.width = { OC_UI_SIZE_PARENT, 1, 0 },
@ -2506,7 +2481,7 @@ void oc_ui_menu_bar_begin_str8(oc_str8 name)
                          | OC_UI_STYLE_LAYOUT_AXIS;
    oc_ui_style_next(&style, mask);
-    oc_ui_box* bar = oc_ui_box_begin_str8(name, OC_UI_FLAG_DRAW_BACKGROUND);
+    oc_ui_box* bar = oc_ui_box_begin(name, OC_UI_FLAG_DRAW_BACKGROUND);
    oc_ui_sig sig = oc_ui_box_sig(bar);
    oc_ui_context* ui = oc_ui_get_context();
@ -2516,21 +2491,16 @@ void oc_ui_menu_bar_begin_str8(oc_str8 name)
    }
 }
 void oc_ui_menu_bar_begin(const char* name)
 {
    oc_ui_menu_bar_begin_str8(OC_STR8(name));
 }
 void oc_ui_menu_bar_end(void)
 {
    oc_ui_box_end(); // menu bar
 }
-void oc_ui_menu_begin_str8(oc_str8 label)
+void oc_ui_menu_begin(const char* label)
 {
    oc_ui_context* ui = oc_ui_get_context();
    oc_ui_theme* theme = ui->theme;
-    oc_ui_box* container = oc_ui_box_make_str8(label, 0);
+    oc_ui_box* container = oc_ui_box_make(label, 0);
    oc_ui_box_push(container);
    oc_ui_style_next(&(oc_ui_style){ .size.width = { OC_UI_SIZE_CHILDREN },
@ -2555,7 +2525,7 @@ void oc_ui_menu_begin_str8(oc_str8 label)
    oc_ui_style_next(&(oc_ui_style){ .size.width = { OC_UI_SIZE_TEXT },
                                     .size.height = { OC_UI_SIZE_TEXT } },
                     OC_UI_STYLE_SIZE);
-    oc_ui_box* buttonLabel = oc_ui_box_make_str8(label, OC_UI_FLAG_DRAW_TEXT);
+    oc_ui_box* buttonLabel = oc_ui_box_make(label, OC_UI_FLAG_DRAW_TEXT);
    oc_ui_box_end(); // button
@ -2622,18 +2592,13 @@ void oc_ui_menu_begin_str8(oc_str8 label)
    oc_ui_box_push(menu);
 }
 void oc_ui_menu_begin(const char* label)
 {
    oc_ui_menu_begin_str8(OC_STR8(label));
 }
 void oc_ui_menu_end(void)
 {
    oc_ui_box_pop(); // menu
    oc_ui_box_pop(); // container
 }
-oc_ui_sig oc_ui_menu_button_str8(oc_str8 label)
+oc_ui_sig oc_ui_menu_button(const char* name)
 {
    oc_ui_context* ui = oc_ui_get_context();
    oc_ui_theme* theme = ui->theme;
@ -2662,16 +2627,11 @@ oc_ui_sig oc_ui_menu_button_str8(oc_str8 label)
                      | OC_UI_FLAG_DRAW_TEXT
                      | OC_UI_FLAG_DRAW_BACKGROUND;
-    oc_ui_box* box = oc_ui_box_make_str8(label, flags);
+    oc_ui_box* box = oc_ui_box_make(name, flags);
    oc_ui_sig sig = oc_ui_box_sig(box);
    return (sig);
 }
 oc_ui_sig oc_ui_menu_button(const char* label)
 {
    return oc_ui_menu_button_str8(OC_STR8(label));
 }
 //------------------------------------------------------------------------------
 // Select
 //------------------------------------------------------------------------------
@ -2729,14 +2689,14 @@ void oc_ui_select_popup_draw_checkmark(oc_ui_box* box, void* data)
    oc_matrix_pop();
 }
-oc_ui_select_popup_info oc_ui_select_popup_str8(oc_str8 name, oc_ui_select_popup_info* info)
+oc_ui_select_popup_info oc_ui_select_popup(const char* name, oc_ui_select_popup_info* info)
 {
    oc_ui_select_popup_info result = *info;
    oc_ui_context* ui = oc_ui_get_context();
    oc_ui_theme* theme = ui->theme;
-    oc_ui_container_str8(name, 0)
+    oc_ui_container(name, 0)
    {
        oc_ui_pattern hoverPattern = { 0 };
        oc_ui_pattern_push(&ui->frameArena, &hoverPattern, (oc_ui_selector){ .kind = OC_UI_SEL_STATUS, .status = OC_UI_HOVER });
@ -2948,11 +2908,6 @@ oc_ui_select_popup_info oc_ui_select_popup_str8(oc_str8 name, oc_ui_select_popup
    return (result);
 }
 oc_ui_select_popup_info oc_ui_select_popup(const char* name, oc_ui_select_popup_info* info)
 {
    return oc_ui_select_popup_str8(OC_STR8(name), info);
 }
 //------------------------------------------------------------------------------
 // Radio group
 //------------------------------------------------------------------------------
@ -2971,7 +2926,7 @@ void oc_ui_radio_indicator_draw(oc_ui_box* box, void* data)
    oc_matrix_pop();
 }
-oc_ui_radio_group_info oc_ui_radio_group_str8(oc_str8 name, oc_ui_radio_group_info* info)
+oc_ui_radio_group_info oc_ui_radio_group(const char* name, oc_ui_radio_group_info* info)
 {
    oc_ui_radio_group_info result = *info;
@ -2982,7 +2937,7 @@ oc_ui_radio_group_info oc_ui_radio_group_str8(oc_str8 name, oc_ui_radio_group_in
                                     .layout.spacing = 12 },
                     OC_UI_STYLE_LAYOUT_AXIS
                         | OC_UI_STYLE_LAYOUT_SPACING);
-    oc_ui_container_str8(name, 0)
+    oc_ui_container(name, 0)
    {
        for(int i = 0; i < info->optionCount; i++)
        {
@ -3081,11 +3036,6 @@ oc_ui_radio_group_info oc_ui_radio_group_str8(oc_str8 name, oc_ui_radio_group_in
    return (result);
 }
 oc_ui_radio_group_info oc_ui_radio_group(const char* name, oc_ui_radio_group_info* info)
 {
    return oc_ui_radio_group_str8(OC_STR8(name), info);
 }
 //------------------------------------------------------------------------------
 // text box
 //------------------------------------------------------------------------------
@ -3867,7 +3817,7 @@ void oc_ui_text_box_render(oc_ui_box* box, void* data)
    }
 }
-oc_ui_text_box_result oc_ui_text_box_str8(oc_str8 name, oc_arena* arena, oc_str8 text)
+oc_ui_text_box_result oc_ui_text_box(const char* name, oc_arena* arena, oc_str8 text)
 {
    oc_ui_context* ui = oc_ui_get_context();
    oc_ui_theme* theme = ui->theme;
@ -3903,7 +3853,7 @@ oc_ui_text_box_result oc_ui_text_box_str8(oc_str8 name, oc_arena* arena, oc_str8
    oc_ui_flags frameFlags = OC_UI_FLAG_CLICKABLE
                           | OC_UI_FLAG_DRAW_BACKGROUND
                           | OC_UI_FLAG_DRAW_BORDER;
-    oc_ui_box* frame = oc_ui_box_begin_str8(name, frameFlags);
+    oc_ui_box* frame = oc_ui_box_begin(name, frameFlags);
    oc_ui_tag_box(frame, "frame");
    oc_font font = frame->style.font;
    f32 fontSize = frame->style.fontSize;
@ -4186,11 +4136,6 @@ oc_ui_text_box_result oc_ui_text_box_str8(oc_str8 name, oc_arena* arena, oc_str8
    return (result);
 }
 oc_ui_text_box_result oc_ui_text_box(const char* name, oc_arena* arena, oc_str8 text)
 {
    return oc_ui_text_box_str8(OC_STR8(name), arena, text);
 }
 //------------------------------------------------------------------------------
 // Themes
 // doc/UIColors.md has them visualized
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@ -518,6 +518,7 @@ struct oc_ui_box
    oc_list beforeRules;
    oc_list afterRules;
    //oc_ui_style_tag tag;
    oc_ui_style* targetStyle;
    oc_ui_style style;
    u32 z;
@ -631,6 +632,8 @@ typedef struct oc_ui_context
    i32 editWordSelectionInitialCursor;
    i32 editWordSelectionInitialMark;
    bool clipboardRegistered;
    oc_ui_theme* theme;
 } oc_ui_context;
@ -728,28 +731,39 @@ ORCA_API void oc_ui_style_match_after(oc_ui_pattern pattern, oc_ui_style* style,
 //-------------------------------------------------------------------------
 // Basic widget helpers
 //-------------------------------------------------------------------------
 enum
 {
    OC_UI_STYLE_TAG_USER_MAX = 1 << 16,
    OC_UI_STYLE_TAG_LABEL,
    OC_UI_STYLE_TAG_BUTTON,
    OC_UI_STYLE_TAG_SCROLLBAR,
    OC_UI_STYLE_TAG_PANEL,
    OC_UI_STYLE_TAG_TOOLTIP,
    OC_UI_STYLE_TAG_MENU
 };
 ORCA_API oc_ui_sig oc_ui_label(const char* label);
 ORCA_API oc_ui_sig oc_ui_label_str8(oc_str8 label);
 ORCA_API oc_ui_sig oc_ui_button(const char* label);
 ORCA_API oc_ui_sig oc_ui_checkbox(const char* name, bool* checked);
-ORCA_API oc_ui_box* oc_ui_slider(const char* name, f32* value);
+ORCA_API oc_ui_box* oc_ui_slider(const char* label, f32* value);
-ORCA_API oc_ui_box* oc_ui_scrollbar(const char* name, f32 thumbRatio, f32* scrollValue);
+ORCA_API oc_ui_box* oc_ui_scrollbar(const char* label, f32 thumbRatio, f32* scrollValue);
 ORCA_API void oc_ui_tooltip(const char* label);
 ORCA_API void oc_ui_panel_begin(const char* name, oc_ui_flags flags);
 ORCA_API void oc_ui_panel_end(void);
 #define oc_ui_panel(s, f) oc_defer_loop(oc_ui_panel_begin(s, f), oc_ui_panel_end())
-ORCA_API void oc_ui_menu_bar_begin(const char* name);
+ORCA_API void oc_ui_menu_bar_begin(const char* label);
 ORCA_API void oc_ui_menu_bar_end(void);
 #define oc_ui_menu_bar(name) oc_defer_loop(oc_ui_menu_bar_begin(name), oc_ui_menu_bar_end())
 ORCA_API void oc_ui_menu_begin(const char* label);
 ORCA_API void oc_ui_menu_end(void);
-#define oc_ui_menu(label) oc_defer_loop(oc_ui_menu_begin(label), oc_ui_menu_end())
+#define oc_ui_menu(name) oc_defer_loop(oc_ui_menu_begin(name), oc_ui_menu_end())
-ORCA_API oc_ui_sig oc_ui_menu_button(const char* label);
+ORCA_API oc_ui_sig oc_ui_menu_button(const char* name);
 typedef struct oc_ui_text_box_result
 {
Author	SHA1	Message	Date
Martin Fouilleul	82e4d0e08b	Moving repo to github	2023-10-09 17:23:54 +02:00
Martin Fouilleul	ef79405805	Licensing changes	2023-10-08 18:29:58 +02:00
Martin Fouilleul	a1b48b2b2f	add github sponsor yml file	2023-10-08 18:27:43 +02:00
Ilia Demianenko	5e62a5d2e7	Make intensity FPS-independent	2023-10-03 21:31:22 -07:00
Ilia Demianenko	c05223f91c	Make the fluid sample do a splat on startup	2023-10-03 21:19:36 -07:00
Reuben Dunnington	6e4943c2fa	make scancode -> keycode conversion consistent with header definitions	2023-09-29 22:09:31 -04:00
		`@ -0,0 +1,2 @@`
							`github: orca-app`
							`custom: "https://orca-app.dev/sponsor.html"`