Compare commits

...

11 Commits

Author SHA1 Message Date
Burer
82e2b25a9e CONTIBUTING.md - Fixed broken anchor link 2025-03-14 10:03:49 +02:00
Burer
46739aa601 CONTRIBUTING.md: removed commit categories section 2025-03-13 20:40:31 +02:00
Burer
c1704a1c43 Fixed some language mistakes in CONTRIBUTING.md 2025-03-12 10:36:48 +02:00
63264c83a3 Docs: Added GNU GPL v2.0
Source: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

Signed-off-by: Max Logaev <maxlogaev@proton.me>
2025-03-12 01:10:12 +03:00
3cc3fa6689 Docs: Added README and contributing guide
Co-authored-by: Burer
Signed-off-by: Max Logaev <maxlogaev@proton.me>
2025-03-12 00:29:48 +03:00
1525cb7e37 Apps/cedit: Improved tab visuals
- Improved tab visuals;
- Fixed scroll.ob07 file name;
- Updated binary (27-feb-2025).

Co-authored-by: Max Logaev <maxlogaev@proton.me>
2025-02-28 14:27:08 +01:00
bad1a3c3ca Data: Replace Testris icon from NintendoDS by a taldariner's 2025-02-27 01:31:53 +01:00
b1d8436000 Data: By default use CodeEdit instead of Tinypad 2025-02-27 01:31:53 +01:00
3da226faf6 Data: Fixed issue #24 2025-02-27 01:31:53 +01:00
70297cd8f4 Libs/cmm: Use the actual number of processes instead of the max 2025-02-27 01:03:29 +01:00
bf9f7d2a19 Apps/downloader: Improved UI
Fixed an issue in the UI: The user does not realize that the file
has already been downloaded and may want to click "Download" again.
2025-02-27 02:22:53 +03:00
15 changed files with 646 additions and 111 deletions

