Compare commits
No commits in common. "577e88551d0d316802c199d9ef2cc46b2574d70d" and "24b576f59faf55a2aab09409915aae7a93c21d03" have entirely different histories.
577e88551d
...
24b576f59f
661
LICENSE.md
661
LICENSE.md
@ -1,661 +0,0 @@
|
|||||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 19 November 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU Affero General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works, specifically designed to ensure
|
|
||||||
cooperation with the community in the case of network server software.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
our General Public Licenses are intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
Developers that use our General Public Licenses protect your rights
|
|
||||||
with two steps: (1) assert copyright on the software, and (2) offer
|
|
||||||
you this License which gives you legal permission to copy, distribute
|
|
||||||
and/or modify the software.
|
|
||||||
|
|
||||||
A secondary benefit of defending all users' freedom is that
|
|
||||||
improvements made in alternate versions of the program, if they
|
|
||||||
receive widespread use, become available for other developers to
|
|
||||||
incorporate. Many developers of free software are heartened and
|
|
||||||
encouraged by the resulting cooperation. However, in the case of
|
|
||||||
software used on network servers, this result may fail to come about.
|
|
||||||
The GNU General Public License permits making a modified version and
|
|
||||||
letting the public access it on a server without ever releasing its
|
|
||||||
source code to the public.
|
|
||||||
|
|
||||||
The GNU Affero General Public License is designed specifically to
|
|
||||||
ensure that, in such cases, the modified source code becomes available
|
|
||||||
to the community. It requires the operator of a network server to
|
|
||||||
provide the source code of the modified version running there to the
|
|
||||||
users of that server. Therefore, public use of a modified version, on
|
|
||||||
a publicly accessible server, gives the public access to the source
|
|
||||||
code of the modified version.
|
|
||||||
|
|
||||||
An older license, called the Affero General Public License and
|
|
||||||
published by Affero, was designed to accomplish similar goals. This is
|
|
||||||
a different license, not a version of the Affero GPL, but Affero has
|
|
||||||
released a new version of the Affero GPL which permits relicensing under
|
|
||||||
this license.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. 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
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If your software can interact with users remotely through a computer
|
|
||||||
network, you should also make sure that it provides a way for users to
|
|
||||||
get its source. For example, if your program is a web application, its
|
|
||||||
interface could display a "Source" link that leads users to an archive
|
|
||||||
of the code. There are many ways you could offer source, and different
|
|
||||||
solutions will be better for different programs; see section 13 for the
|
|
||||||
specific requirements.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
4
Makefile
4
Makefile
@ -1,9 +1,9 @@
|
|||||||
TARGET = quest
|
TARGET = quest
|
||||||
LIBS = -lm -luiohook -lcjson
|
LIBS = -lm -luiohook
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CFLAGS = -g -Wall
|
CFLAGS = -g -Wall
|
||||||
INSTALL_PATH = /usr/local
|
INSTALL_PATH = /usr/local
|
||||||
VERSION = 0.6.0
|
VERSION = 0.5.0
|
||||||
|
|
||||||
.PHONY: default all clean
|
.PHONY: default all clean
|
||||||
|
|
||||||
|
|||||||
21
README.md
21
README.md
@ -13,8 +13,8 @@ A speedrun timer for \*nix terminals
|
|||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
Copy `examples/sample.json` somewhere, replace the sample information with
|
Copy `examples/sample.json` somewhere, replace the sample information with
|
||||||
the names of your game, categories and segments. Changing the number of
|
the names of your game, catagories and splits. Changing split names/number of
|
||||||
segments after the first use of the split file is currently unsupported.
|
splits after the first use of the split file is currently unsupported.
|
||||||
|
|
||||||
### Default Keybinds
|
### Default Keybinds
|
||||||
| Keys | Action | Global |
|
| Keys | Action | Global |
|
||||||
@ -28,19 +28,4 @@ segments after the first use of the split file is currently unsupported.
|
|||||||
| `T` | Toggle global hotkeys | YES |
|
| `T` | Toggle global hotkeys | YES |
|
||||||
| `C` | Toggle compact UI | NO |
|
| `C` | Toggle compact UI | NO |
|
||||||
|
|
||||||
Hotkeys can be configured in `$HOME/.config/quest/keymaps/default`
|
Customisable hotkeys without editing the source code coming soon!
|
||||||
|
|
||||||
## Third Party Integration
|
|
||||||
|
|
||||||
If a feature isn't listed here, it probably isn't planned
|
|
||||||
yet and may not ever be
|
|
||||||
|
|
||||||
### [Splits.io](https://splits.io/)
|
|
||||||
|
|
||||||
- [X] Import game, category and segment names from generic format
|
|
||||||
- [ ] Import all information the generic format supports i.e. run histories
|
|
||||||
- [ ] Export runs in the generic format
|
|
||||||
|
|
||||||
### [Speedrun.com](https://www.speedrun.com/)
|
|
||||||
|
|
||||||
- [ ] Submit runs
|
|
||||||
|
|||||||
3110
src/cJSON.c
Normal file
3110
src/cJSON.c
Normal file
File diff suppressed because it is too large
Load Diff
293
src/cJSON.h
Normal file
293
src/cJSON.h
Normal file
@ -0,0 +1,293 @@
|
|||||||
|
/*
|
||||||
|
Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef cJSON__h
|
||||||
|
#define cJSON__h
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
{
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
|
||||||
|
#define __WINDOWS__
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __WINDOWS__
|
||||||
|
|
||||||
|
/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention. For windows you have 3 define options:
|
||||||
|
|
||||||
|
CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
|
||||||
|
CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
|
||||||
|
CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
|
||||||
|
|
||||||
|
For *nix builds that support visibility attribute, you can define similar behavior by
|
||||||
|
|
||||||
|
setting default visibility to hidden by adding
|
||||||
|
-fvisibility=hidden (for gcc)
|
||||||
|
or
|
||||||
|
-xldscope=hidden (for sun cc)
|
||||||
|
to CFLAGS
|
||||||
|
|
||||||
|
then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define CJSON_CDECL __cdecl
|
||||||
|
#define CJSON_STDCALL __stdcall
|
||||||
|
|
||||||
|
/* export symbols by default, this is necessary for copy pasting the C and header file */
|
||||||
|
#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
|
||||||
|
#define CJSON_EXPORT_SYMBOLS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(CJSON_HIDE_SYMBOLS)
|
||||||
|
#define CJSON_PUBLIC(type) type CJSON_STDCALL
|
||||||
|
#elif defined(CJSON_EXPORT_SYMBOLS)
|
||||||
|
#define CJSON_PUBLIC(type) __declspec(dllexport) type CJSON_STDCALL
|
||||||
|
#elif defined(CJSON_IMPORT_SYMBOLS)
|
||||||
|
#define CJSON_PUBLIC(type) __declspec(dllimport) type CJSON_STDCALL
|
||||||
|
#endif
|
||||||
|
#else /* !__WINDOWS__ */
|
||||||
|
#define CJSON_CDECL
|
||||||
|
#define CJSON_STDCALL
|
||||||
|
|
||||||
|
#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
|
||||||
|
#define CJSON_PUBLIC(type) __attribute__((visibility("default"))) type
|
||||||
|
#else
|
||||||
|
#define CJSON_PUBLIC(type) type
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* project version */
|
||||||
|
#define CJSON_VERSION_MAJOR 1
|
||||||
|
#define CJSON_VERSION_MINOR 7
|
||||||
|
#define CJSON_VERSION_PATCH 15
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
/* cJSON Types: */
|
||||||
|
#define cJSON_Invalid (0)
|
||||||
|
#define cJSON_False (1 << 0)
|
||||||
|
#define cJSON_True (1 << 1)
|
||||||
|
#define cJSON_NULL (1 << 2)
|
||||||
|
#define cJSON_Number (1 << 3)
|
||||||
|
#define cJSON_String (1 << 4)
|
||||||
|
#define cJSON_Array (1 << 5)
|
||||||
|
#define cJSON_Object (1 << 6)
|
||||||
|
#define cJSON_Raw (1 << 7) /* raw json */
|
||||||
|
|
||||||
|
#define cJSON_IsReference 256
|
||||||
|
#define cJSON_StringIsConst 512
|
||||||
|
|
||||||
|
/* The cJSON structure: */
|
||||||
|
typedef struct cJSON
|
||||||
|
{
|
||||||
|
/* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
|
||||||
|
struct cJSON *next;
|
||||||
|
struct cJSON *prev;
|
||||||
|
/* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
|
||||||
|
struct cJSON *child;
|
||||||
|
|
||||||
|
/* The type of the item, as above. */
|
||||||
|
int type;
|
||||||
|
|
||||||
|
/* The item's string, if type==cJSON_String and type == cJSON_Raw */
|
||||||
|
char *valuestring;
|
||||||
|
/* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
|
||||||
|
int valueint;
|
||||||
|
/* The item's number, if type==cJSON_Number */
|
||||||
|
double valuedouble;
|
||||||
|
|
||||||
|
/* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
|
||||||
|
char *string;
|
||||||
|
} cJSON;
|
||||||
|
|
||||||
|
typedef struct cJSON_Hooks
|
||||||
|
{
|
||||||
|
/* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
|
||||||
|
void *(CJSON_CDECL *malloc_fn)(size_t sz);
|
||||||
|
void (CJSON_CDECL *free_fn)(void *ptr);
|
||||||
|
} cJSON_Hooks;
|
||||||
|
|
||||||
|
typedef int cJSON_bool;
|
||||||
|
|
||||||
|
/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
|
||||||
|
* This is to prevent stack overflows. */
|
||||||
|
#ifndef CJSON_NESTING_LIMIT
|
||||||
|
#define CJSON_NESTING_LIMIT 1000
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* returns the version of cJSON as a string */
|
||||||
|
CJSON_PUBLIC(const char*) cJSON_Version(void);
|
||||||
|
|
||||||
|
/* Supply malloc, realloc and free functions to cJSON */
|
||||||
|
CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
|
||||||
|
|
||||||
|
/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
|
||||||
|
/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length);
|
||||||
|
/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
|
||||||
|
/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated);
|
||||||
|
|
||||||
|
/* Render a cJSON entity to text for transfer/storage. */
|
||||||
|
CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
|
||||||
|
/* Render a cJSON entity to text for transfer/storage without any formatting. */
|
||||||
|
CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
|
||||||
|
/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
|
||||||
|
CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
|
||||||
|
/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
|
||||||
|
/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
|
||||||
|
/* Delete a cJSON entity and all subentities. */
|
||||||
|
CJSON_PUBLIC(void) cJSON_Delete(cJSON *item);
|
||||||
|
|
||||||
|
/* Returns the number of items in an array (or object). */
|
||||||
|
CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
|
||||||
|
/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
|
||||||
|
/* Get item "string" from object. Case insensitive. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
|
||||||
|
/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
|
||||||
|
CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
|
||||||
|
|
||||||
|
/* Check item type and return its value */
|
||||||
|
CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item);
|
||||||
|
|
||||||
|
/* These functions check the type of an item */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
|
||||||
|
|
||||||
|
/* These calls create a cJSON item of the appropriate type. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
|
||||||
|
/* raw json */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
|
||||||
|
|
||||||
|
/* Create a string where valuestring references a string so
|
||||||
|
* it will not be freed by cJSON_Delete */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
|
||||||
|
/* Create an object/array that only references it's elements so
|
||||||
|
* they will not be freed by cJSON_Delete */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
|
||||||
|
|
||||||
|
/* These utilities create an Array of count items.
|
||||||
|
* The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count);
|
||||||
|
|
||||||
|
/* Append item to the specified array/object. */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
|
||||||
|
/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
|
||||||
|
* WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
|
||||||
|
* writing to `item->string` */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
|
||||||
|
/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
|
||||||
|
|
||||||
|
/* Remove/Detach items from Arrays/Objects. */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
|
||||||
|
CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
|
||||||
|
CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
|
||||||
|
CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
|
||||||
|
|
||||||
|
/* Update array items. */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
|
||||||
|
|
||||||
|
/* Duplicate a cJSON item */
|
||||||
|
CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
|
||||||
|
/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
|
||||||
|
* need to be released. With recurse!=0, it will duplicate any children connected to the item.
|
||||||
|
* The item->next and ->prev pointers are always zero on return from Duplicate. */
|
||||||
|
/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
|
||||||
|
* case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
|
||||||
|
CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
|
||||||
|
|
||||||
|
/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings.
|
||||||
|
* The input pointer json cannot point to a read-only address area, such as a string constant,
|
||||||
|
* but should point to a readable and writable address area. */
|
||||||
|
CJSON_PUBLIC(void) cJSON_Minify(char *json);
|
||||||
|
|
||||||
|
/* Helper functions for creating and adding items to an object at the same time.
|
||||||
|
* They return the added item or NULL on failure. */
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
|
||||||
|
CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
|
||||||
|
|
||||||
|
/* When assigning an integer value, it needs to be propagated to valuedouble too. */
|
||||||
|
#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
|
||||||
|
/* helper for the cJSON_SetNumberValue macro */
|
||||||
|
CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
|
||||||
|
#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
|
||||||
|
/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
|
||||||
|
CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
|
||||||
|
|
||||||
|
/* Macro for iterating over an array or object */
|
||||||
|
#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
|
||||||
|
|
||||||
|
/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
|
||||||
|
CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
|
||||||
|
CJSON_PUBLIC(void) cJSON_free(void *object);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
299
src/display.c
299
src/display.c
@ -1,21 +1,16 @@
|
|||||||
#include "display.h"
|
#include "display.h"
|
||||||
|
|
||||||
|
const char *millitime = "%8d.%d";
|
||||||
|
const char *secondstime = "%7d.%02d";
|
||||||
|
const char *minutestime = "%7d:%02d";
|
||||||
|
const char *hourstime = "%5d:%02d:%02d";
|
||||||
|
const char *fulltime = "%2d:%02d:%02d.%02d";
|
||||||
|
const char *sfulltime = "%4d:%02d.%02d";
|
||||||
#define MVCUR "\033[%d;%dH%s"
|
#define MVCUR "\033[%d;%dH%s"
|
||||||
int maxrows = INT_MAX;
|
int maxrows = INT_MAX;
|
||||||
int maxcols = INT_MAX;
|
int maxcols = INT_MAX;
|
||||||
int colwidth = 10;
|
int colwidth = 10;
|
||||||
int in;
|
int in = 0;
|
||||||
|
|
||||||
//UI
|
|
||||||
struct color bg = { 47, 53, 66};
|
|
||||||
struct color fg = {247, 248, 242};
|
|
||||||
struct color fade = {210, 210, 210};
|
|
||||||
struct color gold = {249, 255, 79};
|
|
||||||
struct color good = { 79, 255, 85};
|
|
||||||
struct color bad = {255, 79, 79};
|
|
||||||
int h, w;
|
|
||||||
bool compact = false;
|
|
||||||
bool dirty = false;
|
|
||||||
|
|
||||||
struct termios base;
|
struct termios base;
|
||||||
|
|
||||||
@ -105,14 +100,13 @@ void drawHLine(int row, int maxlen)
|
|||||||
|
|
||||||
//Column 0 is the left justified column, all following columns columns count
|
//Column 0 is the left justified column, all following columns columns count
|
||||||
//from the right hand side towards the left.
|
//from the right hand side towards the left.
|
||||||
void drawColumn(char **data, int count, int column, int end)
|
void drawColumn(char **data, int count, int column)
|
||||||
{
|
{
|
||||||
int x = maxcols - (column * 10) + 1;
|
int x = maxcols - (column * 10) + 1;
|
||||||
int y = 6;
|
int y = 6;
|
||||||
if (column == 0)
|
if (column == 0)
|
||||||
x = 1;
|
x = 1;
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
if (i <= end)
|
|
||||||
printf(MVCUR, y + i, x, data[i]);
|
printf(MVCUR, y + i, x, data[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -128,13 +122,12 @@ void drawRow(char **data, int count, int row)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//In case you need colors, you gotta draw cell by cell
|
void drawCell(char *data, int column, int row)
|
||||||
void drawCell(char *data, int column, int row, struct color col)
|
|
||||||
{
|
{
|
||||||
int x = maxcols - (column * 10) + 1;
|
int x = maxcols - (column * 10);
|
||||||
if (column == 1)
|
if (column == 1)
|
||||||
x = 1;
|
x = 1;
|
||||||
printf("\033[38;2;%d;%d;%dm\033[%d;%dH%s", col.r, col.g, col.b, row, x, data);
|
printf(MVCUR, row, x, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setMaxRows(int rows)
|
void setMaxRows(int rows)
|
||||||
@ -146,273 +139,3 @@ void setMaxCols(int cols)
|
|||||||
{
|
{
|
||||||
maxcols = cols;
|
maxcols = cols;
|
||||||
}
|
}
|
||||||
|
|
||||||
void drawSegmentNames()
|
|
||||||
{
|
|
||||||
char *names[segCount];
|
|
||||||
for(int i = 0; i < segCount; i++) {
|
|
||||||
names[i] = segments[i].name;
|
|
||||||
}
|
|
||||||
drawColumn(names, segCount, 0, segCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
//TODO: Fix up all this commented garbage
|
|
||||||
//Really the entire display system needs rethinking first but yea
|
|
||||||
void drawDeltaColumn(int column)
|
|
||||||
{
|
|
||||||
char *times[segCount];
|
|
||||||
for (int i = 0; i < segCount; i++) {
|
|
||||||
times[i] = calloc(1, COLSTRLEN);
|
|
||||||
int time = 0;
|
|
||||||
if (i == currSeg)
|
|
||||||
time = currentMS - pbrun[i].ms;
|
|
||||||
else if (i < currSeg)
|
|
||||||
time = segments[i].ms - pbrun[i].ms;
|
|
||||||
ftime(times[i], time, 1, true);
|
|
||||||
struct color col = {0};
|
|
||||||
if (time <= 0)
|
|
||||||
col = good;
|
|
||||||
else
|
|
||||||
col = bad;
|
|
||||||
if (i < currSeg)
|
|
||||||
drawCell(times[i], column, i + 6, col);
|
|
||||||
if (i == currSeg && time >= -5000)
|
|
||||||
drawCell(times[i], column, i + 6, col);
|
|
||||||
}
|
|
||||||
//drawColumn(times, segCount, column, currSeg);
|
|
||||||
//Use drawCell because we're doing colors.
|
|
||||||
//for (int i = 0; i < segCount; i++) {
|
|
||||||
// if (i <= currSeg)
|
|
||||||
// drawCell(times[i], column, i + 6, good);
|
|
||||||
//}
|
|
||||||
setFGColor(fg);
|
|
||||||
for (int i = 0; i < segCount; i++) {
|
|
||||||
free(times[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//TODO: try to clean the branching up
|
|
||||||
void drawTimeColumn(int timeoption, int column)
|
|
||||||
{
|
|
||||||
char *times[segCount];
|
|
||||||
int drawEnd = currSeg;
|
|
||||||
for (int i = 0; i < segCount; i++) {
|
|
||||||
times[i] = calloc(1, COLSTRLEN);
|
|
||||||
int time = 0;
|
|
||||||
switch (timeoption) {
|
|
||||||
case 0:
|
|
||||||
time = pbrun[i].ms;
|
|
||||||
drawEnd = segCount;
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
if (i > 0 && i < currSeg)
|
|
||||||
time = segments[i].ms - segments[i - 1].ms;
|
|
||||||
else if (i > 0 && i == currSeg)
|
|
||||||
time = currentMS - segments[i - 1].ms;
|
|
||||||
else if (i == 0 && i == currSeg)
|
|
||||||
time = currentMS;
|
|
||||||
else
|
|
||||||
time = segments[i].ms;
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
if (i == currSeg)
|
|
||||||
time = currentMS;
|
|
||||||
else
|
|
||||||
time = segments[i].ms;
|
|
||||||
}
|
|
||||||
ftime(times[i], time, 1, false);
|
|
||||||
}
|
|
||||||
drawColumn(times, segCount, column, drawEnd);
|
|
||||||
for (int i = 0; i < segCount; i++) {
|
|
||||||
free(times[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void drawNotif(char* text)
|
|
||||||
{
|
|
||||||
clock_gettime(CLOCK_REALTIME, ¬if);
|
|
||||||
clearNotif();
|
|
||||||
leftPrint(maxrows, w, text);
|
|
||||||
}
|
|
||||||
|
|
||||||
void clearNotif()
|
|
||||||
{
|
|
||||||
leftPrint(maxrows, w, "\033[2K");
|
|
||||||
}
|
|
||||||
|
|
||||||
void toggleCompact()
|
|
||||||
{
|
|
||||||
compact = !compact;
|
|
||||||
//Clears the screen rather than dirtying it so the notif doesnt clear
|
|
||||||
clrScreen();
|
|
||||||
if (compact)
|
|
||||||
drawNotif("Compact mode enabled");
|
|
||||||
else
|
|
||||||
drawNotif("Compact mode disabled");
|
|
||||||
}
|
|
||||||
|
|
||||||
void drawDisplay()
|
|
||||||
{
|
|
||||||
if (dirty) {
|
|
||||||
clrScreen();
|
|
||||||
dirty = false;
|
|
||||||
}
|
|
||||||
rghtPrint(1, w, "Attempts");
|
|
||||||
char atmpt[10];
|
|
||||||
sprintf(atmpt, "%9d", attempts);
|
|
||||||
rghtPrint(2, w, atmpt);
|
|
||||||
cntrPrint(1, w / 2, w, gameTitle);
|
|
||||||
cntrPrint(2, w / 2, w, categoryTitle);
|
|
||||||
setFGColor(fade);
|
|
||||||
drawHLine(5, w);
|
|
||||||
printf("\033[5;3H");
|
|
||||||
if (hotkeys_enabled || compact)
|
|
||||||
printf("[");
|
|
||||||
if (hotkeys_enabled)
|
|
||||||
printf("h");
|
|
||||||
if (compact)
|
|
||||||
printf("c");
|
|
||||||
if (hotkeys_enabled || compact)
|
|
||||||
printf("]");
|
|
||||||
setFGColor(fg);
|
|
||||||
drawSegmentNames();
|
|
||||||
//TODO: The column names stuff has to be more dynamic, part of the
|
|
||||||
//drawColumn function probably
|
|
||||||
if (!compact) {
|
|
||||||
char cols[41];
|
|
||||||
sprintf(cols, "%10s%10s%10s%10s", "Delta", "Sgmt", "Time", "PB");
|
|
||||||
setFGColor(fade);
|
|
||||||
rghtPrint(4, w, cols);
|
|
||||||
setFGColor(fg);
|
|
||||||
drawTimeColumn(0, 1);
|
|
||||||
drawTimeColumn(3, 2);
|
|
||||||
drawTimeColumn(2, 3);
|
|
||||||
drawDeltaColumn(4);
|
|
||||||
} else {
|
|
||||||
char cols[21];
|
|
||||||
sprintf(cols, "%10s%10s", "Delta", "Time/PB");
|
|
||||||
setFGColor(fade);
|
|
||||||
rghtPrint(4, w, cols);
|
|
||||||
setFGColor(fg);
|
|
||||||
drawTimeColumn(0, 1);
|
|
||||||
drawTimeColumn(3, 1);
|
|
||||||
drawDeltaColumn(2);
|
|
||||||
}
|
|
||||||
setFGColor(fade);
|
|
||||||
drawHLine(segCount + 6, w);
|
|
||||||
setFGColor(fg);
|
|
||||||
ftime(currentTime, currentMS, 2, false);
|
|
||||||
rghtPrint(segCount + 7, w, currentTime);
|
|
||||||
fflush(stdout);
|
|
||||||
}
|
|
||||||
|
|
||||||
void resize(int i)
|
|
||||||
{
|
|
||||||
struct winsize ws;
|
|
||||||
ioctl(1, TIOCGWINSZ, &ws);
|
|
||||||
w = ws.ws_col;
|
|
||||||
h = ws.ws_row;
|
|
||||||
setMaxCols(w);
|
|
||||||
setMaxRows(h);
|
|
||||||
dirty = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void ftime(char *timestr, int rms, int decimals, bool sign)
|
|
||||||
{
|
|
||||||
if (decimals > 3 || decimals < 0)
|
|
||||||
decimals = 0;
|
|
||||||
int seconds = rms / 1000;
|
|
||||||
int minutes = seconds / 60;
|
|
||||||
int hours = minutes / 60;
|
|
||||||
//A few better formatted variables for displaying these numbers
|
|
||||||
int thr = rms % 1000;
|
|
||||||
int two = thr / 10;
|
|
||||||
int one = two / 10;
|
|
||||||
int s = seconds % 60;
|
|
||||||
int m = minutes % 60;
|
|
||||||
int h = hours;
|
|
||||||
int d = 0;
|
|
||||||
switch (decimals) {
|
|
||||||
case 1:
|
|
||||||
d = one;
|
|
||||||
break;
|
|
||||||
case 2:
|
|
||||||
d = two;
|
|
||||||
break;
|
|
||||||
case 3:
|
|
||||||
d = thr;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
char tformat[22];
|
|
||||||
int i = 0;
|
|
||||||
int decimalspace = decimals + (decimals != 0);
|
|
||||||
if (hours) {
|
|
||||||
tformat[i++] = '%';
|
|
||||||
if (sign)
|
|
||||||
tformat[i++] = '+';
|
|
||||||
tformat[i++] = (colwidth - 6 - decimalspace) + 48;
|
|
||||||
tformat[i++] = 'd';
|
|
||||||
tformat[i++] = ':';
|
|
||||||
}
|
|
||||||
if (minutes) {
|
|
||||||
tformat[i++] = '%';
|
|
||||||
if (sign && !hours)
|
|
||||||
tformat[i++] = '+';
|
|
||||||
if (hours) {
|
|
||||||
tformat[i++] = '0';
|
|
||||||
tformat[i++] = '2';
|
|
||||||
} else {
|
|
||||||
tformat[i++] = (colwidth - 3 - decimalspace) + 48;
|
|
||||||
}
|
|
||||||
tformat[i++] = 'd';
|
|
||||||
tformat[i++] = ':';
|
|
||||||
}
|
|
||||||
|
|
||||||
tformat[i++] = '%';
|
|
||||||
if (s != 0 && sign && !hours && !minutes)
|
|
||||||
tformat[i++] = '+';
|
|
||||||
if (minutes) {
|
|
||||||
tformat[i++] = '0';
|
|
||||||
tformat[i++] = '2';
|
|
||||||
} else {
|
|
||||||
//This value can push the resulting char out of the numbers
|
|
||||||
//section of the ascii table so we gotta clamp it
|
|
||||||
int n = colwidth - decimalspace + 48;
|
|
||||||
if (n >= 58)
|
|
||||||
n = 57;
|
|
||||||
tformat[i++] = n;
|
|
||||||
}
|
|
||||||
tformat[i++] = 'd';
|
|
||||||
|
|
||||||
if (decimals) {
|
|
||||||
tformat[i++] = '.';
|
|
||||||
tformat[i++] = '%';
|
|
||||||
tformat[i++] = '0';
|
|
||||||
tformat[i++] = decimals + 48;
|
|
||||||
tformat[i++] = 'd';
|
|
||||||
}
|
|
||||||
tformat[i] = 0;
|
|
||||||
|
|
||||||
if (hours) {
|
|
||||||
if (!decimals)
|
|
||||||
sprintf(timestr, tformat, h, abs(m), abs(s));
|
|
||||||
else
|
|
||||||
sprintf(timestr, tformat, h, abs(m), abs(s), abs(d));
|
|
||||||
} else if (minutes) {
|
|
||||||
if (!decimals)
|
|
||||||
sprintf(timestr, tformat, m, abs(s));
|
|
||||||
else
|
|
||||||
sprintf(timestr, tformat, m, abs(s), abs(d));
|
|
||||||
} else {
|
|
||||||
if (!decimals) {
|
|
||||||
sprintf(timestr, tformat, s);
|
|
||||||
} else {
|
|
||||||
sprintf(timestr, tformat, s, abs(d));
|
|
||||||
if (sign && s == 0 && d < 0)
|
|
||||||
timestr[COLSTRLEN - 4 - decimals] = '-';
|
|
||||||
if (sign && s == 0 && d >= 0)
|
|
||||||
timestr[COLSTRLEN - 4 - decimals] = '+';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@ -7,18 +7,17 @@
|
|||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/ioctl.h>
|
|
||||||
#include <stdbool.h>
|
|
||||||
#include <time.h>
|
|
||||||
#include "timer.h"
|
|
||||||
|
|
||||||
#define COLSTRLEN 11
|
|
||||||
|
|
||||||
|
extern const char *millitime;
|
||||||
|
extern const char *secondstime;
|
||||||
|
extern const char *minutestime;
|
||||||
|
extern const char *hourstime;
|
||||||
|
extern const char *fulltime;
|
||||||
|
extern const char *sfulltime;
|
||||||
extern int maxrows;
|
extern int maxrows;
|
||||||
extern int maxcols;
|
extern int maxcols;
|
||||||
extern int colwidth;
|
extern int colwidth;
|
||||||
extern int in;
|
extern int in;
|
||||||
extern bool dirty;
|
|
||||||
|
|
||||||
struct color {
|
struct color {
|
||||||
int r;
|
int r;
|
||||||
@ -26,9 +25,6 @@ struct color {
|
|||||||
int b;
|
int b;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern struct color bg;
|
|
||||||
extern struct color fg;
|
|
||||||
|
|
||||||
void setBGColor(struct color);
|
void setBGColor(struct color);
|
||||||
void setFGColor(struct color);
|
void setFGColor(struct color);
|
||||||
void clrScreen();
|
void clrScreen();
|
||||||
@ -42,19 +38,11 @@ void cntrPrint(int row, int col, int maxlen, char *text);
|
|||||||
void leftPrint(int row, int maxlen, char *text);
|
void leftPrint(int row, int maxlen, char *text);
|
||||||
void rghtPrint(int row, int maxlem, char *text);
|
void rghtPrint(int row, int maxlem, char *text);
|
||||||
void drawHLine(int row, int maxlen);
|
void drawHLine(int row, int maxlen);
|
||||||
void drawColumn(char **data, int count, int column, int end);
|
void drawColumn(char **data, int count, int column);
|
||||||
void drawRow(char **data, int count, int row);
|
void drawRow(char **data, int count, int row);
|
||||||
void drawCell(char *data, int column, int row, struct color col);
|
void drawCell(char *data, int column, int row);
|
||||||
void setMaxRows(int rows);
|
void setMaxRows(int rows);
|
||||||
void setMaxCols(int cols);
|
void setMaxCols(int cols);
|
||||||
void drawNotif();
|
|
||||||
void clearNotif();
|
|
||||||
void drawSegmentNames();
|
|
||||||
void drawTimeColumn();
|
|
||||||
void toggleCompact();
|
|
||||||
void drawDisplay();
|
|
||||||
void resize(int i);
|
|
||||||
void ftime(char *timestr, int rms, int decimals, bool sign);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
64
src/keys.c
64
src/keys.c
@ -5,38 +5,6 @@ char buf;
|
|||||||
int pipefd[2];
|
int pipefd[2];
|
||||||
struct keymap km;
|
struct keymap km;
|
||||||
|
|
||||||
char *keystrings[KEYNUM] = {
|
|
||||||
"a", "b", "c", "d", "e", "f",
|
|
||||||
"g", "h", "i", "j", "k", "l",
|
|
||||||
"m", "n", "o", "p", "q", "r",
|
|
||||||
"s", "t", "u", "v", "w", "x",
|
|
||||||
"y", "z", "1", "2", "3", "4",
|
|
||||||
"5", "6", "7", "8", "9", "0",
|
|
||||||
"F1", "F2", "F3", "F4", "F5", "F6",
|
|
||||||
"F7", "F8", "F9", "F10", "F11", "F12",
|
|
||||||
"F13", "F14", "F15", "F16", "F17", "F18",
|
|
||||||
"F19", "F20", "F21", "F22", "F23", "F24",
|
|
||||||
"ESC", "`", "-", "=", "BSP", "TAB",
|
|
||||||
"CAP", "[", "]", "\\", ";", "\"",
|
|
||||||
"ENT", ",", ".", "/", " ",
|
|
||||||
};
|
|
||||||
|
|
||||||
uint16_t uiohookKeycodes[KEYNUM] = {
|
|
||||||
VC_A, VC_B, VC_C, VC_D, VC_E, VC_F,
|
|
||||||
VC_G, VC_H, VC_I, VC_J, VC_K, VC_L,
|
|
||||||
VC_M, VC_N, VC_O, VC_P, VC_Q, VC_R,
|
|
||||||
VC_S, VC_T, VC_U, VC_V, VC_W, VC_X,
|
|
||||||
VC_Y, VC_Z, VC_1, VC_2, VC_3, VC_4,
|
|
||||||
VC_5, VC_6, VC_7, VC_8, VC_9, VC_0,
|
|
||||||
VC_F1, VC_F2, VC_F3, VC_F4, VC_F5, VC_F6,
|
|
||||||
VC_F7, VC_F8, VC_F9, VC_F10, VC_F11, VC_F12,
|
|
||||||
VC_F13, VC_F14, VC_F15, VC_F16, VC_F17, VC_F18,
|
|
||||||
VC_F19, VC_F20, VC_F21, VC_F22, VC_F23, VC_F24,
|
|
||||||
VC_ESCAPE, VC_BACKQUOTE, VC_MINUS, VC_EQUALS, VC_BACKSPACE, VC_TAB,
|
|
||||||
VC_CAPS_LOCK, VC_OPEN_BRACKET, VC_CLOSE_BRACKET, VC_BACK_SLASH, VC_SEMICOLON, VC_QUOTE,
|
|
||||||
VC_ENTER, VC_COMMA, VC_PERIOD, VC_SLASH, VC_SPACE
|
|
||||||
};
|
|
||||||
|
|
||||||
bool logger_proc(unsigned int level, const char *format, ...) {
|
bool logger_proc(unsigned int level, const char *format, ...) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -67,16 +35,9 @@ void dispatch_proc(uiohook_event * const event) {
|
|||||||
|
|
||||||
int handleInput()
|
int handleInput()
|
||||||
{
|
{
|
||||||
//Non global hotkeys
|
ssize_t rd = read(pipefd[0], &buf, 1);
|
||||||
char t;
|
char t;
|
||||||
read(in, &t, 1);
|
read(in, &t, 1);
|
||||||
if (t == 'c')
|
|
||||||
toggleCompact();
|
|
||||||
if (t == 'q')
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
//Global hotkeys
|
|
||||||
ssize_t rd = read(pipefd[0], &buf, 1);
|
|
||||||
if ((!hotkeys_enabled && buf != K_HOTKS) || rd == -1)
|
if ((!hotkeys_enabled && buf != K_HOTKS) || rd == -1)
|
||||||
return 0;
|
return 0;
|
||||||
if (buf == K_SPLIT)
|
if (buf == K_SPLIT)
|
||||||
@ -98,24 +59,9 @@ int handleInput()
|
|||||||
unsplit();
|
unsplit();
|
||||||
if (buf == K_SKIP)
|
if (buf == K_SKIP)
|
||||||
skip();
|
skip();
|
||||||
|
if (t == 'c')
|
||||||
|
toggleCompact();
|
||||||
|
if (t == 'q')
|
||||||
|
return 1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void loadKeymap()
|
|
||||||
{
|
|
||||||
km.START = VC_R;
|
|
||||||
km.STOP = VC_F;
|
|
||||||
km.PAUSE = VC_D;
|
|
||||||
km.SPLIT = VC_E;
|
|
||||||
km.HOTKS = VC_T;
|
|
||||||
km.USPLT = VC_G;
|
|
||||||
km.SKIP = VC_V;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t keystringToKeycode(char *keystring) {
|
|
||||||
for (int i = 0; i < KEYNUM; i++)
|
|
||||||
if (strcmp(keystring, keystrings[i]) == 0)
|
|
||||||
return uiohookKeycodes[i];
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
#ifndef KEYS_H
|
#ifndef KEYS_H
|
||||||
#define KEYS_H
|
#define KEYS_H
|
||||||
|
|
||||||
#include "uiohook.h"
|
#include <uiohook.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include "timer.h"
|
#include "timer.h"
|
||||||
#include "display.h"
|
#include "display.h"
|
||||||
@ -14,8 +14,6 @@
|
|||||||
#define K_USPLT 6
|
#define K_USPLT 6
|
||||||
#define K_SKIP 7
|
#define K_SKIP 7
|
||||||
|
|
||||||
#define KEYNUM 77
|
|
||||||
|
|
||||||
extern bool hotkeys_enabled;
|
extern bool hotkeys_enabled;
|
||||||
|
|
||||||
struct keymap
|
struct keymap
|
||||||
@ -33,13 +31,9 @@ extern char buf;
|
|||||||
extern int pipefd[2];
|
extern int pipefd[2];
|
||||||
extern struct keymap km;
|
extern struct keymap km;
|
||||||
|
|
||||||
extern char *keystrings[77];
|
|
||||||
|
|
||||||
bool logger_proc(unsigned int level, const char *format, ...);
|
bool logger_proc(unsigned int level, const char *format, ...);
|
||||||
void dispatch_proc(uiohook_event * const event);
|
void dispatch_proc(uiohook_event * const event);
|
||||||
int handleInput();
|
int handleInput();
|
||||||
void loadKeymap();
|
|
||||||
uint16_t keystringToKeycode(char *keystring);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
145
src/splitsio.c
145
src/splitsio.c
@ -1,145 +0,0 @@
|
|||||||
#include "splitsio.h"
|
|
||||||
|
|
||||||
//Splits.io data
|
|
||||||
const char *schemaver = "v1.0.1";
|
|
||||||
const char *timersname = "quest";
|
|
||||||
const char *timerlname = "Quinn's Utterly Elegant Speedrun Timer";
|
|
||||||
const char *timerver = "v0.6.0";
|
|
||||||
const char *timerlink = "https://github.com/SilentFungus/quest";
|
|
||||||
|
|
||||||
//Imports game/catagory names and segment names
|
|
||||||
void importSplitsIO(cJSON *splitfile)
|
|
||||||
{
|
|
||||||
cJSON *p = NULL;
|
|
||||||
cJSON *game = NULL;
|
|
||||||
cJSON *cate = NULL;
|
|
||||||
cJSON *segs = NULL;
|
|
||||||
game = cJSON_GetItem(splitfile, "game");
|
|
||||||
cate = cJSON_GetItem(splitfile, "category");
|
|
||||||
segs = cJSON_GetItem(splitfile, "segments");
|
|
||||||
|
|
||||||
if (game) {
|
|
||||||
cJSON *title = cJSON_GetItem(game, "longname");
|
|
||||||
if (cJSON_IsString(title) && (title->valuestring != NULL)) {
|
|
||||||
gameTitle = malloc(strlen(title->valuestring));
|
|
||||||
strcpy(gameTitle, title->valuestring);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (cate) {
|
|
||||||
cJSON *title = cJSON_GetItem(cate, "longname");
|
|
||||||
if (cJSON_IsString(title) && (title->valuestring != NULL)) {
|
|
||||||
categoryTitle = malloc(strlen(title->valuestring));
|
|
||||||
strcpy(categoryTitle, title->valuestring);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (segs) {
|
|
||||||
segCount = cJSON_GetArraySize(segs);
|
|
||||||
segments = calloc(segCount, sizeof(struct segment));
|
|
||||||
pbrun = calloc(segCount, sizeof(struct segment));
|
|
||||||
wrrun = calloc(segCount, sizeof(struct segment));
|
|
||||||
bestsegs = calloc(segCount, sizeof(struct segment));
|
|
||||||
|
|
||||||
cJSON *segname = NULL;
|
|
||||||
|
|
||||||
int it = 0;
|
|
||||||
cJSON *iterator = NULL;
|
|
||||||
cJSON_ArrayForEach(iterator, segs) {
|
|
||||||
segname = cJSON_GetItem(iterator, "name");
|
|
||||||
if (cJSON_IsString(segname) && (segname->valuestring != NULL)) {
|
|
||||||
segments[it].name = malloc(strlen(segname->valuestring));
|
|
||||||
strcpy(segments[it].name, segname->valuestring);
|
|
||||||
}
|
|
||||||
it++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
cJSON_Delete(splitfile);
|
|
||||||
}
|
|
||||||
|
|
||||||
void exportSplitsIO()
|
|
||||||
{
|
|
||||||
//cJSON root node
|
|
||||||
cJSON *export = NULL;
|
|
||||||
|
|
||||||
//Schema version
|
|
||||||
cJSON *schema = NULL;
|
|
||||||
|
|
||||||
//Links
|
|
||||||
cJSON *links_root = NULL;
|
|
||||||
cJSON *speedruncom_id = NULL;
|
|
||||||
cJSON *splitsio_id = NULL;
|
|
||||||
|
|
||||||
//Timer
|
|
||||||
cJSON *timer_root = NULL;
|
|
||||||
cJSON *timer_shortname = NULL;
|
|
||||||
cJSON *timer_longname = NULL;
|
|
||||||
cJSON *timer_version = NULL;
|
|
||||||
cJSON *timer_website = NULL;
|
|
||||||
|
|
||||||
//Attempts
|
|
||||||
cJSON *attempts_root = NULL;
|
|
||||||
cJSON *attempts_total = NULL;
|
|
||||||
cJSON *histories = NULL;
|
|
||||||
cJSON *history_root = NULL;
|
|
||||||
cJSON *history_attmpt = NULL;
|
|
||||||
cJSON *history_dur = NULL;
|
|
||||||
cJSON *history_dur_rms = NULL;
|
|
||||||
cJSON *history_dur_gms = NULL;
|
|
||||||
|
|
||||||
//Supplementary data
|
|
||||||
cJSON *image_url = NULL;
|
|
||||||
cJSON *video_url = NULL;
|
|
||||||
|
|
||||||
//Time
|
|
||||||
cJSON *started_at = NULL;
|
|
||||||
cJSON *ended_at = NULL;
|
|
||||||
|
|
||||||
//Pauses
|
|
||||||
cJSON *pauses_root = NULL;
|
|
||||||
cJSON *pause_started = NULL;
|
|
||||||
cJSON *pause_ended = NULL;
|
|
||||||
|
|
||||||
//Game
|
|
||||||
cJSON *game_root = NULL;
|
|
||||||
cJSON *game_longname = NULL;
|
|
||||||
cJSON *game_shortname = NULL;
|
|
||||||
cJSON *game_links = NULL;
|
|
||||||
cJSON *game_srcom_id = NULL;
|
|
||||||
cJSON *game_splits_id = NULL;
|
|
||||||
|
|
||||||
//Catagory
|
|
||||||
cJSON *cate_root = NULL;
|
|
||||||
cJSON *cate_longname = NULL;
|
|
||||||
cJSON *cate_shortname = NULL;
|
|
||||||
cJSON *cate_links = NULL;
|
|
||||||
cJSON *cate_splits_id = NULL;
|
|
||||||
cJSON *cate_spdrun_id = NULL;
|
|
||||||
|
|
||||||
//Runners
|
|
||||||
cJSON *runner_root = NULL;
|
|
||||||
cJSON *runner_longname = NULL;
|
|
||||||
cJSON *runner_shrtname = NULL;
|
|
||||||
cJSON *runner_links = NULL;
|
|
||||||
cJSON *runner_twitch = NULL;
|
|
||||||
cJSON *runner_spltsio = NULL;
|
|
||||||
cJSON *runner_spdrun = NULL;
|
|
||||||
cJSON *runner_twitter = NULL;
|
|
||||||
|
|
||||||
//Segments
|
|
||||||
cJSON *seg_root = NULL;
|
|
||||||
cJSON *seg_name = NULL;
|
|
||||||
cJSON *seg_ended = NULL;
|
|
||||||
cJSON *seg_ended_rms = NULL;
|
|
||||||
cJSON *seg_ended_gms = NULL;
|
|
||||||
cJSON *seg_best = NULL;
|
|
||||||
cJSON *seg_best_rms = NULL;
|
|
||||||
cJSON *seg_best_gms = NULL;
|
|
||||||
cJSON *seg_is_skipped = NULL;
|
|
||||||
cJSON *seg_is_reset = NULL;
|
|
||||||
cJSON *seg_histories = NULL;
|
|
||||||
cJSON *seg_hst_attmp = NULL;
|
|
||||||
cJSON *seg_hst_end = NULL;
|
|
||||||
cJSON *seg_hst_end_rms = NULL;
|
|
||||||
cJSON *seg_hst_end_gms = NULL;
|
|
||||||
cJSON *seg_hst_skp = NULL;
|
|
||||||
cJSON *seg_hst_rst = NULL;
|
|
||||||
}
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
#ifndef SPLITSIO_H
|
|
||||||
#define SPLITSIO_H
|
|
||||||
|
|
||||||
#include <cjson/cJSON.h>
|
|
||||||
#include "timer.h"
|
|
||||||
|
|
||||||
//const char *schemaver;
|
|
||||||
//const char *timersname;
|
|
||||||
//const char *timerlname;
|
|
||||||
//const char *timerver;
|
|
||||||
//const char *timerlink;
|
|
||||||
|
|
||||||
void importSplitsIO(cJSON *splitfile);
|
|
||||||
void exportSplitsIO();
|
|
||||||
|
|
||||||
#endif
|
|
||||||
388
src/timer.c
388
src/timer.c
@ -3,12 +3,24 @@
|
|||||||
//Timekeeping
|
//Timekeeping
|
||||||
struct timespec timestart, finish, notif;
|
struct timespec timestart, finish, notif;
|
||||||
int currentMS = 0;
|
int currentMS = 0;
|
||||||
int timeSave = 0;
|
bool timerActive;
|
||||||
bool timerActive = false;
|
|
||||||
|
//UI
|
||||||
|
struct color bg = { 47, 53, 66};
|
||||||
|
struct color fg = {247, 248, 242};
|
||||||
|
int h, w;
|
||||||
|
bool compact = false;
|
||||||
|
bool dirty = false;
|
||||||
|
|
||||||
|
//Splits.io data
|
||||||
|
const char *schemaver = "v1.0.1";
|
||||||
|
const char *timersname = "quest";
|
||||||
|
const char *timerlname = "Quinn's Utterly Elegant Speedrun Timer";
|
||||||
|
const char *timerver = "v0.5.0";
|
||||||
|
const char *timerlink = "https://github.com/SilentFungus/quest";
|
||||||
|
|
||||||
//Run data
|
//Run data
|
||||||
char *filepath;
|
char *filepath;
|
||||||
char *configpath;
|
|
||||||
char *gameTitle = "title not loaded";
|
char *gameTitle = "title not loaded";
|
||||||
char *categoryTitle = "category not loaded";
|
char *categoryTitle = "category not loaded";
|
||||||
int attempts = 0;
|
int attempts = 0;
|
||||||
@ -40,12 +52,9 @@ void start()
|
|||||||
{
|
{
|
||||||
if (timerActive || segCount == 0)
|
if (timerActive || segCount == 0)
|
||||||
return;
|
return;
|
||||||
//for now we do this here for reasons explained in stop()
|
|
||||||
calculatePB();
|
|
||||||
clock_gettime(CLOCK_REALTIME, ×tart);
|
clock_gettime(CLOCK_REALTIME, ×tart);
|
||||||
timerActive = true;
|
timerActive = true;
|
||||||
//Reset state of timer
|
//Reset state of timer
|
||||||
dirty = true; //find a way to put this in src/display.c
|
|
||||||
for(int i = 0; i < segCount; i++) {
|
for(int i = 0; i < segCount; i++) {
|
||||||
segments[i].ms = 0;
|
segments[i].ms = 0;
|
||||||
segments[i].isSkipped = false;
|
segments[i].isSkipped = false;
|
||||||
@ -73,10 +82,7 @@ void stop()
|
|||||||
t.isReset = segments[i].isReset;
|
t.isReset = segments[i].isReset;
|
||||||
pastRuns[((attempts-1) * segCount) + i] = t;
|
pastRuns[((attempts-1) * segCount) + i] = t;
|
||||||
}
|
}
|
||||||
//If this is done here you wont get a chance to peep your deltas on
|
calculatePB();
|
||||||
//a pb coz the ui will just update and zero them all out if your current
|
|
||||||
//run is the pb run youre now comparing to
|
|
||||||
//calculatePB();
|
|
||||||
saveFile();
|
saveFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -113,17 +119,185 @@ void skip()
|
|||||||
stop();
|
stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void loadKeymap()
|
||||||
|
{
|
||||||
|
km.START = VC_R;
|
||||||
|
km.STOP = VC_F;
|
||||||
|
km.PAUSE = VC_D;
|
||||||
|
km.SPLIT = VC_E;
|
||||||
|
km.HOTKS = VC_T;
|
||||||
|
km.USPLT = VC_G;
|
||||||
|
km.SKIP = VC_V;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ftime(char *timestr, bool withMS, int rms)
|
||||||
|
{
|
||||||
|
int seconds = rms / 1000;
|
||||||
|
int minutes = seconds / 60;
|
||||||
|
int hours = minutes / 60;
|
||||||
|
//A few better formatted variables for displaying these numbers
|
||||||
|
int tms = (rms % 1000) / 10;
|
||||||
|
int oms = tms / 10;
|
||||||
|
int s = seconds % 60;
|
||||||
|
int m = minutes % 60;
|
||||||
|
int h = hours;
|
||||||
|
|
||||||
|
if (hours) {
|
||||||
|
if (withMS)
|
||||||
|
sprintf(timestr, fulltime, h, abs(h), abs(m), abs(s), abs(tms));
|
||||||
|
else
|
||||||
|
sprintf(timestr, hourstime, h, abs(m), abs(s));
|
||||||
|
} else if (minutes) {
|
||||||
|
if (withMS)
|
||||||
|
sprintf(timestr, sfulltime, m, abs(s), abs(tms));
|
||||||
|
else
|
||||||
|
sprintf(timestr, minutestime, m, abs(s));
|
||||||
|
} else {
|
||||||
|
if (withMS)
|
||||||
|
sprintf(timestr, secondstime, s, abs(tms));
|
||||||
|
else
|
||||||
|
sprintf(timestr, millitime, s, abs(oms));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
int timespecToMS(struct timespec t)
|
int timespecToMS(struct timespec t)
|
||||||
{
|
{
|
||||||
return (t.tv_nsec / 1000000) + (t.tv_sec * 1000);
|
return (t.tv_nsec / 1000000) + (t.tv_sec * 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void drawSegmentNames()
|
||||||
|
{
|
||||||
|
char *names[segCount];
|
||||||
|
for(int i = 0; i < segCount; i++) {
|
||||||
|
names[i] = segments[i].name;
|
||||||
|
}
|
||||||
|
drawColumn(names, segCount, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
//TODO: try to clean the branching up
|
||||||
|
void drawTimeColumn(int timeoption, int column)
|
||||||
|
{
|
||||||
|
char *times[segCount];
|
||||||
|
for (int i = 0; i < segCount; i++) {
|
||||||
|
times[i] = calloc(1, 11);
|
||||||
|
int time = 0;
|
||||||
|
switch (timeoption) {
|
||||||
|
case 0:
|
||||||
|
time = pbrun[i].ms;
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
if (i == currSeg)
|
||||||
|
time = currentMS - pbrun[i].ms;
|
||||||
|
else
|
||||||
|
time = segments[i].ms - pbrun[i].ms;
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
if (i > 0 && i < currSeg)
|
||||||
|
time = segments[i].ms - segments[i - 1].ms;
|
||||||
|
else if (i > 0 && i == currSeg)
|
||||||
|
time = currentMS - segments[i - 1].ms;
|
||||||
|
else if (i == 0 && i == currSeg)
|
||||||
|
time = currentMS;
|
||||||
|
else
|
||||||
|
time = segments[i].ms;
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
if (i == currSeg)
|
||||||
|
time = currentMS;
|
||||||
|
else
|
||||||
|
time = segments[i].ms;
|
||||||
|
}
|
||||||
|
ftime(times[i], false, time);
|
||||||
|
}
|
||||||
|
drawColumn(times, segCount, column);
|
||||||
|
for (int i = 0; i < segCount; i++) {
|
||||||
|
free(times[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void drawNotif(char* text)
|
||||||
|
{
|
||||||
|
clock_gettime(CLOCK_REALTIME, ¬if);
|
||||||
|
clearNotif();
|
||||||
|
leftPrint(maxrows, w, text);
|
||||||
|
}
|
||||||
|
|
||||||
|
void clearNotif()
|
||||||
|
{
|
||||||
|
leftPrint(maxrows, w, "\033[2K");
|
||||||
|
}
|
||||||
|
|
||||||
|
void toggleCompact()
|
||||||
|
{
|
||||||
|
compact = !compact;
|
||||||
|
//Clears the screen rather than dirtying it so the notif doesnt clear
|
||||||
|
clrScreen();
|
||||||
|
if (compact)
|
||||||
|
drawNotif("Compact mode enabled");
|
||||||
|
else
|
||||||
|
drawNotif("Compact mode disabled");
|
||||||
|
}
|
||||||
|
|
||||||
|
void drawDisplay()
|
||||||
|
{
|
||||||
|
if (dirty) {
|
||||||
|
clrScreen();
|
||||||
|
dirty = false;
|
||||||
|
}
|
||||||
|
rghtPrint(1, w, "Attempts");
|
||||||
|
char atmpt[10];
|
||||||
|
sprintf(atmpt, "%9d", attempts);
|
||||||
|
rghtPrint(2, w, atmpt);
|
||||||
|
cntrPrint(1, w / 2, w, gameTitle);
|
||||||
|
cntrPrint(2, w / 2, w, categoryTitle);
|
||||||
|
drawHLine(5, w);
|
||||||
|
printf("\033[5;3H");
|
||||||
|
if (hotkeys_enabled || compact)
|
||||||
|
printf("[");
|
||||||
|
if (hotkeys_enabled)
|
||||||
|
printf("h");
|
||||||
|
if (compact)
|
||||||
|
printf("c");
|
||||||
|
if (hotkeys_enabled || compact)
|
||||||
|
printf("]");
|
||||||
|
drawSegmentNames();
|
||||||
|
//TODO: The column names stuff has to be more dynamic, part of the
|
||||||
|
//drawColumn function probably
|
||||||
|
if (!compact) {
|
||||||
|
char cols[41];
|
||||||
|
sprintf(cols, "%10s%10s%10s%10s", "Delta", "Sgmt", "Time", "PB");
|
||||||
|
rghtPrint(4, w, cols);
|
||||||
|
drawTimeColumn(0, 1);
|
||||||
|
drawTimeColumn(3, 2);
|
||||||
|
drawTimeColumn(2, 3);
|
||||||
|
drawTimeColumn(1, 4);
|
||||||
|
} else {
|
||||||
|
char cols[21];
|
||||||
|
sprintf(cols, "%10s%10s", "Delta", "Time/PB");
|
||||||
|
rghtPrint(4, w, cols);
|
||||||
|
drawTimeColumn(3, 1);
|
||||||
|
drawTimeColumn(1, 2);
|
||||||
|
}
|
||||||
|
drawHLine(segCount + 6, w);
|
||||||
|
ftime(currentTime, true, currentMS);
|
||||||
|
rghtPrint(segCount + 7, w, currentTime);
|
||||||
|
fflush(stdout);
|
||||||
|
}
|
||||||
|
|
||||||
|
void resize(int i)
|
||||||
|
{
|
||||||
|
struct winsize ws;
|
||||||
|
ioctl(1, TIOCGWINSZ, &ws);
|
||||||
|
w = ws.ws_col;
|
||||||
|
h = ws.ws_row;
|
||||||
|
setMaxCols(w);
|
||||||
|
setMaxRows(h);
|
||||||
|
dirty = true;
|
||||||
|
}
|
||||||
|
|
||||||
void calculatePB()
|
void calculatePB()
|
||||||
{
|
{
|
||||||
bool valid = false;
|
bool valid = false;
|
||||||
//TODO: come back to this value, this function should be redone a little
|
|
||||||
int PBsfound = 0;
|
|
||||||
|
|
||||||
int bestMS = INT_MAX;
|
int bestMS = INT_MAX;
|
||||||
int bestAttempt = 0;
|
int bestAttempt = 0;
|
||||||
|
|
||||||
@ -137,12 +311,11 @@ void calculatePB()
|
|||||||
valid = false;
|
valid = false;
|
||||||
}
|
}
|
||||||
if (valid && pastRuns[run + segCount - 1].ms < bestMS) {
|
if (valid && pastRuns[run + segCount - 1].ms < bestMS) {
|
||||||
PBsfound++;
|
|
||||||
bestAttempt = i;
|
bestAttempt = i;
|
||||||
bestMS = pastRuns[run + segCount - 1].ms;
|
bestMS = pastRuns[run + segCount - 1].ms;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (PBsfound > 0)
|
if (valid)
|
||||||
for (int i = 0; i < segCount; i++)
|
for (int i = 0; i < segCount; i++)
|
||||||
pbrun[i].ms = pastRuns[(bestAttempt * segCount) + i].ms;
|
pbrun[i].ms = pastRuns[(bestAttempt * segCount) + i].ms;
|
||||||
}
|
}
|
||||||
@ -152,109 +325,13 @@ void calculateBestSegs()
|
|||||||
if (attempts == 0)
|
if (attempts == 0)
|
||||||
return;
|
return;
|
||||||
for (int i = 0; i < segCount; i++) {
|
for (int i = 0; i < segCount; i++) {
|
||||||
int bestDuration = INT_MAX;
|
int bms = INT_MAX;
|
||||||
for (int j = 0; j < attempts; j++) {
|
for (int j = 0; j < attempts; j++) {
|
||||||
int duration = pastRuns[(j * segCount) + i].ms;
|
int cms = pastRuns[(j * segCount) + i].ms;
|
||||||
if (i != 0)
|
if (cms != 0 && cms < bms)
|
||||||
duration -= bestsegs[i-1].ms;
|
bms = cms;
|
||||||
if (duration != 0 && duration < bestDuration)
|
|
||||||
bestDuration = duration;
|
|
||||||
}
|
}
|
||||||
bestsegs[i].ms = bestDuration;
|
bestsegs[i].ms = bms;
|
||||||
if (i != 0)
|
|
||||||
bestsegs[i].ms += bestsegs[i-1].ms;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void loadConfig()
|
|
||||||
{
|
|
||||||
cJSON *config = NULL;
|
|
||||||
char path[256];
|
|
||||||
strcat(strcpy(path, getenv("HOME")), "/.config/quest");
|
|
||||||
mkdir(path, 0777);
|
|
||||||
strcat(strcpy(path, getenv("HOME")), "/.config/quest/keymaps");
|
|
||||||
mkdir(path, 0777);
|
|
||||||
strcat(strcpy(path, getenv("HOME")), "/.config/quest/keymaps/default");
|
|
||||||
configpath = malloc(strlen(path) + 1);
|
|
||||||
strcpy(configpath, path);
|
|
||||||
|
|
||||||
long length;
|
|
||||||
FILE* f = fopen(path, "rb");
|
|
||||||
if (f != NULL) {
|
|
||||||
char *buffer = NULL;
|
|
||||||
fseek(f, 0, SEEK_END);
|
|
||||||
length = ftell(f);
|
|
||||||
fseek(f, 0, SEEK_SET);
|
|
||||||
buffer = malloc(length + 1);
|
|
||||||
if (buffer != NULL)
|
|
||||||
fread(buffer, 1, length, f);
|
|
||||||
fclose(f);
|
|
||||||
buffer[length] = '\0';
|
|
||||||
|
|
||||||
config = cJSON_Parse(buffer);
|
|
||||||
free(buffer);
|
|
||||||
|
|
||||||
cJSON *startkey = cJSON_GetItem(config, "start");
|
|
||||||
cJSON *stopkey = cJSON_GetItem(config, "stop");
|
|
||||||
cJSON *pausekey = cJSON_GetItem(config, "pause");
|
|
||||||
cJSON *splitkey = cJSON_GetItem(config, "split");
|
|
||||||
cJSON *hotkskey = cJSON_GetItem(config, "toggle hotkeys");
|
|
||||||
cJSON *uspltkey = cJSON_GetItem(config, "unsplit");
|
|
||||||
cJSON *skipkey = cJSON_GetItem(config, "skip");
|
|
||||||
|
|
||||||
if (cJSON_IsString(startkey) && (startkey->valuestring != NULL))
|
|
||||||
km.START = keystringToKeycode(startkey->valuestring);
|
|
||||||
if (cJSON_IsString(stopkey) && (stopkey->valuestring != NULL))
|
|
||||||
km.STOP = keystringToKeycode(stopkey->valuestring);
|
|
||||||
if (cJSON_IsString(pausekey) && (pausekey->valuestring != NULL))
|
|
||||||
km.PAUSE = keystringToKeycode(pausekey->valuestring);
|
|
||||||
if (cJSON_IsString(splitkey) && (splitkey->valuestring != NULL))
|
|
||||||
km.SPLIT = keystringToKeycode(splitkey->valuestring);
|
|
||||||
if (cJSON_IsString(hotkskey) && (hotkskey->valuestring != NULL))
|
|
||||||
km.HOTKS = keystringToKeycode(hotkskey->valuestring);
|
|
||||||
if (cJSON_IsString(uspltkey) && (uspltkey->valuestring != NULL))
|
|
||||||
km.USPLT = keystringToKeycode(uspltkey->valuestring);
|
|
||||||
if (cJSON_IsString(skipkey) && (skipkey->valuestring != NULL))
|
|
||||||
km.SKIP = keystringToKeycode(skipkey->valuestring);
|
|
||||||
} else {
|
|
||||||
config = cJSON_CreateObject();
|
|
||||||
km.START = VC_R;
|
|
||||||
km.STOP = VC_F;
|
|
||||||
km.PAUSE = VC_D;
|
|
||||||
km.SPLIT = VC_E;
|
|
||||||
km.HOTKS = VC_T;
|
|
||||||
km.USPLT = VC_G;
|
|
||||||
km.SKIP = VC_V;
|
|
||||||
cJSON *startkey = cJSON_CreateString("r");
|
|
||||||
cJSON_AddItemToObject(config, "start", startkey);
|
|
||||||
cJSON *stopkey = cJSON_CreateString("f");
|
|
||||||
cJSON_AddItemToObject(config, "stop", stopkey);
|
|
||||||
cJSON *pausekey = cJSON_CreateString("d");
|
|
||||||
cJSON_AddItemToObject(config, "pause", pausekey);
|
|
||||||
cJSON *splitkey = cJSON_CreateString("e");
|
|
||||||
cJSON_AddItemToObject(config, "split", splitkey);
|
|
||||||
cJSON *hotkskey = cJSON_CreateString("t");
|
|
||||||
cJSON_AddItemToObject(config, "toggle hotkeys", hotkskey);
|
|
||||||
cJSON *uspltkey = cJSON_CreateString("g");
|
|
||||||
cJSON_AddItemToObject(config, "unsplit", uspltkey);
|
|
||||||
cJSON *skipkey = cJSON_CreateString("v");
|
|
||||||
cJSON_AddItemToObject(config, "skip", skipkey);
|
|
||||||
saveConfig(config);
|
|
||||||
}
|
|
||||||
cJSON_Delete(config);
|
|
||||||
}
|
|
||||||
|
|
||||||
void saveConfig(cJSON *config)
|
|
||||||
{
|
|
||||||
char *string = cJSON_Print(config);
|
|
||||||
if (string != NULL) {
|
|
||||||
FILE *f = fopen(configpath, "w");
|
|
||||||
if (f == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
fwrite(string, 1, strlen(string), f);
|
|
||||||
|
|
||||||
fclose(f);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,6 +339,18 @@ void saveConfig(cJSON *config)
|
|||||||
//instance of the segments name, instead of copying the contents over
|
//instance of the segments name, instead of copying the contents over
|
||||||
void loadFile()
|
void loadFile()
|
||||||
{
|
{
|
||||||
|
//char path[256];
|
||||||
|
//strcat(strcpy(path, getenv("HOME")), "/.config/qtimer");
|
||||||
|
//mkdir(path, 0777);
|
||||||
|
//strcat(strcpy(path, getenv("HOME")), "/.config/qtimer/keymaps");
|
||||||
|
//mkdir(path, 0777);
|
||||||
|
//strcat(strcpy(path, getenv("HOME")), "/.config/qtimer/keymaps/default");
|
||||||
|
|
||||||
|
//FILE* fp = fopen(path, "r");
|
||||||
|
// READING THE FILE TO A BUFFER
|
||||||
|
//fclose(fp);
|
||||||
|
|
||||||
|
|
||||||
char *buffer = NULL;
|
char *buffer = NULL;
|
||||||
long length;
|
long length;
|
||||||
FILE *f = fopen(filepath, "rb");
|
FILE *f = fopen(filepath, "rb");
|
||||||
@ -301,14 +390,14 @@ void loadFile()
|
|||||||
if (game) {
|
if (game) {
|
||||||
cJSON *title = cJSON_GetItem(game, "name");
|
cJSON *title = cJSON_GetItem(game, "name");
|
||||||
if (cJSON_IsString(title) && (title->valuestring != NULL)) {
|
if (cJSON_IsString(title) && (title->valuestring != NULL)) {
|
||||||
gameTitle = malloc(strlen(title->valuestring) + 1);
|
gameTitle = malloc(strlen(title->valuestring));
|
||||||
strcpy(gameTitle, title->valuestring);
|
strcpy(gameTitle, title->valuestring);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (cate) {
|
if (cate) {
|
||||||
cJSON *title = cJSON_GetItem(cate, "name");
|
cJSON *title = cJSON_GetItem(cate, "name");
|
||||||
if (cJSON_IsString(title) && (title->valuestring != NULL)) {
|
if (cJSON_IsString(title) && (title->valuestring != NULL)) {
|
||||||
categoryTitle = malloc(strlen(title->valuestring) + 1);
|
categoryTitle = malloc(strlen(title->valuestring));
|
||||||
strcpy(categoryTitle, title->valuestring);
|
strcpy(categoryTitle, title->valuestring);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -329,7 +418,7 @@ void loadFile()
|
|||||||
cJSON_ArrayForEach(iterator, segs) {
|
cJSON_ArrayForEach(iterator, segs) {
|
||||||
segname = cJSON_GetItem(iterator, "name");
|
segname = cJSON_GetItem(iterator, "name");
|
||||||
if (cJSON_IsString(segname) && (segname->valuestring != NULL)) {
|
if (cJSON_IsString(segname) && (segname->valuestring != NULL)) {
|
||||||
segments[it].name = malloc(strlen(segname->valuestring) + 1);
|
segments[it].name = malloc(strlen(segname->valuestring));
|
||||||
strcpy(segments[it].name, segname->valuestring);
|
strcpy(segments[it].name, segname->valuestring);
|
||||||
}
|
}
|
||||||
it++;
|
it++;
|
||||||
@ -346,9 +435,9 @@ void loadFile()
|
|||||||
cJSON_ArrayForEach(iIterator, oIterator) {
|
cJSON_ArrayForEach(iIterator, oIterator) {
|
||||||
struct pastseg t;
|
struct pastseg t;
|
||||||
|
|
||||||
cJSON *rms = cJSON_GetItem(iIterator, "m");
|
cJSON *rms = cJSON_GetItem(iIterator, "rms");
|
||||||
cJSON *skp = cJSON_GetItem(iIterator, "s");
|
cJSON *skp = cJSON_GetItem(iIterator, "skipped");
|
||||||
cJSON *rst = cJSON_GetItem(iIterator, "r");
|
cJSON *rst = cJSON_GetItem(iIterator, "reset");
|
||||||
|
|
||||||
t.ms = rms->valueint;
|
t.ms = rms->valueint;
|
||||||
if (cJSON_IsTrue(skp))
|
if (cJSON_IsTrue(skp))
|
||||||
@ -371,6 +460,52 @@ void loadFile()
|
|||||||
calculateBestSegs();
|
calculateBestSegs();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Imports game/catagory names and segment names
|
||||||
|
void importSplitsIO(cJSON *splitfile)
|
||||||
|
{
|
||||||
|
cJSON *game = NULL;
|
||||||
|
cJSON *cate = NULL;
|
||||||
|
cJSON *segs = NULL;
|
||||||
|
game = cJSON_GetItem(splitfile, "game");
|
||||||
|
cate = cJSON_GetItem(splitfile, "category");
|
||||||
|
segs = cJSON_GetItem(splitfile, "segments");
|
||||||
|
|
||||||
|
if (game) {
|
||||||
|
cJSON *title = cJSON_GetItem(game, "longname");
|
||||||
|
if (cJSON_IsString(title) && (title->valuestring != NULL)) {
|
||||||
|
gameTitle = malloc(strlen(title->valuestring));
|
||||||
|
strcpy(gameTitle, title->valuestring);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (cate) {
|
||||||
|
cJSON *title = cJSON_GetItem(cate, "longname");
|
||||||
|
if (cJSON_IsString(title) && (title->valuestring != NULL)) {
|
||||||
|
categoryTitle = malloc(strlen(title->valuestring));
|
||||||
|
strcpy(categoryTitle, title->valuestring);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (segs) {
|
||||||
|
segCount = cJSON_GetArraySize(segs);
|
||||||
|
segments = calloc(segCount, sizeof(struct segment));
|
||||||
|
pbrun = calloc(segCount, sizeof(struct segment));
|
||||||
|
wrrun = calloc(segCount, sizeof(struct segment));
|
||||||
|
bestsegs = calloc(segCount, sizeof(struct segment));
|
||||||
|
|
||||||
|
cJSON *segname = NULL;
|
||||||
|
|
||||||
|
int it = 0;
|
||||||
|
cJSON *iterator = NULL;
|
||||||
|
cJSON_ArrayForEach(iterator, segs) {
|
||||||
|
segname = cJSON_GetItem(iterator, "name");
|
||||||
|
if (cJSON_IsString(segname) && (segname->valuestring != NULL)) {
|
||||||
|
segments[it].name = malloc(strlen(segname->valuestring));
|
||||||
|
strcpy(segments[it].name, segname->valuestring);
|
||||||
|
}
|
||||||
|
it++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cJSON_Delete(splitfile);
|
||||||
|
}
|
||||||
|
|
||||||
void saveFile()
|
void saveFile()
|
||||||
{
|
{
|
||||||
@ -415,9 +550,9 @@ void saveFile()
|
|||||||
cJSON *skp = cJSON_CreateBool(t.isSkipped);
|
cJSON *skp = cJSON_CreateBool(t.isSkipped);
|
||||||
cJSON *rst = cJSON_CreateBool(t.isReset);
|
cJSON *rst = cJSON_CreateBool(t.isReset);
|
||||||
|
|
||||||
cJSON_AddItemToObject(seg, "m", tim);
|
cJSON_AddItemToObject(seg, "rms", tim);
|
||||||
cJSON_AddItemToObject(seg, "s", skp);
|
cJSON_AddItemToObject(seg, "skipped", skp);
|
||||||
cJSON_AddItemToObject(seg, "r", rst);
|
cJSON_AddItemToObject(seg, "reset", rst);
|
||||||
|
|
||||||
cJSON_AddItemToArray(run, seg);
|
cJSON_AddItemToArray(run, seg);
|
||||||
}
|
}
|
||||||
@ -441,6 +576,7 @@ void saveFile()
|
|||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
timerActive = false;
|
||||||
filepath = argv[1];
|
filepath = argv[1];
|
||||||
hook_set_logger_proc(&logger_proc);
|
hook_set_logger_proc(&logger_proc);
|
||||||
hook_set_dispatch_proc(&dispatch_proc);
|
hook_set_dispatch_proc(&dispatch_proc);
|
||||||
@ -450,7 +586,7 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
pipe(pipefd);
|
pipe(pipefd);
|
||||||
fcntl(pipefd[0], F_SETFL, O_NONBLOCK);
|
fcntl(pipefd[0], F_SETFL, O_NONBLOCK);
|
||||||
loadConfig();
|
loadKeymap();
|
||||||
cpid = fork();
|
cpid = fork();
|
||||||
|
|
||||||
if (cpid == 0) {
|
if (cpid == 0) {
|
||||||
|
|||||||
28
src/timer.h
28
src/timer.h
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include "display.h"
|
#include "display.h"
|
||||||
#include "keys.h"
|
#include "keys.h"
|
||||||
#include "splitsio.h"
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
@ -17,7 +16,7 @@
|
|||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include <cjson/cJSON.h>
|
#include "cJSON.h"
|
||||||
|
|
||||||
#define NS_PER_S 1000000000
|
#define NS_PER_S 1000000000
|
||||||
#define cJSON_GetItem(x, y) cJSON_GetObjectItemCaseSensitive(x, y)
|
#define cJSON_GetItem(x, y) cJSON_GetObjectItemCaseSensitive(x, y)
|
||||||
@ -37,19 +36,6 @@ struct pastseg
|
|||||||
bool isReset;
|
bool isReset;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern char *gameTitle;
|
|
||||||
extern char *categoryTitle;
|
|
||||||
extern int currentMS;
|
|
||||||
extern int currSeg;
|
|
||||||
extern int segCount;
|
|
||||||
extern int attempts;
|
|
||||||
extern char currentTime[10];
|
|
||||||
extern struct segment *pbrun;
|
|
||||||
extern struct segment *bestsegs;
|
|
||||||
extern struct segment *wrrun;
|
|
||||||
extern struct segment *segments;
|
|
||||||
extern struct timespec notif;
|
|
||||||
|
|
||||||
void sub_timespec(struct timespec t1, struct timespec t2, struct timespec* td);
|
void sub_timespec(struct timespec t1, struct timespec t2, struct timespec* td);
|
||||||
void add_timespec(struct timespec t1, struct timespec t2, struct timespec* td);
|
void add_timespec(struct timespec t1, struct timespec t2, struct timespec* td);
|
||||||
void start();
|
void start();
|
||||||
@ -58,10 +44,18 @@ void split();
|
|||||||
void tpause();
|
void tpause();
|
||||||
void unsplit();
|
void unsplit();
|
||||||
void skip();
|
void skip();
|
||||||
|
void loadKeymap();
|
||||||
|
void ftime(char *timestr, bool withMS, int ms);
|
||||||
int timespecToMS(struct timespec t);
|
int timespecToMS(struct timespec t);
|
||||||
|
void drawNotif();
|
||||||
|
void clearNotif();
|
||||||
|
void drawSegmentNames();
|
||||||
|
void drawTimeColumn();
|
||||||
|
void toggleCompact();
|
||||||
|
void drawDisplay();
|
||||||
|
void resize(int i);
|
||||||
|
void importSplitsIO(cJSON *splitfile);
|
||||||
void calculatePB();
|
void calculatePB();
|
||||||
void loadConfig();
|
|
||||||
void saveConfig(cJSON *config);
|
|
||||||
void loadFile();
|
void loadFile();
|
||||||
void saveFile();
|
void saveFile();
|
||||||
int main(int argc, char **argv);
|
int main(int argc, char **argv);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user