commit 3e801bda100cdc20efa6534efa0e1b5ff95c283d Author: Marrub Date: Mon Oct 17 11:57:44 2016 -0400 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c59db5d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +lithos_c/bin +*.swp diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..bcdb36d --- /dev/null +++ b/LICENSE @@ -0,0 +1,340 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README b/README new file mode 100644 index 0000000..8bbb3c6 --- /dev/null +++ b/README @@ -0,0 +1 @@ +Lithos3 is a generic GUI system written in GDCC C. diff --git a/acs/lithos3.bin b/acs/lithos3.bin new file mode 100644 index 0000000..0aa3a9b Binary files /dev/null and b/acs/lithos3.bin differ diff --git a/acs/lithos3l.bin b/acs/lithos3l.bin new file mode 100644 index 0000000..d61b210 Binary files /dev/null and b/acs/lithos3l.bin differ diff --git a/lithos_c/Makefile b/lithos_c/Makefile new file mode 100644 index 0000000..d023579 --- /dev/null +++ b/lithos_c/Makefile @@ -0,0 +1,90 @@ +##----------------------------------------------------------------------------- +## +## Copyright © 2016 Project Golan +## +## See "LICENSE" for more information. +## +##----------------------------------------------------------------------------- +## +## Main Makefile. +## +##----------------------------------------------------------------------------- + +## +## Definitions +## + +## Compiler + +CC=gdcc-cc +LD=gdcc-ld +MAKELIB=gdcc-makelib + +## Directories + +BIN=../acs +SRC=src +INC=inc +IR=bin + +## Compiler flags + +TARGET=--bc-target=ZDoom +LFLAGS=$(TARGET) --bc-zdacs-init-delay --bc-zdacs-chunk-STRE +CFLAGS=$(TARGET) -iinc +ALLOCMIN=--alloc-min Sta "" + +## Sources + +SOURCES= \ + $(SRC)/context.c \ + $(SRC)/control.c \ + $(SRC)/draw.c \ + $(SRC)/main.c \ + $(SRC)/stdlib.c \ + $(SRC)/window.c + +HEADERS= \ + $(INC)/Lth.h \ + $(INC)/Lth_assert.h \ + $(INC)/Lth_control.h \ + $(INC)/Lth_callback.h \ + $(INC)/Lth_hudmessage.h \ + $(INC)/Lth_linklist.h \ + $(INC)/Lth_stdlib.h \ + $(INC)/Lth_types.h + +## Output + +OUTPUT=$(SOURCES:$(SRC)/%.c=$(IR)/%.ir) + +## +## Rules +## + +## all + +all: $(BIN)/lithos3l.bin $(BIN)/lithos3.bin + +## bin/lithos3*.bin + +$(BIN)/lithos3l.bin: $(IR)/libc.ir $(IR)/libGDCC.ir + $(LD) $(LFLAGS) $(ALLOCMIN) 700000000 $^ -o $@ + +$(BIN)/lithos3.bin: $(OUTPUT) + $(LD) $(LFLAGS) $(ALLOCMIN) 7000000000 $^ -o $@ -llithos3l + +## ir/*.ir + +$(IR)/%.ir: $(SRC)/%.c $(HEADERS) + $(CC) $(CFLAGS) -c $< -o $@ + +## irlib/lib*.ir + +$(IR)/libc.ir: + $(MAKELIB) $(TARGET) -c libc -o $@ + +$(IR)/libGDCC.ir: + $(MAKELIB) $(TARGET) -c libGDCC -o $@ + +## EOF diff --git a/lithos_c/inc/Lth.h b/lithos_c/inc/Lth.h new file mode 100644 index 0000000..3d56fce --- /dev/null +++ b/lithos_c/inc/Lth.h @@ -0,0 +1,23 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Main header file. +// +//----------------------------------------------------------------------------- + +#ifndef lithos3__Lth_h +#define lithos3__Lth_h + +#include "Lth_assert.h" +#include "Lth_control.h" +#include "Lth_hudmessage.h" +#include "Lth_linklist.h" +#include "Lth_stdlib.h" +#include "Lth_types.h" + +#endif//lithos3__Lth_h diff --git a/lithos_c/inc/Lth_assert.h b/lithos_c/inc/Lth_assert.h new file mode 100644 index 0000000..62b823e --- /dev/null +++ b/lithos_c/inc/Lth_assert.h @@ -0,0 +1,29 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Assertions. +// +//----------------------------------------------------------------------------- + +#ifndef lithos3__Lth_assert_h +#define lithos3__Lth_assert_h + +#include + +#ifdef NDEBUG +#define Lth_assert(expression) ((void)0) +#else +#define Lth_assert(expression) \ + if(!(expression)) \ + printf("[lithos3] Assertion failed in %s (%s:%i): %s\n", \ + __func__, __FILE__, __LINE__, #expression); \ + else \ + ((void)0) +#endif + +#endif//lithos3__Lth_assert_h diff --git a/lithos_c/inc/Lth_callback.h b/lithos_c/inc/Lth_callback.h new file mode 100644 index 0000000..c6af274 --- /dev/null +++ b/lithos_c/inc/Lth_callback.h @@ -0,0 +1,74 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Callbacks. +// +// If an x-macro is defined, this file will give info about callback types. +// Format: (sig, name, ret, arguments...) +// sig - Signal name. +// name - Identifier. +// ret - Return value of callback. +// arguments - Arguments of callback (vararg). +// +//----------------------------------------------------------------------------- + +#if defined(Lth_X) + +Lth_X(SIGDESTROY, destroy, void, struct Lth_Control *) +Lth_X(SIGCLICK , click, void, struct Lth_Control *) +Lth_X(SIGDRAW , draw, void, struct Lth_Context *, struct Lth_Control *) +Lth_X(SIGUPDATE , update, void, struct Lth_Context *, struct Lth_Control *) + +#undef Lth_X + +#elif !defined(lithos3__Lth_callback_h) +#define lithos3__Lth_callback_h + +#define Lth_Callback(name) ((Lth_Callback_t)(name)) +#define Lth_Call(name, ...) \ + do \ + { \ + if((name).data != NULL) \ + for(size_t cbIter = 0; cbIter < (name).size; cbIter++) \ + (name).data[cbIter](__VA_ARGS__); \ + } \ + while(0) +#define Lth_CallReverse(name, ...) \ + do \ + { \ + if((name).data != NULL) \ + for(size_t cbIter = (name).size; cbIter > 0; cbIter--) \ + (name).data[cbIter - 1](__VA_ARGS__); \ + } \ + while(0) + + +//----------------------------------------------------------------------------| +// Type Definitions | +// + +struct Lth_Context; +struct Lth_Control; + +typedef void (*Lth_Callback_t)(void); + +#define Lth_X(sig, name, ret, ...) \ + typedef ret (*Lth_##sig##_t)(__VA_ARGS__); +#include "Lth_callback.h" + +// +// Lth_CallbackSet +// +typedef struct Lth_CallbackSet +{ +#define Lth_X(sig, name, ret, ...) \ + struct { Lth_##sig##_t *data; size_t size; } name; +#include "Lth_callback.h" +} Lth_CallbackSet; + +#endif//lithos3__Lth_callback_h diff --git a/lithos_c/inc/Lth_control.h b/lithos_c/inc/Lth_control.h new file mode 100644 index 0000000..7ded7de --- /dev/null +++ b/lithos_c/inc/Lth_control.h @@ -0,0 +1,140 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Controls. +// +//----------------------------------------------------------------------------- + +#ifndef lithos3__Lth_control_h +#define lithos3__Lth_control_h + +#include "Lth_linklist.h" +#include "Lth_types.h" +#include "Lth_callback.h" + + +//----------------------------------------------------------------------------| +// Type Definitions | +// + +// +// Lth_Rect +// +typedef struct Lth_Rect +{ + int x, y; + int w, h; +} Lth_Rect; + +// +// Lth_HIDRange +// +// read-only +// base: beginning of HID range (must be more than end) +// end: end of HID range (must be less than base) +// +// read-write +// cur: current HID +// +typedef struct Lth_HIDRange +{ + Lth_HID base; + Lth_HID end; + Lth_HID cur; +} Lth_HIDRange; + +// +// Lth_Context +// +// internal data +// clip +// map +// +// read-only +// w: width of screen +// h: height of screen +// +// read-write +// hid: HUD ID range +// +typedef struct Lth_Context +{ + struct { Lth_Rect rects[16]; int num; } clip; + Lth_LinkList *map; + + int w, h; + + Lth_HIDRange hid; +} Lth_Context; + +// +// Lth_Control +// +// Has members of Lth_Rect (read-write). +// +// internal data +// desclink +// descendants +// cb +// +// read-only +// parent: control's parent (NULL if none) +// +// read-write +// userdata: opaque pointer to associate with this control +// +// +typedef struct Lth_Control +{ + Lth_LinkList desclink; + Lth_LinkList *descendants; + Lth_CallbackSet cb; + + struct Lth_Control *parent; + + void *userdata; + + Lth_Mixin(Lth_Rect); +} Lth_Control; + +// +// Lth_Window +// +// Inherits Lth_Control (read-write). +// +// read-only +// title: title of window (see also: Lth_WindowSetTitle) +// +typedef struct Lth_Window +{ + Lth_Inherits(Lth_Control); + char *title; +} Lth_Window; + + +//----------------------------------------------------------------------------| +// Extern Functions | +// + +Lth_Context *Lth_ContextNew(int w, int h, Lth_HID hidBase, Lth_HID hidEnd); +void Lth_ContextMap(Lth_Context *ctx, Lth_Window *window); +void Lth_ContextDestroy(Lth_Context *ctx); +void Lth_ContextRun(Lth_Context *ctx); +void Lth_ContextClipPush(Lth_Context *ctx, int x, int y, int w, int h); +void Lth_ContextClipPop(Lth_Context *ctx); + +void Lth_DrawRect(Lth_Context *ctx, int x, int y, int w, int h, __fixed alpha); + +void Lth_ControlRun(Lth_Context *ctx, void *control_); +void Lth_ControlConnect(void *control_, Lth_Signal signal, Lth_Callback_t cb); +void Lth_ControlDestroy(void *control_); + +Lth_Window *Lth_WindowNew(char const *title, int w, int h, int x, int y); +void Lth_WindowSetTitle(Lth_Window *control, char const *title); + +#endif//lithos3__Lth_control_h diff --git a/lithos_c/inc/Lth_hudmessage.h b/lithos_c/inc/Lth_hudmessage.h new file mode 100644 index 0000000..0e9396a --- /dev/null +++ b/lithos_c/inc/Lth_hudmessage.h @@ -0,0 +1,108 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// HudMessage things. +// +//----------------------------------------------------------------------------- + +#ifndef lithos3__Lth_hudmessage_h +#define lithos3__Lth_hudmessage_h + +#include +#include +#include + +#define Lth_HudMessageFont(font, ...) \ + ( \ + ACS_SetFont(font), \ + Lth_HudMessage(__VA_ARGS__) \ + ) + +#define Lth_HudMessageParams(flags, id, tr, x, y, ...) \ + ( \ + ACS_OptHudMessage((flags) | HUDMSG_NOTWITHFULLMAP, id, tr, x, y, \ + Lth_TICK), \ + ACS_EndHudMessage(__VA_ARGS__) \ + ) + +#define Lth_HudMessagePlain(id, x, y) \ + ( \ + ACS_OptHudMessage(HUDMSG_PLAIN | HUDMSG_NOTWITHFULLMAP, id, \ + CR_UNTRANSLATED, x, y, Lth_TICK), \ + ACS_EndHudMessage() \ + ) + +#define Lth_HudMessageFade(id, x, y, fadetime) \ + ( \ + ACS_OptHudMessage(HUDMSG_FADEOUT | HUDMSG_NOTWITHFULLMAP, id, \ + CR_UNTRANSLATED, x, y, Lth_TICK), \ + ACS_EndHudMessage(fadetime) \ + ) + +#define Lth_DrawSprite(name, flags, id, x, y, ...) \ + ( \ + ACS_SetFont(name), \ + ACS_PrintChar('A'), \ + Lth_HudMessageParams((flags) | HUDMSG_NOTWITHFULLMAP, id, \ + CR_UNTRANSLATED, x, y, __VA_ARGS__) \ + ) + +#define Lth_DrawSpriteFade(name, id, x, y, fadetime) \ + ( \ + ACS_SetFont(name), \ + ACS_PrintChar('A'), \ + Lth_HudMessageFade(id, x, y, fadetime) \ + ) + +#define Lth_DrawSpritePlain(name, id, x, y) \ + ( \ + ACS_SetFont(name), \ + ACS_PrintChar('A'), \ + Lth_HudMessagePlain(id, x, y) \ + ) + +#define Lth_DrawSpriteAlpha(name, id, x, y, alpha) \ + ( \ + ACS_SetFont(name), \ + ACS_PrintChar('A'), \ + Lth_HudMessageParams(HUDMSG_ALPHA, id, CR_UNTRANSLATED, x, y, alpha) \ + ) + +#define Lth_TICK (0.029k) // One tick, in seconds. + +#define Lth_A_Cen (0.0k) +#define Lth_A_Lef (0.1k) +#define Lth_A_Rig (0.2k) +#define Lth_A_Top (0.1k) +#define Lth_A_Bot (0.2k) +#define Lth_A_TCen (0.4k) +#define Lth_A_TLef (0.5k) +#define Lth_A_TRig (0.6k) + + +//----------------------------------------------------------------------------| +// Static Functions | +// + +// +// Lth_HudMessage +// +static inline void Lth_HudMessage(char const *fmt, ...) +{ + va_list vl; + + ACS_BeginPrint(); + + va_start(vl, fmt); + __vnprintf(fmt, vl); + va_end(vl); + + ACS_MoreHudMessage(); +} + +#endif//lithos3__Lth_hudmessage_h diff --git a/lithos_c/inc/Lth_linklist.h b/lithos_c/inc/Lth_linklist.h new file mode 100644 index 0000000..53c3824 --- /dev/null +++ b/lithos_c/inc/Lth_linklist.h @@ -0,0 +1,76 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Doubly linked list structure. +// +//----------------------------------------------------------------------------- + +#ifndef lithos3__Lth_linklist_h +#define lithos3__Lth_linklist_h + +#include "Lth_assert.h" + +#include + + +//----------------------------------------------------------------------------| +// Type Definitions | +// + +// +// Lth_LinkList +// +typedef struct Lth_LinkList +{ + struct Lth_LinkList *next, **prev; + void *owner; +} Lth_LinkList; + + +//----------------------------------------------------------------------------| +// Static Functions | +// + +// +// Lth_LinkListInsert +// +static inline void Lth_LinkListInsert(Lth_LinkList *list, void *object, + Lth_LinkList **head) +{ + Lth_assert(list != NULL); + Lth_assert(head != NULL); + Lth_assert(*head != NULL); + + Lth_LinkList *next = *head; + + if((list->next = next)) + next->prev = &list->next; + + list->prev = head; + *head = list; + + list->owner = object; +} + +// +// Lth_LinkListRemove +// +static inline void Lth_LinkListRemove(Lth_LinkList *list) +{ + Lth_assert(list != NULL); + + Lth_LinkList *next = list->next, **prev = list->prev; + + if(prev && (*prev = next)) + next->prev = prev; + + list->next = NULL; + list->prev = NULL; +} + +#endif//lithos3__Lth_linklist_h diff --git a/lithos_c/inc/Lth_stdlib.h b/lithos_c/inc/Lth_stdlib.h new file mode 100644 index 0000000..eb8edc5 --- /dev/null +++ b/lithos_c/inc/Lth_stdlib.h @@ -0,0 +1,24 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Miscallaneous library functions. +// +//----------------------------------------------------------------------------- + +#ifndef lithos3__Lth_stdlib_h +#define lithos3__Lth_stdlib_h + + +//----------------------------------------------------------------------------| +// Extern Functions | +// + +char *Lth_strdup(char const *s); +void Lth_PrintString(char const *s); + +#endif//lithos3__Lth_stdlib_h diff --git a/lithos_c/inc/Lth_types.h b/lithos_c/inc/Lth_types.h new file mode 100644 index 0000000..3437653 --- /dev/null +++ b/lithos_c/inc/Lth_types.h @@ -0,0 +1,37 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Basic type handling. +// +//----------------------------------------------------------------------------- + +#ifndef lithos3__Lth_types_h +#define lithos3__Lth_types_h + +#define Lth_Inherits(name) [[__anonymous]] name _super +#define Lth_Mixin(name) [[__anonymous]] name _##name + + +//----------------------------------------------------------------------------| +// Type Definitions | +// + +typedef int Lth_HID; + +// +// Lth_Signal +// +typedef enum Lth_Signal +{ +#define Lth_X(sig, name, ret, ...) \ + Lth_##sig, +#include "Lth_callback.h" + Lth_SIGMAX +} Lth_Signal; + +#endif//lithos3__Lth_types_h diff --git a/lithos_c/src/context.c b/lithos_c/src/context.c new file mode 100644 index 0000000..5115041 --- /dev/null +++ b/lithos_c/src/context.c @@ -0,0 +1,121 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Context functions. +// +//----------------------------------------------------------------------------- + +#include "Lth.h" + +#include +#include +#include + + +//----------------------------------------------------------------------------| +// Extern Functions | +// + +// +// Lth_ContextNew +// +Lth_Context *Lth_ContextNew(int w, int h, Lth_HID hidBase, Lth_HID hidEnd) +{ + Lth_Context *ctx = calloc(1, sizeof(Lth_Context)); + Lth_assert(ctx != NULL); + + ctx->w = w; + ctx->h = h; + ctx->hid.cur = ctx->hid.base = hidBase; + ctx->hid.end = hidEnd; + + return ctx; +} + +// +// Lth_ContextMap +// +void Lth_ContextMap(Lth_Context *ctx, Lth_Window *window) +{ + Lth_assert(ctx != NULL); + Lth_assert(window != NULL); + + // TODO: should use last window's position + some divisor of screenspace + if(window->x == -1) window->x = ctx->w / 2; + if(window->y == -1) window->y = ctx->h / 2; + + if(ctx->map) + Lth_LinkListInsert(&window->desclink, window, &ctx->map); + else + { + ctx->map = &window->desclink; + ctx->map->owner = window; + } +} + +// +// Lth_ContextDestroy +// +void Lth_ContextDestroy(Lth_Context *ctx) +{ + if(ctx == NULL) + return; + + if(ctx->map) + { + for(Lth_LinkList *list = ctx->map; list;) + { + Lth_LinkList *next = list->next; + Lth_Control *owner = list->owner; + Lth_LinkListRemove(list); + if(owner) Lth_ControlDestroy(owner); + list = next; + } + } + + free(ctx); +} + +// +// Lth_ContextRun +// +void Lth_ContextRun(Lth_Context *ctx) +{ + Lth_assert(ctx != NULL); + + ACS_SetHudSize(ctx->w, ctx->h, true); + ctx->hid.cur = ctx->hid.base; + + if(ctx->map) + for(Lth_LinkList *list = ctx->map; list; list = list->next) + Lth_ControlRun(ctx, list->owner); +} + +// +// Lth_ContextClipPush +// +void Lth_ContextClipPush(Lth_Context *ctx, int x, int y, int w, int h) +{ + Lth_assert(ctx != NULL); + + ctx->clip.rects[++ctx->clip.num] = (Lth_Rect){ x, y, w, h }; + ACS_SetHudClipRect(x, y, w, h); +} + +// +// Lth_ContextClipPop +// +void Lth_ContextClipPop(Lth_Context *ctx) +{ + Lth_assert(ctx != NULL); + + Lth_Rect rect = ctx->clip.rects[--ctx->clip.num]; + ACS_SetHudClipRect(rect.x, rect.y, rect.w, rect.h); +} + +// EOF diff --git a/lithos_c/src/control.c b/lithos_c/src/control.c new file mode 100644 index 0000000..9985b65 --- /dev/null +++ b/lithos_c/src/control.c @@ -0,0 +1,90 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Control functions. +// +// # of rewrites because of DavidPH: 1 +// +//----------------------------------------------------------------------------- + +#include "Lth.h" + +#include + + +//----------------------------------------------------------------------------| +// Extern Functions | +// + +// +// Lth_ControlRun +// +void Lth_ControlRun(Lth_Context *ctx, void *control_) +{ + Lth_assert(ctx != NULL); + Lth_assert(control_ != NULL); + + Lth_Control *control = control_; + + Lth_Call(control->cb.update, ctx, control); + Lth_Call(control->cb.draw, ctx, control); +} + +// +// Lth_ControlConnect +// +void Lth_ControlConnect(void *control_, Lth_Signal signal, Lth_Callback_t cb) +{ + Lth_assert(control_ != NULL); + Lth_assert(signal < Lth_SIGMAX && signal >= 0); + Lth_assert(cb != NULL); + + Lth_Control *control = control_; + + switch(signal) + { +#define vec(name) control->cb.name +#define Lth_X(sig, name, ret, ...) \ + case Lth_##sig: \ + vec(name).data = \ + realloc(vec(name).data, \ + sizeof(Lth_##sig##_t) * (vec(name).size + 1)); \ + vec(name).data[vec(name).size++] = (Lth_##sig##_t)cb; \ + break; +#include "Lth_callback.h" +#undef vec + } +} + +// +// Lth_ControlDestroy +// +void Lth_ControlDestroy(void *control_) +{ + Lth_assert(control_ != NULL); + + Lth_Control *control = control_; + + for(Lth_LinkList *list = control->descendants; list;) + { + Lth_LinkList *next = list->next; + Lth_Control *owner = list->owner; + + Lth_ControlDestroy(owner); + + list = next; + } + + Lth_CallReverse(control->cb.destroy, control); + Lth_LinkListRemove(&control->desclink); + + free(control); +} + + +// EOF diff --git a/lithos_c/src/draw.c b/lithos_c/src/draw.c new file mode 100644 index 0000000..6494131 --- /dev/null +++ b/lithos_c/src/draw.c @@ -0,0 +1,34 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Context drawing functions. +// +//----------------------------------------------------------------------------- + +#include "Lth.h" + + +//----------------------------------------------------------------------------| +// Extern Functions | +// + +void Lth_DrawRect(Lth_Context *ctx, int x, int y, int w, int h, __fixed alpha) +{ + Lth_assert(ctx != NULL); + + Lth_ContextClipPush(ctx, x, y, w, h); + + for(int ix = 0; ix < w; ix += 128) + for(int iy = 0; iy < h; iy += 128) + Lth_DrawSpriteAlpha(s"lithos_gfx/Base/Black128.png", ctx->hid.cur--, + x + ix, y + iy, alpha); + + Lth_ContextClipPop(ctx); +} + +// EOF diff --git a/lithos_c/src/main.c b/lithos_c/src/main.c new file mode 100644 index 0000000..3612f6e --- /dev/null +++ b/lithos_c/src/main.c @@ -0,0 +1,46 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Program entry point. +// +//----------------------------------------------------------------------------- + +#include "Lth.h" + +#include +#include + + +//----------------------------------------------------------------------------| +// Static Functions | +// + +[[__call("ScriptS"), __script("Enter")]] +static void main() +{ + Lth_Context *ctx = Lth_ContextNew(320, 200, 0x5000, 0x1000); + Lth_Window *window[2] = { + Lth_WindowNew("test window", 50, 100, 30, 30), + Lth_WindowNew("test window 2", 100, 100, -1, -1) + }; + + for(int i = 0; i < 2; i++) + Lth_ContextMap(ctx, window[i]); + + ACS_Delay(1); + + for(;;) + { + Lth_ContextRun(ctx); + ACS_Delay(1); + } + + Lth_ContextDestroy(ctx); +} + +// EOF diff --git a/lithos_c/src/stdlib.c b/lithos_c/src/stdlib.c new file mode 100644 index 0000000..742b69e --- /dev/null +++ b/lithos_c/src/stdlib.c @@ -0,0 +1,49 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Miscallaneous library functions. +// +//----------------------------------------------------------------------------- + +#include "Lth.h" + +#include +#include + + +//----------------------------------------------------------------------------| +// Extern Functions | +// + +// +// Lth_strdup +// +// Duplicates a string, allocating a new one. +// +char *Lth_strdup(char const *s) +{ + Lth_assert(s != NULL); + size_t len = strlen(s); + char *ret = calloc(len + 1, 1); + Lth_assert(ret != NULL); + memcpy(ret, s, len); + return ret; +} + +// +// Lth_PrintString +// +// Print a C string into the ACS print buffer. +// +void Lth_PrintString(char const *s) +{ + if(s == NULL) return; + for(char const *p = s; *p;) ACS_PrintChar(*p++); +} + +// EOF diff --git a/lithos_c/src/window.c b/lithos_c/src/window.c new file mode 100644 index 0000000..7112c4e --- /dev/null +++ b/lithos_c/src/window.c @@ -0,0 +1,71 @@ +//----------------------------------------------------------------------------- +// +// Copyright © 2016 Project Golan +// +// See "LICENSE" for more information. +// +//----------------------------------------------------------------------------- +// +// Window functions. +// +//----------------------------------------------------------------------------- + +#include "Lth.h" + +#include + + +//----------------------------------------------------------------------------| +// Static Functions | +// + +// +// Lth_WindowDraw +// +static void Lth_WindowDraw(Lth_Context *ctx, Lth_Window *window) +{ + Lth_DrawRect(ctx, window->x, window->y, window->w, window->h, 0.5k); + ACS_SetFont(s"CONFONT"); + Lth_PrintString(window->title); + Lth_HudMessagePlain(ctx->hid.cur--, window->x - 8 + Lth_A_Lef, + window->y - 8 + Lth_A_Top); +} + + +//----------------------------------------------------------------------------| +// Extern Functions | +// + +// +// Lth_WindowNew +// +Lth_Window *Lth_WindowNew(char const *title, int w, int h, int x, int y) +{ + Lth_Window *control = calloc(1, sizeof(Lth_Window)); + Lth_assert(control != NULL); + + control->w = w; + control->h = h; + control->x = x; + control->y = y; + + Lth_WindowSetTitle(control, title); + Lth_ControlConnect(control, Lth_SIGDRAW, Lth_Callback(Lth_WindowDraw)); + + return control; +} + +// +// Lth_WindowSetTitle +// +void Lth_WindowSetTitle(Lth_Window *control, char const *title) +{ + Lth_assert(control != NULL); + + if(title != NULL) + control->title = Lth_strdup(title); + else + control->title = Lth_strdup(""); +} + +// EOF diff --git a/lithos_gfx/Base/Black128.png b/lithos_gfx/Base/Black128.png new file mode 100644 index 0000000..6590bec Binary files /dev/null and b/lithos_gfx/Base/Black128.png differ diff --git a/loadacs.txt b/loadacs.txt new file mode 100644 index 0000000..171d16d --- /dev/null +++ b/loadacs.txt @@ -0,0 +1,2 @@ +lithos3l +lithos3