60
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,60 @@
# Contributing guide
## Type of contributing
There are two main types of contributions accepted in KolibriOS:
- Submitting issues about problems in the project
- Submitting code to the project via pull requests
Each of these types is described in detail below.
## Issues
You can help us by submitting issues about problems found in the system. Currently, there are two main ways of submitting an issue in the project: **Bug Reports** and **Feature Requests**:
- Bug Reports are suitable if you find a **bug** (crash, error, unexpected behavior) in some part of the system (kernel, drivers, apps, etc.) and want to report it
- Feature Request are used, when you want to propose some **improvement** to the system (missing features, improved user experience, etc.)
## Pull requests
You can also help us by submitting code via pull requests. The process of submitting a pull request consists of the following steps:
1. Find what you want to implement or improve
2. Make a fork of kolibrios (or other needed) repository
3. Create a branch with a name that matches your changes
4. Implement and test the changes
5. Create commits according to the [accepted style](#commit-style)
6. Create and submit a pull request into `main` branch
7. Wait for CI/CD pipelines and code review to pass
When a pull request is submitted, at least two project participants must conduct a code review, after which the proposed changes can be corrected (if it's necessary) and merged into the project.
## Commit style
### Pattern
The commit message should look like this:
```test
Commit message header
Commit message body, if needed
```
- Commit message header and body should reflect changes made in commit
- Commit message header should start with a capital letter
- Commit message body should be separated from the header by one empty line
### Length
Maximum number of characters in a commit header is **72** (standard for **Git**). Also, **72** is the maximum length of a line in a commit body.
## Merge commits
> [!WARNING]
> Merge commits are **prohibited** in the project
## Conclusion
We hope this small instructions will help you to get familiar with KolibriOS contribution rules and inspire you to participate in the work of this project.

338
COPYING.TXT Normal file
View File

@@ -0,0 +1,338 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 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 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.
<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 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, see <https://www.gnu.org/licenses/>.
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.
<signature of Moe Ghoul>, 1 April 1989
Moe Ghoul, 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.

28
README.md Normal file
View File

@@ -0,0 +1,28 @@
# KolibriOS
[![License](https://img.shields.io/badge/License-GPL%202.0-green)](./COPYING.TXT)
[![Build system](https://git.kolibrios.org/KolibriOS/kolibrios/actions/workflows/build.yaml/badge.svg)](https://git.kolibrios.org/KolibriOS/kolibrios/actions/workflows/build.yaml)
KolibriOS is a hobby operating system for x86-compatible computers, which is currently being developed by a small teem of enthusiasts.
It's kernel is written entirely in [FASM](https://flatassembler.net/) assembly language, making it very compact and lean on system resources.
Based on [MenuetOS](https://www.menuetos.net/), it uses its own standards and is NOT fully POSIX or UNIX compliant
## Contributing
We would appreciate any participation in the project and always welcome new users and contributors.
Detailed instructions for the contribution process can be found in the [contributing guide](./CONTRIBUTING.md).
Common list of tasks, issues and enhancement proposals can be found on [this page](https://git.kolibrios.org/KolibriOS/kolibrios/issues).
## Special thanks
The KolibriOS team expresses special thanks to the author of the 32-bit **MenuetOS**, [Ville Turjanmaa](https://www.menuetos.net/contact.htm). We also want to note that all **MenuetOS** copyrights have been preserved.
## License
Contents of this repository are licensed under the terms of **GNU GPL 2.0** unless otherwise specified.
See [this](./COPYING.TXT) file for details.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

@@ -94,11 +94,11 @@ lua=$CodeEdit
ob07=$CodeEdit ob07=$CodeEdit
json=$CodeEdit json=$CodeEdit
asm=$TinyPad asm=$CodeEdit
inc=$TinyPad inc=$CodeEdit
mac=$TinyPad mac=$CodeEdit
inf=$TinyPad inf=$CodeEdit
conf=$TinyPad conf=$CodeEdit
ini=$TextEditor ini=$TextEditor

View File

@@ -49,7 +49,7 @@
11 Fplay Video * |/kolibrios/media/fplay 11 Fplay Video * |/kolibrios/media/fplay
#5 **** DEV #5 **** DEV
54 Flat Assembler |develop/fasm 54 Flat Assembler |develop/fasm
27 Example.asm |example.asm 27 Example.asm |/sys/example.asm
49 Debugger mtdbg |develop/mtdbg 49 Debugger mtdbg |develop/mtdbg
49 Debugger koldbg * |/kolibrios/develop/koldbg 49 Debugger koldbg * |/kolibrios/develop/koldbg
13 Debug Board |develop/board 13 Debug Board |develop/board

View File

@@ -4,7 +4,7 @@
00 3D Demos > |@2 00 3D Demos > |@2
00 Gr<47>ficos > |@3 00 Gr<47>ficos > |@3
00 Multimedia > |@4 00 Multimedia > |@4
00 Emulators > |@18 00 Emulators > |@6
00 Desarrollo > |@5 00 Desarrollo > |@5
00 Sistema > |@7 00 Sistema > |@7
00 Proceso de datos > |@11 00 Proceso de datos > |@11
@@ -45,12 +45,12 @@
#4 **** MULTIMEDIA #4 **** MULTIMEDIA
16 Pixie Audioplayer |media/pixie 16 Pixie Audioplayer |media/pixie
16 AC97SND Audioplayer |media/ac97snd 16 AC97SND Audioplayer |media/ac97snd
16 Fplay - video |/kolibrios/media/fplay 16 Fplay - video * |/kolibrios/media/fplay
16 MidAMP |media/midamp 16 MidAMP |media/midamp
#5 **** DESARROLLO #5 **** DESARROLLO
00 Ejemplos > |@6 27 Example.asm |/sys/example.asm
16 Archiver KPack |kpack
16 Flat Assembler |develop/fasm 16 Flat Assembler |develop/fasm
16 Archiver KPack |kpack
16 Diff Tool |develop/diff 16 Diff Tool |develop/diff
16 Debug Board |develop/board 16 Debug Board |develop/board
49 Debugger mtdbg |develop/mtdbg 49 Debugger mtdbg |develop/mtdbg
@@ -59,12 +59,14 @@
16 Tabla de caracteres |ASCIIVju 16 Tabla de caracteres |ASCIIVju
16 C<>digos ASCII |develop/keyascii 16 C<>digos ASCII |develop/keyascii
16 C<>digos SCAN |develop/scancode 16 C<>digos SCAN |develop/scancode
#6 **** EJEMPLOS #6 **** EMULATORS
16 Threads |develop/thread 24 DOSBox * |/kolibrios/emul/DosBox/dosbox
16 Selector de color |demos/cslide 16 e80 (ZX Spectrum) * |/kolibrios/emul/e80/e80
16 Ejemplo de consola 1 |develop/testcon2 23 FCE Ultra (NES) * |/kolibrios/emul/fceu/fceu
16 Ejemplo de consola 2 |develop/test_gets 23 DGEN (Sega) * |/kolibrios/emul/dgen/dgen
16 Ejemplo de Messages |demos/use_mb 23 Gameboy Color * |/kolibrios/emul/gameboy
23 ZSNES * |/kolibrios/emul/zsnes/zsnes
16 ScummVM * |/kolibrios/emul/scummvm
#7 **** SISTEMA #7 **** SISTEMA
00 Archivos > |@10 00 Archivos > |@10
00 Accesibilidad > |@17 00 Accesibilidad > |@17
@@ -132,12 +134,4 @@
#17 **** ACCESIBILIDAD #17 **** ACCESIBILIDAD
16 Ampliaci<63>n de pantalla|magnify 16 Ampliaci<63>n de pantalla|magnify
16 Teclado en pantalla |zkey 16 Teclado en pantalla |zkey
#18 **** EMULATORS
24 DOSBox * |/kolibrios/emul/DosBox/dosbox
16 e80 (ZX Spectrum) * |/kolibrios/emul/e80/e80
23 FCE Ultra (NES) * |/kolibrios/emul/fceu/fceu
23 DGEN (Sega) * |/kolibrios/emul/dgen/dgen
23 Gameboy Color * |/kolibrios/emul/gameboy
23 ZSNES * |/kolibrios/emul/zsnes/zsnes
16 ScummVM * |/kolibrios/emul/scummvm
## ##

View File

@@ -49,7 +49,7 @@
11 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Fplay * |/kolibrios/media/fplay 11 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Fplay * |/kolibrios/media/fplay
#5 **** <20><><EFBFBD><EFBFBD> #5 **** <20><><EFBFBD><EFBFBD>
54 Flat Assembler |develop/fasm 54 Flat Assembler |develop/fasm
27 Example.asm |example.asm 27 Example.asm |/sys/example.asm
09 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>騪 KPack |kpack 09 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>騪 KPack |kpack
49 <20><EFBFBD>稪 mtdbg |develop/mtdbg 49 <20><EFBFBD>稪 mtdbg |develop/mtdbg
49 <20><EFBFBD>稪 koldbg * |/kolibrios/develop/koldbg 49 <20><EFBFBD>稪 koldbg * |/kolibrios/develop/koldbg

View File

@@ -6,12 +6,20 @@
#define T_CANCEL "<22><EFBFBD><E2ACA5>" #define T_CANCEL "<22><EFBFBD><E2ACA5>"
#define T_OPEN_DIR "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>" #define T_OPEN_DIR "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>"
#define T_RUN "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><>" #define T_RUN "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><>"
#define T_SPEED_TEST "<22><><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" #define T_NEW "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
#define T_SAVE_TO "<22><><EFBFBD><EFBFBD><E0A0AD><EFBFBD> <20>:"
#define T_AUTOCLOSE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><E8A5AD> <20><><EFBFBD><EFBFBD><EFBFBD>"
#define T_STATUS_READY "<22><><20> <20><><EFBFBD><EFBFBD><EFBFBD> ^_^ "
#define T_STATUS_DOWNLOADING "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><><E4A0A9>... %i.%i M<> <20><><EFBFBD><EFBFBD><EFBFBD> (%i K<>/<EFBFBD>) "
#define T_STATUS_COMPLETE "<22><><EFBFBD><EFBFBD><EFBFBD> <20>ᯥ譮 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. "
#define T_STATUS_DL_P1 "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><><E4A0A9>... "
#define T_STATUS_DL_P2 " M<> <20><><EFBFBD><EFBFBD><EFBFBD> ("
#define T_STATUS_DL_P3 " K<>/<EFBFBD>) "
#define FILE_SAVED_AS "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><E0A0AD> <20><><EFBFBD> %s' -Dt" #define FILE_SAVED_AS "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><E0A0AD> <20><><EFBFBD> %s' -Dt"
#define FILE_NOT_SAVED "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n<><EFBFBD><E8A8A1>! <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><E0A0AD> <20><><EFBFBD>\n%s' -Et" #define FILE_NOT_SAVED "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n<><EFBFBD><E8A8A1>! <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><E0A0AD> <20><><EFBFBD>\n%s' -Et"
#define KB_RECEIVED "<22><><EFBFBD><EFBFBD> ᪠稢<E1AAA0><E7A8A2><EFBFBD><EFBFBD>: %i.%i M<> <20><><EFBFBD><EFBFBD><EFBFBD> (%i K<>/<EFBFBD>) "
#define T_ERROR_STARTING_DOWNLOAD "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᪠稢<E1AAA0><E7A8A2><EFBFBD><EFBFBD>.\n<><EFBFBD><E0AEA2><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><E1AEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>୥⮬.' -E" #define T_ERROR_STARTING_DOWNLOAD "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᪠稢<E1AAA0><E7A8A2><EFBFBD><EFBFBD>.\n<><EFBFBD><E0AEA2><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><E1AEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>୥⮬.' -E"
#define T_AUTOCLOSE "<22><><EFBFBD><E2AEA7><EFBFBD><EFBFBD>⨥"
char accept_language[]= "Accept-Language: ru\n"; char accept_language[]= "Accept-Language: ru\n";
#else #else
#define DL_WINDOW_HEADER "Download Manager" #define DL_WINDOW_HEADER "Download Manager"
@@ -19,20 +27,31 @@
#define T_CANCEL "Cancel" #define T_CANCEL "Cancel"
#define T_OPEN_DIR " Show in folder " #define T_OPEN_DIR " Show in folder "
#define T_RUN "Open file" #define T_RUN "Open file"
#define T_SPEED_TEST "Speed test" #define T_NEW "New download"
#define T_SAVE_TO "Download to:"
#define T_AUTOCLOSE "Close this window when download completes"
#define T_STATUS_READY "Ready to download ^_^ "
#define T_STATUS_DOWNLOADING "Downloading... %i.%i MB received (%i KB/s) "
#define T_STATUS_COMPLETE "Download completed succesfully. "
#define T_STATUS_DL_P1 "Downloading... "
#define T_STATUS_DL_P2 " MB received ("
#define T_STATUS_DL_P3 " KB/s) "
#define FILE_SAVED_AS "'Download manager\nFile saved as %s' -Dt" #define FILE_SAVED_AS "'Download manager\nFile saved as %s' -Dt"
#define FILE_NOT_SAVED "'Download manager\nError! Can\96t save file as %s' -Et" #define FILE_NOT_SAVED "'Download manager\nError! Can\96t save file as %s' -Et"
#define KB_RECEIVED "Downloading: %i.%i MB received (%i KB/s) "
#define T_ERROR_STARTING_DOWNLOAD "'Error while starting download process.\nCheck entered path and Internet connection.' -E" #define T_ERROR_STARTING_DOWNLOAD "'Error while starting download process.\nCheck entered path and Internet connection.' -E"
#define T_AUTOCLOSE "Autoclose"
char accept_language[]= "Accept-Language: en\n"; char accept_language[]= "Accept-Language: en\n";
#endif #endif
#define GAPX 15 #define WIN_W 526
#define WIN_W 540 #define WIN_H 195
#define WIN_H 100
#define GAPX 15
#define BUT_W 148
#define DEFAULT_SAVE_DIR "/tmp0/1/Downloads"
char save_dir[] = "/tmp0/1/Downloads";
char dl_shared[] = "DL"; char dl_shared[] = "DL";
#define URL_SPEED_TEST "http://speedtest.tele2.net/100MB.zip" #define URL_SPEED_TEST "http://speedtest.tele2.net/100MB.zip"
@@ -43,4 +62,9 @@ enum {
BTN_STOP, BTN_STOP,
BTN_DIR, BTN_DIR,
BTN_RUN, BTN_RUN,
BTN_NEW
}; };
#define PB_COL_ERROR 0xF55353
#define PB_COL_PROGRESS 0x297FFD
#define PB_COL_COMPLETE 0x74DA00

View File

@@ -7,7 +7,6 @@
#include "const.h" #include "const.h"
bool exit_param = false;
bool open_file = false; bool open_file = false;
dword speed; dword speed;
@@ -17,11 +16,15 @@ _http http;
checkbox autoclose = { T_AUTOCLOSE, false }; checkbox autoclose = { T_AUTOCLOSE, false };
char uEdit[URL_SIZE]; char uEdit[URL_SIZE];
char filepath[URL_SIZE+96]; char filepath[4096];
char save_dir[4096];
char* active_status;
progress_bar pb = {0, GAPX, 58, 380, 17, 0, NULL, NULL, 0xFFFfff, 0x74DA00, NULL};
edit_box ed = {WIN_W-GAPX-GAPX,GAPX,20,0xffffff,0x94AECE,0xffffff,0xffffff, edit_box ed = {WIN_W-GAPX-GAPX,GAPX,20,0xffffff,0x94AECE,0xffffff,0xffffff,
0x10000000, sizeof(uEdit)-2,#uEdit,0,ed_focus,19,19}; 0x10000000, sizeof(uEdit)-2, #uEdit, 0, ed_focus + ed_always_focus, 19, 19};
progress_bar pb = {0, GAPX, 52, WIN_W - GAPX - GAPX, 17, 0, NULL, NULL,
0xFFFfff, 0, NULL};
void main() void main()
@@ -30,16 +33,19 @@ void main()
load_dll(boxlib, #box_lib_init,0); load_dll(boxlib, #box_lib_init,0);
load_dll(libHTTP, #http_lib_init,1); load_dll(libHTTP, #http_lib_init,1);
strcpy(#save_dir, DEFAULT_SAVE_DIR);
if (!dir_exists(#save_dir)) CreateDir(#save_dir); if (!dir_exists(#save_dir)) CreateDir(#save_dir);
SetCurDir(#save_dir); SetCurDir(#save_dir);
sc.get();
InitDownload();
if (param) { if (param) {
if (streqrp(#param, "-e ")) { if (streqrp(#param, "-e ")) {
exit_param = true; autoclose.checked = true;
param += 3; param += 3;
} }
if (streqrp(#param, "-eo ")) { if (streqrp(#param, "-eo ")) {
exit_param = true; autoclose.checked = true;
open_file = true; open_file = true;
param += 4; param += 4;
} }
@@ -65,7 +71,7 @@ void main()
case evMouse: edit_box_mouse stdcall (#ed); break; case evMouse: edit_box_mouse stdcall (#ed); break;
case evButton: ProcessButtonClick(@GetButtonID()); break; case evButton: ProcessButtonClick(@GetButtonID()); break;
case evKey: ProcessKeyPress(); break; case evKey: ProcessKeyPress(); break;
case evReDraw: DrawWindow(); break; case evReDraw: DefineWindow(); break;
default: MonitorProgress(); default: MonitorProgress();
} }
} }
@@ -73,11 +79,30 @@ void main()
void ProcessButtonClick(int id) void ProcessButtonClick(int id)
{ {
autoclose.click(id); autoclose.click(id);
if (id==BTN_EXIT) { StopDownloading(); ExitProcess(); } switch (id) {
if (id==BTN_START) StartDownloading(); case BTN_EXIT:
if (id==BTN_STOP) StopDownloading(); StopDownloading();
if (id==BTN_DIR) { RunProgram("/sys/File managers/Eolite", #filepath); ExitProcess(); } ExitProcess();
if (id==BTN_RUN) { RunProgram("/sys/@open", #filepath); ExitProcess(); } case BTN_START:
StartDownloading();
break;
case BTN_STOP:
StopDownloading();
InitDownload();
DrawWindow();
break;
case BTN_NEW:
InitDownload();
EditBox_UpdateText(#ed, ed_focus + ed_always_focus);
DrawWindow();
break;
case BTN_DIR:
RunProgram("/sys/File managers/Eolite", #filepath);
break;
case BTN_RUN:
RunProgram("/sys/@open", #filepath);
break;
}
} }
void ProcessKeyPress() void ProcessKeyPress()
@@ -85,33 +110,53 @@ void ProcessKeyPress()
@GetKey(); @GetKey();
edit_box_key stdcall(#ed); edit_box_key stdcall(#ed);
EAX >>= 16; EAX >>= 16;
if (AL == SCAN_CODE_ENTER) StartDownloading(); if (AL == SCAN_CODE_ENTER) ProcessButtonClick(BTN_START);
if (AL == SCAN_CODE_ESC) StopDownloading(); if (AL == SCAN_CODE_ESC) ProcessButtonClick(BTN_STOP);
}
void DrawDlButton(int x, id, t)
{
DrawCaptButton(x, 102, BUT_W, 24, id, sc.button, sc.button_text, t);
}
void DefineWindow()
{
sc.get();
pb.frame_color = ed.border_color = ed.focus_border_color = sc.line;
DefineAndDrawWindow(110 + random(300), 100 + random(300), WIN_W+9,
WIN_H + 5 + skin_h, 0x34, sc.work, DL_WINDOW_HEADER, 0);
DrawWindow();
} }
void DrawWindow() void DrawWindow()
{ {
sc.get();
pb.frame_color = sc.dark;
DefineAndDrawWindow(110 + random(300), 100 + random(300), WIN_W+9,
WIN_H + 5 + skin_h, 0x34, sc.work, DL_WINDOW_HEADER, 0);
#define BUT_Y 58; #define BUT_Y 58;
//autoclose.draw(WIN_W-135, BUT_Y+6); if (!http.transfer) && (!filepath) {
if (!http.transfer) DrawBar(GAPX, 102, WIN_W - GAPX - GAPX+1, 24+1, sc.work);
{ DeleteButton(BTN_DIR);
DrawStandartCaptButton(GAPX, BUT_Y, BTN_START, T_DOWNLOAD); DeleteButton(BTN_NEW);
if (filepath) DrawDlButton(WIN_W-BUT_W/2, BTN_START, T_DOWNLOAD);
{ autoclose.disabled = false;
DrawStandartCaptButton(GAPX+102, BUT_Y, BTN_DIR, T_OPEN_DIR); } else if (http.transfer) {
DrawStandartCaptButton(GAPX+276, BUT_Y, BTN_RUN, T_RUN); DrawDlButton(WIN_W-BUT_W/2, BTN_STOP, T_CANCEL);
}
} else {
DrawStandartCaptButton(WIN_W - 120, BUT_Y, BTN_STOP, T_CANCEL);
DrawDownloadingProgress(); DrawDownloadingProgress();
} else if (!http.transfer) && (filepath) {
autoclose.disabled = true;
DrawDlButton(GAPX, BTN_RUN, T_RUN);
DrawDlButton(WIN_W-BUT_W/2, BTN_DIR, T_OPEN_DIR);
DrawDlButton(WIN_W-BUT_W-GAPX, BTN_NEW, T_NEW);
} }
//ed.offset=0; //DEL?
DrawEditBox(#ed); WriteTextWithBg(GAPX, pb.top + 22, 0xD0, sc.work_text, active_status, sc.work);
DrawBar(GAPX, WIN_H - 58, WIN_W - GAPX - GAPX, 1, sc.light);
DrawBar(GAPX, WIN_H - 58 + 1, WIN_W - GAPX - GAPX, 1, sc.dark);
WriteText(GAPX, WIN_H - 48, 0x90, sc.work_text, T_SAVE_TO);
WriteTextWithBg(GAPX + 108, WIN_H - 48, 0xD0, sc.work_text, #save_dir, sc.light);
edit_box_draw stdcall (#ed);
progressbar_draw stdcall(#pb);
autoclose.draw(GAPX, WIN_H - 24);
} }
void StartDownloading() void StartDownloading()
@@ -119,34 +164,31 @@ void StartDownloading()
char get_url[URL_SIZE+33]; char get_url[URL_SIZE+33];
if (http.transfer > 0) return; if (http.transfer > 0) return;
ResetDownloadSpeed(); ResetDownloadSpeed();
filepath = '\0'; pb.back_color = 0xFFFfff;
if (!strncmp(#uEdit,"https:",6)) { if (!strncmp(#uEdit,"https:",6)) {
miniprintf(#get_url, "http://gate.aspero.pro/?site=%s", #uEdit); //miniprintf(#get_url, "http://gate.aspero.pro/?site=%s", #uEdit);
//notify("'HTTPS for download is not supported, trying to download the file via HTTP' -W"); notify("'HTTPS for download temporary is not supported,\ntrying to download the file via HTTP' -W");
//miniprintf(#http_url, "http://%s", #uEdit+8); miniprintf(#uEdit, "http://%s", #uEdit+8);
//if (!downloader.Start(#http_url)) {
// notify("'Download failed.' -E");
// StopDownloading();
//}
} else {
strcpy(#get_url, #uEdit);
} }
strcpy(#get_url, #uEdit);
if (http.get(#get_url)) { if (http.get(#get_url)) {
ed.border_color = 0xCACACA;
EditBox_UpdateText(#ed, ed_disabled);
pb.value = 0; pb.value = 0;
pb.progress_color = PB_COL_PROGRESS;
EditBox_UpdateText(#ed, ed_disabled);
DrawWindow(); DrawWindow();
} else { } else {
pb.progress_color = PB_COL_ERROR;
notify(T_ERROR_STARTING_DOWNLOAD); notify(T_ERROR_STARTING_DOWNLOAD);
StopDownloading(); StopDownloading();
if (exit_param) ExitProcess(); EditBox_UpdateText(#ed, ed_focus + ed_always_focus);
DrawWindow();
} }
} }
void DrawDownloadingProgress() void DrawDownloadingProgress()
{ {
char bytes_received[70]; char received_status[70];
dword gotkb = http.content_received/1024; dword gotkb = http.content_received/1024;
EDI = http.content_received / 100; EDI = http.content_received / 100;
@@ -156,8 +198,20 @@ void DrawDownloadingProgress()
pb.max = http.content_length / 100; pb.max = http.content_length / 100;
progressbar_draw stdcall(#pb); progressbar_draw stdcall(#pb);
CalculateDownloadSpeed(); CalculateDownloadSpeed();
sprintf(#bytes_received, KB_RECEIVED, gotkb/1024, gotkb%1024/103, speed);
WriteTextWithBg(GAPX, pb.top + 22, 0xD0, sc.work_text, #bytes_received, sc.work); //sprintf gets too much space
//sprintf(#received_status, T_STATUS_DOWNLOADING, gotkb/1024, gotkb%1024/103, speed);
strcpy(#received_status, T_STATUS_DL_P1);
strcat(#received_status, itoa(gotkb/1024));
strcat(#received_status, ".");
strcat(#received_status, itoa(gotkb%1024/103));
strcat(#received_status, T_STATUS_DL_P2);
strcat(#received_status, itoa(speed));
strcat(#received_status, T_STATUS_DL_P3);
active_status = #received_status;
WriteTextWithBg(GAPX, pb.top + 22, 0xD0, sc.work_text, active_status, sc.work);
} }
void StopDownloading() void StopDownloading()
@@ -165,10 +219,15 @@ void StopDownloading()
http.stop(); http.stop();
if (http.content_pointer) http.content_pointer = free(http.content_pointer); if (http.content_pointer) http.content_pointer = free(http.content_pointer);
http.content_received = http.content_length = 0; http.content_received = http.content_length = 0;
}
ed.border_color = 0xFFFfff; void InitDownload()
EditBox_UpdateText(#ed, ed_focus); {
DrawWindow(); pb.value = 0;
pb.back_color = sc.light;
pb.progress_color = PB_COL_PROGRESS;
filepath = '\0';
active_status = T_STATUS_READY;
} }
void MonitorProgress() void MonitorProgress()
@@ -188,22 +247,32 @@ void MonitorProgress()
StopDownloading(); StopDownloading();
StartDownloading(); StartDownloading();
return; return;
} else {
CompleteDownload();
} }
SaveFile(0);
if (exit_param) ExitProcess();
StopDownloading();
DrawWindow();
} }
} }
void CompleteDownload()
{
SaveFile(0);
if (autoclose.checked) ExitProcess();
pb.value = pb.max;
pb.progress_color = PB_COL_COMPLETE;
StopDownloading();
active_status = T_STATUS_COMPLETE;
DrawWindow();
}
void SaveFile(int attempt) void SaveFile(int attempt)
{ {
int i, fi=0; int i, fi=0;
char notify_message[4296]; char notify_message[4296];
char file_name[URL_SIZE+96]; char file_name[URL_SIZE+96];
strcpy(#filepath, #save_dir); strcpy(#filepath, #save_dir);
chrcat(#filepath, '/'); chrcat(#filepath, '/'); ///need to check the last symbol
if (attempt > 9) { if (attempt > 9) {
notify("'Too many saving attempts' -E"); notify("'Too many saving attempts' -E");
@@ -243,7 +312,8 @@ void SaveFile(int attempt)
miniprintf(#notify_message, FILE_NOT_SAVED, #filepath); miniprintf(#notify_message, FILE_NOT_SAVED, #filepath);
} }
if (!exit_param) notify(#notify_message); if (!autoclose.checked) notify(#notify_message);
if (!strcmpi(#filepath+strlen(#filepath)-4, ".zip")) if (!strcmpi(#filepath+strlen(#filepath)-4, ".zip"))
|| (!strcmpi(#filepath+strlen(#filepath)-3, ".7z")) { || (!strcmpi(#filepath+strlen(#filepath)-3, ".7z")) {
@@ -257,11 +327,12 @@ void SaveFile(int attempt)
void Unarchive(dword _arc) void Unarchive(dword _arc)
{ {
char folder_name[4096]; char folder_name[4096];
strcpy(#folder_name, "/tmp0/1/Downloads/"); strcpy(#folder_name, #save_dir);
strcpy(#folder_name, #filepath+strrchr(#filepath, '/')); strcpy(#folder_name, #filepath+strrchr(#filepath, '/'));
folder_name[strlen(#folder_name)-4] = '\0'; folder_name[strlen(#folder_name)-4] = '\0';
CreateDir(#folder_name); CreateDir(#folder_name);
//miniprintf2(#param, "-o \"%s\" -h \"%s", #folder_name, #filepath);
strcpy(#param, "-o \""); strcpy(#param, "-o \"");
strcat(#param, #folder_name); strcat(#param, #folder_name);
strcat(#param, "\" -h \""); strcat(#param, "\" -h \"");

View File

@@ -31,6 +31,7 @@ enum {
for (i=0; i<MAX_PROCESS_COUNT; i++) for (i=0; i<MAX_PROCESS_COUNT; i++)
{ {
GetProcessInfo(#Process, i); GetProcessInfo(#Process, i);
if (EAX+1 >= i) break;
if (Process.status_slot != TSTATE_FREE) if (Process.status_slot != TSTATE_FREE)
&& (strcmpi(#Process.name, proc_name)==0) && (strcmpi(#Process.name, proc_name)==0)
{ {
@@ -46,6 +47,7 @@ enum {
for (i=0; i<MAX_PROCESS_COUNT; i++) for (i=0; i<MAX_PROCESS_COUNT; i++)
{ {
GetProcessInfo(#Process, i); GetProcessInfo(#Process, i);
if (EAX+1 >= i) break;
if (Process.status_slot != TSTATE_FREE) if (Process.status_slot != TSTATE_FREE)
&& (strcmpi(#Process.name, proc_name)==0) && (strcmpi(#Process.name, proc_name)==0)
count++; count++;
@@ -65,8 +67,8 @@ enum {
for (i=0; i<MAX_PROCESS_COUNT; i++) for (i=0; i<MAX_PROCESS_COUNT; i++)
{ {
GetProcessInfo(#Process, i); GetProcessInfo(#Process, i);
if (EAX+1 >= i) break;
if (Process.name) if (Process.name)
&& (!streq(#Process.name, "OS"))
&& (Process.ID != Self.ID) && (Process.ID != Self.ID)
KillProcess(Process.ID); KillProcess(Process.ID);
} }

Binary file not shown.

View File

@@ -28,7 +28,7 @@ IMPORT
RW, Ini, EB := EditBox, Tabs, Toolbar, SB := StatusBar; RW, Ini, EB := EditBox, Tabs, Toolbar, SB := StatusBar;
CONST CONST
HEADER = "CEdit (01-oct-2023)"; HEADER = "CEdit (27-feb-2025)";
ShellFilter = ""; ShellFilter = "";
EditFilter = "sh|inc|txt|asm|ob07|c|cpp|h|pas|pp|lua|ini|json"; EditFilter = "sh|inc|txt|asm|ob07|c|cpp|h|pas|pp|lua|ini|json";

View File

@@ -62,26 +62,43 @@ PROCEDURE drawTab (t: tTabs; id, x, y, width, height: INTEGER; s: ARRAY OF CHAR;
CONST CONST
btnCloseSize = 14; btnCloseSize = 14;
VAR VAR
x2, y2, color, closeColor, closeForeColor, textColor: INTEGER; x2, y2, bgColor, closeColor, closeForeColor, textColor: INTEGER;
left, top: INTEGER; left, top: INTEGER;
BEGIN BEGIN
IF id = t.current THEN IF id = t.current THEN
INC(height, curTabHeight - tabHeight); INC(height, curTabHeight - tabHeight + 1);
DEC(y, curTabHeight - tabHeight) DEC(y, curTabHeight - tabHeight + 1)
ELSE
INC(height);
DEC(y)
END; END;
color := K.colors.work;
textColor := K.colors.work_text; textColor := K.colors.work_text;
DEC(x); INC(width); DEC(x); INC(width);
x2 := x + width - 1; x2 := x + width - 1;
y2 := y + height - 1; y2 := y + height - 1;
K.DrawRect(x, y, width, height, color); //K.DrawRect(x, y + 2, width, height - 3, color); //seems to be unnecessary redraw
K.DrawLine(x, y, x2, y, K.colors.line); K.DrawLine(x2, y + 1, x2, y2, K.colors.line);
K.DrawLine(x2, y, x2, y2, K.colors.line); K.DrawLine(x2 - 1, y2, x, y2, K.colors.line);
IF id = t.current THEN
bgColor := K.colors.light;
K.DrawRect(x, y + 1, width - 2, height - 3, bgColor);
K.DrawLine(x + 1, y, x2 - 1, y, K.colors.line);
K.DrawLine(x2 + 1, y + 2, x2 + 1, y2 - 1, K.colors.dark);
K.PutPixel(x, y, K.colors.dark);
K.PutPixel(x + 1, y + 1, K.colors.dark);
K.PutPixel(x2, y, K.colors.dark);
K.PutPixel(x2 - 1, y + 1, K.colors.dark)
ELSE
bgColor := K.colors.work;
K.DrawLine(x, y + 1, x2 - 1, y + 1, K.colors.light);
K.DrawLine(x, y, x2, y, K.colors.line)
END;
top := y + 4;
top := y + 3;
IF id # t.current THEN IF id # t.current THEN
K.DrawLine(x2 - 1, y2, x, y2, K.colors.line);
closeColor := K.colors.button; closeColor := K.colors.button;
closeForeColor := K.colors.button_text closeForeColor := K.colors.button_text
ELSE ELSE
@@ -89,14 +106,15 @@ BEGIN
closeColor := btnCloseColor; closeColor := btnCloseColor;
closeForeColor := 0FFFFFFH closeForeColor := 0FFFFFFH
END; END;
K.DrawLine(x, y2, x, y, K.colors.line); K.DrawLine(x, y2, x, y + 1, K.colors.line);
K.DrawText866bk(x + K.fontWidth + K.fontWidth DIV 2, y + (height - K.fontHeight) DIV 2, textColor, color, s); y := y + 1;
K.DrawText866bk(x + K.fontWidth + K.fontWidth DIV 2, y + (height - K.fontHeight) DIV 2, textColor, bgColor, s);
IF modified THEN IF modified THEN
K.DrawText866bk(x + K.fontWidth DIV 2, y + (height - K.fontHeight) DIV 2, modifColor, color, "*") K.DrawText866bk(x + K.fontWidth DIV 2, y + (height - K.fontHeight) DIV 2, modifColor, bgColor, "*")
END; END;
K.CreateButton(id + ORD({30}) + btnID, x + 1, y - 1, width - 1, height - 1, 0, ""); K.CreateButton(id + ORD({30}) + btnID, x + 1, y, width - 3, height - 3, 0, "");
left := x + width - btnCloseSize - 5; left := x + width - btnCloseSize - 6;
K.CreateButton(id + btnClose, left, top, btnCloseSize, btnCloseSize, closeColor, ""); K.CreateButton(id + btnClose, left, top, btnCloseSize, btnCloseSize, closeColor, "");
K.DrawLine(left + 5, top + 4, left + btnCloseSize - 4, top + btnCloseSize - 5, closeForeColor); K.DrawLine(left + 5, top + 4, left + btnCloseSize - 4, top + btnCloseSize - 5, closeForeColor);
K.DrawLine(left + 4, top + 4, left + btnCloseSize - 4, top + btnCloseSize - 4, closeForeColor); K.DrawLine(left + 4, top + 4, left + btnCloseSize - 4, top + btnCloseSize - 4, closeForeColor);
@@ -137,7 +155,7 @@ VAR
BEGIN BEGIN
y := t.y; y := t.y;
x := t.x; x := t.x;
K.DrawRect(x, y - (curTabHeight - tabHeight), t.width + (2*scrWidth + 2), t.height + (curTabHeight - tabHeight) - 1, K.colors.work); K.DrawRect(x, y - (curTabHeight - tabHeight) - 1, t.width + (2*scrWidth + 2), t.height + (curTabHeight - tabHeight), K.colors.work);
IF Width(t, 0, t.strings.count - 1) > t.width THEN IF Width(t, 0, t.strings.count - 1) > t.width THEN
INC(x, 2*scrWidth); INC(x, 2*scrWidth);
K.DeleteButton(btnLeft); K.DeleteButton(btnLeft);