Docs: Added licensing to contributing guide

Also renamed COPYING.TXT to LICENSE Signed-off-by: Max Logaev <maxlogaev@proton.me>
Period: Moved from IMG to ISO
2025-04-04 11:27:53 +03:00 · 2025-04-03 10:00:33 +02:00 · 2025-04-03 09:39:02 +02:00 · 2025-04-02 21:34:04 +02:00 · 2025-04-02 21:26:12 +02:00 · 2025-04-01 21:58:38 +02:00
30 changed files with 5816 additions and 563 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -66,6 +66,17 @@ to the end commit message body on a new line.

 Use **rebase** to keep your branch up to date.

+## Licensing
+
+For new source code files and for existing ones without a license, you need to add the following header to the beginning of the file:
+```asm
+; SPDX-License-Identifier: GPL-2.0-only
+; Program - Brief description.
+; Copyright (C) 2011-2025 KolibriOS team
+```
+
+Be careful when setting copyright and date interval. Review the file's history to verify its origin.
+
 ## Conclusion

 We hope this small instructions will help you to get familiar with KolibriOS contribution rules and inspire you to participate in the life of our project.
--- a/COPYING.TXT
+++ b/COPYING.TXT
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # KolibriOS

-[![License](https://img.shields.io/badge/License-GPL%202.0-green)](./COPYING.TXT)
+[![License](https://img.shields.io/badge/License-GPL%202.0-green)](./LICENSE)
 [![Build system](https://git.kolibrios.org/KolibriOS/kolibrios/actions/workflows/build.yaml/badge.svg)](https://git.kolibrios.org/KolibriOS/kolibrios/actions)

 KolibriOS is a hobby operating system for x86-compatible computers, which is currently being developed by a small but passionate team of enthusiasts.
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -157,7 +157,7 @@ extra_files = {
 {"kolibrios/3D/info3ds/OBJECTS.PNG", SRC_PROGS .. "/develop/info3ds/objects.png"},
 {"kolibrios/3D/info3ds/TOOLBAR.PNG", SRC_PROGS .. "/develop/info3ds/toolbar.png"},
 {"kolibrios/3D/info3ds/FONT8X9.BMP", SRC_PROGS .. "/fs/kfar/trunk/font8x9.bmp"},
- {"kolibrios/3D/blocks/", "../programs/bcc32/games/blocks/bin/*"},
+ {"kolibrios/3D/blocks/blocks.kex", "../programs/bcc32/games/blocks/bin/blocks.kex"},
 {"kolibrios/3D/blocks/models/", "../programs/bcc32/games/blocks/models/*"},
 {"kolibrios/3D/md2view/", "common/3d/md2view/*"},
 {"kolibrios/3D/md2view/md2_model/", "common/3d/md2view/md2_model/*"},
@@ -631,10 +631,10 @@ tup.append_table(extra_files, {
 {"kolibrios/utils/calcplus", VAR_PROGS .. "/other/calcplus/calcplus"},
 {"kolibrios/utils/kfm/kfm", VAR_PROGS .. "/fs/kfm/trunk/kfm"},
 {"kolibrios/utils/tedit/t_edit", VAR_PROGS .. "/other/t_edit/t_edit"},
+ {"kolibrios/3D/blocks/block.bin", VAR_PROGS .. "/bcc32/games/blocks/block.bin"}
 })
 -- For russian build, add russian-only programs.
 if build_type == "ru_RU" then tup.append_table(img_files, {
- {"PERIOD", VAR_PROGS .. "/other/period/trunk/period"},
 {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/klavisha"},
 {"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"},
 }) else tup.append_table(img_files, {
@@ -642,6 +642,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
 }) end

 if build_type == "ru_RU" then tup.append_table(extra_files, {
+ {"kolibrios/utils/period", VAR_PROGS .. "/other/period/trunk/period"},
 {"kolibrios/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"},
 }) end

--- a/programs/bcc32/games/blocks/Tupfile.lua
+++ b/programs/bcc32/games/blocks/Tupfile.lua
@@ -0,0 +1,2 @@
+if tup.getconfig("NO_FASM") ~= "" then return end
+tup.rule("block.asm", "fasm -m 65636 %f %o " .. tup.getconfig("KPACK_CMD"), "block.bin")
--- a/programs/bcc32/games/blocks/bin/block.bin
+++ b/programs/bcc32/games/blocks/bin/block.bin
--- a/programs/bcc32/games/blocks/block.asm
+++ b/programs/bcc32/games/blocks/block.asm
--- a/programs/bcc32/games/blocks/models/model_8911_bird.bjs
+++ b/programs/bcc32/games/blocks/models/model_8911_bird.bjs
@@ -0,0 +1,229 @@
+// block name, color, step, coord: x,y,z, rotation: x,y,z
+
+const m1=16711680;
+const m2=16776960;
+const m3=655615;
+const m4=65315;
+const m5=16777215;
+const m6=16756655;
+const m7=16776367;
+const m8=0;
+const m9=65498;
+
+model_list=[
+['b2x3x1', m1,  0,  4,-20, 3, 0,0,90],
+['b2x3x1', m1,  0,  4,-12, 3, 0,0,90],
+['b2x3x1', m1,  0,  4, -4, 3, 0,0,90],
+['b2x3x1', m1,  0,  4,  4, 3, 0,0,90],
+['b2x3x1', m1,  0,  4, 12, 3, 0,0,90],
+['t2x3x1', m1,  0,  0, 20, 3, 0,0,90],
+['b1x1x1', m1,  0,  0, 28, 3, 0,0,0],
+['b1x1x1', m1,  0, -8,-16, 3, 0,0,0],
+['b1x1x1', m1,  0,  8,-16, 3, 0,0,0],
+['b2x4x1', m1,  0,-12,-12, 3, 0,0,0],
+['b2x4x1', m1,  0,  8,-12, 3, 0,0,0],
+['l2x2x1', m1,  0, -8,  4, 3, 0,0,90],
+['l2x2x1', m1,  0,  8,  4, 3, 0,0,0],
+['b1x6x1', m1,  1,  0, 20, 6, 0,0,0],
+['b1x6x1', m1,  1, -4, 16, 6, 0,0,0],
+['b1x6x1', m1,  1,  4, 16, 6, 0,0,0],
+['b1x10x1', m1,  1,  0,-24, 6, 0,0,0],
+['b2x8x1', m1,  1, -8,-16, 6, 0,0,0],
+['b2x8x1', m1,  1,  4,-16, 6, 0,0,0],
+['b2x3x1', m1,  1,-16, -8, 6, 0,0,0],
+['b2x3x1', m1,  1, 12, -8, 6, 0,0,0],
+['l2x2x1', m1,  1, -4,-20, 6, 0,0,-180],
+['l2x2x1', m1,  1,-12,-12, 6, 0,0,-180],
+['l2x2x1', m1,  1,-12,  4, 6, 0,0,90],
+['l2x2x1', m1,  1, 12,  4, 6, 0,0,0],
+['l2x2x1', m1,  1, 12,-12, 6, 0,0,-90],
+['l2x2x1', m1,  1,  4,-20, 6, 0,0,-90],
+['b2x3x1', m1,  2,  4,-24, 9, 0,0,90],
+['b1x3x1', m1,  2, -8,-24, 9, 0,0,0],
+['b1x3x1', m1,  2,  8,-24, 9, 0,0,0],
+['b1x4x1', m1,  2,-12,-20, 9, 0,0,0],
+['b1x4x1', m1,  2, 12,-20, 9, 0,0,0],
+['b1x6x1', m1,  2,-16,-16, 9, 0,0,0],
+['b1x6x1', m1,  2, 16,-16, 9, 0,0,0],
+['t2x3x1', m1,  2,-12,  8, 9, 0,0,90],
+['t2x3x1', m1,  2, 12,  8, 9, 0,0,90],
+['b2x4x1', m1,  2,  4, 12, 9, 0,0,90],
+['b1x2x1', m1,  2,  8, 12, 9, 0,0,0],
+['b1x3x1', m2,  2,  4, 20, 9, 0,0,90],
+['b1x3x1', m3,  2,  4, 24, 9, 0,0,90],
+['t2x3x1', m3,  2,  0, 28, 9, 0,0,90],
+['b2x3x1', m1,  3,  0,-28, 12, 0,0,90],
+['b2x2x1', m1,  3,  4,-28, 12, 0,0,0],
+['l2x2x1', m1,  3,-12,-20, 12, 0,0,-180],
+['l2x2x1', m1,  3, 12,-20, 12, 0,0,-90],
+['b2x4x1', m1,  3,-16,-16, 12, 0,0,0],
+['b2x4x1', m1,  3, 12,-16, 12, 0,0,0],
+['b1x3x1', m1,  3,-16,  0, 12, 0,0,0],
+['b1x3x1', m1,  3, 16,  0, 12, 0,0,0],
+['l2x2x1', m1,  3,-12, 12, 12, 0,0,-90],
+['l2x2x1', m1,  3, 12, 12, 12, 0,0,180],
+['b1x2x1', m2,  3, -4, 16, 12, 0,0,90],
+['b1x2x1', m2,  3,  8, 16, 12, 0,0,90],
+['t2x3x1', m3,  3,  0, 20, 12, 0,0,90],
+['b1x3x1', m1,  4,  4,-28, 15, 0,0,90],
+['l2x2x1', m1,  4, -8,-24, 15, 0,0,180],
+['l2x2x1', m1,  4,  8,-24, 15, 0,0,-90],
+['b1x2x1', m1,  4,-12,-20, 15, 0,0,90],
+['b1x2x1', m1,  4, 16,-20, 15, 0,0,90],
+['c1x2x1', m4,  4,-16,-16, 15, 0,0,90],
+['c1x2x1', m4,  4, 20,-16, 15, 0,0,90],
+['b1x4x1', m1,  4,-16,-12, 15, 0,0,0],
+['b1x4x1', m1,  4, 16,-12, 15, 0,0,0],
+['l2x2x1', m1,  4,-12,  4, 15, 0,0,90],
+['l2x2x1', m1,  4, 12,  4, 15, 0,0,0],
+['b1x1x1', m1,  4,-12, 12, 15, 0,0,0],
+['b1x1x1', m1,  4, 12, 12, 15, 0,0,0],
+['l2x2x1', m2,  4, -4, 12, 15, 0,0,90],
+['l2x2x1', m2,  4,  4, 12, 15, 0,0,0],
+['b1x2x1', m2,  4,  0, 16, 15, 0,0,0],
+['b1x6x1', m1,  5,-16,-20, 18, 0,0,0],
+['b1x6x1', m1,  5, 16,-20, 18, 0,0,0],
+['b1x3x1', m1,  5, -8,  4, 18, 0,0,90],
+['b1x3x1', m1,  5, 16,  4, 18, 0,0,90],
+['l2x2x1', m1,  5, -8, 12, 18, 0,0,-90],
+['l2x2x1', m1,  5,  8, 12, 18, 0,0,-180],
+['b1x3x1', m2,  5,  4, 16, 18, 0,0,90],
+['b1x2x1', m1,  5,-12,-24, 18, 0,0,0],
+['b1x2x1', m1,  5, 12,-24, 18, 0,0,0],
+['b2x3x1', m1,  5,  0,-28, 18, 0,0,90],
+['b2x2x1', m1,  5,  4,-28, 18, 0,0,0],
+['t2x3x1', m1,  6,  0,-28, 21, 0,0,90],
+['l2x2x1', m1,  6, -8,-24, 21, 0,0,0],
+['l2x2x1', m1,  6,-16,-20, 21, 0,0,0],
+['l2x2x1', m1,  6,  8,-24, 21, 0,0,90],
+['l2x2x1', m1,  6, 16,-20, 21, 0,0,90],
+['b1x3x1', m1,  6,-16,-12, 21, 0,0,0],
+['b1x3x1', m1,  6, 16,-12, 21, 0,0,0],
+['l2x2x1', m1,  6,-12,  0, 21, 0,0,90],
+['l2x2x1', m1,  6, -8,  8, 21, 0,0,-90],
+['l2x2x1', m1,  6, 12,  0, 21, 0,0,0],
+['l2x2x1', m1,  6,  8,  8, 21, 0,0,-180],
+['b1x3x1', m1,  6, -4, 12, 21, 0,0,-90],
+['b1x1x1', m1,  7, -8,  8, 24, 0,0,0],
+['b2x3x1', m1,  7, -4, 12, 24, 0,0,-90],
+['b1x1x1', m1,  7,  8,  8, 24, 0,0,0],
+['l2x2x1', m1,  7,-12,  4, 24, 0,0,-90],
+['l2x2x1', m1,  7, 12,  4, 24, 0,0,-180],
+['b1x3x1', m1,  7,-16,  0, 24, 0,0,180],
+['b1x3x1', m1,  7, 16,  0, 24, 0,0,180],
+['l2x2x1', m1,  7,-16,-16, 24, 0,0,0],
+['l2x2x1', m1,  7, 16,-16, 24, 0,0,90],
+['l2x2x1', m1,  7, -8,-20, 24, 0,0,180],
+['l2x2x1', m1,  7,  8,-20, 24, 0,0,-90],
+['b1x3x1', m3,  7,  4,-24, 24, 0,0,90],
+['b2x2x1', m5,  8, -8,-24, 27, 0,0,0],
+['b2x3x1', m5,  8,  8,-24, 27, 0,0,90],
+['b1x3x1', m1,  8,-12,-24, 27, 0,0,0],
+['b1x3x1', m1,  8, 12,-24, 27, 0,0,0],
+['b1x4x1', m1,  8,-16,-20, 27, 0,0,0],
+['b1x4x1', m1,  8, 16,-20, 27, 0,0,0],
+['l2x2x1', m1,  8,-16,  0, 27, 0,0,-90],
+['l2x2x1', m1,  8, 16,  0, 27, 0,0,-180],
+['l2x2x1', m1,  8,  8,  4, 27, 0,0,0],
+['b2x4x1', m1,  8,  4,  4, 27, 0,0,90],
+['b1x1x1', m1,  8,-12,  4, 27, 0,0,0],
+['r1x1x1', m5,  9,-16,-20, 30, 0,0,0],
+['r1x1x1', m5,  9, 16,-20, 30, 0,0,0],
+['b1x2x1', m5,  9, -8,-20, 30, 0,0,90],
+['b1x2x1', m5,  9, 12,-20, 30, 0,0,90],
+['t2x3x1', m5,  9,  0,-20, 30, 0,0,-90],
+['r1x1x1', m6,  9,-12,-24, 30, 0,0,0],
+['r1x1x1', m6,  9, 12,-24, 30, 0,0,0],
+['r1x2x1', m7,  9, -4,-28, 30, 0,0,0],
+['r1x2x1', m7,  9,  4,-28, 30, 0,0,0],
+['b1x4x1', m1,  9,-16,-16, 30, 0,0,0],
+['b1x4x1', m1,  9, 16,-16, 30, 0,0,0],
+['l2x2x1', m1,  9,-12,  0, 30, 0,0,90],
+['l2x2x1', m1,  9, 12,  0, 30, 0,0,0],
+['l2x2x1', m1,  9,  8,  8, 30, 0,0,-180],
+['b2x3x1', m1,  9,  0,  4, 30, 0,0,90],
+['l2x2x1', m5,  10, -4,-20, 33, 0,0,-180],
+['l2x2x1', m5,  10,-12,-16, 33, 0,0,-180],
+['l2x2x1', m5,  10,  4,-20, 33, 0,0,-90],
+['l2x2x1', m5,  10, 12,-16, 33, 0,0,-90],
+['a1x2x2', m7,  10,  0,-24, 30, 0,0,-180],
+['r1x2x1', m7,  10,  0,-24, 33, 0,0,0],
+['b1x2x1', m1,  10,-16,-12, 33, 0,0,0],
+['l2x2x1', m1,  10,-16,  0, 33, 0,0,-90],
+['b1x1x1', m1,  10,-12,  4, 33, 0,0,0],
+['b2x4x1', m1,  10,  4,  4, 33, 0,0,90],
+['l2x2x1', m1,  10,  8,  4, 33, 0,0,0],
+['b2x4x1', m1,  10, 12,-12, 33, 0,0,0],
+['b1x1x1', m1, 11,  0,-24, 36, 0,0,0],
+['b1x1x1', m5, 11, -4,-24, 36, 0,0,0],
+['b1x1x1', m5, 11,  4,-24, 36, 0,0,0],
+['b1x1x3', m8, 11, -8,-24, 30, 0,0,0],
+['b1x1x3', m8, 11,  8,-24, 30, 0,0,0],
+['l2x2x1', m5, 11,-12,-20, 36, 0,0,0],
+['l2x2x1', m5, 11, 12,-20, 36, 0,0,90],
+['r1x1x1', m5, 11,-16,-16, 36, 0,0,90],
+['r1x1x1', m5, 11, 16,-16, 36, 0,0,90],
+['b1x4x1', m1, 11,-16,-12, 36, 0,0,0],
+['b2x4x1', m1, 11, 12,-12, 36, 0,0,0],
+['b2x3x1', m1, 11,  4,  0, 36, 0,0,0],
+['l2x2x1', m1, 11, -8,  0, 36, 0,0,90],
+['b1x3x1', m1, 11,  0,  8, 36, 0,0,90],
+['b1x3x1', m1, 12,  4,-24, 39, 0,0,90],
+['r1x1x1', m5, 12, -8,-24, 39, 0,0,0],
+['r1x1x1', m5, 12,  8,-24, 39, 0,0,0],
+['b1x1x1', m5, 12,-12,-20, 39, 0,0,0],
+['b1x6x1', m5, 12, 12,-20, 39, 0,0,90],
+['b1x1x1', m1, 12,-12,-16, 39, 0,0,0],
+['l2x2x1', m1, 12,-16,-12, 39, 0,0,0],
+['l2x2x1', m1, 12,-12, -4, 39, 0,0,90],
+['b1x1x1', m1, 12, -8,  0, 39, 0,0,0],
+['l2x2x1', m1, 12, -4,  4, 39, 0,0,90],
+['l2x2x1', m1, 12,  4,  8, 39, 0,0,-180],
+['b1x1x1', m1, 12,  8,  4, 39, 0,0,0],
+['l2x2x1', m1, 12, 12,  0, 39, 0,0,-180],
+['b1x2x1', m1, 12, 16, -8, 39, 0,0,0],
+['l2x2x1', m1, 12, 12,-12, 39, 0,0,-90],
+['l2x2x1', m1, 13,  4,-20, 42, 0,0,-90],
+['l2x2x1', m1, 13, -4,-24, 42, 0,0,0],
+['b2x6x1', m1, 13,-12,-20, 42, 0,0,0],
+['b1x3x1', m1, 13,  0,  4, 42, 0,0,90],
+['b2x2x1', m1, 13,  4,  0, 42, 0,0,0],
+['b1x6x1', m1, 13, 12,-20, 42, 0,0,0],
+['b1x4x1', m1, 14,-12,-16, 45, 0,0,0],
+['b2x4x1', m1, 14,  4,-20, 45, 0,0,90],
+['b2x6x1', m1, 14, 12,-12, 45, 0,0,90],
+['b2x4x1', m1, 14,  4, -4, 45, 0,0,90],
+['b1x3x1', m1, 14,  4,  4, 45, 0,0,90],
+['l2x2x1', m1, 14,  8, -4, 45, 0,0,0],
+['l2x2x1', m1, 14,  8,-16, 45, 0,0,-90],
+['b2x4x1', m1, 15, -4,-16, 48, 0,0,0],
+['b1x3x1', m1, 15, -8,-12, 48, 0,0,0],
+['b1x3x1', m1, 15,  4,  0, 48, 0,0,90],
+['b2x2x1', m1, 15,  4, -8, 48, 0,0,0],
+['l2x2x1', m1, 15,  4,-12, 48, 0,0,-90],
+['b1x3x1', m2, 16,  8,-12, 0, 0,0,0],
+['b1x3x1', m2, 16, -8,-12, 0, 0,0,0],
+['c1x2x1', m9, 17, 20,-16, 12, 0,0,0],
+['b1x6x1', m4, 17,  0,  8, 0, 0,0,0, 1],
+['b1x6x1', m9, 17,  0,  4, -3, 0,0,0, 1],
+['b1x3x1', m4, 18,  0,  4, 3, 0,0,0, 1],
+['b1x3x1', m2, 18,  0, 16, 3, 0,0,0, 1],
+['c1x2x1', m4, 18,  0,  0, 6, 0,0,0, 1],
+['b1x1x1', m4, 18,  0,  8, 6, 0,0,0, 1],
+['b1x2x1', m2, 18,  0, 12, 6, 0,0,0, 1],
+['b1x3x1', m2, 18,  0,  4, 9, 0,0,0, 1],
+['c1x2x1', m9, 17, -20,-16, 12, 0,0,0],
+['b1x6x1', m4, 17,  0,  8, 0, 0,0,0, 1],
+['b1x6x1', m9, 17,  0,  4, -3, 0,0,0, 1],
+['b1x3x1', m4, 18,  0,  4, 3, 0,0,0, 1],
+['b1x3x1', m2, 18,  0, 16, 3, 0,0,0, 1],
+['c1x2x1', m4, 18,  0,  0, 6, 0,0,0, 1],
+['b1x1x1', m4, 18,  0,  8, 6, 0,0,0, 1],
+['b1x2x1', m2, 18,  0, 12, 6, 0,0,0, 1],
+['b1x3x1', m2, 18,  0,  4, 9, 0,0,0, 1],
+];
+
+model_animat=[
+[192,'rotation','z','Left', -1.570796327, 0, 0.017453293],
+[201,'rotation','z','Right', 0, 1.570796327, 0.017453293],
+];
--- a/programs/bcc32/games/blocks/models/model_a8404_castle_Neuschwanstein.bjs
+++ b/programs/bcc32/games/blocks/models/model_a8404_castle_Neuschwanstein.bjs
@@ -0,0 +1,531 @@
+// block name, color, step, coord: x,y,z, rotation: x,y,z
+
+const m1=32768;
+const m2=9474192;
+const m3=16777215;
+const m4=2164260863;
+const m5=655615;
+const m6=255;
+const m7=16776960;
+const m8=10824234;
+const m9=16384;
+const m10=0xc97e3b;
+
+model_list=[
+['b2x4x1', m2,  0,-28, -4, 6, 0,0,90],
+['b2x3x1', m2,  0,-40,  4, 6, 0,0,0],
+['b2x3x1', m2,  0,-32,  8, 6, 0,0,0],
+['b2x6x1', m2,  0, -4,  8, 6, 0,0,90],
+['b1x3x1', m2,  0, -4,  4, 6, 0,0,90],
+['b2x4x1', m2,  0, -4, -4, 6, 0,0,90],
+['b1x2x1', m2,  0, -8, -8, 6, 0,0,90],
+['b2x3x1', m2,  0,-24, -8, 6, 0,0,0],
+['b2x4x1', m2,  1,-12, -8, 9, 0,0,0],
+['b2x2x1', m2,  1,-20, -4, 9, 0,0,0],
+['b1x2x1', m2,  1,-20, -8, 9, 0,0,90],
+['b2x3x1', m2,  1,-24, -4, 9, 0,0,90],
+['b2x3x1', m2,  1,-40, -4, 9, 0,0,0],
+['b1x2x1', m2,  1,-40,  8, 9, 0,0,0],
+['b2x4x1', m2,  1,-24,  8, 9, 0,0,90],
+['b1x2x1', m2,  1,-28, 16, 9, 0,0,90],
+['l2x2x1', m2,  2,  0,-12, 6, 0,0,-90],
+['l2x2x1', m2,  2,  8,-12, 6, 0,0,-90],
+['b2x4x1', m2,  2, 12, -8, 6, 0,0,90],
+['b2x4x1', m2,  2, 12,  0, 6, 0,0,90],
+['b2x4x1', m2,  2, 12,  8, 6, 0,0,90],
+['b2x4x1', m2,  2, 12, 16, 6, 0,0,90],
+['b2x4x1', m2,  2, 28, 16, 6, 0,0,90],
+['b2x4x1', m2,  2, 28,  8, 6, 0,0,90],
+['b2x4x1', m2,  2, 28,  0, 6, 0,0,90],
+['b1x4x1', m2,  2, 28, -4, 6, 0,0,90],
+['b1x2x1', m2,  2, 24, -8, 6, 0,0,90],
+['b2x2x1', m3,  3, 20, 16, 9, 0,0,0],
+['b2x2x1', m2,  3, 12, 16, 9, 0,0,0],
+['b1x3x1', m2,  3, 20, 12, 9, 0,0,90],
+['b1x2x1', m2,  3, 20,  4, 9, 0,0,0],
+['b1x3x1', m2,  3, 20, -8, 9, 0,0,0],
+['l2x2x1', m2,  3, 24, -4, 9, 0,0,-90],
+['b2x4x1', m2,  3, 12, -4, 9, 0,0,0],
+['b2x6x1', m2,  3,  4, -4, 9, 0,0,0],
+['b1x2x1', m2,  3,  8, 20, 9, 0,0,90],
+['b1x2x1', m2,  3,  0, 16, 9, 0,0,0],
+['b2x6x1', m2,  3,  0,  8, 9, 0,0,90],
+['b2x3x1', m2,  3, -4, -4, 9, 0,0,0],
+['b2x4x1', m2,  3, 12,-12, 9, 0,0,90],
+['b1x1x1', m2,  3,  8,-16, 9, 0,0,0],
+['b1x1x1', m2,  3,  0,-16, 9, 0,0,0],
+['b1x4x1', m2,  4,-28, -4, 3, 0,0,90],
+['b1x4x1', m2,  4,-40,  0, 3, 0,0,0],
+['b1x4x1', m2,  4,-24, 12, 3, 0,0,90],
+['b1x2x1', m2,  4,-28, 16, 3, 0,0,90],
+['b1x4x1', m2,  4, -8, 12, 3, 0,0,90],
+['l2x2x1', m2,  4,  0, 12, 3, 0,0,90],
+['b1x4x1', m2,  4, 12, 20, 3, 0,0,90],
+['b1x3x1', m2,  4, 24, 20, 3, 0,0,90],
+['b1x3x1', m2,  4, 28, 12, 3, 0,0,0],
+['b1x3x1', m2,  4, 28,  0, 3, 0,0,0],
+['b1x4x1', m2,  4, 28, -4, 3, 0,0,90],
+['b1x2x1', m2,  4, 24, -8, 3, 0,0,90],
+['b1x3x1', m2,  4, 12,-12, 3, 0,0,0],
+['l2x2x1', m2,  4,  8,-12, 3, 0,0,-180],
+['b1x4x1', m2,  4,  0,-16, 3, 0,0,0],
+['b1x2x1', m2,  4, -4, -4, 3, 0,0,90],
+['b1x2x1', m2,  4, -8, -8, 3, 0,0,90],
+['b1x4x1', m2,  4,-12, -4, 3, 0,0,90],
+['b1x2x1', m2,  4,-20, -8, 3, 0,0,90],
+['b20x20x1', m1,  5,-40,-40, 0, 0,0,0],
+['b1x4x1', m3,  6,-28, -4, 12, 0,0,90],
+['b2x4x1', m2,  6,-40,  0, 12, 0,0,0],
+['b2x4x1', m2,  6,-32,  4, 12, 0,0,0],
+['b2x6x1', m2,  6,-24, -8, 12, 0,0,0],
+['b2x4x1', m2,  6, -4,  8, 12, 0,0,90],
+['b2x4x1', m2,  6, -4, -4, 12, 0,0,90],
+['b1x2x1', m2,  6, -8, -8, 12, 0,0,90],
+['b1x3x1', m2,  6,  0, -8, 12, 0,0,0],
+['b1x2x1', m2,  6,  0,-16, 12, 0,0,0],
+['b1x2x1', m2,  6,  4,-12, 12, 0,0,0],
+['b1x4x1', m2,  6,  8,-16, 12, 0,0,0],
+['b1x4x1', m2,  6, 12,-12, 12, 0,0,0],
+['b1x2x1', m2,  6, 20, -4, 12, 0,0,90],
+['b1x2x1', m2,  6, 24, -8, 12, 0,0,90],
+['b2x4x1', m2,  6, 16,  0, 12, 0,0,0],
+['b1x2x1', m2,  6, 16, 16, 12, 0,0,0],
+['b2x2x1', m3,  6, 20, 16, 12, 0,0,0],
+['b2x4x1', m2,  6,  8,  8, 12, 0,0,0],
+['b2x4x1', m2,  6,  0,  8, 12, 0,0,0],
+['b2x6x1', m3,  7, 24, 16, 15, 0,0,90],
+['b1x2x1', m3,  7,  0, 16, 15, 0,0,0],
+['b1x4x1', m2,  7, 20,  0, 15, 0,0,0],
+['b1x4x1', m2,  7, 16, 12, 15, 0,0,90],
+['b2x4x1', m2,  7, 16,  4, 15, 0,0,90],
+['b2x4x1', m2,  7, 16, -4, 15, 0,0,90],
+['b2x4x1', m2,  7, -4,  0, 15, 0,0,0],
+['b1x4x1', m2,  7, -8, 12, 15, 0,0,90],
+['b1x4x1', m3,  7,-24, 12, 15, 0,0,90],
+['b1x3x1', m3,  7,-40,  4, 15, 0,0,0],
+['l2x2x1', m3,  7,-40, -4, 15, 0,0,0],
+['b1x4x1', m3,  7,-20, -4, 15, 0,0,90],
+['l2x2x1', m2,  7,-12, -4, 15, 0,0,180],
+['l2x2x1', m2,  7, -8, -4, 15, 0,0,-90],
+['b1x4x1', m2,  7,  0,-16, 15, 0,0,0],
+['b1x2x1', m2,  7,  4,-12, 15, 0,0,0],
+['b1x2x1', m2,  7,  8,-16, 15, 0,0,0],
+['b1x2x1', m2,  7, 12,-12, 15, 0,0,0],
+['b1x1x1', m3,  8, 24, 16, 18, 0,0,0],
+['c1x1x1', m4,  8, 24, 20, 18, 0,0,0],
+['b2x2x1', m3,  8, 16, 16, 18, 0,0,0],
+['c1x1x1', m4,  8, 12, 20, 18, 0,0,0],
+['c1x1x1', m4,  8, 12, 16, 18, 0,0,0],
+['b1x2x1', m3,  8,  8, 16, 18, 0,0,0],
+['c1x1x1', m4,  8,  4, 20, 18, 0,0,0],
+['c1x1x1', m4,  8,  4, 16, 18, 0,0,0],
+['b1x2x1', m3,  8,  0, 16, 18, 0,0,0],
+['b1x2x1', m3,  8, -4, 12, 18, 0,0,90],
+['b1x4x1', m3,  8,-12, 12, 18, 0,0,90],
+['b1x4x1', m3,  8,-28, 12, 18, 0,0,90],
+['b1x4x1', m3,  8,-40, -4, 18, 0,0,0],
+['b1x4x1', m3,  8,-24, -4, 18, 0,0,90],
+['b1x2x1', m3,  8,-16, -4, 18, 0,0,90],
+['b2x2x1', m3,  8,-12, -8, 18, 0,0,0],
+['b1x4x1', m3,  8, -4, -4, 18, 0,0,0],
+['b2x4x1', m3,  8, 12,-12, 18, 0,0,90],
+['b1x1x1', m3,  8,  0,-16, 18, 0,0,0],
+['b1x1x1', m3,  8,  8,-16, 18, 0,0,0],
+['b2x2x1', m3,  9, 20, 16, 21, 0,0,0],
+['b1x2x1', m5,  9, 16, 16, 21, 0,0,0],
+['b2x2x1', m3,  9,  8, 16, 21, 0,0,0],
+['b2x2x1', m5,  9,  0, 16, 21, 0,0,0],
+['b1x1x1', m3,  9, -4, 12, 21, 0,0,0],
+['c1x1x1', m4,  9, -8, 12, 21, 0,0,0],
+['b1x1x1', m3,  9,-12, 12, 21, 0,0,0],
+['c1x1x1', m4,  9,-16, 12, 21, 0,0,0],
+['b1x1x1', m3,  9,-20, 12, 21, 0,0,0],
+['c1x1x1', m4,  9,-24, 12, 21, 0,0,0],
+['b1x2x1', m3,  9,-28, 12, 21, 0,0,90],
+['c1x1x1', m4,  9,-36, 12, 21, 0,0,0],
+['b1x1x1', m3,  9,-40, 12, 21, 0,0,0],
+['b2x3x1', m3,  9,-44,  0, 21, 0,0,0],
+['b1x1x1', m3,  9,-40, -4, 21, 0,0,0],
+['c1x1x1', m4,  9,-36, -4, 21, 0,0,0],
+['b1x1x1', m3,  9,-32, -4, 21, 0,0,0],
+['c1x1x1', m4,  9,-28, -4, 21, 0,0,0],
+['b1x2x1', m3,  9,-20, -4, 21, 0,0,90],
+['c1x1x1', m4,  9,-16, -4, 21, 0,0,0],
+['b1x2x1', m3,  9,-12, -8, 21, 0,0,0],
+['c1x1x1', m4,  9, -8, -8, 21, 0,0,0],
+['b1x2x1', m3,  9, -4, -4, 21, 0,0,90],
+['c1x1x1', m4,  9, -4,  0, 21, 0,0,0],
+['b1x1x1', m3,  9, -4,  4, 21, 0,0,0],
+['c1x1x1', m4,  9, -4,  8, 21, 0,0,0],
+['b2x4x1', m3,  9, 12,-12, 21, 0,0,90],
+['c1x1x1', m4,  9,  0,-16, 21, 0,0,0],
+['c1x1x1', m4,  9,  8,-16, 21, 0,0,0],
+['c1x1x1', m4, 10, 24, 20, 24, 0,0,0],
+['l2x2x1', m3, 10, 20, 16, 24, 0,0,0],
+['c1x1x1', m4, 10, 12, 20, 24, 0,0,0],
+['c1x1x1', m4, 10,  8, 20, 24, 0,0,0],
+['c1x1x1', m4, 10,  8, 16, 24, 0,0,0],
+['c1x1x1', m4, 10, 12, 16, 24, 0,0,0],
+['b1x4x1', m3, 10, -4,  0, 24, 0,0,0],
+['b1x4x1', m3, 10, -8, 12, 24, 0,0,90],
+['b1x4x1', m3, 10,-24, 12, 24, 0,0,90],
+['b1x4x1', m3, 10,-40,  0, 24, 0,0,0],
+['c1x1x1', m4, 10,-44,  8, 24, 0,0,0],
+['c1x1x1', m4, 10,-44,  4, 24, 0,0,0],
+['c1x1x1', m4, 10,-44,  0, 24, 0,0,0],
+['b1x2x1', m3, 10,-36, -4, 24, 0,0,90],
+['b1x4x1', m3, 10,-20, -4, 24, 0,0,90],
+['b1x4x1', m3, 10, -4, -4, 24, 0,0,90],
+['b1x2x1', m3, 10, -8, -8, 24, 0,0,90],
+['l2x2x1', m3, 10,  4, -8, 24, 0,0,180],
+['b1x2x1', m5, 10,  0,-16, 24, 0,0,0],
+['l2x2x1', m3, 10, 12, -8, 24, 0,0,180],
+['b1x2x1', m5, 10,  8,-16, 24, 0,0,0],
+['b2x2x1', m3, 11, 24, 16, 27, 0,0,90],
+['b2x2x1', m5, 11,  8, 16, 27, 0,0,0],
+['b1x1x1', m3, 11, -4, 12, 27, 0,0,0],
+['c1x1x1', m4, 11, -8, 12, 27, 0,0,0],
+['b1x1x1', m3, 11,-12, 12, 27, 0,0,0],
+['c1x1x1', m4, 11,-16, 12, 27, 0,0,0],
+['b1x1x1', m3, 11,-20, 12, 27, 0,0,0],
+['c1x1x1', m4, 11,-24, 12, 27, 0,0,0],
+['b1x2x1', m3, 11,-28, 12, 27, 0,0,90],
+['c1x1x1', m4, 11,-36, 12, 27, 0,0,0],
+['b1x1x1', m3, 11,-40, 12, 27, 0,0,0],
+['b2x3x1', m3, 11,-44,  0, 27, 0,0,0],
+['b1x1x1', m3, 11,-40, -4, 27, 0,0,0],
+['c1x1x1', m4, 11,-36, -4, 27, 0,0,0],
+['b1x1x1', m3, 11,-32, -4, 27, 0,0,0],
+['c1x1x1', m4, 11,-28, -4, 27, 0,0,0],
+['b1x2x1', m3, 11,-20, -4, 27, 0,0,90],
+['c1x1x1', m4, 11,-16, -4, 27, 0,0,0],
+['b1x2x1', m3, 11,-12, -8, 27, 0,0,0],
+['c1x1x1', m4, 11, -8, -8, 27, 0,0,0],
+['b1x2x1', m3, 11, -4, -4, 27, 0,0,90],
+['c1x1x1', m4, 11, -4,  0, 27, 0,0,0],
+['b1x1x1', m3, 11, -4,  4, 27, 0,0,0],
+['c1x1x1', m4, 11, -4,  8, 27, 0,0,0],
+['b1x2x1', m5, 11,  0,-12, 27, 0,0,0],
+['c1x1x1', m5, 11,  0,-16, 27, 0,0,0],
+['f1x2x1', m5, 11,  4,-12, 27, 0,0,0],
+['f1x2x1', m5, 11,  8,-12, 27, 0,0,0],
+['c1x1x1', m5, 11,  8,-16, 27, 0,0,0],
+['b1x2x1', m5, 11, 12,-12, 27, 0,0,0],
+['b2x2x1', m3, 12, 20, 16, 30, 0,0,0],
+['b1x4x1', m3, 12, -4,  0, 30, 0,0,0],
+['b1x4x1', m3, 12, -8, 12, 30, 0,0,90],
+['b1x4x1', m3, 12,-24, 12, 30, 0,0,90],
+['b1x4x1', m3, 12,-40,  0, 30, 0,0,0],
+['c1x1x1', m4, 12,-44,  8, 30, 0,0,0],
+['c1x1x1', m4, 12,-44,  4, 30, 0,0,0],
+['c1x1x1', m4, 12,-44,  0, 30, 0,0,0],
+['b1x2x1', m3, 12,-36, -4, 30, 0,0,90],
+['b1x4x1', m3, 12,-20, -4, 30, 0,0,90],
+['b1x4x1', m3, 12, -4, -4, 30, 0,0,90],
+['b1x2x1', m3, 12, -8, -8, 30, 0,0,90],
+['b1x2x1', m5, 12,  8,-10, 30, 0,0,90],
+['b2x2x1', m3, 13, -4, 12, 33, 0,0,0],
+['c1x1x1', m4, 13, -8, 12, 33, 0,0,0],
+['b1x1x1', m3, 13,-12, 12, 33, 0,0,0],
+['c1x1x1', m4, 13,-16, 12, 33, 0,0,0],
+['b1x1x1', m3, 13,-20, 12, 33, 0,0,0],
+['c1x1x1', m4, 13,-24, 12, 33, 0,0,0],
+['b1x2x1', m3, 13,-28, 12, 33, 0,0,90],
+['c1x1x1', m4, 13,-36, 12, 33, 0,0,0],
+['b1x1x1', m3, 13,-40, 12, 33, 0,0,0],
+['b2x3x1', m3, 13,-44,  0, 33, 0,0,0],
+['b1x1x1', m3, 13,-40, -4, 33, 0,0,0],
+['c1x1x1', m4, 13,-36, -4, 33, 0,0,0],
+['b1x1x1', m3, 13,-32, -4, 33, 0,0,0],
+['c1x1x1', m4, 13,-28, -4, 33, 0,0,0],
+['b1x2x1', m3, 13,-20, -4, 33, 0,0,90],
+['c1x1x1', m4, 13,-16, -4, 33, 0,0,0],
+['b1x2x1', m3, 13,-12, -8, 33, 0,0,0],
+['c1x1x1', m4, 13, -8, -8, 33, 0,0,0],
+['b1x1x1', m3, 13, -8, -4, 33, 0,0,90],
+['c1x1x1', m4, 13, -4,  0, 33, 0,0,0],
+['b1x1x1', m3, 13, -4,  4, 33, 0,0,0],
+['c1x1x1', m4, 13, -4,  8, 33, 0,0,0],
+['b2x2x1', m3, 13, -4, -8, 33, 0,0,0],
+['b2x4x1', m3, 13, 28, 16, 33, 0,0,90],
+['b1x2x1', m3, 14, 24, 12, 33, 0,0,90],
+['b1x2x1', m3, 14, 24, 24, 33, 0,0,90],
+['b2x4x1', m6, 14, 20, 12, 36, 0,0,0],
+['b1x2x1', m6, 14, 28, 16, 36, 0,0,0],
+['b1x2x1', m6, 14, 16, 16, 36, 0,0,0],
+['c1x1x1', m4, 14,  0, 16, 36, 0,0,0],
+['b1x1x1', m3, 14, -4, 16, 36, 0,0,0],
+['b1x1x1', m3, 14,  0, 12, 36, 0,0,0],
+['b1x4x1', m3, 14, -8, 12, 36, 0,0,90],
+['b1x4x1', m3, 14,-24, 12, 36, 0,0,90],
+['b1x4x1', m3, 14,-40,  0, 36, 0,0,0],
+['b1x2x1', m3, 14,-36, -4, 36, 0,0,90],
+['b1x4x1', m3, 14,-20, -4, 36, 0,0,90],
+['b1x4x1', m3, 14, -4, -4, 36, 0,0,90],
+['b1x4x1', m3, 14, -4,  0, 36, 0,0,0],
+['b1x1x1', m3, 14,  0, -4, 36, 0,0,0],
+['c1x1x1', m4, 14,  0, -8, 36, 0,0,0],
+['b1x1x1', m3, 14, -4, -8, 36, 0,0,0],
+['b1x2x1', m6, 14, -8, -8, 36, 0,0,90],
+['b2x2x1', m3, 15, -4, 12, 39, 0,0,0],
+['c1x1x1', m4, 15, -8, 12, 39, 0,0,0],
+['b1x1x1', m3, 15,-12, 12, 39, 0,0,0],
+['c1x1x1', m4, 15,-16, 12, 39, 0,0,0],
+['b1x1x1', m3, 15,-20, 12, 39, 0,0,0],
+['c1x1x1', m4, 15,-24, 12, 39, 0,0,0],
+['b1x2x1', m3, 15,-28, 12, 39, 0,0,90],
+['c1x1x1', m4, 15,-36, 12, 39, 0,0,0],
+['b1x1x1', m3, 15,-40, 12, 39, 0,0,0],
+['b1x1x1', m3, 15,-40,  4, 39, 0,0,0],
+['b1x1x1', m3, 15,-40, -4, 39, 0,0,0],
+['c1x1x1', m4, 15,-36, -4, 39, 0,0,0],
+['b1x1x1', m3, 15,-32, -4, 39, 0,0,0],
+['c1x1x1', m4, 15,-28, -4, 39, 0,0,0],
+['b1x2x1', m3, 15,-20, -4, 39, 0,0,90],
+['c1x1x1', m4, 15,-16, -4, 39, 0,0,0],
+['b1x1x1', m3, 15,-12, -4, 39, 0,0,0],
+['c1x1x1', m4, 15,-40,  8, 39, 0,0,0],
+['c1x1x1', m4, 15, -4,  0, 39, 0,0,0],
+['b1x1x1', m3, 15, -4,  4, 39, 0,0,0],
+['c1x1x1', m4, 15, -4,  8, 39, 0,0,0],
+['b2x2x1', m3, 15, -4, -8, 39, 0,0,0],
+['c1x1x1', m4, 15,-40,  0, 39, 0,0,0],
+['c1x1x1', m4, 15, -8, -4, 39, 0,0,0],
+['c1x1x1', m4, 16,  0, 16, 42, 0,0,0],
+['b1x1x1', m3, 16, -4, 16, 42, 0,0,0],
+['b1x1x1', m3, 16,  0, 12, 42, 0,0,0],
+['b1x4x1', m3, 16, -8, 12, 42, 0,0,90],
+['b1x4x1', m3, 16,-24, 12, 42, 0,0,90],
+['b1x4x1', m3, 16,-40,  0, 42, 0,0,0],
+['b1x2x1', m3, 16,-36, -4, 42, 0,0,90],
+['b1x4x1', m3, 16,-20, -4, 42, 0,0,90],
+['b1x4x1', m3, 16, -4, -4, 42, 0,0,90],
+['b1x4x1', m3, 16, -4,  0, 42, 0,0,0],
+['b1x1x1', m3, 16,  0, -4, 42, 0,0,0],
+['c1x1x1', m4, 16,  0, -8, 42, 0,0,0],
+['b1x1x1', m3, 16, -4, -8, 42, 0,0,0],
+['b2x2x1', m3, 17, -4, 12, 45, 0,0,0],
+['b2x3x1', m6, 17, -8, 12, 45, 0,0,90],
+['b2x2x1', m6, 17,-24, 12, 45, 0,0,0],
+['b1x2x1', m6, 17,-28, 12, 45, 0,0,90],
+['b2x2x1', m6, 17,-40, 12, 45, 0,0,0],
+['b1x1x1', m3, 17,-40,  8, 45, 0,0,0],
+['c1x1x1', m4, 17,-40,  4, 45, 0,0,0],
+['b1x1x1', m3, 17,-40,  0, 45, 0,0,0],
+['b2x4x1', m6, 17,-28, -8, 45, 0,0,90],
+['b1x2x1', m6, 17,-20, -4, 45, 0,0,90],
+['b2x3x1', m6, 17, -8, -8, 45, 0,0,90],
+['b2x2x1', m3, 17, -4, -8, 45, 0,0,0],
+['b1x1x1', m3, 17, -4,  0, 45, 0,0,0],
+['c1x1x1', m4, 17, -4,  4, 45, 0,0,0],
+['b1x1x1', m3, 17, -4,  8, 45, 0,0,0],
+['c1x1x1', m3, 18,-24, -8, 15, 0,0,0],
+['c1x1x1', m3, 18,-20, -8, 15, 0,0,0],
+['c1x1x1', m3, 18,-32, 16, 15, 0,0,0],
+['c1x1x1', m3, 18,-28, 16, 15, 0,0,0],
+['c1x1x1', m3, 18,-24, -8, 18, 0,0,0],
+['c1x1x1', m3, 18,-20, -8, 18, 0,0,0],
+['c1x1x1', m3, 18,-32, 16, 18, 0,0,0],
+['c1x1x1', m3, 18,-28, 16, 18, 0,0,0],
+['c1x1x1', m3, 18,-24, -8, 21, 0,0,0],
+['c1x1x1', m3, 18,-20, -8, 21, 0,0,0],
+['c1x1x1', m3, 18,-32, 16, 21, 0,0,0],
+['c1x1x1', m3, 18,-28, 16, 21, 0,0,0],
+['c1x1x1', m4, 19,-24, -8, 24, 0,0,0],
+['c1x1x1', m4, 19,-20, -8, 24, 0,0,0],
+['c1x1x1', m4, 19,-32, 16, 24, 0,0,0],
+['c1x1x1', m4, 19,-28, 16, 24, 0,0,0],
+['c1x1x1', m3, 19,-24, -8, 27, 0,0,0],
+['c1x1x1', m3, 19,-20, -8, 27, 0,0,0],
+['c1x1x1', m3, 19,-32, 16, 27, 0,0,0],
+['c1x1x1', m3, 19,-28, 16, 27, 0,0,0],
+['c1x1x1', m3, 19,-24, -8, 30, 0,0,0],
+['c1x1x1', m3, 19,-20, -8, 30, 0,0,0],
+['c1x1x1', m3, 19,-32, 16, 30, 0,0,0],
+['c1x1x1', m3, 19,-28, 16, 30, 0,0,0],
+['c1x1x1', m4, 20,-24, -8, 33, 0,0,0],
+['c1x1x1', m4, 20,-20, -8, 33, 0,0,0],
+['c1x1x1', m4, 20,-32, 16, 33, 0,0,0],
+['c1x1x1', m4, 20,-28, 16, 33, 0,0,0],
+['c1x1x1', m3, 20,-24, -8, 36, 0,0,0],
+['c1x1x1', m3, 20,-20, -8, 36, 0,0,0],
+['c1x1x1', m3, 20,-32, 16, 36, 0,0,0],
+['c1x1x1', m3, 20,-28, 16, 36, 0,0,0],
+['c1x1x1', m3, 20,-24, -8, 39, 0,0,0],
+['c1x1x1', m3, 20,-20, -8, 39, 0,0,0],
+['c1x1x1', m3, 20,-32, 16, 39, 0,0,0],
+['c1x1x1', m3, 20,-28, 16, 39, 0,0,0],
+['c1x1x1', m4, 21,-24, -8, 42, 0,0,0],
+['c1x1x1', m4, 21,-20, -8, 42, 0,0,0],
+['c1x1x1', m4, 21,-32, 16, 42, 0,0,0],
+['c1x1x1', m4, 21,-28, 16, 42, 0,0,0],
+['c1x1x1', m3, 21,-24, -8, 45, 0,0,0],
+['c1x1x1', m3, 21,-20, -8, 45, 0,0,0],
+['c1x1x1', m3, 21,-32, 16, 45, 0,0,0],
+['c1x1x1', m3, 21,-28, 16, 45, 0,0,0],
+['c1x1x1', m3, 21,-24, -8, 48, 0,0,0],
+['c1x1x1', m3, 21,-20, -8, 48, 0,0,0],
+['c1x1x1', m3, 21,-32, 16, 48, 0,0,0],
+['c1x1x1', m3, 21,-28, 16, 48, 0,0,0],
+['c1x1x1', m3, 22, 20, 16, 39, 0,0,0],
+['c1x1x1', m3, 22, 24, 16, 39, 0,0,0],
+['c1x1x1', m3, 22, 24, 20, 39, 0,0,0],
+['c1x1x1', m3, 22, 20, 20, 39, 0,0,0],
+['b2x2x1', m3, 22, 20, 16, 42, 0,0,0],
+['f1x2x1', m6, 22, 20, 16, 45, 0,0,0],
+['f1x2x1', m6, 22, 24, 16, 45, 0,0,0],
+['f1x2x1', m6, 23, 24, 18, 48, 0,0,90],
+['c1x1x1', m6, 23,  0, 16, 48, 0,0,0],
+['b1x3x1', m6, 23, -4, 12, 48, 0,0,90],
+['b1x1x1', m3, 23, -8, 16, 48, 0,0,0],
+['b2x4x1', m6, 23,-16,  8, 48, 0,0,90],
+['b1x3x1', m6, 23,-32, 12, 48, 0,0,90],
+['b1x1x1', m3, 23,-40, 16, 48, 0,0,0],
+['b1x3x1', m3, 23,-40,  0, 48, 0,0,0],
+['b1x3x1', m6, 23,-32, -4, 48, 0,0,90],
+['b1x1x1', m3, 23,-40, -8, 48, 0,0,0],
+['b2x4x1', m6, 23,-16, -4, 48, 0,0,90],
+['b1x3x1', m6, 23, -4, -4, 48, 0,0,90],
+['b1x1x1', m3, 23, -8, -8, 48, 0,0,0],
+['c1x1x1', m6, 23,  0, -8, 48, 0,0,0],
+['b1x3x1', m3, 23, -4,  0, 48, 0,0,0],
+['c1x1x1', m6, 24, 22, 18, 51, 0,0,0],
+['c1x1x1', m6, 24,  0, 16, 51, 0,0,90],
+['c1x1x1', m6, 24, -8, 16, 51, 0,0,0],
+['b2x6x1', m6, 24, -4,  8, 51, 0,0,90],
+['b1x2x1', m6, 24,-28,  8, 51, 0,0,90],
+['b2x2x1', m3, 24,-32, 12, 51, 0,0,0],
+['b2x2x1', m6, 24,-40,  8, 51, 0,0,0],
+['c1x1x1', m6, 24,-40, 16, 51, 0,0,0],
+['b1x1x1', m3, 24,-40,  4, 51, 0,0,0],
+['b2x4x1', m6, 24,-28, -4, 51, 0,0,90],
+['c1x1x1', m6, 24,-40, -8, 51, 0,0,0],
+['b1x2x1', m6, 24,-20,  0, 51, 0,0,90],
+['b2x2x1', m3, 24,-24, -8, 51, 0,0,0],
+['b2x4x1', m6, 24, -4, -4, 51, 0,0,90],
+['c1x1x1', m6, 24, -8, -8, 51, 0,0,0],
+['c1x1x1', m6, 24,  0, -8, 51, 0,0,0],
+['b1x1x1', m3, 24, -4,  4, 51, 0,0,0],
+['c1x1x1', m7, 25, 22, 18, 54, 0,0,0],
+['b1x1x1', m3, 25, -4,  4, 54, 0,0,0],
+['b1x3x1', m5, 25, -4,  8, 54, 0,0,90],
+['b1x3x1', m5, 25, -4,  0, 54, 0,0,90],
+['b2x3x1', m5, 25,-20,  0, 54, 0,0,0],
+['b2x3x1', m5, 25,-28,  0, 54, 0,0,0],
+['b1x3x1', m5, 25,-32,  8, 54, 0,0,90],
+['b1x1x1', m3, 25,-40,  4, 54, 0,0,0],
+['b1x3x1', m5, 25,-32,  0, 54, 0,0,90],
+['c1x1x1', m3, 25,-32, 12, 54, 0,0,0],
+['c1x1x1', m3, 25,-28, 12, 54, 0,0,0],
+['c1x1x1', m3, 25,-28, 16, 54, 0,0,0],
+['c1x1x1', m3, 25,-32, 16, 54, 0,0,0],
+['c1x1x1', m3, 25,-24, -4, 54, 0,0,0],
+['c1x1x1', m3, 25,-20, -4, 54, 0,0,0],
+['c1x1x1', m3, 25,-20, -8, 54, 0,0,0],
+['c1x1x1', m3, 25,-24, -8, 54, 0,0,0],
+['c1x1x1', m3, 26,-32, 12, 57, 0,0,0],
+['c1x1x1', m3, 26,-28, 12, 57, 0,0,0],
+['c1x1x1', m3, 26,-28, 16, 57, 0,0,0],
+['c1x1x1', m3, 26,-32, 16, 57, 0,0,0],
+['c1x1x1', m3, 26,-24, -4, 57, 0,0,0],
+['c1x1x1', m3, 26,-20, -4, 57, 0,0,0],
+['c1x1x1', m3, 26,-20, -8, 57, 0,0,0],
+['c1x1x1', m3, 26,-24, -8, 57, 0,0,0],
+['f1x2x1', m6, 27,-20, -8, 60, 0,0,90],
+['f1x2x1', m6, 27,-20, -4, 60, 0,0,90],
+['f1x2x1', m6, 27,-22, -8, 63, 0,0,0],
+['c1x1x1', m6, 27,-22, -6, 66, 0,0,0],
+['c1x1x1', m7, 27,-22, -6, 69, 0,0,0],
+['b2x2x1', m3, 28,-32, 12, 60, 0,0,0],
+['b2x2x1', m5, 28,-32, 12, 63, 0,0,0],
+['c1x1x1', m3, 28,-32, 12, 66, 0,0,0],
+['c1x1x1', m3, 28,-28, 12, 66, 0,0,0],
+['c1x1x1', m3, 28,-28, 16, 66, 0,0,0],
+['c1x1x1', m3, 28,-32, 16, 66, 0,0,0],
+['b2x2x1', m3, 28,-32, 12, 69, 0,0,0],
+['f1x2x1', m5, 29,-28, 12, 72, 0,0,90],
+['f1x2x1', m5, 29,-28, 16, 72, 0,0,90],
+['f1x2x1', m5, 29,-30, 12, 75, 0,0,0],
+['c1x1x1', m5, 29,-30, 12, 78, 0,0,0],
+['c1x1x1', m5, 29,-30, 12, 81, 0,0,0],
+['c1x1x1', m7, 29,-30, 12, 84, 0,0,0],
+['b2x3x1', m5, 30, -8,  0, 57, 0,0,0],
+['b2x3x1', m5, 30,-16,  0, 57, 0,0,0],
+['b2x3x1', m5, 30,-24,  0, 57, 0,0,0],
+['b2x3x1', m5, 30,-32,  0, 57, 0,0,0],
+['b2x3x1', m5, 30,-40,  0, 57, 0,0,0],
+['b1x4x1', m5, 30, -4,  4, 60, 0,0,90],
+['b1x2x1', m5, 30,-20,  4, 60, 0,0,90],
+['b1x4x1', m5, 30,-28,  4, 60, 0,0,90],
+['b1x3x1', m5, 31, -4,  4, 63, 0,0,90],
+['b1x4x1', m5, 31,-16,  4, 63, 0,0,90],
+['b1x3x1', m5, 31,-32,  4, 63, 0,0,90],
+['c1x1x1', m7, 31, -4,  4, 66, 0,0,0],
+['c1x1x1', m7, 31,-40,  4, 66, 0,0,0],
+['c1x1x1', m8, 32,-32,-36, 3, 0,0,0],
+['b1x2x1', m9, 32,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 32,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 32,  0,  0, 9, 0,0,45, 1],
+['c1x1x1', m9, 32,  0,  0, 12, 0,0,0, 1],
+['c1x1x1', m8, 33,-12,-24, 3, 0,0,0],
+['b1x2x1', m9, 33,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 33,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 33,  0,  0, 9, 0,0,45, 1],
+['b1x2x1', m9, 33,  0,  0, 12, 0,0,-45, 1],
+['b1x2x1', m9, 33,  0,  0, 15, 0,0,45, 1],
+['c1x1x1', m9, 33,  0,  0, 18, 0,0,0, 1],
+['c1x1x1', m8, 34, 16,-36, 3, 0,0,0],
+['b1x2x1', m9, 34,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 34,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 34,  0,  0, 9, 0,0,45, 1],
+['c1x1x1', m9, 34,  0,  0, 12, 0,0,0, 1],
+['c1x1x1', m8, 35, 32,-24, 3, 0,0,0],
+['b1x2x1', m9, 35,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 35,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 35,  0,  0, 9, 0,0,45, 1],
+['b1x2x1', m9, 35,  0,  0, 12, 0,0,-45, 1],
+['b1x2x1', m9, 35,  0,  0, 15, 0,0,45, 1],
+['c1x1x1', m9, 35,  0,  0, 18, 0,0,0, 1],
+['c1x1x1', m8, 36,-20, 28, 3, 0,0,0],
+['b1x2x1', m9, 36,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 36,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 36,  0,  0, 9, 0,0,45, 1],
+['b1x2x1', m9, 36,  0,  0, 12, 0,0,-45, 1],
+['b1x2x1', m9, 36,  0,  0, 15, 0,0,45, 1],
+['c1x1x1', m9, 36,  0,  0, 18, 0,0,0, 1],
+['c1x1x1', m8, 37, 16, 32, 3, 0,0,0],
+['b1x2x1', m9, 37,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 37,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 37,  0,  0, 9, 0,0,45, 1],
+['c1x1x1', m9, 37,  0,  0, 12, 0,0,0, 1],
+['c1x1x1', m3, 38, 36, -4, 3, 0,0,0],
+['b1x2x1', m10, 38, 36,  0, 3, 0,0,90],
+['b1x2x1', m10, 38, 36, 12, 3, 0,0,90],
+['c1x1x1', m3, 38, 36, 16, 3, 0,0,0],
+['c1x1x1', m3, 39, 36, -4, 6, 0,0,0],
+['b1x2x1', m10, 39, 36, 0, 6, 0,0,90],
+['b1x2x1', m10, 39, 36, 12, 6, 0,0,90],
+['c1x1x1', m3, 39, 36, 16, 6, 0,0,0],
+['c1x1x1', m3, 40, 36, -4, 9, 0,0,0],
+['b1x2x1', m10, 40, 36,  0, 9, 0,0,90],
+['b1x2x1', m10, 40, 36, 12, 9, 0,0,90],
+['c1x1x1', m3, 40, 36, 16, 9, 0,0,0],
+['c1x1x1', m3, 41, 36, -4, 12, 0,0,0],
+['b1x2x1', m10, 41, 36,  0, 12, 0,0,90],
+['b1x2x1', m10, 41, 36, 12, 12, 0,0,90],
+['c1x1x1', m3, 41, 36, 16, 12, 0,0,0],
+['b2x2x1', m3, 41, 32,  4, 12, 0,0,0],
+['c1x1x1', m3, 42, 36, -4, 15, 0,0,0],
+['b2x4x1', m10, 42, 32, 0, 15, 0,0,0],
+['c1x1x1', m3, 42, 36, 16, 15, 0,0,0],
+['b1x1x1', m3, 43, 36, -4, 18, 0,0,0],
+['b1x2x1', m6, 43, 36,  0, 18, 0,0,90],
+['b1x2x1', m6, 43, 36, 12, 18, 0,0,90],
+['b1x1x1', m3, 43, 36, 16, 18, 0,0,0],
+['b2x2x1', m10, 43, 32,  4, 18, 0,0,0],
+['c1x1x1', m6, 44, 36, -4, 21, 0,0,0],
+['c1x1x1', m6, 44, 36, 16, 21, 0,0,0],
+['f1x2x1', m6, 44, 36,  4, 21, 0,0,0],
+['f1x2x1', m6, 44, 32,  4, 21, 0,0,0],
+['f1x2x1', m6, 44, 36,  6, 24, 0,0,90],
+];
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -1,9 +1,8 @@
-//Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2022
+//Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2025
 //GNU GPL license.

 /*
 BUGS:
- F1 in KFM (move Properties to an external app)
 - Ctrl+1+2+3+4 in KFM
 - Highlight another commands on Ctrl|Shift in KFM like in Classic KFM
 TODO:
@@ -11,9 +10,9 @@ TODO:
  http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334
 */

-#define ABOUT_TITLE "EOLITE 5.30"
-#define TITLE_EOLITE "Eolite File Manager 5.30"
-#define TITLE_KFM "Kolibri File Manager 2.30";
+#define ABOUT_TITLE "Eolite 5.32"
+#define TITLE_EOLITE "Eolite File Manager 5.32"
+#define TITLE_KFM "Kolibri File Manager 2.32";

 #define MEMSIZE 1024 * 250
 #include "../lib/clipboard.h"
@@ -444,6 +443,9 @@ void main()
 							}
 							EventDriveClick(key_scancode);
 							break;
+					case SCAN_CODE_KEY_P:
+							EventCopyItemPath();
+							break;
 					case SCAN_CODE_KEY_X:
 							CopyFilesListToClipboard(CUT);
 							break;
@@ -716,7 +718,7 @@ void DrawFilePanels()
 		DrawButtonsAroundList();
 		path = location[active_panel^1];
 		active_panel ^= 1;
-		OpenDir2(WITH_REDRAW);
+		OpenDir_without_unselect(WITH_REDRAW);
 		active_panel ^= 1;
 		if (!getSelectedCount()) files_inactive.count = files.count;
 		llist_copy(#files, #files_active);
@@ -729,38 +731,22 @@ void DrawFilePanels()

 		DrawButtonsAroundList();
 		path = location[active_panel];
-		OpenDir2(WITH_REDRAW);
+		OpenDir_without_unselect(WITH_REDRAW);
 	}
 }

-void OpenDir2(char redraw){
-	if (buf) free(buf);
-	if (GetDir(#buf, #files.count, path, DIRS_NOROOT)) {
-		Write_Error(EAX);
-		history.add(path);
-		EventHistoryGoBack();
-		return;
-	}
-	SetCurDir(path);
-	if (files.count>0) && (files.cur_y-files.first==-1) files.cur_y=0;
-	files.visible = math.min(files.h / files.item_h, files.count);
-	if (!strncmp(path, "/rd/1",5)) || (!strncmp(path, "/sys/",4))
-		dir_at_fat16 = true; else dir_at_fat16 = false;
-	Sorting();
-	SystemDiscs.Draw();
-	list_full_redraw = true;
-	List_ReDraw();
-	DrawPathBar();
-}
-
-
-void OpenDir(char redraw){
-	int errornum;
+void OpenDir(char redraw) {
 	unselectAll();
+	OpenDir_without_unselect(redraw);
+}
+
+
+void OpenDir_without_unselect(char redraw) {
+	int errornum;
+
 	if (buf) free(buf);
 	if (errornum = GetDir(#buf, #files.count, path, DIRS_NOROOT)) {
 		history.add(path);
-		//EventHistoryGoBack();
 		Dir_Up();
 		Write_Error(errornum);
 		return;
@@ -1055,7 +1041,6 @@ void EventHistoryGoForward()
 	}
 }

-
 void ShowOpenWithDialog()
 {
 	byte open_param[4097];
@@ -1149,6 +1134,7 @@ void ShowPopinForm(byte _popin_type)
 				break;
 		case POPIN_DELETE:
 				if (!files.count) return;
+				popin_string[0] = -1;
 				if (!getSelectedCount()) && (!strncmp(#file_name,"..",2)) return;
 				popinx = DrawEolitePopup(T_YES, T_NO);
 				WriteTextCenter(popinx, 178, POPIN_W, sc.work_text, T_DELETE_FILE);
@@ -1346,6 +1332,12 @@ void EventOpenSearch()
 	RunProgram(#program_path, #param);	
 }

+
+void EventCopyItemPath()
+{
+	Clipboard__CopyText(#file_path);
+}
+
 void ProceedMouseGestures()
 {
 	char stats;
--- a/programs/cmm/eolite/include/menu.h
+++ b/programs/cmm/eolite/include/menu.h
@@ -4,9 +4,11 @@ char file_actions[]=
 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>           |Enter
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  |Ctrl+Ent
 -
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD><EFBFBD>         |Ctrl+C
-<EFBFBD><EFBFBD>१<EFBFBD><EFBFBD><EFBFBD>           |Ctrl+X
-<EFBFBD><EFBFBD>⠢<EFBFBD><EFBFBD><EFBFBD>           |Ctrl+V
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>    |Ctrl+P
+-
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD><EFBFBD>|Ctrl+C
+<EFBFBD><EFBFBD>१<EFBFBD><EFBFBD><EFBFBD>|Ctrl+X
+<EFBFBD><EFBFBD>⠢<EFBFBD><EFBFBD><EFBFBD>|Ctrl+V
 -
 <EFBFBD><EFBFBD>२<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>      |F2
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>            |Del
@@ -15,8 +17,10 @@ char empty_folder_actions[]=
 "<EFBFBD><EFBFBD>⠢<EFBFBD><EFBFBD><EFBFBD>      |Ctrl+V";
 char burger_menu_items[] = 
 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>|Ctrl+N
+-
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>᮫<EFBFBD>|Ctrl+G
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|Ctrl+R
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|Ctrl+F
+-
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ன<EFBFBD><EFBFBD>|F10
 <EFBFBD> <EFBFBD>ணࠬ<EFBFBD><EFBFBD>";

@@ -25,6 +29,8 @@ char file_actions[]=
 "Ava           |Enter
 Ava ...        |Ctrl+Ent
 -
+Copy path      |Ctrl+P
+-
 Kopeeri        |Ctrl+C
 L<EFBFBD>ika          |Ctrl+X
 Aseta          |Ctrl+V
@@ -36,8 +42,10 @@ char empty_folder_actions[]=
 "Aseta         |Ctrl+V";
 char burger_menu_items[] = 
 "New window|Ctrl+N
+-
 Open console here|Ctrl+G
-V<EFBFBD>rskenda|Ctrl+R
+Search|Ctrl+F
+-
 Settings|F10
 About";

@@ -46,6 +54,8 @@ char file_actions[]=
 "Open         |Enter
 Open with...  |Ctrl+Ent
 -
+Copy path     |Ctrl+P
+-
 Copy          |Ctrl+C
 Cut           |Ctrl+X
 Paste         |Ctrl+V
@@ -57,8 +67,10 @@ char empty_folder_actions[]=
 "Paste        |Ctrl+V";
 char burger_menu_items[] = 
 "New window|Ctrl+N
+-
 Open console here|Ctrl+G
-Refresh folder|Ctrl+R
+Search|Ctrl+F
+-
 Settings|F10
 About";
 #endif
@@ -76,17 +88,18 @@ void EventMenuClick(dword _id)
 	if (active_menu == MENU_FILE) switch(_id) {
 		case 1: EventOpen(0); break;
 		case 2: ShowOpenWithDialog(); break;
-		case 3: CopyFilesListToClipboard(COPY); break;
-		case 4: CopyFilesListToClipboard(CUT); break;
-		case 5: EventPaste(path); break;
-		case 6: FnProcess(2); break;
-		case 7: ShowPopinForm(POPIN_DELETE); break;
-		case 8: FnProcess(1); break;
+		case 3: EventCopyItemPath(); break;
+		case 4: CopyFilesListToClipboard(COPY); break;
+		case 5: CopyFilesListToClipboard(CUT); break;
+		case 6: EventPaste(path); break;
+		case 7: FnProcess(2); break;
+		case 8: ShowPopinForm(POPIN_DELETE); break;
+		case 9: FnProcess(1); break;
 	}
 	if (active_menu == MENU_BURGER) switch(_id) {
 		case 1: EventOpenNewEolite(); break;
 		case 2: EventOpenConsoleHere(); break;
-		case 3: EventRefreshDisksAndFolders(); break;
+		case 3: EventOpenSearch(); break;
 		case 4: FnProcess(10); break;
 		case 5: EventShowAbout(); break;		
 	}
--- a/programs/cmm/eolite/include/settings.h
+++ b/programs/cmm/eolite/include/settings.h
@@ -69,7 +69,7 @@ void settings_dialog()
 			case evKey:
 				GetKeys();
 				if (key_scancode==SCAN_CODE_ESC) ExitSettings();
-        edit_box_key_c stdcall (#path_start_ed,key_ascii << 8);	
+				edit_box_key_c stdcall (#path_start_ed,key_editbox);	
 				break;
 				
 			case evReDraw:
--- a/programs/cmm/eolite/search.c
+++ b/programs/cmm/eolite/search.c
@@ -50,10 +50,6 @@ opendialog open_folder_dialog =
  NULL
 };

-#define TOOLBAR_H 100
-#define LISTX 0
-#define LISTY TOOLBAR_H
-
 //===================================================//
 //                                                   //
 //                      RESULTS                      //
@@ -95,9 +91,7 @@ void SearchThread()
 {  
 	int prev_first, prev_cur_y;

-#ifndef __COFF__
 	load_dll(Proc_lib, #OpenDialog_init,0);
-#endif
 	OpenDialog_init stdcall (#open_folder_dialog);

 	if (!ESBYTE[path]) strcpy(path, "/sys");
@@ -107,28 +101,43 @@ void SearchThread()
 	loop() switch(@WaitEvent())
 	{
 	  	case evMouse:
+
 			edit_box_mouse stdcall (#edit_name);
 			edit_box_mouse stdcall (#edit_path);
+
+
+			prev_cur_y = select_list.cur_y;
+
 			if (SelectList_ProcessMouse()) {
 				SelectList_Draw();
 			} else {
 				SelectList_DrawLine(select_list.cur_y);
-			}
-			if (mouse.key&MOUSE_RIGHT) && (mouse.up) && (select_list.MouseOver()) EventOpenFile(false);
-	  		break;
+				
+				if (select_list.MouseOver(mouse.x, mouse.y)) 
+				{
+						if (mouse.key&MOUSE_LEFT) && (mouse.up) {
+							if (prev_cur_y == select_list.cur_y) EventRunFile();
+						}

+						if (mouse.key&MOUSE_RIGHT) && (mouse.up) {
+							EventShowFileInFolder();
+						}
+				}
+			}
+	  		
+	  	break;
 		case evButton:
 			switch (@GetButtonID()) {
 				case 1: @ExitProcess(); break;
 				case BTN_SEARCH: EventSearch(); break;
 				case BTN_CHOOSE_PATH: EventChooseSearchInPath();
 			}
-			break;
-	  
+
+			break;	  
 		case evKey:
-			@GetKeys(); 
-			edit_box_key_c stdcall (#edit_name);
-			edit_box_key_c stdcall (#edit_path);
+			GetKeys(); 
+			edit_box_key_c stdcall (#edit_name, key_editbox);
+			edit_box_key_c stdcall (#edit_path, key_editbox);
 			if (key_scancode == SCAN_CODE_TAB) {
 				if (edit_name.flags & ed_focus) {
 					edit_name.flags >< edit_path.flags;
@@ -143,7 +152,7 @@ void SearchThread()
 			if (edit_name.flags & ed_focus) || (edit_path.flags & ed_focus) {
 				if (SCAN_CODE_ENTER == key_scancode) EventSearch();
 			} else {
-				if (SCAN_CODE_ENTER == key_scancode) EventOpenFile(true);
+				if (SCAN_CODE_ENTER == key_scancode) EventRunFile();
 				prev_first = select_list.first;
 				prev_cur_y = select_list.cur_y;
 				if (select_list.ProcessKey(key_scancode)) {
@@ -169,17 +178,24 @@ void SearchThread()
   }
 }

+#define TOOLBAR_H 100
+#define PAD 10
+#define LISTX PAD
+#define LISTY TOOLBAR_H
+
 void draw_window_search()
 {
-	SelectList_Init(LISTX, LISTY, Form.cwidth-scroll1.size_x-1, Form.cheight-TOOLBAR_H-1);
+	SelectList_Init(LISTX, LISTY, Form.cwidth-scroll1.size_x-LISTX-LISTX, Form.cheight-TOOLBAR_H-PAD);
 	SelectList_Draw();
-	DrawBar(0, TOOLBAR_H-1, Form.cwidth, 1, sc.line);
+	DrawWideRectangle(0, LISTY-PAD-1, Form.cwidth, Form.cheight-TOOLBAR_H+PAD+1, 9, sc.work);
+	DrawRectangle(PAD-1, LISTY-1, select_list.w+1, select_list.h+1, sc.line);
+
 	DrawBar(0, 0, Form.cwidth, TOOLBAR_H-1, sc.work);
 	DrawEditBox(#edit_name);
 	WriteText(edit_name.left-2, edit_name.top-20, 0x90, sc.work_text, T_SEARCH_NAME);
 	edit_path.width = Form.cwidth - 314;
+	DrawStandartCaptButton(PAD, 63, BTN_SEARCH, T_BUTTON_SEARCH);
 	DrawFileBox(#edit_path, T_SEARCH_PATH, BTN_CHOOSE_PATH);
-	DrawStandartCaptButton(10, 63, BTN_SEARCH, T_BUTTON_SEARCH);
 }

 void SelectList_DrawLine(dword i)
@@ -224,6 +240,12 @@ void SelectList_LineChanged()
 	return;
 }

+void getfullpath(dword to, path, name) {
+	strcpy(to, path);
+	chrcat(to, '/');
+	strcat(to, name);
+}
+
 //===================================================//
 //                                                   //
 //                     EVENTS                        //
@@ -238,22 +260,21 @@ void EventChooseSearchInPath()
 	}
 }

-void getfullpath(dword to, path, name) {
-	strcpy(to, path);
-	chrcat(to, '/');
-	strcat(to, name);
-}
-
-void EventOpenFile(int run_file_not_show_in_folder)
+void EventShowFileInFolder()
 {
 	char full_path[4096];
 	int pos = select_list.cur_y;
 	getfullpath(#full_path, results.path.get(pos), results.name.get(pos));
-	if (run_file_not_show_in_folder) {
-		RunProgram("/sys/@open", #full_path);
-	} else {
-		RunProgram("/sys/file managers/eolite", #full_path);	
-	}
+	RunProgram(#program_path, #full_path);	
+}
+
+void EventRunFile()
+{
+	char full_path[4096];
+	int pos = select_list.cur_y;
+	getfullpath(#full_path, results.path.get(pos), results.name.get(pos));
+	if (dir_exists(#full_path)) chrcat(#full_path, '/');
+	RunProgram("/sys/@open", #full_path);
 }

 void EventSearch()
--- a/programs/cmm/lib/kolibri.h
+++ b/programs/cmm/lib/kolibri.h
@@ -9,7 +9,6 @@
 #pragma option -CPA
 #initallvar 0

-#ifndef __COFF__
 #jumptomain FALSE

 #startaddress 0
@@ -30,17 +29,6 @@ dword  I_Param      = #param;
 dword  I_Path       = #program_path;
 char param[4096];
 char program_path[4096];
-#else
-extern dword            __argv;
-extern dword            __path;
-
-dword  I_Param      =   #__argv;
-dword  I_Path       =   #__path;
-
-#define param           __argv
-#define program_path    __path
-#define ______INIT______  start
-#endif

 #define bool      int

@@ -403,6 +391,7 @@ inline fastcall int TestBit( EAX, CL)

 //------------------------------------------------------------------------------

+#define MINIMIZED 0x02
 #define ROLLED_UP 0x04
 :void DefineAndDrawWindow(dword _x, _y, _w, _h, _window_type, _bgcolor, _title, _flags)
 {
--- a/programs/cmm/lib/mouse.h
+++ b/programs/cmm/lib/mouse.h
@@ -116,17 +116,10 @@
 	EAX = 37;
 	EBX = 2;
 	$int	64
-	$mov	ebx, eax
-	$mov	ecx, eax
 	key = EAX;
-	$and	eax, 0x00000001
-	$shr	ebx, 1
-	$and	ebx, 0x00000001
-	$shr	ecx, 2
-	$and	ecx, 0x00000001
-	lkm = EAX;
-	pkm = EBX;
-	mkm = ECX;
+	lkm = EAX&MOUSE_LEFT;
+	pkm = EAX&MOUSE_RIGHT;
+	mkm = EAX&MOUSE_MIDDLE;
 	
 	//when you release the MOUSE button
 	// Mouse Move Event
--- a/programs/cmm/lib/obj/box_lib.h
+++ b/programs/cmm/lib/obj/box_lib.h
@@ -6,37 +6,6 @@
 #include "../lib/kolibri.h"
 #endif

-#ifdef __COFF__
-extern dword edit_box_draw;
-extern dword edit_box_key_safe;
-extern dword edit_box_mouse;
-extern dword edit_box_set_text;
-
-extern dword scrollbar_v_draw;
-extern dword scrollbar_v_mouse;
-extern dword scrollbar_h_draw;
-extern dword scrollbar_h_mouse;
-
-extern dword PathShow_prepare;
-extern dword PathShow_draw;
-
-extern dword progressbar_draw;
-extern dword progressbar_progress;
-
-extern dword frame_draw;
-
-/* 
-    Legacy support
-    For new programs need to use edit_box_key_safe (or edit_box_key_c
-    with a define below)   
-    TODO: change in all cmm programs edit_box_key to edit_box_key_safe (edit_box_key_c)
-          See examples in eolite and imgedit
-          
-    This define changed all edit_box_key_c to edit_box_key_safe identifier's              
-*/
-#define edit_box_key_c  edit_box_key_safe
-
-#else
 #ifndef INCLUDE_DLL_H
 #include "../lib/dll.h"
 #endif
@@ -242,5 +211,3 @@ struct frame
 	frame_draw stdcall (#frame123);
 }

-
-#endif
--- a/programs/cmm/lib/patterns/select_list.h
+++ b/programs/cmm/lib/patterns/select_list.h
@@ -44,15 +44,14 @@ signed SelectList_ProcessMouse()
 		return true;
 	}

-	if (mouse.up) && (mouse.click) 
-		if (select_list.ProcessMouse(mouse.x, mouse.y)) {
-			SelectList_LineChanged();
-			return true;
-		}
+	if (mouse.up) && (select_list.ProcessMouse(mouse.x, mouse.y)) {
+		SelectList_LineChanged();
+		return true;
+	}
 	return false;
 }

-void SelectList_DrawBorder() {
+:void SelectList_DrawBorder() {
 	DrawRectangle3D(select_list.x-2, select_list.y-2,
 		select_list.w+3+scroll1.size_x, select_list.h+3, 
 		sc.dark, sc.light);
@@ -61,8 +60,8 @@ void SelectList_DrawBorder() {

 void SelectList_DrawScroller()
 {
-	scroll1.bckg_col = MixColors(sc.work, 0xBBBbbb, 80);
-	scroll1.frnt_col = MixColors(sc.work,0xFFFfff,120);
+	scroll1.bckg_col = sc.dark;  // MixColors(sc.work, 0xBBBbbb, 80);
+	scroll1.frnt_col = sc.light; // MixColors(sc.work,0xFFFfff,120);
 	scroll1.line_col = sc.line;

 	scroll1.max_area = select_list.count;
--- a/programs/develop/libraries/box_lib/trunk/tree_list.asm
+++ b/programs/develop/libraries/box_lib/trunk/tree_list.asm
@@ -1,7 +1,6 @@
-; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> TreeList <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪<EFBFBD> box_lib.obj
-; <EFBFBD><EFBFBD> <20><><EFBFBD> <20>ਬ<EFBFBD><E0A8AC><EFBFBD><EFBFBD><EFBFBD> GPL2 <20><>業<EFBFBD><E6A5AD><EFBFBD>
-; <EFBFBD><EFBFBD>᫥<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD> 12.01.2021 IgorA
-
+; SPDX-License-Identifier: GPL-2.0-only
+; TreeList: used as a ListBox or Tree control (determined by settings)
+; Copyright (C) 2009-2025  IgorA <aie85playm@gmail.com>

 struct TreeNode
 	type dw ? ;+ 0 ⨯ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> 㧫<>
@@ -14,6 +13,52 @@ struct TreeNode
 ends


+;input:
+; ecx - 0xXX...... font options
+;output:
+; eax - font height in pixels
+align 4
+proc get_font_h uses ebx
+	mov eax,ecx
+	shr eax,24
+	bt eax,4
+	jc @f
+	bt eax,5
+	jc @f
+		mov ebx,9
+		jmp .siz0
+	@@:
+		mov ebx,16
+	.siz0:
+	and eax,7
+	inc eax
+	imul eax,ebx
+	ret
+endp
+
+;input:
+; ecx - 0xXX...... font options
+;output:
+; eax - font width in pixels
+align 4
+proc get_font_w uses ebx
+	mov eax,ecx
+	shr eax,24
+	bt eax,4
+	jc @f
+	bt eax,5
+	jc @f
+		mov ebx,6
+		jmp .siz0
+	@@:
+		mov ebx,8
+	.siz0:
+	and eax,7
+	inc eax
+	imul eax,ebx
+	ret
+endp
+
 ;<3B>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᯨ᪠ <20> <20>᭮<EFBFBD><E1ADAE><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ଠ樨 (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
 align 16
 proc tl_data_init uses eax ecx edi, tlist:dword
@@ -463,34 +508,24 @@ proc tl_draw, tlist:dword

 	cmp tl_capt_cy,9 ;9 - minimum caption height
 	jl @f
-	mov ebx,edi ;calculate cursor position
-	mov eax,tl_cur_pos
-	inc eax
-	lea edi,[txt_capt_cur.v]
-	stdcall tl_convert_to_str, 5
-
-	mov edi,ebx
+	call tl_draw_caption_cur_pos
 	mov eax,tl_tim_undo
+	or eax,eax
+	jz @f
+	mov ebx,edi ;save edi
 	lea edi,[txt_capt_otm.v]
 	stdcall tl_convert_to_str, 5
 	mov edi,ebx ;restore edi

-	mov eax,SF_DRAW_TEXT ;captions
-	mov ebx,tl_box_left
-	shl ebx,16
-	add ebx,5*65536+3
-	add ebx,tl_box_top
-	mov ecx,tl_col_txt
-	or  ecx,0x80000000
-	lea edx,[txt_capt_cur]
-	int 0x40
-
 	mov ebx,tl_box_left
 	shl ebx,16
 	add ebx,100*65536+3
+	mov ecx,tl_col_txt
+	and ecx,0x00ffffff
+	or  ecx,0x80000000
 	add ebx,tl_box_top
 	lea edx,[txt_capt_otm]
-	int 0x40
+	mcall SF_DRAW_TEXT ;undo
 	@@:

 	;cycle to nodes
@@ -1163,10 +1198,11 @@ proc tl_draw_node_caption uses ebx ecx edx esi
 		ror ecx,16
 		mov ebx,ecx
 		add bx,tl_img_cy ;<3B><>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>࠭<EFBFBD><E0A0AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-		sub bx,9 ;<3B>⭨<EFBFBD><E2ADA8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥪<><E2A5AA><EFBFBD>
 		mov ecx,tl_col_txt
-		and ecx,0xffffff
-		mcall SF_DRAW_TEXT
+		call get_font_h
+		sub bx,ax ;<3B>⭨<EFBFBD><E2ADA8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥪<><E2A5AA><EFBFBD>
+		and ecx,0x37ffffff
+		mcall SF_DRAW_TEXT ;node text
 	@@:
 	ret
 endp
@@ -1179,13 +1215,15 @@ endp
 align 4
 proc tl_get_draw_text_len uses eax ecx edx
 	mov esi,eax ;<3B><>६ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ப<EFBFBD>
+	mov ecx,tl_col_txt
+	call get_font_w
+	mov ecx,eax
 	mov eax,tl_box_left
 	add eax,tl_box_width
 	cmp eax,ebx
 	jle .text_null ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><>࠭<EFBFBD><E0A0AD>
 		sub eax,ebx
 		xor edx,edx
-		mov ecx,6 ;<3B><>ਭ<EFBFBD> <20><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 		div ecx ;ᬮ<>ਬ ᪮<>쪮 ᨬ<><E1A8AC><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>࠭<EFBFBD>
 		cmp esi,eax
 		jl @f
@@ -1858,10 +1896,8 @@ pushad
 			.po8:
 				call tl_node_move_po8 ;㧫<> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>塞 8 <20><>뫮<EFBFBD>
 			.cur_mov:
-				push dword edi
-				call tl_cur_perv
-				push dword edi
-				call tl_draw
+				stdcall tl_cur_perv, edi
+				stdcall tl_draw, edi
 	@@:
 popad
 	ret
@@ -1981,10 +2017,11 @@ tl_draw_caption_cur_pos:
 		add ebx,5*65536+3
 		add ebx,tl_box_top
 		mov ecx,tl_col_txt
+		and ecx,0x00ffffff
 		or  ecx,0xc0000000 ;0x40000000 <20><><EFBFBD><EFBFBD><EFBFBD>訢<EFBFBD><E8A8A2><EFBFBD> 䮭 梥⮬ edi
 		lea edx,[txt_capt_cur]
 		mov edi,tl_col_zag
-		mcall SF_DRAW_TEXT ;captions
+		mcall SF_DRAW_TEXT ;row number
 	popad
 	@@:
 	ret
@@ -2253,6 +2290,6 @@ align 4
 	jge @f
 		or al,0x30  ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 ᨬ<><E1A8AC><EFBFBD> '0'
 		stosb       ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> al <20> <20>祪<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [edi]
-		mov byte[edi],0
+		mov word[edi],' ' ;add space symbol and 0
 	@@:
 	ret
--- a/programs/develop/libraries/menuetlibc/src/libm/ef_exp.s
+++ b/programs/develop/libraries/menuetlibc/src/libm/ef_exp.s
@@ -6,7 +6,7 @@ MK_C_SYM(__ieee754_expf)
 	fstl	%st(1)
 	frndint				
 	fstl	%st(2)
-	fsubrp				
+	fsubp				
 	f2xm1				 
 	fld1
 	faddp				
--- a/programs/fs/unz/unz.asm
+++ b/programs/fs/unz/unz.asm
@@ -41,6 +41,7 @@ dd     1, start, init_end, end_mem, stack_top, params,	0
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), es_ES, en_US.
 include '../../macros.inc'
 include '../../proc32.inc'
+include "../../string.inc"
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../dll.inc'
 ;include '../../debug.inc'
@@ -369,6 +370,12 @@ endl

 	mcall	30,4,,1
 	jmp	.n
+@@:
+	stdcall string.length, pathOut
+	add     eax, pathOut
+	cmpne   [eax - 1], byte '/', @f
+	mov     [eax - 1], byte 0
+	dec     dword[edtUnpPath.size]
@@:
 	mcall	30,4,pathOut,1
 .n:
--- a/programs/games/flood-it/build.bat
+++ b/programs/games/flood-it/build.bat
@@ -0,0 +1,5 @@
+@del *.
+@For /R %%i In (*.c) Do c-- "%%i"
+@rename *.com *.
+@pause
+@del warning.txt
--- a/programs/games/flood-it/compile_eng.bat
+++ b/programs/games/flood-it/compile_eng.bat
@@ -1,9 +0,0 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-C-- flood-it.c
-@del flood-it
-@rename flood-it.com flood-it
-@kpack flood-it
-@del lang.h--
-@del warning.txt
-@pause
--- a/programs/games/flood-it/compile_rus.bat
+++ b/programs/games/flood-it/compile_rus.bat
@@ -1,9 +0,0 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-C-- flood-it.c
-@del flood-it
-@rename flood-it.com flood-it
-@kpack flood-it
-@del lang.h--
-@del warning.txt
-@pause
--- a/programs/games/flood-it/flood-it.c
+++ b/programs/games/flood-it/flood-it.c
@@ -1,49 +1,44 @@
-//Leency 06.10.2011, Flood-it! v2.41, GPL
+// SPDX-License-Identifier: GPL-2.0-only
+// Flood-it! - Strategy game: Flood the board with one color, within a step limit.
+// Copyright (C) 2011-2025  Leency <lipatov.kiril@gmail.com>

 #include "lib\kolibri.h" 
 #include "lib\random.h"

-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 system_colors sc;
 proc_info Form;
-dword stak[100]; //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+dword help_window_stak[100];

-//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-int DIFFICULTY_LEV_PARAMS[]={ 28, 14, 25,  //<2F><><EFBFBD><EFBFBD><EFBFBD>
-                              17, 28, 50}; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-							  
-//<2F><>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD>"
-int BLOCK_SIZE = 28; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-int BLOCKS_NUM = 14; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20> <20><> Y
-int MAX_CLICKS = 25; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+#define DEFAULT_BLOCK_COUNT 14
+#define DEFAULT_MAX_CLICKS 25
+#define MAX_BLOCK_SIZE 28
+char board_size = -1;
+int BLOCK_SIZE; //cell size
+int BLOCKS_NUM; //number of cells by X and Y
+int MAX_CLICKS; //max clicks for win
+int CLICKS;     //how many clicks user already did
+int game_end;

-int CLICKS = 0;      //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
+#define USER_PANEL_WIDTH 144

-#define USER_PANEL_WIDTH 119
-
-//<2F><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD> <20><><EFBFBD><EFBFBD>,
-//<2F><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-dword FIELD_COLORS[]= {0xf18db6, 0x605ca8, 0xfddc80, 0xdc4a20, 0x46b1e2, 0x7e9d1e,   0x232323, 0};
-char *BOARD_SIZES[]={ "S", "L", 0 };
+//six colors are used in a game for a cells
+//and seventh color is used to mark a cell during filling process
+dword FIELD_COLORS[] = {0xf18db6, 0x605ca8, 0xfddc80, 0xdc4a20, 0x46b1e2, 0x7e9d1e, 0x232323};
+char BOARD_SIZES[] = "S\0L";


 #ifdef LANG_RUS
 	char *BUTTON_CAPTIONS[]={ " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [F2]", " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [F1]", " <20><>室 [Esc]", 0}; 
-	char CLICKS_TEXT[]=" <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:   /";
-	char LEVELS_TEXT[]="<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:";
+	char CLICKS_TEXT[]="<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:   /";
+	char LEVELS_TEXT[]=" <EFBFBD><EFBFBD><EFBFBD><EFBFBD>:";
 	
 	char HELP_WINDOW_CAPTION[]="<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
 	char *HELP_TEXT[]={	"<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> Flood-it?",
 	"",
-	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 梥⮬ <20><> <20><>࠭<EFBFBD>祭<EFBFBD><EFBFBD><EFBFBD> <20><>᫮ 室<><E5AEA4>.",
-	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>稭<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD>孥<EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⪨. <20>롥<EFBFBD><EBA1A5><EFBFBD><EFBFBD> 梥<>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>",
-	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⨪<EFBFBD><EFBFBD> ᫥<EFBFBD><EFBFBD>, <20> <EFBFBD><EFBFBD><EFBFBD>⪨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>⨬ 梥⮬ - ⠪ <20><> <EFBFBD><EFBFBD><EFBFBD>ᮥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-	"<EFBFBD><EFBFBD>ᥤ<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⪨ ⮩ <20><> <20><><EFBFBD><EFBFBD>᪨. <20><>墠<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>㦭<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>쭮<EFBFBD>",
-	"<EFBFBD><EFBFBD>᫮ 室<><E5AEA4>. <20><>蠣<EFBFBD><E8A0A3><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>⥣<EFBFBD><E2A5A3> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ਭ樯<E0A8AD><E6A8AF> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,",
-	"<EFBFBD>⮡<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!",
+	"<EFBFBD>롥<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 梥<>, <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⨪<EFBFBD><EFBFBD>. <20><><EFBFBD>⪨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+	"<EFBFBD>⨬ 梥⮬ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> - ⠪ <20><> <20><><EFBFBD>ᮥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+	"<EFBFBD><EFBFBD>ᥤ<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⪨ ⮩ <EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>᪨. <20><>墠<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD> <20>㦭<EFBFBD> <20><>",
+	"<EFBFBD><EFBFBD>࠭<EFBFBD>祭<EFBFBD><EFBFBD><EFBFBD> <20><>᫮ 室<><E5AEA4>. <20><><EFBFBD><EFBFBD>㯭<EFBFBD> <20><><EFBFBD> ࠧ<><E0A0A7><EFBFBD><EFBFBD> <20><>᪨.",
 	"",
 	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⠪<><E2A0AA> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>蠬<EFBFBD>:",
 	"[Q] [W] [E]",
@@ -62,28 +57,25 @@ char *BOARD_SIZES[]={ "S", "L", 0 };
 	"vajutades nuppudele vasakul. Kui sa muudad v<>rvi pragusel alal,",
 	"siis iga kokkupuutuv sama v<>rv muutub samaks. Nii saad ujutada",
 	"teised alad m<>nguv<75>ljal <20>le. Valida saad 2 m<>nguv<75>lja suuruse",
-	"vahel. Proovi v<>li <20>le ujutada etteandtud k<>ikude arvuga!",
-	"Kaasahaarav ja l<>bus!",
+	"vahel.",
 	"",
 	"M<EFBFBD>ngida saab ka klaviatuuriga:",
 	"[Q] [W] [E]",
 	"[A] [S] [D]",
 	0}; 
 #else
-	char *BUTTON_CAPTIONS[]={ "New Game [F2]", "Help     [F1]", "Exit    [Esc]", 0}; 
+	char *BUTTON_CAPTIONS[]={ "Restart [F2]", " Help  [F1]", " Exit  [Esc]", 0}; 
 	char CLICKS_TEXT[]="Clicks:   /";
 	char LEVELS_TEXT[]="Board:";
 	
 	char HELP_WINDOW_CAPTION[]="Help";
 	char *HELP_TEXT[]={	"How to play Flood-it?",
 	"",
-	"Flood the whole board with one color within the allowed steps.",
-	"You start from the top left corner and progress by selecting one",
+	"You start from the TOP LEFT corner and progress by selecting one",
 	"of the colored buttons on the left. When you change your current area",
 	"color, every adjacent square with the same color also changes, that",
-	"way you can flood other areas of the board. Select from 3 sizes of",
+	"way you can flood other areas of the board. Select from 2 sizes of",
 	"the board and try to flood-it in the least amount of steps!",
-	"Addictive and Fun!",
 	"",
 	"You can also play with keyboard:",
 	"[Q] [W] [E]",
@@ -92,7 +84,7 @@ char *BOARD_SIZES[]={ "S", "L", 0 };
 #endif


-unsigned char color_matrix[28*28]; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+unsigned char color_matrix[28*28]; //our field

 unsigned char loss_matrix[14*14]={
 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -132,152 +124,160 @@ void main()
 {   
 	int key, id;
 	
+	set_board_size(0); //small board by default
 	new_game();
   
-	loop()
+	loop() switch(WaitEvent()) 
 	{
-		switch(WaitEvent()) 
-		{
-			case evButton:
-				id = GetButtonID(); 
-				IF (id==1) || (id==4) ExitProcess();
-				IF (id==2) goto _NEW_GAME_MARK;
-				IF (id==3) goto _HELP_MARK;
-				IF (id>=100)
-				{
-					make_turn(id-100);
+		case evButton:
+			id = GetButtonID(); 
+			IF (id==1) || (id==4) ExitProcess();
+			IF (id==2) goto _NEW_GAME_MARK;
+			IF (id==3) goto _HELP_MARK;
+			IF (id>=100) {
+				make_turn(id-100);
+			}
+			if (id==10) set_board_size(0);
+			if (id==11) set_board_size(1);
+			break;
+		case evKey:
+			key = GetKeyScancode();
+			IF (key==01) //Escape
+				 ExitProcess();
+			IF (key==59) //F1
+			{
+				_HELP_MARK:
+					CreateThread(#help_thread,#help_window_stak);
 					break;
-				}
-				if (id>=10)
-				{
-					id=id-10*3;
-					
-					IF (BLOCK_SIZE == DIFFICULTY_LEV_PARAMS[id]) break; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-					
-					BLOCK_SIZE = DIFFICULTY_LEV_PARAMS[id]; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-					BLOCKS_NUM = DIFFICULTY_LEV_PARAMS[id+1]; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20> <20><> Y
-					MAX_CLICKS = DIFFICULTY_LEV_PARAMS[id+2]; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-					
+			}
+			IF (key==60) //F2
+			{
+				_NEW_GAME_MARK:
 					new_game();
-					
-					MoveSize(-1, -1, BLOCK_SIZE*BLOCKS_NUM +14+USER_PANEL_WIDTH, BLOCK_SIZE*BLOCKS_NUM +GetSkinHeight()+14);
-				}
-				break;
-			case evKey:
-				key = GetKeyScancode();
-				IF (key==01) //Escape
-					 ExitProcess();
-				IF (key==59) //F1
-				{
-					_HELP_MARK:
-						CreateThread(#help,#stak); 
-				}
-				IF (key==60) //F2
-				{
-					_NEW_GAME_MARK:
-						new_game();
-						draw_clicks_num();
-						draw_field();
-				}
-				IF (key==16) make_turn(0); //Q
-				IF (key==17) make_turn(1); //W
-				IF (key==18) make_turn(2); //E
-				IF (key==30) make_turn(3); //A
-				IF (key==31) make_turn(4); //S
-				IF (key==32) make_turn(5); //D
-				break;
-			case evReDraw:
-				draw_window();
-		}
+					draw_clicks_num();
+					draw_field();
+					break;
+			}
+			IF (key==16) make_turn(0); //Q
+			IF (key==17) make_turn(1); //W
+			IF (key==18) make_turn(2); //E
+			IF (key==30) make_turn(3); //A
+			IF (key==31) make_turn(4); //S
+			IF (key==32) make_turn(5); //D
+			break;
+		case evReDraw:
+			draw_window();
+	}
+}
+
+void set_board_size(char s)
+{
+	if (board_size != s) {
+		board_size = s;
+		
+		BLOCKS_NUM = board_size + 1 * DEFAULT_BLOCK_COUNT;
+		MAX_CLICKS = board_size + 1 * DEFAULT_MAX_CLICKS;
+		
+		BLOCK_SIZE = GetScreenHeight() - 70 / BLOCKS_NUM; 
+		if (BLOCK_SIZE > MAX_BLOCK_SIZE) BLOCK_SIZE = MAX_BLOCK_SIZE;
+		
+		new_game();
+		
+		MoveSize(-1, -1, BLOCK_SIZE*BLOCKS_NUM +14+USER_PANEL_WIDTH, 
+		BLOCK_SIZE*BLOCKS_NUM +GetSkinHeight()+14);		
 	}
 }


 void make_turn(int turn_id)
 {
-	IF (color_matrix[0]==turn_id) return; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>
-	IF (CLICKS>=MAX_CLICKS) return; //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
-	CLICKS++;
-	draw_clicks_num();
-	
-	fill_field(turn_id);
-	draw_field();
-	check_for_end(); //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	
+	IF (color_matrix[0]==turn_id) return; //ignore no-sence click: first item color is equal to a new color
+	IF (!game_is_ended()) {
+		CLICKS++;
+		draw_clicks_num();
+		fill_field(turn_id);
+		if (!game_is_ended()) draw_field();
+	}
 }

-
 void draw_window()
 {
-	int i, j;
+	int i;
 	#define BUTTON_SIZE 28
 	
 	sc.get();
 		
-	DefineAndDrawWindow(300,176, BLOCK_SIZE*BLOCKS_NUM +14+USER_PANEL_WIDTH, BLOCK_SIZE*BLOCKS_NUM +GetSkinHeight()+14, 0x74,sc.work,0,0,"Flood-it!"); 
+	DefineAndDrawWindow(300,176, BLOCK_SIZE*BLOCKS_NUM +14+USER_PANEL_WIDTH, 
+	BLOCK_SIZE*BLOCKS_NUM +GetSkinHeight()+14, 0x74,0,"Flood-it!"); 
 	
-	//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	// Fix rolled-up bug
 	GetProcessInfo(#Form, SelfInfo);
 	IF (Form.status_window==4) return;
 	
-	//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> -> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	// Fill background to reduce window redraw
 	for (i=0;i<=4;i++)
 	{
-		IF (i<>4)
-			DrawRegion(USER_PANEL_WIDTH+i-5,i, BLOCK_SIZE*BLOCKS_NUM +9-i-i, BLOCK_SIZE*BLOCKS_NUM+9-i-i, sc.work);
-		else
-			DrawRegion(USER_PANEL_WIDTH+i-5,i, BLOCK_SIZE*BLOCKS_NUM +9-i-i, BLOCK_SIZE*BLOCKS_NUM+9-i-i, sc.work_graph); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+		ESI = sc.work; 
+		IF (i==4) ESI = sc.work_graph;
+		DrawRegion(USER_PANEL_WIDTH+i-5,i, BLOCK_SIZE*BLOCKS_NUM +9-i-i, ESI);
 	}
 	DrawBar(0,0, USER_PANEL_WIDTH-5, BLOCK_SIZE*BLOCKS_NUM+10, sc.work);
-	
-	//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+	// Main buttons to fill the board
+	#define FILL_BUTTON_SIZE BUTTON_SIZE+8
+	for (i=0;i<6;i++)
+		DefineButton(i%3*FILL_BUTTON_SIZE+17,i/3*FILL_BUTTON_SIZE+15,FILL_BUTTON_SIZE,FILL_BUTTON_SIZE, i+100,FIELD_COLORS[i]);
+
+	// Menu buttons
+	for (i=0;i<3;i++)
+	{
+		DefineButton(17,i*31+140, 13*8+6, 25, i+2,sc.work_button);
+		WriteText(17+4,i*31+146,0x90,sc.work_button_text,BUTTON_CAPTIONS[i],0);
+	}
+
+	// Board size
+	WriteText(17,BLOCKS_NUM*BLOCK_SIZE-25+7,0x90,sc.work_text,#LEVELS_TEXT,0);
 	for (i=0;i<2;i++)
-		for (j=0;j<3;j++)
-			DefineButton(j*BUTTON_SIZE+17,i*BUTTON_SIZE+15,BUTTON_SIZE,BUTTON_SIZE, i*3+j+100,FIELD_COLORS[i*3+j]);
-
-	//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	for (j=0;j<3;j++)
 	{
-		DefineButton(17,j*25+120, 13*6+6, 20, j+2,sc.work_button);
-		WriteText(17+4,j*25+127,0x80,sc.work_button_text,BUTTON_CAPTIONS[j],0);
-	}
+		IF (board_size == i) {
+			ESI=sc.work_button;
+			EDI=sc.work_button_text;
+		} ELSE {
+			ESI = sc.work;
+			EDI = sc.work_text;
+		}

-	//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	WriteText(17,BLOCKS_NUM*BLOCK_SIZE-20+7,0x80,sc.work_text,#LEVELS_TEXT,0);
-	for (j=0;j<2;j++)
-	{
-		DefineButton(j*25+56,BLOCKS_NUM*BLOCK_SIZE-20, 20,20, j+10,sc.work_button);
-		
-		IF (BLOCK_SIZE == DIFFICULTY_LEV_PARAMS[j*3]) EDI=0x800080;
-			else EDI=sc.work_button_text;
-		
-		WriteText(j*25+56+8,BLOCKS_NUM*BLOCK_SIZE-20+7,0x80,EDI,BOARD_SIZES[j],0);
-		WriteText(j*25+56+9,BLOCKS_NUM*BLOCK_SIZE-20+7,0x80,EDI,BOARD_SIZES[j],0);
+		DefineButton(i*32+69,BLOCKS_NUM*BLOCK_SIZE-24, 26,25, i+10,ESI);		
+		WriteText(i*32+69+9,BLOCKS_NUM*BLOCK_SIZE-24+6,0x90,EDI,#BOARD_SIZES+i+i,0);
+		$add ebx, 1<<16 //bold
+		$int 0x40
 	}
 	
-	draw_clicks_num();
-	
+	draw_clicks_num();	
 	draw_field();
-
 }

+void randomly_fill_the_board()
+{
+	int i;
+	for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) {
+		color_matrix[i] = random(6);
+	}		
+}

 void new_game()
 {
-	int i;
-	
 	CLICKS = 0;
-	
-	for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) 
-			color_matrix[i] = random(6);
+	game_end = false;
+	randomly_fill_the_board();	
 }

-
 void fill_field(int new_color_id)
 {
 	int i, j,
 	old_color_id=color_matrix[0],
 	restart;
+	int cur_cell;
 	#define MARKED 6
 	
 	color_matrix[0]=MARKED;
@@ -289,15 +289,16 @@ void fill_field(int new_color_id)
 	for (i=0;i<BLOCKS_NUM;i++)
 		for (j=0;j<BLOCKS_NUM;j++)
 		{
-			IF (color_matrix[i*BLOCKS_NUM+j]<>old_color_id) continue; //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			IF (color_matrix[i*BLOCKS_NUM+j]==MARKED) continue; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
+			cur_cell = i*BLOCKS_NUM+j;
+			IF (color_matrix[cur_cell]<>old_color_id) continue; //if not a needed color then continue
+			IF (color_matrix[cur_cell]==MARKED) continue; //if already marked then continue
 			
-			IF (j>0) && (color_matrix[i*BLOCKS_NUM+j-1]==MARKED) color_matrix[i*BLOCKS_NUM+j]=MARKED; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
-			IF (i>0) && (color_matrix[i-1*BLOCKS_NUM+j]==MARKED) color_matrix[i*BLOCKS_NUM+j]=MARKED; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			IF (j<BLOCKS_NUM-1) && (color_matrix[i*BLOCKS_NUM+j+1]==MARKED) color_matrix[i*BLOCKS_NUM+j]=MARKED; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			IF (i<BLOCKS_NUM-1) && (color_matrix[i+1*BLOCKS_NUM+j]==MARKED) color_matrix[i*BLOCKS_NUM+j]=MARKED; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			IF (j>0) && (color_matrix[i*BLOCKS_NUM+j-1]==MARKED) color_matrix[cur_cell]=MARKED; //left
+			IF (i>0) && (color_matrix[i-1*BLOCKS_NUM+j]==MARKED) color_matrix[cur_cell]=MARKED; //top
+			IF (j<BLOCKS_NUM-1) && (color_matrix[i*BLOCKS_NUM+j+1]==MARKED) color_matrix[cur_cell]=MARKED; //right
+			IF (i<BLOCKS_NUM-1) && (color_matrix[i+1*BLOCKS_NUM+j]==MARKED) color_matrix[cur_cell]=MARKED; //bottom
 			
-			IF (color_matrix[i*BLOCKS_NUM+j]==MARKED) restart=1; //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			IF (color_matrix[cur_cell]==MARKED) restart=1;
 		}
 	IF (restart) goto _RESTART_MARK;

@@ -305,101 +306,83 @@ void fill_field(int new_color_id)
 			IF (color_matrix[i]==MARKED) color_matrix[i]=new_color_id;
 }

-
-int check_for_end()
+void draw_win_or_loose_animation(dword matrix)
 {
 	int i, j, ii, jj;
-
-	if (CLICKS>=MAX_CLICKS) //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	{
-		IF (CLICKS==MAX_CLICKS) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
-		{
-			for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-					IF (color_matrix[i]<>color_matrix[0]) goto _loss_MARK;
-			goto _WIN_MARK;
-		}
-		
-		_loss_MARK:
-		
-		for (i=0;i<14;i++)
-			for (j=0;j<14;j++)
-			{
-				IF (BLOCK_SIZE == DIFFICULTY_LEV_PARAMS[0])
-				{
-					ii=i;
-					jj=j;
-				}
-				else
-				{
-					ii=i*2;
-					jj=j*2;
-				}
-				color_matrix[ii*BLOCKS_NUM+jj]=loss_matrix[i*14+j];
-				color_matrix[ii+1*BLOCKS_NUM+jj]=loss_matrix[i*14+j];
-				color_matrix[ii*BLOCKS_NUM+jj+1]=loss_matrix[i*14+j];
-				color_matrix[ii+1*BLOCKS_NUM+jj+1]=loss_matrix[i*14+j];
-				draw_field();
-				//Pause(5);				
-			}	
-			
-		return 1;
-	}
-	
-	for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			IF (color_matrix[i]<>color_matrix[0]) return 0;
-
-	//<2F><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MAX_CLICKS -> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
-	_WIN_MARK:
-	
-	for (i=0;i<25;i++)
-	{
-		new_game();
-		draw_field();
-		Pause(7);
-	}
-
-	CLICKS=MAX_CLICKS;
-	
-	for (i=0;i<14;i++)
+	for (i=0;i<14;i++) {
 		for (j=0;j<14;j++)
 		{
-			IF (BLOCK_SIZE == DIFFICULTY_LEV_PARAMS[0]) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			{
-				ii=i;
-				jj=j;
-			}
-			else
-			{
-				ii=i*2;
-				jj=j*2;
-			}
-			color_matrix[ii*BLOCKS_NUM+jj]=win_matrix[i*14+j];
-			color_matrix[ii+1*BLOCKS_NUM+jj]=win_matrix[i*14+j];
-			color_matrix[ii*BLOCKS_NUM+jj+1]=win_matrix[i*14+j];
-			color_matrix[ii+1*BLOCKS_NUM+jj+1]=win_matrix[i*14+j];
+			ii = board_size * 2 + i;
+			jj = board_size * 2 + j;
+			color_matrix[ii*BLOCKS_NUM+jj]=
+			color_matrix[ii+1*BLOCKS_NUM+jj]=
+			color_matrix[ii*BLOCKS_NUM+jj+1]=
+			color_matrix[ii+1*BLOCKS_NUM+jj+1]=ESBYTE[i*14+j+matrix];
+			draw_field();			
+		}
+	}
+}
+
+int field_is_solid()
+{
+	int i;
+	if (game_end) return 1;
+	game_end = 1;
+	for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) {
+		IF (color_matrix[i]<>color_matrix[0]) game_end = 0;
+	}
+	return game_end;
+}
+
+int game_is_ended()
+{
+	int i;
+	
+	if (game_end) return 1;
+
+	if (CLICKS>=MAX_CLICKS) //check for game end via max_clicks
+	{
+		IF (CLICKS==MAX_CLICKS) //probably user won on the last step
+		{
+			if (field_is_solid()) goto _WIN_MARK;
+		}
+		draw_win_or_loose_animation(#loss_matrix);			
+		return 1;
+	} else {
+		if (!field_is_solid()) return 0;
+		
+		//field is solid and CLICKS<MAX_CLICKS -> win
+		
+		_WIN_MARK:
+		
+		for (i=0;i<25;i++)
+		{
+			randomly_fill_the_board();
 			draw_field();
-			//Pause(5);				
-		}	
-	return 1;
+			Pause(7);
+		}
+		
+		draw_win_or_loose_animation(#win_matrix);	
+		return 1;
+	}
 }


 void draw_clicks_num()
 {
-	#define TEXT_X 21
-	#define TEXT_Y 92
+	#define TEXT_X 19
+	#define TEXT_Y 100
 	
-	DrawBar(TEXT_X, TEXT_Y, USER_PANEL_WIDTH-TEXT_X-3,9, sc.work);
+	DrawBar(TEXT_X, TEXT_Y, USER_PANEL_WIDTH-TEXT_X-5,16, sc.work);
 	
-	WriteText(TEXT_X,TEXT_Y,0x80,sc.work_text,#CLICKS_TEXT,0);
+	WriteText(TEXT_X,TEXT_Y,0x90,sc.work_text,#CLICKS_TEXT,0);

-	IF (CLICKS<10) EBX=9*6+TEXT_X;
-		else EBX=8*6+TEXT_X;
+	IF (CLICKS<10) EBX=9*8+TEXT_X;
+	          else EBX=8*8+TEXT_X;
 	
-	WriteText(EBX,TEXT_Y,0x80,sc.work_text,IntToStr(CLICKS),0);
+	WriteText(EBX,TEXT_Y,0x90,sc.work_text,itoa_nosign(CLICKS),0);
 	
-	WriteText(11*6+TEXT_X,TEXT_Y,0x80,sc.work_text,IntToStr(MAX_CLICKS),0);
+	WriteText(11*8+TEXT_X,TEXT_Y,0x90,sc.work_text,itoa_nosign(MAX_CLICKS),0);
 }


@@ -417,7 +400,7 @@ void draw_field()
 }


-void help()
+void help_thread()
 {  
 	int i;
 	
@@ -429,10 +412,10 @@ void help()
 				IF (GetKeyScancode()==001) ExitProcess(); //Esc
 				break;
 		case evReDraw:
-				for (i=0; HELP_TEXT[i]<>0; i++;) {};
-				DefineAndDrawWindow(400,200,610,i*19+25+GetSkinHeight(),0x34,sc.work,0,0,#HELP_WINDOW_CAPTION);
-				WriteText(6,12,0x90,sc.work_text,HELP_TEXT[0],0); //<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-				for (i=0; HELP_TEXT[i]<>0; i++;) WriteText(5,i*19+12,0x90,sc.work_text,HELP_TEXT[i],0);
+				//for (i=0; HELP_TEXT[i]<>0; i++;) {}; //calculate line numbers, predefined i=12 used to reduce size
+				DefineAndDrawWindow(400,200,612,12*19+25+GetSkinHeight(),0x34,sc.work,#HELP_WINDOW_CAPTION);
+				WriteText(6,12,0x90,sc.work_text,HELP_TEXT[0],0); //for a bold text
+				for (i=0; HELP_TEXT[i]<>0; i++;) WriteText(7,i*19+12,0x90,sc.work_text,HELP_TEXT[i],0);
 	}
 }

--- a/programs/games/flood-it/lib/kolibri.h
+++ b/programs/games/flood-it/lib/kolibri.h
@@ -23,6 +23,10 @@ dword  I_Path       = 0;
 #define BT_HIDE		0x40000000
 #define BT_NOFRAME	0x20000000

+#define bool char
+#define true 1
+#define false 0
+
 //-------------------------------------------------------------------------


@@ -94,16 +98,11 @@ inline fastcall Pause(dword EBX)

 //------------------------------------------------------------------------------

-char buffer[11]="";
-inline fastcall dword IntToStr(dword ESI)
+char buffer[5];
+inline fastcall dword itoa_nosign(dword ESI)
 {
     $mov     edi, #buffer
     $mov     ecx, 10
-     $test     esi, esi
-     $jns     f1
-     $mov     al, '-'
-     $stosb
-     $neg     esi
 f1:
     $mov     eax, esi
     $push     -'0'
@@ -126,7 +125,7 @@ f3:
 //------------------------------------------------------------------------------


-void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType,dword mainAreaColour,byte headerType,dword headerColour,EDI)
+void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType,dword mainAreaColour,EDI)
 {
 	EAX = 12;              // function 12:tell os about windowdraw
 	EBX = 1;
@@ -135,7 +134,7 @@ void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType,dword mainAreaC
 	EBX = x << 16 + sizeX;
 	ECX = y << 16 + sizeY;
 	EDX = mainAreaType << 24 | mainAreaColour;
-	ESI = headerType << 24 | headerColour;
+	ESI = 0;
 	$xor eax,eax
 	$int 0x40

@@ -166,6 +165,13 @@ dword GetSkinHeight()
 	$pop  ebx
 }

+inline fastcall int GetScreenHeight()
+{
+	$mov eax, 14
+	$int 0x40
+	$and eax,0x0000FFFF
+}
+
 void WriteText(dword x,y,byte fontType, dword color, EDX, ESI)
 {
 	EAX = 4;
@@ -190,12 +196,20 @@ void DefineButton(dword x,y,w,h,EDX,ESI)
 	$int 0x40
 }

-void DrawRegion(dword x,y,width,height,EDX)
+void DrawRegion(dword x,y,s,EDX)
 {
-	DrawBar(x,y,width,1,EDX);
-	DrawBar(x,y+height,width,1,EDX);
-	DrawBar(x,y,1,height,EDX);
-	DrawBar(x+width,y,1,height+1,EDX);
+	EAX = 13;
+	EBX = x<<16+s;
+	ECX = y<<16+1;
+ 	$int 0x40
+ 	ECX = y+s<<16+1;
+ 	$int 0x40
+ 	EBX = x<<16+1;
+	ECX = y<<16+s;
+ 	$int 0x40
+  	EBX = x+s<<16+1;
+	ECX = y<<16+s+1;
+ 	$int 0x40	
 }

 inline fastcall dword WriteDebug(dword EDX)
--- a/programs/network/ftpc/ftpc.asm
+++ b/programs/network/ftpc/ftpc.asm
@@ -83,12 +83,12 @@ start: ;////////////////////////////////////////////////////////////////////////
 ;< none                                                                                           ;;
 ;;================================================================================================;;
 ; initialize heap for using dynamic blocks
-        mcall   SF_SYS_MISC, SSF_HEAP_INIT
+        mcall   68, 11
        test    eax, eax
        je      exit2
        
 ; disable all events except network event
-        mcall   SF_SET_EVENTS_MASK, EV_STACK
+        mcall   40, EV_STACK
 ; load libraries
        stdcall dll.Load, @IMPORT
        test    eax, eax
@@ -125,16 +125,16 @@ start: ;////////////////////////////////////////////////////////////////////////
        mov     [acti_port_stop], ax

        invoke  ini.get_str, path, str_general, str_dir, buf_buffer1, BUFFERSIZE, 0
-        mcall   SF_CURRENT_FOLDER, SSF_SET_CF, buf_buffer1 ; set working directory
+        mcall   30, 1, buf_buffer1                      ; set working directory

        ; initialize log file
        invoke  ini.get_str, path, str_general, str_logfile, log_file, 512, 0
-        mov     [filestruct2.subfn], SSF_CREATE_FILE
+        mov     [filestruct2.subfn], 2
        mov     [filestruct2.offset], 0
        mov     [filestruct2.size], 0
        mov     [filestruct2.ptr], 0
        mov     [filestruct2.name], log_file
-        mcall   SF_FILE, filestruct2
+        mcall   70, filestruct2

 ; Usage: ftpc [-cli] [ftp://username:password@server:port/path]

@@ -355,7 +355,7 @@ wait_for_servercommand: ;///////////////////////////////////////////////////////

 ; receive socket data with timeout
  .receive:
-        mcall   SF_SYSTEM_GET, SSF_TIME_COUNT
+        mcall   26, 9
        add     eax, TIMEOUT*100
        mov     [timeout], eax
  .again:
@@ -365,11 +365,11 @@ wait_for_servercommand: ;///////////////////////////////////////////////////////
        je      .closed
        cmp     ebx, EWOULDBLOCK
        jne     .sock_err
-        mcall   SF_SYSTEM_GET, SSF_TIME_COUNT
+        mcall   26, 9
        mov     ebx, [timeout]
        sub     ebx, eax
        jle     .timeout
-        mcall   SF_WAIT_EVENT_TIMEOUT ; Wait for event with timeout
+        mcall   23      ; Wait for event with timeout
        jmp     .again

  .sock_err:
@@ -524,7 +524,7 @@ transfer_queued:

        ; Error occured, we reached the end of the buffer before [queued] reached 0
        mov     [queued], 0
-        mcall   SF_SYS_MISC, SSF_MEM_FREE, [ptr_fname] ; free buffer
+        mcall   68, 13, [ptr_fname]             ; free buffer
        test    eax, eax
        jz      error_heap
        jmp     wait_for_usercommand
@@ -535,7 +535,7 @@ transfer_queued:
        dec     [queued]
        jnz     cmd_retr

-        mcall   SF_SYS_MISC, SSF_MEM_FREE, [ptr_fname] ; free buffer
+        mcall   68, 13, [ptr_fname]             ; free buffer
        test    eax, eax
        jz      error_heap
        jmp     cmd_retr
@@ -655,12 +655,12 @@ write_to_file: ;////////////////////////////////////////////////////////////////
        mov     eax, 0
        ret
      @@:
-        mov     [filestruct2.subfn], SSF_WRITE_FILE
+        mov     [filestruct2.subfn], 3
        m2m     [filestruct2.offset], [logfile_offset]
        mov     [filestruct2.size], ecx
        mov     [filestruct2.ptr], eax
        mov     [filestruct2.name], log_file
-        mcall   SF_FILE, filestruct2
+        mcall   70, filestruct2
        test    eax, eax
        jz      @f
        mov     [logfile_offset], -1 ; disable logging
@@ -754,7 +754,7 @@ wait_for_keypress:
 exit:
        mcall   close, [controlsocket]
 exit2:  
-        mcall   SF_TERMINATE_PROCESS
+        mcall   -1



--- a/programs/network/ftpc/gui.inc
+++ b/programs/network/ftpc/gui.inc
@@ -7,7 +7,6 @@ include '../../load_lib.mac'
 
 icon_tl_sys dd 0
 icon_tl_nod dd 0
-show_log    db 0 ; 0 - hide log, 1 - show log

 TLIST_SZ = 325+16 ;=341. 16 is x-size of scroll bar
 TLIST1_X = 50
@@ -46,8 +45,8 @@ gui: ;//////////////////////////////////////////////////////////////////////////
        test    eax, eax
        jnz     .exit

-        mcall   SF_STYLE_SETTINGS, SSF_GET_COLORS, sc, sizeof.system_colors
-        mcall   SF_SET_EVENTS_MASK, 0xC0000027 ; set event mask
+        mcall   48, 3, sc, sizeof.system_colors
+        mcall   40, 0xC0000027 ; set event mask
        ret

    .server_addr:
@@ -85,7 +84,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
        mov     [filestruct.subfn], 0
        mov     [filestruct.offset], 54
        mov     [filestruct.size], ecx
-        mcall   SF_FILE, filestruct
+        mcall   70, filestruct
        cmp     ebx, 0
        jl      @f
        m2m     dword[tree1.data_img_sys], dword[icon_tl_sys]
@@ -99,7 +98,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
        ;mov    [filestruct.subfn], 0
        ;mov    [filestruct.offset], 54
        mov     [filestruct.size], ecx
-        mcall   SF_FILE, filestruct
+        mcall   70, filestruct
        cmp     ebx, 0
        jl      @f
        m2m     dword[tree1.data_img], dword[icon_tl_nod]
@@ -122,7 +121,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////

    align 4
    .still:
-        mcall   SF_WAIT_EVENT
+        mcall   10

        dec     eax
        jz      .redraw
@@ -147,79 +146,65 @@ gui: ;//////////////////////////////////////////////////////////////////////////

    align 4
    .draw:
-        mcall   SF_REDRAW, SSF_BEGIN_DRAW
+        mcall   12, 1
        ; main window
-        mcall   SF_CREATE_WINDOW, <35,830>, <20,555-160>, 0x34000000+SYS_COL, 0x805080DD, str_title
+        mcall   0, <35,830>, <20,555>, 0x34000000+SYS_COL, 0x805080DD, str_title

        ;-------------------------
        ; textedit components
        ;-------------------------
-        mcall   SF_THREAD_INFO, procinfo, -1
+        mcall   9, procinfo, -1
        mov     edi, tedit0
        call    EvSize

        movzx   ebx,word[procinfo.client_box.width]
        inc     bx
-        mcall   SF_DRAW_RECT, , ted_wnd_t
+        mcall   13, , ted_wnd_t
+        stdcall [ted_draw], tedit0

        ; draw "disconnect" button
-        mcall   SF_DEFINE_BUTTON, <50,95>, <25,25>, 3, BT_COL
+        mcall   8, <50,95>, <25,25>, 3, BT_COL
        ; string "disconnect"
-        mcall   SF_DRAW_TEXT, <50+5,25+5>, 0xb0000000+STR_COL, str_disconnect
-        ; draw "Show|Hide log" button
-        mcall   SF_DEFINE_BUTTON, <50,79>, <326,25>, 10, BT_COL
-        ; string "Show|Hide log"
-        cmp     [show_log],0
-        je      @f
-        stdcall [ted_draw], tedit0
-        mov     edx, str_hide_log
-        jmp     .end_log_1
-        @@:
-        mov     edx, str_show_log
-        .end_log_1:
-        mcall   SF_DRAW_TEXT, <50+5,326+5>, 0xb0000000+STR_COL
-        cmp     [show_log],0
-        je @f
+        mcall   4, <50+5,25+5>, 0xb0000000+STR_COL, str_disconnect
        ; draw "Copy" button
-        mcall   SF_DEFINE_BUTTON, <129+5,40>, <326,25>, 4, BT_COL
+        mcall   8, <50,40>, <326,25>, 4, BT_COL
        ; string "copy"
-        mcall   SF_DRAW_TEXT, <129+10,326+5>, 0xb0000000+STR_COL, str_copy
-        @@:
+        mcall   4, <50+5,326+5>, 0xb0000000+STR_COL, str_copy
        ; draw "Search" button
-        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-55,55>, <20,25>, 5, BT_COL
+        mcall   8, <TLIST2_X+TLIST_SZ-55,55>, <20,25>, 5, BT_COL
        ; string "Search"
-        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-55+5,20+5>, 0xb0000000+STR_COL, str_search
+        mcall   4, <TLIST2_X+TLIST_SZ-55+5,20+5>, 0xb0000000+STR_COL, str_search

        ; draw "LIST" button
-        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-4*BT_SZ_X-15,BT_SZ_X>, <50,25>, 12, BT_COL
+        mcall   8, <TLIST2_X+TLIST_SZ-4*BT_SZ_X-15,BT_SZ_X>, <50,25>, 12, BT_COL
        ; string "LIST"
-        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-4*BT_SZ_X-15+5,50+5>, 0xb0000000+STR_COL, str_list
+        mcall   4, <TLIST2_X+TLIST_SZ-4*BT_SZ_X-15+5,50+5>, 0xb0000000+STR_COL, str_list
        ; draw "DELE" button
-        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-3*BT_SZ_X-10,BT_SZ_X>, <50,25>, 7, BT_COL
+        mcall   8, <TLIST2_X+TLIST_SZ-3*BT_SZ_X-10,BT_SZ_X>, <50,25>, 7, BT_COL
        ; string "DELE"
-        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-3*BT_SZ_X-10+5,50+5>, 0xb0000000+STR_COL, str_dele
+        mcall   4, <TLIST2_X+TLIST_SZ-3*BT_SZ_X-10+5,50+5>, 0xb0000000+STR_COL, str_dele
        ; draw "RDIR" button
-        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-2*BT_SZ_X-5,BT_SZ_X>, <50,25>, 8, BT_COL
+        mcall   8, <TLIST2_X+TLIST_SZ-2*BT_SZ_X-5,BT_SZ_X>, <50,25>, 8, BT_COL
        ; string "RDIR"
-        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-2*BT_SZ_X-5+5,50+5>, 0xb0000000+STR_COL, str_rdir
+        mcall   4, <TLIST2_X+TLIST_SZ-2*BT_SZ_X-5+5,50+5>, 0xb0000000+STR_COL, str_rdir
        ; draw "RMD" button
-        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-BT_SZ_X,BT_SZ_X>, <50,25>, 9, BT_COL
+        mcall   8, <TLIST2_X+TLIST_SZ-BT_SZ_X,BT_SZ_X>, <50,25>, 9, BT_COL
        ; string "RMD"
-        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-BT_SZ_X+5,50+5>, 0xb0000000+STR_COL, str_rmd
+        mcall   4, <TLIST2_X+TLIST_SZ-BT_SZ_X+5,50+5>, 0xb0000000+STR_COL, str_rmd

        ; draw "mkd" button
-        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-BT_SZ_X,BT_SZ_X>, <80,20>, 6, BT_COL
+        mcall   8, <TLIST2_X+TLIST_SZ-BT_SZ_X,BT_SZ_X>, <80,20>, 6, BT_COL
        ; string "mkd"
-        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-BT_SZ_X+5,80+5>, 0xb0000000+STR_COL, str_mkd
+        mcall   4, <TLIST2_X+TLIST_SZ-BT_SZ_X+5,80+5>, 0xb0000000+STR_COL, str_mkd
        
        ; draw "cancel" button
-        ;mcall   SF_DEFINE_BUTTON, <555,55>, <308,25>, 10, BT_COL
+        ;mcall   8, <555,55>, <308,25>, 10, BT_COL
        ; string "Cancel"
-        ;mcall   SF_DRAW_TEXT, <555+5,308+5>, 0xb0000000+STR_COL, str_abort
+        ;mcall   4, <555+5,308+5>, 0xb0000000+STR_COL, str_abort
        ; draw "change volume" button
-        mcall   SF_DEFINE_BUTTON, <TLIST1_X+TLIST_SZ-55,55>, <100-20,22>, 11, BT_COL
+        mcall   8, <TLIST1_X+TLIST_SZ-55,55>, <100-20,22>, 11, BT_COL
        ; string "Change"
-        mcall   SF_DRAW_TEXT, <TLIST1_X+TLIST_SZ-55+5,100-20+5>, 0xb0000000+STR_COL, str_change
+        mcall   4, <TLIST1_X+TLIST_SZ-55+5,100-20+5>, 0xb0000000+STR_COL, str_change

        ;--------------------------
        ; tree list components
@@ -237,12 +222,12 @@ gui: ;//////////////////////////////////////////////////////////////////////////
        stdcall [edit_box_draw], edit_volume
        stdcall [edit_box_draw], edit_search

-        mcall   SF_REDRAW, SSF_END_DRAW
+        mcall   12,2
        ret

    align 16
    .mouse:
-        mcall   SF_MOUSE_GET, SSF_WINDOW_POSITION
+        mcall   37, 1
        cmp     word[tedit0.wnd.top], ax
        jg      .no_edit

@@ -250,7 +235,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
        cmp     word[tedit0.wnd.left], ax
        jg      .no_edit

-        mcall   SF_MOUSE_GET, SSF_BUTTON_EXT
+        mcall   37, 3
        bt      eax, 24
        jnc     @f

@@ -258,8 +243,6 @@ gui: ;//////////////////////////////////////////////////////////////////////////
        jmp     .still

      @@:
-        cmp     [show_log],0
-        je      .still
        stdcall [ted_mouse], tedit0
        jmp     .still

@@ -273,7 +256,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////

    align 16
    .key:
-        mcall   SF_GET_KEY
+        mcall   2
        stdcall [tl_key], tree1
        stdcall [tl_key], tree2
        stdcall [edit_box_key], edit_mkd
@@ -283,19 +266,13 @@ gui: ;//////////////////////////////////////////////////////////////////////////

    align 16
    .button:
-        mcall   SF_GET_BUTTON
+        mcall   17

        cmp     ah, 3
        jne     @f
        ijmp    eax, interface_addr, interface.server_addr
        jmp     .still

-      @@:
-        cmp     ah, 10
-        jne     @f
-        call    show_hide_log
-        jmp     .still
-
      @@:
        cmp     ah, 4
        jne     @f
@@ -350,10 +327,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
        cmp     byte[esi], 0
        jne     @b
        stdcall [ted_text_add], tedit0, tedit_buffer, ecx, ebx
-        cmp     [show_log],0
-        je      .end_log_2
        stdcall [ted_draw], tedit0
-    .end_log_2:
        ; write to log file
        mov     eax, [esp+36]
        sub     ecx, 2 ; 0a0d is not included
@@ -450,8 +424,6 @@ gui: ;//////////////////////////////////////////////////////////////////////////
        mov     byte[edi], 0

        ; add node to tree list
-        and dword[tree2.style], not 8
-        stdcall [tl_cur_next], tree2
        cmp     word[node_entry2], 'fi'
        jne     @f
        stdcall [tl_node_add], tree2, 0, node_entry2
@@ -498,8 +470,6 @@ gui: ;//////////////////////////////////////////////////////////////////////////
        jne     @b

      .done_parsing:
-        stdcall [tl_cur_beg], tree2
-        or dword[tree2.style], 8
        call    .draw ; to update tree list immediately in case of "auto_list"
        pop     eax
        pop     edx
@@ -524,7 +494,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
 ;;================================================================================================;;

        ; detect abort
-        mcall   SF_GET_BUTTON
+        mcall   17
        cmp     ah, 10
        je      cmd_abor

@@ -671,7 +641,7 @@ populate_local_tree_list: ;/////////////////////////////////////////////////////
    jne     @f

    ; removes last file name from filestruct.name
-    mcall   SF_CURRENT_FOLDER, SSF_GET_CF, filestruct.name,1024 ; get absolute path for cwd
+    mcall   30, 2, filestruct.name,1024 ; get absolute path for cwd
    lea     edi, [filestruct.name+eax] ; edi = pointer to the tail of file name
    mov     al, '/'
    mov     ecx, -1
@@ -682,15 +652,15 @@ populate_local_tree_list: ;/////////////////////////////////////////////////////
    mov     ecx, filestruct.name

  @@:
-    mcall   SF_CURRENT_FOLDER, SSF_SET_CF ; set cwd
-    mcall   SF_CURRENT_FOLDER, SSF_GET_CF, filestruct.name, 1024 ; get absolute path for cwd
+    mcall   30, 1, ; set cwd
+    mcall   30, 2, filestruct.name, 1024 ; get absolute path for cwd
    ; clear all nodes in tree list
    stdcall [tl_info_clear], tree1
    mov     [filestruct.offset], 0

  ; read 32 blocks
  .outer:
-    mcall   SF_FILE, filestruct
+    mcall   70, filestruct
    ;int3
    test    eax, eax
    jz      @f
@@ -776,16 +746,6 @@ EvSize:
    ret


-;
-show_hide_log:
-    mov     esi, 555
-    xor     [show_log],1
-    jnz     @f
-    sub     esi, 160
-    @@:
-    mcall   SF_CHANGE_WINDOW, -1, -1, -1
-    ret
-
 ;;================================================================================================;;
 filter_remote_list: ;/////////////////////////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
@@ -906,8 +866,6 @@ search: ;///////////////////////////////////////////////////////////////////////
 ;hed             db 'FTP Client for KolibriOS',0
 str_change      db 'Change',0
 str_disconnect  db 'Disconnect',0
-str_show_log    db 'Show log',0
-str_hide_log    db 'Hide log',0
 str_copy        db 'Copy',0
 str_mkd         db 'MKD',0
 str_dele        db 'DELE',0
--- a/programs/network/ftpc/login_gui.inc
+++ b/programs/network/ftpc/login_gui.inc
@@ -27,7 +27,7 @@ login_gui: ;////////////////////////////////////////////////////////////////////
  .get_username:
        ; in case of error when either login_gui.server_addr or 
        ; login_gui.get_username is called, should resize window
-        mcall   SF_CHANGE_WINDOW, WIN_X, WIN_Y, WIN_W, WIN_H ; resize to login gui window size
+        mcall   67, WIN_X, WIN_Y, WIN_W, WIN_H ; resize to login gui window size

  .redraw:
        call    .draw
@@ -44,22 +44,22 @@ login_gui: ;////////////////////////////////////////////////////////////////////

  align 4
  .draw:
-        mcall   SF_REDRAW, SSF_BEGIN_DRAW
-        mcall   SF_STYLE_SETTINGS, SSF_GET_COLORS, sc, 40
+        mcall   12, 1
+        mcall   48, 3, sc, 40
        edit_boxes_set_sys_color edit_usr,editboxes_end,sc
        mov     edx, 0x34000000
        or      edx, [sc.work]
-        mcall   SF_CREATE_WINDOW, <WIN_X,WIN_W>, <WIN_Y,WIN_H>, , 0x805080DD, str_title
+        mcall   0, <WIN_X,WIN_W>, <WIN_Y,WIN_H>, , 0x805080DD, str_title

 		call    .draw_editboxes

        ; draw "connect" button
-        mcall   SF_DEFINE_BUTTON, <162,65>, <150,25>, 2, [sc.work_button]
+        mcall   8, <162,65>, <150,25>, 2, [sc.work_button]

        ; draw strings
        mov     ecx, 0x90000000
        or      ecx, [sc.work_text]
-        mcall   SF_DRAW_TEXT, <3,      8>, , gui_str_usr
+        mcall   4, <3,      8>, , gui_str_usr
        mcall    , <3,PAD*1+8>, , gui_str_pass
        mcall    , <3,PAD*2+8>, , gui_str_server
        mcall    , <3,PAD*3+8>, , gui_str_port
@@ -74,12 +74,12 @@ login_gui: ;////////////////////////////////////////////////////////////////////
 		mcall
        mov     [str_error_addr], gui_str_null ; reset error string address

-        mcall   SF_REDRAW, SSF_END_DRAW
+        mcall   12, 2
        ret

  align 4
  .still:
-        mcall    SF_WAIT_EVENT
+        mcall    10     ; wait for event
        dec      eax
        jz       .redraw
        dec      eax
@@ -96,7 +96,7 @@ login_gui: ;////////////////////////////////////////////////////////////////////
        jmp     .still

  .button:
-        mcall   SF_GET_BUTTON
+        mcall   17

        dec     ah
        jz      .exit
@@ -107,7 +107,7 @@ login_gui: ;////////////////////////////////////////////////////////////////////
        jmp     .still

  .key:
-        mcall   SF_GET_KEY
+        mcall   2

        cmp     ah,13
        je      .connect
@@ -122,17 +122,12 @@ login_gui: ;////////////////////////////////////////////////////////////////////
        stdcall [edit_box_key], edit_path

        jmp     .still
-
+	
  .connect:
-        mov     esi, 555
-        or      [show_log],0
-        jnz     @f
-        sub     esi, 160
-  @@:
-        mcall   SF_CHANGE_WINDOW, 35, 20, 830 ; resize to main gui window's coordinates
+		mcall   67, 35, 20, 830, 555 ; resize to main gui window's coordinates
        cmp     [param_server_addr], 0
-        jne     gui.main
-        
+		jne     gui.main
+		
        mov     [str_error_addr], gui_str_no_srvr
        jmp     .redraw
 
--- a/programs/network/ftpc/servercommands.inc
+++ b/programs/network/ftpc/servercommands.inc
@@ -190,7 +190,7 @@ data_loop:
        mov     [filestruct.ptr], buf_buffer2
        mov     [filestruct.size], eax
        push    eax
-        mcall   SF_FILE, filestruct
+        mcall   70, filestruct
        test    eax, eax
        jz      @f
        call    error_fs
@@ -204,7 +204,7 @@ data_loop:

 ; storing, send all data
  .stor:
-        mcall   SF_FILE, filestruct
+        mcall   70, filestruct
        cmp     eax, 6          ; end of file
        je      .last_call
        test    eax, eax        ; error
@@ -244,7 +244,7 @@ data_loop:
        mov     ecx, eax                        ; eax is size of buffer received
        inc     ecx
        add     ecx, [size_fname]               ; added old size to form new required size
-        mcall   SF_SYS_MISC, SSF_MEM_REALLOC, , [ptr_fname]
+        mcall   68, 20, , [ptr_fname]           ; realloc
        test    eax, eax
        je      error_heap
        mov     [ptr_fname], eax                ; eax contains the new block now
--- a/programs/network/ftpc/usercommands.inc
+++ b/programs/network/ftpc/usercommands.inc
@@ -82,13 +82,13 @@ cmd_retr:
        mov     ecx, 256-5
        call    set_filename

-        mov     [filestruct.subfn], SSF_CREATE_FILE ; create/rewrite file
+        mov     [filestruct.subfn], 2   ; create/rewrite file
        mov     [filestruct.offset], 0
        mov     [filestruct.offset+4], 0
        mov     [filestruct.size], 0
        mov     [filestruct.ptr], 0

-        mcall   SF_FILE, filestruct
+        mcall   70, filestruct
        test    eax, eax
        jz      @f
        call    error_fs
@@ -96,7 +96,7 @@ cmd_retr:
      @@:
 ; Prepare to write to the file

-        mov     [filestruct.subfn], SSF_WRITE_FILE
+        mov     [filestruct.subfn], 3   ; write to file
        mov     [operation], OPERATION_RETR

 ; Request the file from server
@@ -138,7 +138,7 @@ cmd_stor:
        mov     [operation], OPERATION_STOR

        ; get file size
-        mov     [filestruct.subfn], SSF_GET_INFO
+        mov     [filestruct.subfn], 5
        mov     [filestruct.offset], 0
        mov     [filestruct.offset+4], 0
        mov     [filestruct.size], 0
@@ -148,12 +148,12 @@ cmd_stor:
        mov     ecx, 256-5
        call    set_filename

-        mcall   SF_FILE, filestruct
+        mcall   70, filestruct

        mov     eax, dword[folder_buf+32] ; supports file size upto 4GB
        mov     [file_size], eax

-        mov     [filestruct.subfn], SSF_READ_FILE
+        mov     [filestruct.subfn], 0   ; read file
        ; mov     [filestruct.offset], 0
        ; mov     [filestruct.offset+4], 0
        mov     [filestruct.size], BUFFERSIZE
@@ -191,12 +191,12 @@ cmd_lcwd:
        mov     byte[esi-1], 0

        ; check whether entered path is valid (folder exists)
-        mov     [filestruct2.subfn], SSF_GET_INFO
+        mov     [filestruct2.subfn], 5
        mov     [filestruct2.offset], 0
        mov     [filestruct2.size], 0
        mov     [filestruct2.ptr], folder_buf
        mov     [filestruct2.name], buf_cmd+5
-        mcall   SF_FILE, filestruct2
+        mcall   70, filestruct2
        test    eax, eax
        jz      @f
        cmp     eax, 2
@@ -205,10 +205,10 @@ cmd_lcwd:
        jmp     wait_for_usercommand

  @@:
-        mcall   SF_CURRENT_FOLDER, SSF_SET_CF, buf_cmd+5 ; set working directory
+        mcall   30, 1, buf_cmd+5              ; set working directory

  .print:
-        mcall   SF_CURRENT_FOLDER, SSF_GET_CF, buf_cmd, 256 ; and read it again
+        mcall   30, 2, buf_cmd, 256           ; and read it again
        icall   eax, interface_addr, interface.print, str_lcwd, buf_cmd, str_newline

        jmp     wait_for_usercommand
Author	SHA1	Message	Date
Max Logaev	1e663f36c8	Docs: Added licensing to contributing guide All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 27s Details Build system / Build (pull_request) Successful in 12m40s Details Also renamed COPYING.TXT to LICENSE Signed-off-by: Max Logaev <maxlogaev@proton.me>	2025-04-04 11:27:53 +03:00
leency	00c2cfbcfc	Period: Moved from IMG to ISO All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 32s Details Build system / Build (pull_request) Successful in 6m27s Details	2025-04-03 10:00:33 +02:00
leency	c398a2bbf4	Unz: Fixed bug #27 (#190 ) Reviewed-on: #190 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: leency <lipatov.kiril@gmail.com> Co-committed-by: leency <lipatov.kiril@gmail.com>	2025-04-03 09:39:02 +02:00
IgorA	58cf25fe43	menuetlibc: Fixed ef_exp.s (#177 ) Fix for a similar problem: https://git.kolibrios.org/KolibriOS/kolibrios/commit/12a6b7f2 Reviewed-on: #177 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: IgorA <aie85playm@gmail.com> Co-committed-by: IgorA <aie85playm@gmail.com>	2025-04-02 21:34:04 +02:00
leency	8da45bab3e	Eolite 5.32: Search fix (#191 ) - LMB to open file, RMB to show in folder - fix: correctly open folders - fix UI: better list alignment - Eolite: optimize OpenDir - SelectList_ProcessMouse() better react on click Reviewed-on: #191 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: leency <lipatov.kiril@gmail.com> Co-committed-by: leency <lipatov.kiril@gmail.com>	2025-04-02 21:26:12 +02:00
IgorA	5abc319817	Boxlib: the tree_list can use large fonts, fix line number error All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 28s Details Build system / Build (pull_request) Successful in 5m25s Details	2025-04-01 21:58:38 +02:00
leency	ff625706c0	Eolite 5.31: (#187 ) - fix: editbox edit text - fix: remove unnecessary editbox form delete popin - add: "Copy path" menu item - add: "Search" to a burger menu Reviewed-on: #187 Reviewed-by: Max Logaev <maxlogaev@proton.me> Reviewed-by: rgimad <rgimad@noreply.localhost> Co-authored-by: leency <lipatov.kiril@gmail.com> Co-committed-by: leency <lipatov.kiril@gmail.com>	2025-03-31 22:40:54 +02:00
leency	81dafb3025	Floot-It v3.0 (#181 ) - adopt window size to screen size - bigger fonts - proper colored 'S' and 'L' buttons - fix issue: after won the game clicks count always increased to max - code refactoring, translate comments to English - help updated Reviewed-on: #181 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: leency <lipatov.kiril@gmail.com> Co-committed-by: leency <lipatov.kiril@gmail.com>	2025-03-31 08:15:28 +02:00
IgorA	58e2d0b844	Blocks: Added 2 models and 5 types of blocks (#180 ) - Added 2 models (bird and castle); - Added 5 types of blocks; - Added block.asm to autobuild. Co-authored-by: Max Logaev <maxlogaev@proton.me> Reviewed-on: #180 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: IgorA <aie85playm@gmail.com> Co-committed-by: IgorA <aie85playm@gmail.com>	2025-03-30 16:42:51 +02:00