develop/libraries/box_lib: Post-SVN tidy

- Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.
develop/open_watcom: Post-SVN tidy
2025-05-25 11:05:56 +01:00 · 2025-05-24 13:38:52 +01:00 · 2025-05-24 13:31:24 +01:00 · 2025-05-24 13:21:19 +01:00 · 2025-05-24 13:08:31 +01:00 · 2025-05-24 13:04:57 +01:00
1632 changed files with 42354 additions and 40375 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -39,7 +39,7 @@ jobs:
        id: toolchain-hash
        run: |
          a=$(find ${{ gitea.workspace }}/programs/develop/cmm/ -type f -print0 | sort -z | xargs -0 sha1sum)
-          b=$(sha1sum ${{ gitea.workspace }}/programs/develop/ktcc/trunk/bin/kos32-tcc)
+          b=$(sha1sum ${{ gitea.workspace }}/programs/develop/ktcc/bin/kos32-tcc)
          c=$(find ${{ gitea.workspace }}/programs/develop/objconv/ -type f -print0 | sort -z | xargs -0 sha1sum)
          d=$(find ${{ gitea.workspace }}/programs/other/kpack/kerpack_linux/ -type f -print0 | sort -z | xargs -0 sha1sum)
          e=$(find ${{ gitea.workspace }}/programs/other/kpack/linux/ -type f -print0 | sort -z | xargs -0 sha1sum)
@@ -66,7 +66,7 @@ jobs:
      - name: Install TCC
        if: steps.cache-toolchain.outputs.cache-hit != 'true'
        run: |
-          cp ${{ gitea.workspace }}/programs/develop/ktcc/trunk/bin/kos32-tcc /home/autobuild/tools/win32/bin/kos32-tcc
+          cp ${{ gitea.workspace }}/programs/develop/ktcc/bin/kos32-tcc /home/autobuild/tools/win32/bin/kos32-tcc
          chmod +x /home/autobuild/tools/win32/bin/kos32-tcc

      - name: Build and install objconv
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -66,17 +66,6 @@ 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)](./LICENSE)
+[![License](https://img.shields.io/badge/License-GPL%202.0-green)](./COPYING.TXT)
 [![Build system](https://git.kolibrios.org/KolibriOS/kolibrios/actions/workflows/build.yaml/badge.svg)](https://git.kolibrios.org/KolibriOS/kolibrios/actions)

 KolibriOS is a hobby operating system for x86-compatible computers, which is currently being developed by a small but passionate team of enthusiasts.
--- a/contrib/C_Layer/ASM/loadboxlib.asm
+++ b/contrib/C_Layer/ASM/loadboxlib.asm
@@ -1,3 +1,7 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+
 format coff
 use32                                   ; Tell compiler to use 32 bit instructions

@@ -7,7 +11,7 @@ include '../../../programs/proc32.inc'
 include '../../../programs/macros.inc'
 purge section,mov,add,sub

-include '../../../programs/develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../../programs/develop/libraries/box_lib/box_lib.mac'
 include '../../../programs/system/run/trunk/txtbut.inc'
 include '../../../programs/dll.inc'

--- a/contrib/C_Layer/EXAMPLE/boxlib/boxlib.c
+++ b/contrib/C_Layer/EXAMPLE/boxlib/boxlib.c
@@ -1,7 +1,7 @@
 // BOXLIB example (scrollbar, progressbar)
 // ! without kolibri_gui !
 // Writed by maxcodehack
-// TCC version is in /programs/develop/ktcc/trunk/samples
+// TCC version is in /programs/develop/ktcc/samples
 #include <kos32sys.h>
 #include <stdlib.h>

--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -49,8 +49,6 @@ img_files = {
 {"MEDIA/IMGF/INVSOL.OBJ", "common/media/ImgF/invSol.obj"},
 {"MEDIA/PIXIESKN.PNG", SRC_PROGS .. "/cmm/pixie2/pixieskn.png"},
 {"NETWORK/FTPC.INI", SRC_PROGS .. "/network/ftpc/ftpc.ini"},
- {"NETWORK/FTPC_SYS.PNG", SRC_PROGS .. "/network/ftpc/ftpc_sys.png"},
- {"NETWORK/FTPC_NOD.PNG", SRC_PROGS .. "/network/ftpc/ftpc_nod.png"},
 {"NETWORK/FTPD.INI", "common/network/ftpd.ini"},
 {"NETWORK/KNMAP", "common/network/knmap"},
 {"NETWORK/USERS.INI", "common/network/users.ini"},
@@ -75,7 +73,7 @@ img_files = {

 -- For russian build, add russian-only files.
 if build_type == "ru_RU" then tup.append_table(img_files, {
- {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/rus/example.asm"},
+ {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/rus/example.asm"},
 {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy_ru"},
 {"GAMES/BASEKURS.KLA", build_type .. "/games/basekurs.kla"},
 {"File Managers/KFAR.INI", build_type .. "/File Managers/kfar.ini"},
@@ -86,7 +84,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
 {"SETTINGS/SYSPANEL.INI", "ru_RU/settings/syspanel.ini"},
 }) elseif build_type == "en_US" then tup.append_table(img_files, {
 {"WELCOME.HTM", VAR_DATA .. "/" .. build_type .. "/welcome.htm.kpack"},
- {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
+ {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/example.asm"},
 {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"},
 {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
 {"GAMES/DESCENT", "common/games/descent"},
@@ -95,7 +93,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
 {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
 {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) elseif build_type == "es_ES" then tup.append_table(img_files, {
- {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
+ {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/example.asm"},
 {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"},
 {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
 {"GAMES/DESCENT", "common/games/descent"},
@@ -104,7 +102,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
 {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
 {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) elseif build_type == "it_IT" then tup.append_table(img_files, {
- {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
+ {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/example.asm"},
 {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"},
 {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
 {"GAMES/DESCENT", "common/games/descent"},
@@ -113,7 +111,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
 {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
 {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) else tup.append_table(img_files, {
- {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
+ {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/example.asm"},
 {"DEVELOP/BACKY", SRC_PROGS .. "/develop/backy/Backy"},
 {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
 {"GAMES/DESCENT", "common/games/descent"},
@@ -185,20 +183,20 @@ extra_files = {
 {"kolibrios/develop/oberon07/doc/", "../programs/develop/oberon07/doc/*"},
 {"kolibrios/develop/oberon07/lib/KolibriOS/", "../programs/develop/oberon07/lib/KolibriOS/*"},
 {"kolibrios/develop/oberon07/samples/", SRC_PROGS .. "/develop/oberon07/samples/*"},
- {"kolibrios/develop/tcc/lib/", SRC_PROGS ..  "/develop/ktcc/trunk/bin/lib/*"},
- {"kolibrios/develop/tcc/include/", SRC_PROGS ..  "/develop/ktcc/trunk/libc.obj/include/*"},
- {"kolibrios/develop/tcc/include/clayer/", SRC_PROGS ..  "/develop/ktcc/trunk/libc.obj/include/clayer/*"},
- {"kolibrios/develop/tcc/include/cryptal/", SRC_PROGS .. "/develop/ktcc/trunk/libc.obj/include/cryptal/*"},
- {"kolibrios/develop/tcc/include/sys/", SRC_PROGS .. "/develop/ktcc/trunk/libc.obj/include/sys/*"},
+ {"kolibrios/develop/tcc/lib/", SRC_PROGS ..  "/develop/ktcc/bin/lib/*"},
+ {"kolibrios/develop/tcc/include/", SRC_PROGS ..  "/develop/ktcc/libc.obj/include/*"},
+ {"kolibrios/develop/tcc/include/clayer/", SRC_PROGS ..  "/develop/ktcc/libc.obj/include/clayer/*"},
+ {"kolibrios/develop/tcc/include/cryptal/", SRC_PROGS .. "/develop/ktcc/libc.obj/include/cryptal/*"},
+ {"kolibrios/develop/tcc/include/sys/", SRC_PROGS .. "/develop/ktcc/libc.obj/include/sys/*"},
 {"kolibrios/develop/tcc/include/SDL/", "../contrib/sdk/sources/SDL-1.2.2_newlib/include/*"},
- {"kolibrios/develop/tcc/samples/", SRC_PROGS ..  "/develop/ktcc/trunk/libc.obj/samples/*.c"},
- {"kolibrios/develop/tcc/samples/", SRC_PROGS ..  "/develop/ktcc/trunk/libc.obj/samples/*.sh"},
- {"kolibrios/develop/tcc/samples/clayer/", SRC_PROGS ..  "/develop/ktcc/trunk/libc.obj/samples/clayer/*"},
+ {"kolibrios/develop/tcc/samples/", SRC_PROGS ..  "/develop/ktcc/libc.obj/samples/*.c"},
+ {"kolibrios/develop/tcc/samples/", SRC_PROGS ..  "/develop/ktcc/libc.obj/samples/*.sh"},
+ {"kolibrios/develop/tcc/samples/clayer/", SRC_PROGS ..  "/develop/ktcc/libc.obj/samples/clayer/*"},
 {"kolibrios/develop/utils/SPEDump", SRC_PROGS .. "/develop/SPEDump/SPEDump.kex"},
 {"kolibrios/emul/", "common/emul/*"},
 {"kolibrios/emul/dosbox/", "common/emul/DosBox/*"},
- {"kolibrios/emul/e80/readme.txt", SRC_PROGS .. "/emulator/e80/trunk/readme.txt"},
- {"kolibrios/emul/e80/keyboard.png", SRC_PROGS .. "/emulator/e80/trunk/keyboard.png"},
+ {"kolibrios/emul/e80/readme.txt", SRC_PROGS .. "/emulator/e80/readme.txt"},
+ {"kolibrios/emul/e80/keyboard.png", SRC_PROGS .. "/emulator/e80/keyboard.png"},
 {"kolibrios/emul/fceu/fceu", SRC_PROGS .. "/emulator/fceu/fceu"},
 {"kolibrios/emul/fceu/FCEU ReadMe.txt", SRC_PROGS .. "/emulator/fceu/FCEU ReadMe.txt"},
 {"kolibrios/emul/chip8/chip8", VAR_PROGS .. "/emulator/chip8/chip8"},
@@ -286,7 +284,7 @@ extra_files = {
 {"kolibrios/netsurf/res/", "common/network/netsurf/res/*"},
 {"kolibrios/res/skins/", "../skins/authors.txt"},
 {"kolibrios/res/templates/", "common/templates/*"},
- {"kolibrios/res/templates/", SRC_PROGS .. "/emulator/e80/trunk/games/*"},
+ {"kolibrios/res/templates/", SRC_PROGS .. "/emulator/e80/games/*"},
 {"kolibrios/res/templates/NES/", "common/templates/NES/*"},
 {"kolibrios/res/wallpapers/", "common/wallpapers/*"},
 {"kolibrios/res/system/", build_type .. "/settings/kolibri.lbl"},
@@ -341,7 +339,7 @@ if build_type == "ru_RU" then tup.append_table(extra_files, {
 {"kolibrios/games/WHOWTBAM/", build_type .. "/games/appdata.dat"},
 {"kolibrios/media/zsea/zsea_keys.txt", SRC_PROGS .. "/media/zsea/Docs/zSea_keys_rus.txt"},
 {"kolibrios/res/guide/", build_type .. "/docs/guide/*"},
- {"kolibrios/develop/tcc/doc/", SRC_PROGS .. "/develop/ktcc/trunk/bin/doc/ru/*"},
+ {"kolibrios/develop/tcc/doc/", SRC_PROGS .. "/develop/ktcc/bin/doc/ru/*"},
 }) else tup.append_table(extra_files, {
 {"Docs/Config.txt", build_type .. "/docs/Config.txt"},
 {"Docs/Copying.txt", build_type .. "/docs/Copying.txt"},
@@ -355,7 +353,7 @@ if build_type == "ru_RU" then tup.append_table(extra_files, {
 {"kolibrios/games/ataka", "common/games/ataka/ataka_en"},
 {"kolibrios/games/sstartrek/SStarTrek", "common/games/sstartrek/SStarTrek_en"},
 {"kolibrios/media/zsea/zsea_keys.txt", SRC_PROGS .. "/media/zsea/Docs/zSea_keys_eng.txt"},
- {"kolibrios/develop/tcc/doc/", SRC_PROGS .. "/develop/ktcc/trunk/bin/doc/en/*"},
+ {"kolibrios/develop/tcc/doc/", SRC_PROGS .. "/develop/ktcc/bin/doc/en/*"},
 }) end
 --[[
 Files to be included in distribution kit outside of kolibri.img, but not kolibri.iso.
@@ -411,7 +409,8 @@ tup.append_table(img_files, {
 {"HACONFIG", VAR_PROGS .. "/other/ha/HACONFIG"},
 {"ACLOCK", VAR_PROGS .. "/demos/aclock/aclock"},
 {"APM", VAR_PROGS .. "/system/apm/apm"},
- {"CALC", VAR_PROGS .. "/other/calc/trunk/calc"},
+ {"CALC", VAR_PROGS .. "/other/calc/calc"},
+ {"CALCPLUS", VAR_PROGS .. "/other/calcplus/calcplus"},
 {"CALENDAR", VAR_PROGS .. "/system/calendar/trunk/calendar"},
 {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"},
 {"CROPFLAT", VAR_PROGS .. "/system/cropflat/cropflat"},
@@ -429,21 +428,21 @@ tup.append_table(img_files, {
 {"KPACK", VAR_PROGS .. "/other/kpack/trunk/kpack"},
 {"LAUNCHER", VAR_PROGS .. "/system/launcher/trunk/launcher"},
 {"LOADDRV", VAR_PROGS .. "/system/loaddrv/loaddrv"},
- {"MAGNIFY", VAR_PROGS .. "/demos/magnify/trunk/magnify"},
+ {"MAGNIFY", VAR_PROGS .. "/system/magnify/magnify"},
 {"MGB", VAR_PROGS .. "/testing/mgb/trunk/mgb"},
 {"MOUSEMUL", VAR_PROGS .. "/system/mousemul/trunk/mousemul"},
 {"MADMOUSE", VAR_PROGS .. "/other/madmouse/madmouse"},
 {"MYKEY", VAR_PROGS .. "/system/MyKey/trunk/MyKey"},
 {"PCIDEV", VAR_PROGS .. "/testing/pcidev/trunk/PCIDEV"},
 {"RDSAVE", VAR_PROGS .. "/system/rdsave/trunk/rdsave"},
- {"RTFREAD", VAR_PROGS .. "/other/rtfread/trunk/rtfread"},
+ {"RTFREAD", VAR_PROGS .. "/other/rtfread/rtfread"},
 {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"},
 {"SCRSHOOT", VAR_PROGS .. "/media/scrshoot/scrshoot"},
 {"SETUP", VAR_PROGS .. "/system/setup/trunk/setup"},
 {"SKINCFG", VAR_PROGS .. "/system/skincfg/trunk/skincfg"},
 {"TERMINAL", VAR_PROGS .. "/system/terminal/terminal"},
 {"TEST", VAR_PROGS .. "/testing/protection/trunk/test"},
- {"TINYPAD", VAR_PROGS .. "/develop/tinypad/trunk/tinypad"},
+ {"TINYPAD", VAR_PROGS .. "/develop/tinypad/tinypad"},
 {"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"},
 {"TIMER", VAR_PROGS .. "/other/Timer/Timer"},
 {"UNZ", VAR_PROGS .. "/fs/unz/unz"},
@@ -472,21 +471,21 @@ tup.append_table(img_files, {
 {"DEVELOP/DBGBOARD", VAR_PROGS .. "/system/dbgboard/dbgboard"},
 {"DEVELOP/CEDIT", SRC_PROGS .. "/develop/cedit/CEDIT"},
 {"DEVELOP/CHARSETS", VAR_PROGS .. "/develop/charsets/charsets"},
- {"DEVELOP/COBJ", VAR_PROGS .. "/develop/cObj/trunk/cObj"},
+ {"DEVELOP/COBJ", VAR_PROGS .. "/develop/cObj/cObj"},
 {"DEVELOP/ENTROPYV", VAR_PROGS .. "/develop/entropyview/entropyview"},
 {"DEVELOP/FASM", VAR_PROGS .. "/develop/fasm/1.73/fasm"},
 {"DEVELOP/GENFILES", VAR_PROGS .. "/testing/genfiles/GenFiles"},
 {"DEVELOP/PIPET", VAR_PROGS .. "/other/pipet/pipet"},
- {"DEVELOP/H2D2B", VAR_PROGS .. "/develop/h2d2b/trunk/h2d2b"},
- {"DEVELOP/HEED", VAR_PROGS .. "/develop/heed/trunk/heed"},
+ {"DEVELOP/H2D2B", VAR_PROGS .. "/develop/h2d2b/h2d2b"},
+ {"DEVELOP/HEED", VAR_PROGS .. "/develop/heed/heed"},
 {"DEVELOP/MTDBG", VAR_PROGS .. "/develop/mtdbg/mtdbg"},
 {"DEVELOP/MSTATE", VAR_PROGS .. "/develop/mstate/mstate"},
- {"DEVELOP/SCANCODE", VAR_PROGS .. "/develop/scancode/trunk/scancode"},
- {"DEVELOP/EXAMPLES/CIRCLE", VAR_PROGS .. "/develop/examples/circle/trunk/circle"},
+ {"DEVELOP/SCANCODE", VAR_PROGS .. "/develop/scancode/scancode"},
+ {"DEVELOP/EXAMPLES/CIRCLE", VAR_PROGS .. "/develop/examples/circle/circle"},
 {"DEVELOP/EXAMPLES/COLORREF", VAR_PROGS .. "/demos/colorref/trunk/colorref"},
 {"DEVELOP/EXAMPLES/CONGET", VAR_PROGS .. "/develop/libraries/console_coff/examples/test_gets"},
 {"DEVELOP/EXAMPLES/CSLIDE", VAR_PROGS .. "/demos/cslide/trunk/cslide"},
- {"DEVELOP/EXAMPLES/THREAD", VAR_PROGS .. "/develop/examples/thread/trunk/thread"},
+ {"DEVELOP/EXAMPLES/THREAD", VAR_PROGS .. "/develop/examples/thread/thread"},
 {"File Managers/KFAR", VAR_PROGS .. "/fs/kfar/trunk/kfar"},
 {"File Managers/OPENDIAL", VAR_PROGS .. "/fs/opendial/opendial"},
 {"LOD", VAR_PROGS .. "/fs/lod/lod"},
@@ -507,7 +506,7 @@ tup.append_table(img_files, {
 {"GAMES/TETRIS", VAR_PROGS .. "/games/tetris/tetris"},
 {"GAMES/C4", VAR_PROGS .. "/games/c4/c4"},
 {"LIB/ARCHIVER.OBJ", VAR_PROGS .. "/fs/kfar/trunk/kfar_arc/kfar_arc.obj"},
- {"LIB/BOX_LIB.OBJ", VAR_PROGS .. "/develop/libraries/box_lib/trunk/box_lib.obj"},
+ {"LIB/BOX_LIB.OBJ", VAR_PROGS .. "/develop/libraries/box_lib/box_lib.obj"},
 {"LIB/BUF2D.OBJ", VAR_PROGS .. "/develop/libraries/buf2d/trunk/buf2d.obj"},
 {"LIB/CONSOLE.OBJ", VAR_PROGS .. "/develop/libraries/console_coff/console.obj"},
 {"LIB/CNV_PNG.OBJ", VAR_PROGS .. "/media/zsea/plugins/png/cnv_png.obj"},
@@ -524,10 +523,10 @@ tup.append_table(img_files, {
 {"LIB/RASTERWORKS.OBJ", VAR_PROGS .. "/develop/libraries/fontRasterWorks_unicode/RasterWorks.obj"},
 {"LIB/SORT.OBJ", VAR_PROGS .. "/develop/libraries/sorter/sort.obj"},
 {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
- {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/trunk/animage"},
+ {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/animage"},
 {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"},
- {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/trunk/kiv"},
- {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/trunk/listplay"},
+ {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/kiv"},
+ {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/listplay"},
 {"MEDIA/MIDAMP", VAR_PROGS .. "/media/midamp/trunk/midamp"},
 {"MEDIA/MP3INFO", VAR_PROGS .. "/media/mp3info/mp3info"},
 {"MEDIA/PALITRA", VAR_PROGS .. "/media/palitra/trunk/palitra"},
@@ -605,6 +604,7 @@ tup.append_table(extra_files, {
 {"kolibrios/3D/voxel_utilites/VOX_CREATOR" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_creator"},
 {"kolibrios/3D/voxel_utilites/VOX_MOVER" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_mover"},
 {"kolibrios/3D/voxel_utilites/VOX_TGL" , VAR_PROGS .. "/media/voxel_editor/utilites/vox_tgl"},
+ {"kolibrios/demos/flag", VAR_PROGS .. "/demos/flag/flag"},
 {"kolibrios/demos/life3", VAR_PROGS .. "/games/life3/life3"},
 {"kolibrios/demos/qjulia", VAR_PROGS .. "/demos/qjulia/trunk/qjulia"},
 {"kolibrios/develop/koldbg", VAR_PROGS .. "/develop/koldbg/koldbg"},
@@ -628,7 +628,6 @@ tup.append_table(extra_files, {
 {"kolibrios/media/zsea/plugins/rotate.obj", VAR_PROGS .. "/media/zsea/plugins/rotate/rotate.obj"},
 {"kolibrios/media/zsea/plugins/scaling.obj", VAR_PROGS .. "/media/zsea/plugins/scaling/scaling.obj"},
 {"kolibrios/utils/AMDtemp", VAR_PROGS .. "/system/amd_temp_view/AMDtemp"},
- {"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"}
@@ -642,7 +641,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/utils/period", VAR_PROGS .. "/other/period/period"},
 {"kolibrios/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"},
 }) end

@@ -746,14 +745,14 @@ if tup.getconfig('NO_GCC') ~= 'full' then
 tup.append_table(img_files, {
 {"GAMES/REVERSI", VAR_PROGS .. "/games/reversi/reversi"},
 {"LIB/BASE64.OBJ", VAR_PROGS .. "/develop/libraries/base64/base64.obj"},
- {"LIB/LIBC.OBJ", VAR_PROGS .. "/develop/ktcc/trunk/libc.obj/source/libc.obj"},
+ {"LIB/LIBC.OBJ", VAR_PROGS .. "/develop/ktcc/libc.obj/source/libc.obj"},
 {"LIB/ICONV.OBJ", VAR_PROGS .. "/develop/libraries/iconv/iconv.obj"},
 -- {"LIB/MTAR.OBJ", VAR_PROGS .. "/develop/libraries/microtar/mtar.obj"},
 })
 tup.append_table(extra_files, {
 -- {"kolibrios/3D/cubeline", VAR_PROGS .. "/demos/cubeline/trunk/cubeline"},
 {"kolibrios/3D/gears", VAR_PROGS .. "/demos/gears/gears"},
- {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/trunk/e80"},
+ {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/e80"},
 {"kolibrios/emul/uarm/", VAR_CONTRIB .. "/other/uarm/uARM"},
 {"kolibrios/games/2048", VAR_PROGS .. "/games/2048/2048"},
 {"kolibrios/games/checkers", VAR_PROGS .. "/games/checkers/checkers"},
@@ -773,7 +772,7 @@ tup.append_table(extra_files, {
 {"kolibrios/utils/minizip/minizip", VAR_PROGS .. "/fs/minizip/minizip"},
 {"kolibrios/utils/minizip/miniunz", VAR_PROGS .. "/fs/minizip/miniunz"},
 {"kolibrios/develop/c--/c--", VAR_PROGS .. "/develop/cmm/cmm"},
- {"kolibrios/develop/tcc/tcc", VAR_PROGS .. "/develop/ktcc/trunk/source/tcc"},
+ {"kolibrios/develop/tcc/tcc", VAR_PROGS .. "/develop/ktcc/source/tcc"},
 {"kolibrios/develop/sqlite3/sqlite3", VAR_CONTRIB .. "/sdk/sources/sqlite3/shell/sqlite3"},
 {"kolibrios/develop/utils/objconv", VAR_PROGS .. "/develop/objconv/objconv"},
 {"kolibrios/drivers/sensors/k10temp.sys", VAR_DRVS .. "/sensors/k10temp/k10temp.sys"},
--- a/data/common/settings/app_plus.ini
+++ b/data/common/settings/app_plus.ini
@@ -29,7 +29,6 @@ Dicty=/k/utils/DICTY.KEX,79
 fNav=/k/utils/fNav/fNav,93
 CncEditor=/k/utils/cnc_editor/cnc_editor,15
 Life=/k/demos/life2,13
-Calc+=/k/utils/calcplus,4
 TinyBasic=/k/develop/TinyBasic/TinyBasic,91
 THashView=/k/utils/thashview,124
 Notes=/k/utils/notes,117
--- a/data/en_US/settings/icon.ini
+++ b/data/en_US/settings/icon.ini
@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
-path=CALC
+name=CALC+
+path=CALCPLUS
 param=
 ico=4
 x=204
--- a/data/en_US/settings/menu.dat
+++ b/data/en_US/settings/menu.dat
@@ -92,6 +92,7 @@
 59 Screen keyboard      |zkey
 #10 **** DATA PROCESSING
 16 Calculator           |calc
+16 Calculator+          |calcplus
 03 Tinypad              |tinypad
 28 CodeEdit             |develop/cedit
 21 Table processor      |table
--- a/data/es_ES/settings/icon.ini
+++ b/data/es_ES/settings/icon.ini
@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
-path=CALC
+name=CALC+
+path=CALCPLUS
 param=
 ico=4
 x=204
--- a/data/es_ES/settings/menu.dat
+++ b/data/es_ES/settings/menu.dat
@@ -96,6 +96,7 @@
 24 NDN                *  |/kolibrios/utils/ndn/ndn
 #11 **** PROCESO DE DATOS
 16 Calculadora           |calc
+16 Calculadora+          |calcplus
 16 Tinypad               |tinypad
 16 CodeEdit              |develop/cedit
 16 Procesador de tablas  |table
--- a/data/et_EE/settings/icon.ini
+++ b/data/et_EE/settings/icon.ini
@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
-path=CALC
+name=CALC+
+path=CALCPLUS
 param=
 ico=4
 x=204
--- a/data/et_EE/settings/menu.dat
+++ b/data/et_EE/settings/menu.dat
@@ -80,6 +80,7 @@
 65 NDN                *  |/kolibrios/utils/ndn/ndn
 #11 **** DATA PROCESSING ****
 16 Kalkulaator           |calc
+16 Kalkulaator+          |calcplus
 16 Teksti redaktor       |tinypad
 16 CodeEdit              |develop/cedit
 16 Tabelarvutus          |table
--- a/data/it_IT/settings/icon.ini
+++ b/data/it_IT/settings/icon.ini
@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
-path=CALC
+name=CALC+
+path=CALCPLUS
 param=
 ico=4
 x=204
--- a/data/it_IT/settings/menu.dat
+++ b/data/it_IT/settings/menu.dat
@@ -79,6 +79,7 @@
 65 NDN                *  |/kolibrios/utils/ndn/ndn
 #11 **** DATA PROCESSING
 16 Calcolatrice          |calc
+16 Calcolatrice+         |calcplus
 16 Tinypad               |tinypad
 16 CodeEdit              |develop/cedit
 16 Table Processor       |table
--- a/data/ru_RU/settings/icon.ini
+++ b/data/ru_RU/settings/icon.ini
@@ -235,8 +235,8 @@ ico=58
 x=68
 y=68
 [21]
-name=CALC
-path=CALC
+name=CALC+
+path=CALCPLUS
 param=
 ico=4
 x=204
--- a/data/ru_RU/settings/menu.dat
+++ b/data/ru_RU/settings/menu.dat
@@ -90,6 +90,7 @@
 59 <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  |zkey
 #10 **** <20><><EFBFBD><EFBFBD>
 16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>          |calc
+16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>+         |calcplus
 03 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Tinypad     |tinypad
 28 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CodeEdit    |develop/cedit
 21 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  |table
@@ -119,7 +120,7 @@
 45 <20><><EFBFBD><EFBFBD>⮩ <20><>ਭ<EFBFBD><E0A8AD><EFBFBD><EFBFBD><EFBFBD>   |easyshot
 29 FB2 <20><>⠫<EFBFBD><E2A0AB>          |fb2read
 16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>      |aclock
-21 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>   |period
+21 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>   |/kolibrios/utils/period
 59 <20>७<EFBFBD><E0A5AD><EFBFBD><EFBFBD> KJ|ABuIIIA  |games/klavisha
 16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>        |demos/bcdclk
 53 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>               |timer
--- a/drivers/examples/test/Makefile
+++ b/drivers/examples/test/Makefile
@@ -1,7 +1,7 @@

 KTCC=kos32-tcc
 KPACK = kpack
-KLIBC =  ../../../programs/develop/ktcc/trunk/libc.obj
+KLIBC =  ../../../programs/develop/ktcc/libc.obj
 CFLAGS = -I $(KLIBC)/include 
 LDFLAGS = -nostdlib -L$(KLIBC)/lib $(KLIBC)/lib/crt0.o

--- a/kernel/trunk/network/socket.inc
+++ b/kernel/trunk/network/socket.inc
@@ -668,6 +668,8 @@ socket_accept:

        DEBUGF  DEBUG_NETWORK_VERBOSE, "SOCKET_accept: socknum=%u sockaddr=%x length=%u\n", ecx, edx, esi

+        push    edx esi
+
        call    socket_num_to_ptr
        test    eax, eax
        jz      .invalid
@@ -696,6 +698,24 @@ socket_accept:
        mov     ebx, [ebx + APPDATA.tid]
        mov     [eax + SOCKET.TID], ebx

+        pop     esi edx
+
+        test    edx, edx
+        jz      .skip_sockaddr
+
+        mov     word[edx], 0 ; unknown domain
+        cmp     esi, 8       ; domain + port + ipv4
+        jb      .skip_sockaddr
+
+        mov     word[edx], AF_INET4
+        mov     esi, edx
+        mov     edx, [eax + IP_SOCKET.RemoteIP]
+        mov     [esi + sockaddr.ip], edx
+
+        mov     dx, [eax + TCP_SOCKET.RemotePort]
+        mov     [esi + sockaddr.port], dx
+
+.skip_sockaddr:
 ; Return socket number to caller
        mov     eax, [eax + SOCKET.Number]
        mov     [esp + SYSCALL_STACK.eax], eax
@@ -711,16 +731,19 @@ socket_accept:
  .wouldblock:
        mov     dword[esp + SYSCALL_STACK.ebx], EWOULDBLOCK
        mov     dword[esp + SYSCALL_STACK.eax], -1
+        pop     esi edx
        ret

  .invalid:
        mov     dword[esp + SYSCALL_STACK.ebx], EINVAL
        mov     dword[esp + SYSCALL_STACK.eax], -1
+        pop     esi edx
        ret

  .notsupp:
        mov     dword[esp + SYSCALL_STACK.ebx], EOPNOTSUPP
        mov     dword[esp + SYSCALL_STACK.eax], -1
+        pop     esi edx
        ret

 ;-----------------------------------------------------------------;
--- a/programs/bcc32/include/l_tinygl.h
+++ b/programs/bcc32/include/l_tinygl.h
@@ -692,6 +692,15 @@ struct TinyGLContext
 	long int dx, dy, x, y;
 };

+struct GLUquadricObj
+{
+	GLenum DrawStyle;      // GLU_FILL, LINE, SILHOUETTE, or POINT
+	GLenum Orientation;    // GLU_INSIDE or GLU_OUTSIDE
+	GLboolean TextureFlag; // Generate texture coords?
+	GLenum Normals;        // GLU_NONE, GLU_FLAT, or GLU_SMOOTH
+	void (__stdcall* ErrorFunc)(GLenum err); // Error handler callback function
+};
+
 //
 // tinygl - import table
 //
@@ -748,7 +757,7 @@ void (__stdcall* glEdgeFlag)(int flag) = (void (__stdcall*)(int))&"glEdgeFlag";
 void (__stdcall* glMatrixMode)(int mode) = (void (__stdcall*)(int))&"glMatrixMode";
 void (__stdcall* glLoadMatrixf)(const float* m) = (void (__stdcall*)(const float*))&"glLoadMatrixf";
 void (__stdcall* glLoadIdentity)() = (void (__stdcall*)())&"glLoadIdentity";
-//void (__stdcall* glMultMatrixf)(...) = (void (__stdcall*)(...))&"glMultMatrixf";
+void (__stdcall* glMultMatrixf)(const GLfloat *m) = (void (__stdcall*)(const GLfloat*))&"glMultMatrixf";
 void (__stdcall* glPushMatrix)() = (void (__stdcall*)())&"glPushMatrix";
 void (__stdcall* glPopMatrix)() = (void (__stdcall*)())&"glPopMatrix";
 void (__stdcall* glRotatef)(float angle, float x, float y, float z) = (void (__stdcall*)(float, float, float, float))&"glRotatef";
@@ -763,7 +772,7 @@ void (__stdcall* glEndList)() = (void (__stdcall*)())&"glEndList";
 void (__stdcall* glCallList)(unsigned int list) = (void (__stdcall*)(unsigned int))&"glCallList";
 void (__stdcall* glClear)(int mask) = (void (__stdcall*)(int))&"glClear";
 void (__stdcall* glClearColor)(float r, float g, float b, float a) = (void (__stdcall*)(float, float, float, float))&"glClearColor";
-//void (__stdcall* glClearDepth)(...) = (void (__stdcall*)(...))&"glClearDepth";
+void (__stdcall* glClearDepth)(double depth) = (void (__stdcall*)(double))&"glClearDepth";
 void (__stdcall* glRenderMode)(int mode) = (void (__stdcall*)(int))&"glRenderMode";
 //void (__stdcall* glSelectBuffer)(...) = (void (__stdcall*)(...))&"glSelectBuffer";
 //void (__stdcall* glInitNames)(...) = (void (__stdcall*)(...))&"glInitNames";
@@ -799,18 +808,22 @@ void (__stdcall* glColorPointer)(GLint size, GLenum type, GLsizei stride, const
 void (__stdcall* glNormalPointer)(GLenum type, GLsizei stride, const GLvoid* pointer) = (void (__stdcall*)(GLenum, GLsizei, const GLvoid*))&"glNormalPointer";
 void (__stdcall* glTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid* pointer) = (void (__stdcall*)(GLint, GLenum, GLsizei, const GLvoid*))&"glTexCoordPointer";
 //void (__stdcall* glPolygonOffset)(...) = (void (__stdcall*)(...))&"glPolygonOffset";
-//void (__stdcall* glOrtho)(...) = (void (__stdcall*)(...))&"glOrtho";
+void (__stdcall* glOrtho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) = (void (__stdcall*)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble))&"glOrtho";
 //void (__stdcall* glDebug)(...) = (void (__stdcall*)(...))&"glDebug";
 //void (__stdcall* glInit)(...) = (void (__stdcall*)(...))&"glInit";
 //void (__stdcall* glClose)(...) = (void (__stdcall*)(...))&"glClose";
-//void (__stdcall* gluPerspective)(...) = (void (__stdcall*)(...))&"gluPerspective";
-//void (__stdcall* gluNewQuadric)(...) = (void (__stdcall*)(...))&"gluNewQuadric";
-//void (__stdcall* gluDeleteQuadric)(...) = (void (__stdcall*)(...))&"gluDeleteQuadric";
-//void (__stdcall* gluQuadricDrawStyle)(...) = (void (__stdcall*)(...))&"gluQuadricDrawStyle";
-//void (__stdcall* gluQuadricOrientation)(...) = (void (__stdcall*)(...))&"gluQuadricOrientation";
-//void (__stdcall* gluQuadricTexture)(...) = (void (__stdcall*)(...))&"gluQuadricTexture";
-//void (__stdcall* gluCylinder)(...) = (void (__stdcall*)(...))&"gluCylinder";
-//void (__stdcall* gluSphere)(...) = (void (__stdcall*)(...))&"gluSphere";
+void (__stdcall* gluPerspective)(GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar) = (void (__stdcall*)(GLdouble, GLdouble, GLdouble, GLdouble))&"gluPerspective";
+GLUquadricObj* (__stdcall* gluNewQuadric)() = (GLUquadricObj* (__stdcall*)())&"gluNewQuadric";
+void (__stdcall* gluDeleteQuadric)(GLUquadricObj *state) = (void (__stdcall*)(GLUquadricObj*))&"gluDeleteQuadric";
+void (__stdcall* gluQuadricDrawStyle)(GLUquadricObj *quadObject, GLenum drawStyle) = (void (__stdcall*)(GLUquadricObj*, GLenum))&"gluQuadricDrawStyle";
+void (__stdcall* gluQuadricOrientation)(GLUquadricObj *quadObject, GLenum orientation) = (void (__stdcall*)(GLUquadricObj*, GLenum))&"gluQuadricOrientation";
+void (__stdcall* gluQuadricTexture)(GLUquadricObj *quadObject, GLboolean textureCoords) = (void (__stdcall*)(GLUquadricObj*, GLboolean))&"gluQuadricTexture";
+void (__stdcall* gluCylinder)(GLUquadricObj *qobj,
+	GLdouble baseRadius, GLdouble topRadius, GLdouble height, GLint slices, GLint stacks) = (void (__stdcall*)(GLUquadricObj*, GLdouble, GLdouble, GLdouble, GLint, GLint))&"gluCylinder";
+void (__stdcall* gluDisk)(GLUquadricObj *qobj,
+	GLdouble innerRadius, GLdouble outerRadius, GLint slices, GLint loops) = (void (__stdcall*)(GLUquadricObj*, GLdouble, GLdouble, GLint, GLint))&"gluDisk";
+void (__stdcall* gluSphere)(GLUquadricObj *qobj,
+	GLdouble radius, GLint slices, GLint stacks) = (void (__stdcall*)(GLUquadricObj*, GLdouble, GLint, GLint))&"gluSphere";
 void (__stdcall* kosglMakeCurrent)(long l, long t, long w, long h, TinyGLContext*) = (void (__stdcall*)(long, long, long, long, TinyGLContext*))&"kosglMakeCurrent";
 void (__stdcall* kosglSwapBuffers)() = (void (__stdcall*)())&"kosglSwapBuffers";
 asm{
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -88,20 +88,20 @@ echo Building develop
 echo *
 fasm develop\cmd\trunk\cmd.asm %BIN%\cmd
 fasm develop\fasm\trunk\fasm.asm %BIN%\develop\fasm
-fasm develop\h2d2b\trunk\h2d2b.asm %BIN%\develop\h2d2b
-fasm develop\heed\trunk\heed.asm %BIN%\demos\heed
+fasm develop\h2d2b\h2d2b.asm %BIN%\develop\h2d2b
+fasm develop\heed\heed.asm %BIN%\demos\heed
 rem fasm develop\hexview\trunk\hexview.asm hexview
-fasm develop\keyascii\trunk\keyascii.asm %BIN%\develop\keyascii
+fasm develop\keyascii\keyascii.asm %BIN%\develop\keyascii
 fasm develop\mtdbg\mtdbg.asm %BIN%\develop\mtdbg
 rem fasm develop\param\trunk\param.asm param
-fasm develop\scancode\trunk\scancode.asm %BIN%\develop\scancode
-fasm develop\tinypad\trunk\tinypad.asm %BIN%\tinypad
-fasm develop\cObj\trunk\cObj.asm %BIN%\develop\cObj
+fasm develop\scancode\scancode.asm %BIN%\develop\scancode
+fasm develop\tinypad\tinypad.asm %BIN%\tinypad
+fasm develop\cObj\cObj.asm %BIN%\develop\cObj

 echo *
 echo Building systems libraries
 echo *
-fasm develop\libraries\box_lib\trunk\box_lib.asm %BIN%\lib\box_lib.obj
+fasm develop\libraries\box_lib\box_lib.asm %BIN%\lib\box_lib.obj
 fasm develop\libraries\console\console.asm %BIN%\lib\console.obj
 fasm develop\libraries\libs-dev\libgfx\libgfx.asm %BIN%\lib\libgfx.obj
 fasm develop\libraries\libs-dev\libimg\libimg.asm %BIN%\lib\libimg.obj
@@ -154,16 +154,16 @@ echo *
 echo Building other
 echo *
 rem fasm other\archer\trunk\@rcher.asm %BIN%\@rcher
-fasm other\calc\trunk\calc.asm %BIN%\calc
+fasm other\calc\calc.asm %BIN%\calc
 fasm other\mhc\trunk\mhc.asm %BIN%\mhc
-fasm other\period\trunk\period.asm %BIN%\period
-fasm other\rtfread\trunk\rtfread.asm %BIN%\rtfread
+fasm other\period\period.asm %BIN%\period
+fasm other\rtfread\rtfread.asm %BIN%\rtfread

 echo *
 echo Building media
 echo *
 rem media\ac97snd\trunk\ac97snd.asm ac97snd
-fasm media\animage\trunk\animage.asm %BIN%\animage
+fasm media\animage\animage.asm %BIN%\animage
 fasm media\cdp\trunk\cdp.asm %BIN%\cdp
 fasm media\gifview\trunk\gifview.asm %BIN%\gifview
 fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit
@@ -231,18 +231,18 @@ echo *
 echo Building depend application for fdd's nightbuild
 echo *
 echo __nightbuild fix yes >> config.inc
-fasm media\kiv\trunk\kiv.asm %BIN%\nightbuild\kiv
+fasm media\kiv\kiv.asm %BIN%\nightbuild\kiv
 fasm media\scrshoot\scrshoot.asm %BIN%\nightbuild\scrshoot
-fasm media\animage\trunk\animage.asm %BIN%\nightbuild\animage
+fasm media\animage\animage.asm %BIN%\nightbuild\animage
 fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp
-fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed
-fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad
+fasm develop\heed\heed.asm %BIN%\nightbuild\heed
+fasm develop\tinypad\tinypad.asm %BIN%\nightbuild\tinypad
 fasm system\skincfg\trunk\skincfg.asm %BIN%\nightbuild\skincfg
 fasm system\hdd_info\trunk\hdd_info.asm %BIN%\nightbuild\hdd_info
 fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb
 fasm system\rdsave\trunk\rdsave.asm %BIN%\nightbuild\rdsave
 fasm other\kpack\trunk\kpack.asm %BIN%\nightbuild\kpack
-fasm other\rtfread\trunk\rtfread.asm %BIN%\nightbuild\rtfread
+fasm other\rtfread\rtfread.asm %BIN%\nightbuild\rtfread
 ;restore
 echo __CPU_type fix %res% > config.inc
 erase lang.inc
--- a/programs/cmm/browser/TWB/TWB.c
+++ b/programs/cmm/browser/TWB/TWB.c
@@ -85,6 +85,7 @@ struct TWebBrowser {
 	void tag_table();
 	void tag_td();
 	void tag_tr();
+	void reset_font_style();
 };

 #include "TWB\render.h"
@@ -94,16 +95,16 @@ void TWebBrowser::SetPageDefaults()
 {
 	t_html = t_body = link = false;
 	style.reset();
+	reset_font_style();
 	link_color_default = 0x0000FF;
 	link_color_active = 0xFF0000;
-	style.cur_line_h = list.item_h;
 	links.clear();
 	anchors.clear();
 	img_url.drop();
 	text_colors.drop();
 	text_colors.add(0);
 	if (secondrun) {
-		canvas.Init(list.x, list.y, list.w, math.max(list.visible, list.count));
+		canvas.Init(list.x, list.y, list.w, math.max(list.visible, list.count)+200);
 		canvas.Fill(0, bg_colors.get(0));
 	}
 	bg_colors.drop();
@@ -114,7 +115,6 @@ void TWebBrowser::SetPageDefaults()
 	draw_w = list.w - BODY_MARGIN - BODY_MARGIN;
 	linebuf = 0;
 	redirect = '\0';
-	list.SetFont(8, 14, 10011000b);
 	tag_table_reset();
 	is_html = true;
 	if (!strstri(bufpointer, "<body")) {
--- a/programs/cmm/browser/TWB/render.h
+++ b/programs/cmm/browser/TWB/render.h
@@ -49,14 +49,14 @@ void TWebBrowser::RenderLine(dword _line)
 		pc = text_colors.get_last();
 		if (link) && (pc == text_colors.get(0)) pc = link_color_default;

-		canvas.WriteText(draw_x, draw_y, list.font_type, pc, _line, NULL);
-		if (style.b) canvas.WriteText(draw_x+1, draw_y, list.font_type, pc, _line, NULL);
+		canvas.WriteText(draw_x, draw_y+1, list.font_type, pc, _line, NULL);
+		if (style.b) canvas.WriteText(draw_x+1, draw_y+1, list.font_type, pc, _line, NULL);
 		if (style.s) canvas.DrawBar(draw_x, list.item_h / 2 - zoom + draw_y, pw, zoom, pc);
-		if (style.u) canvas.DrawBar(draw_x, list.item_h - zoom - zoom + draw_y, pw, zoom, pc);
+		if (style.u) canvas.DrawBar(draw_x, draw_y + list.font_h, pw, zoom, pc);
 		if (link) {
 			if (ESBYTE[_line]==' ') && (ESBYTE[_line+1]==NULL) {} else {
-				canvas.DrawBar(draw_x, draw_y + list.item_h - calc(zoom*2)-1, pw, zoom, link_color_default);
-				links.add_text(draw_x, draw_y + list.y, pw, list.item_h - calc(zoom*2)-1, zoom);				
+				canvas.DrawBar(draw_x, draw_y + list.font_h, pw, zoom, link_color_default);
+				links.add_text(draw_x, draw_y + list.y, pw, list.font_h, zoom);				
 			}
 		}
 		_SKIP_DRAW:
--- a/programs/cmm/browser/TWB/set_style.h
+++ b/programs/cmm/browser/TWB/set_style.h
@@ -208,9 +208,20 @@ void TWebBrowser::tag_li()
 void TWebBrowser::tag_hr()
 {
 	dword hrcol = 0x00777777;
-	if (tag.get_value_of("color")) hrcol = GetColor(tag.value);
+	dword hr_width = draw_w-BODY_MARGIN-BODY_MARGIN;
+	dword hr_size = 1;
+	if (tag.get_value_of("color")) {
+		hrcol = GetColor(tag.value);
+	}
+	if (tag.get_value_of("width")) && (!strchr(tag.value, '%')) {
+		hr_width = math.min(hr_width, tag.get_number_of("width"));
+	}
+	if (tag.get_number_of("size")) {
+		hr_size = math.min(500, tag.number);
+	} 
 	if (draw_x != left_gap) NewLine();
-	if (secondrun) canvas.DrawBar(5+left_gap, style.cur_line_h / 2 + draw_y - 1, draw_w-10, 1, hrcol);
+	if (secondrun) canvas.DrawBar(left_gap, style.cur_line_h / 2 + draw_y - 1, hr_width, hr_size, hrcol);
+	draw_y += hr_size - 3;
 	draw_x++;
 	NewLine();
 	return;
@@ -235,6 +246,12 @@ void TWebBrowser::tag_q()
 	chrncat(#linebuf, '\"', sizeof(TWebBrowser.linebuf));
 }

+void TWebBrowser::reset_font_style()
+{
+	list.SetFont(BASIC_CHAR_W, 14, 10011000b);
+	style.cur_line_h = list.item_h = list.font_h + 5;
+}
+
 void TWebBrowser::tag_h1234_caption()
 {
 	if (ESBYTE[#tag.name+1]=='4') {
@@ -250,19 +267,18 @@ void TWebBrowser::tag_h1234_caption()
 				NewLine();
 			}
 			if (tag.is("h1")) { 
-				list.SetFont(BASIC_CHAR_W*2, 14+14, 10011001b); 
+				list.SetFont(BASIC_CHAR_W*2, 14+13, 10011001b); 
 				style.b = true; 
 			} else if (tag.is("h2")) {
-				list.SetFont(BASIC_CHAR_W*2, 14+14, 10011001b); 
+				list.SetFont(BASIC_CHAR_W*2, 14+13, 10011001b); 
 			} else {
-				list.SetFont(6*2, 9+7, 10001001b);
+				list.SetFont(6*2, 9+8, 10001001b);
 			}
-			style.cur_line_h = list.item_h = list.font_h + 2;
+			style.cur_line_h = list.item_h = list.font_h + 3;
 		} else {
 			if (tag.is("h1")) style.b = false;
 			NewLine();
-			list.SetFont(BASIC_CHAR_W, 14, 10011000b);
-			style.cur_line_h = list.item_h = BASIC_LINE_H;
+			reset_font_style();
 		}		
 	}
 }
@@ -270,12 +286,16 @@ void TWebBrowser::tag_h1234_caption()
 void TWebBrowser::tag_kosicon()
 {
 	dword imgbuf[44];
+	dword maxicon;
 	dword shared_i18 = memopen("ICONS18", NULL, SHM_READ);
+	maxicon = EDX / 18 / 18 / 4;
 	if (shared_i18) && (tag.get_number_of("n")) {
+		if (tag.number < maxicon) {
 			if (draw_x + 18 > canvas.bufw) NewLine();
-		canvas.DrawImage(draw_x, draw_y-2, 18, 18, 18*18*4*tag.number+shared_i18);
+			canvas.DrawImage(draw_x, draw_y-1, 18, 18, 18*18*4*tag.number+shared_i18);
 			draw_x += 22;			
 		}
+	}

 }

--- a/programs/cmm/browser/WebView.c
+++ b/programs/cmm/browser/WebView.c
@@ -571,10 +571,10 @@ void OpenPage(dword _open_URL)
 		//INTERNAL PAGE
 		history.add(#new_url);
 		WB1.custom_encoding = -1;
-		if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buildin_page_home, sizeof(buildin_page_home)-1);
-		else if (streq(#new_url, URL_SERVICE_TEST)) LoadInternalPage(#buildin_page_test, sizeof(buildin_page_test)-1);
+		if (streq(#new_url, URL_SERVICE_HOMEPAGE)) LoadInternalPage(#buildin_page_home, sizeof(buildin_page_home));
+		else if (streq(#new_url, URL_SERVICE_TEST)) LoadInternalPage(#buildin_page_test, sizeof(buildin_page_test));
 		else if (streq(#new_url, URL_SERVICE_HISTORY)) ShowHistory();
-		else LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)-1);
+		else LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));

 	} else if (!strncmp(#new_url,"http:",5)) || (!strncmp(#new_url,"https:",6)) {
 		//WEB PAGE
@@ -589,7 +589,7 @@ void OpenPage(dword _open_URL)

 		if (!http.transfer) {
 			history.add(#new_url);
-			LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)-1);
+			LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
 		}
 	} else {
 		//LOCAL PAGE
@@ -712,7 +712,7 @@ void EventSubmitOmnibox()

 void LoadInternalPage(dword _bufdata, _in_bufsize){
 	if (!_bufdata) || (!_in_bufsize) {
-		LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error)-1);
+		LoadInternalPage(#buildin_page_error, sizeof(buildin_page_error));
 	} else {
 		WB1.list.first = 0; //scroll page to the top
 		DrawOmnibox();
--- a/programs/cmm/browser/const.h
+++ b/programs/cmm/browser/const.h
@@ -112,4 +112,4 @@ char editbox_icons[] = FROM "res/editbox_icons.raw";

 #define DEFAULT_URL URL_SERVICE_HOMEPAGE

-char version[]="WebView 3.85";
+char version[]="WebView 3.91";
--- a/programs/cmm/browser/history.h
+++ b/programs/cmm/browser/history.h
@@ -1,7 +1,7 @@
 #ifdef LANG_RUS
-#define HISTORY_HEADER "<html><title><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></title><body><b><3E><><EFBFBD><EFBFBD>饭<EFBFBD><E9A5AD><EFBFBD> <20><>࠭<EFBFBD><E0A0AD><EFBFBD></b><br>"
+#define HISTORY_HEADER "<html><title><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></title><body bgcolor=#fff><h3><3E><><EFBFBD><EFBFBD>饭<EFBFBD><E9A5AD><EFBFBD> <20><>࠭<EFBFBD><E0A0AD><EFBFBD></h3><br>"
 #else
-#define HISTORY_HEADER "<html><title>History</title><body><b>Visited pages</b><br>"
+#define HISTORY_HEADER "<html><title>History</title><body bgcolor=#fff><h3>Visited pages</h3><br>"
 #endif


@@ -13,7 +13,7 @@ ShowHistory()

 	for (i=0; i<history.items.count-1; i++) //if (cache.type.get(i) == PAGE)
 	{
-		strcat(history_pointer, "<a href='");
+		strcat(history_pointer, "<kosicon n=3><a href='");
 		strcat(history_pointer, history.items.get(i));
 		strcat(history_pointer, "'>");
 		strcat(history_pointer, history.items.get(i));
--- a/programs/cmm/browser/res/homepage_en.htm
+++ b/programs/cmm/browser/res/homepage_en.htm
@@ -1,17 +1,49 @@
-<html>
-<head>
-<title>Homepage</title>
-</head>
-<body><pre>Welcome to WebView a Text-Based Browser. 
+<html><head><title>New tab</title></head>
+<body bgcolor=#fff>

-KolibriOS Bookmarks:
-1. <a href=//kolibrios.org>Homepage</a>
-2. <a href="//builds.kolibrios.org">Night-builds</a>
-3. <a href="//ftp.kolibrios.org">FTP Server</a>
+<table><tr><td width=20><td width=220><pre>
+ _____________________
+|# :               : #|
+|  :    WebView    :  |
+|  :      for      :  |
+|  :   KolibriOS   :  |
+|  :               :  |
+|  :_______________:  |
+|      ____________   |
+|     | __         |  |
+|     ||  |        |  |
+\_____||__|________|__|<font color=#DDD>lc</font>

-<font bg=#F8F15B>By the way,</font> 
+<font bg=#F8F15B> web <font bg=#FF5A7E color=#fff> 1.0 <font bg=#47D018> compatable
+<font bg=#3CE7FF>              </font></font></font></font>
+<td>
+
+</pre>
+<kosicon n=58><a href=//kolibrios.org>Homepage</a> &nbsp;
+<kosicon n=50><a href="//builds.kolibrios.org">Night-builds</a> &nbsp;
+<kosicon n=50><a href="//ftp.kolibrios.org">FTP Server</a>
+<pre>
+
+By the way,
 <font color="#555555">&bull; You can check for browser updates from the main menu.
 &bull; To run a web search, type a text in the adress box and press Ctrl+Enter.
 &bull; Pressing F6 moves a text cursor to the omnibox.
-&bull; Click on a label in the bottom right corner to change the encoding of a page.
-</font>
+&bull; You can manually change the encoding of a page by clicking on a label in the bottom right corner.
+
+
+
+
+
+
+
+        ~+
+
+                 *       +
+           '                  |
+       ()    .-.,="``"=.    - o -
+             '=/_       \     |
+          *   |  '=._    |
+               \     `=./`,        '
+            .   '=.__.=' `='      *
+   +                         +
+        O      *        '       .<font color=#DDD>jgs</font>
--- a/programs/cmm/browser/res/homepage_ru.htm
+++ b/programs/cmm/browser/res/homepage_ru.htm
@@ -1,15 +1,49 @@
-<html><head><meta charset="cp-866">
-<title><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>࠭<EFBFBD><E0A0AD><EFBFBD></title></head>
-<body><pre><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥪<>⮢<EFBFBD><E2AEA2> <20><><EFBFBD>㧥<EFBFBD> WebView!
+<html><head><title><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></title></head>
+<body bgcolor=#fff>

-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> KolibriOS:<ol>
-<li><a href=//kolibrios.org><EFBFBD><EFBFBD><EFBFBD>樠<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᠩ<></a>
-<li><a href="//builds.kolibrios.org"><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᡮન</a>
-<li><a href="//ftp.kolibrios.org">FTP <20><>ࢥ<EFBFBD></a></ol>
+<table><tr><td width=20><td width=220><pre>
+ _____________________
+|# :               : #|
+|  :    WebView    :  |
+|  :      for      :  |
+|  :   KolibriOS   :  |
+|  :               :  |
+|  :_______________:  |
+|      ____________   |
+|     | __         |  |
+|     ||  |        |  |
+\_____||__|________|__|<font color=#DDD>lc</font>

-<font bg=#F8F15B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,</font> 
+<font bg=#F8F15B> web <font bg=#FF5A7E color=#fff> 1.0 <font bg=#47D018> compatable
+<font bg=#3CE7FF>              </font></font></font></font>
+<td>
+
+</pre>
+<kosicon n=58><a href=//kolibrios.org><EFBFBD><EFBFBD><EFBFBD>樠<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᠩ<></a> &nbsp;
+<kosicon n=50><a href="//builds.kolibrios.org"><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᡮન</a> &nbsp;
+<kosicon n=50><a href="//ftp.kolibrios.org">FTP <20><>ࢥ<EFBFBD></a>
+<pre>
+
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,
 <font color="#555555">&bull; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>稥 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 &bull; <20><><EFBFBD> <20><><EFBFBD>᪠ <20> Google <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>᭮<EFBFBD> <20><>ப<EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+Enter
 &bull; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> F6 <20><>६<EFBFBD>頥<EFBFBD> ⥪<>⮢<EFBFBD><E2AEA2> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
 &bull; <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2> <20><>࠭<EFBFBD><E0A0AD><EFBFBD>, <20><><EFBFBD> <20>⮣<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>ࠢ<EFBFBD><E0A0A2> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 㣫<> <20><><EFBFBD><EFBFBD>.

+
+
+
+
+
+
+        ~+
+
+                 *       +
+           '                  |
+       ()    .-.,="``"=.    - o -
+             '=/_       \     |
+          *   |  '=._    |
+               \     `=./`,        '
+            .   '=.__.=' `='      *
+   +                         +
+        O      *        '       .<font color=#DDD>jgs</font>
--- a/programs/cmm/browser/tests/acid_0.1.htm
+++ b/programs/cmm/browser/tests/acid_0.1.htm
@@ -5,12 +5,19 @@
 <title>Тест Acid 0.1</title>
 </head>
 <body bgcolor="#000000" link="#0066FF" text="#FFFFFF">
-<h1 align=center>Это тестовая страница для проверки WebViewer</h1>
-<br />
-<p>WebViewer является текстовым браузером и поддерживает все популярные кодировки (cp1251, koi-8, cp866, unicode)
-и некоторые теги. Поддержка таблииц (&lt;table&gt;), CSS, Javascript'a и Контактика пока не реализована :)
+<h1 align=center>Тест Acid 0.1</h1>
+<br>
+<b>Это тестовая страница для проверки текстового браузера <s>HTML Viewer</s> WebView</b>
+
+<p>Из кодировок поддерживаются: CP866(DOS), CP1251(Windows), CP1252(Latin legacy), KOI8, и конечно UTF8. CSS и Javascript пока не реализованы (ахахаха). Поддержка тега &lt;table&gt; крайне базовая, поддержки вложенных таблиц нет.
 </p>
-<br />
+
+<h3>История</h3>
+
+Ранее программа называлась <b  >HTMLv (HTML Viewer)</b> и изначально задумывалась как <q>Центр справки и поддержки</q>. Чтобы не изобретать велосипед и одновременно исполнить мечту многих, форматом просматриваемых страниц был выбран html. 
+Первоначальный автор Veliant, затем разработка была подхвачена дизайнером Leency. Это была моя вторая программа после файлового менеджера Eolite.<br>
+
+<span> <br />

 <b>
 <font color="#FF0000">K</font>
@@ -33,7 +40,8 @@
 </b>
 <br>

-<p>
+<table>
+<td>
 <bg bgcolor=#333>
 Небольшой список:<ol>
 <li><q>Этот текст в кавычках</q></li>
@@ -46,17 +54,14 @@
 </p>
 <br>

-<pre>
-"Осень уже пришла!"-
-    Шепнул мне на ухо ветер,
-        Подкравшись к подушке моей.
-
-                               Басе
-</pre>
 <!-- комментарий: этого текста здесь <нет> -->

 <br>

+<img alt="нет картинки, просто alt">
+
+<img src = http://wiby.org/about/wibyplex.gif>
+
 <a href="http://kolibrios.org/i/logo.png"><img id="2.1.4" src="http://kolibrios.org/i/logo.png" alt="logo"><br>Открыть</a><br>

 <br>
@@ -65,10 +70,25 @@
 <a href='/sys/index.htm'>Незакрытый тег а - index.htm<br>
 <a href="/sys/calc">/sys/calc</a><br>
 <a href="#2.1.4">#2.1.4</a><br>
-<a href="http://bash.im">http://bash.im</a><br>
+<a href="http://kolibrios.org">http://kolibrios.org</a><br>
 <a href="mailto:leency@mail.ru">Mail to Leency</a><br>
 <br>
-<br>
+
+<h1><a href=#>Link H1</a> <u>Underline H1</u></h1>
+<h2><a href=#>Link H2</a> <u>Underline H2</u></h2>
+<h3><a href=#>Link H3</a> <u>Underline H2</u></h3>
+<a href=#>Link</a> <u>Underline</u>
+
+<td>
+
+<pre>
+"Осень уже пришла!"-
+    Шепнул мне на ухо ветер,
+        Подкравшись к подушке моей.
+
+                               Басе
+
+</pre><br>

 В этом тексте есть переход на следующую строку, но браузер
 его должен проигнорировать. Еще много           пробелов. А тут есть 
@@ -80,8 +100,19 @@
      &#1082;&#1086;&#1088;&#1087;&#1091;&#1089; &#1085;&#1072; &#1090;&#1077;&#1088;&#1088;&#1080;&#1090;&#1086;&#1088;&#1080;&#1080; &#1053;&#1058;&#1059; «&#1061;&#1055;&#1048;»
 </p>

+<pre><font color="#000">
+  <font bg=#FFED00 style="background-color:#FFED00"> Заметки </font>
+  <font bg=#FFFBCE style="background-color:#FFFBCE">                             </font>
+  <font bg=#FFFBCE style="background-color:#FFFBCE">   Речка на Жукова           </font>
+  <font bg=#FFFBCE style="background-color:#FFFBCE">   Heroes 3                  </font>
+  <font bg=#FFFBCE style="background-color:#FFFBCE">   Рисостерон, куринабол     </font>
+  <font bg=#FFFBCE style="background-color:#FFFBCE">                             </font>
+</font></pre>
+
+</table>
+
 <hr color="#758999"> 
-<center>Zhitomyr 2008-2015</center>
+<center>Zhytomyr 2008-2025</center>


 </body>
--- a/programs/demos/flag/Tupfile.lua
+++ b/programs/demos/flag/Tupfile.lua
@@ -0,0 +1,2 @@
+if tup.getconfig("NO_FASM") ~= "" then return end
+tup.rule("flag.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "flag")
--- a/programs/demos/flag/flag.asm
+++ b/programs/demos/flag/flag.asm
@@ -0,0 +1,306 @@
+; SPDX-License-Identifier: GPL-2.0-only
+; Flag - demo program shows a flag with the inscription 'KolibriOS'
+; Copyright (C) 2025 KolibriOS team
+
+use32
+	org 0
+	db 'MENUET01'
+	dd 1,start,i_end,mem,stacktop,0,cur_dir_path
+
+include '../../proc32.inc'
+include '../../macros.inc'
+include '../../KOSfuncs.inc'
+include '../../load_lib.mac'
+include '../../dll.inc'
+include '../../develop/libraries/TinyGL/asm_fork/kosgl.inc'
+include '../../develop/libraries/TinyGL/asm_fork/opengl_const.inc'
+include '../../develop/libraries/TinyGL/asm_fork/examples/fps.inc'
+
+@use_library
+
+align 4
+start:
+	load_library name_tgl, library_path, system_path, import_tinygl
+	cmp eax,SF_TERMINATE_PROCESS
+	jz button.exit
+
+	mcall SF_SET_EVENTS_MASK, 0x27
+
+; *** init ***
+	stdcall [kosglMakeCurrent], 0,15,600,380,ctx1
+
+	stdcall [glMatrixMode], GL_MODELVIEW
+	call    [glLoadIdentity]
+
+	stdcall [glClearColor], 0.549, 0.549, 0.588, 1.0
+
+	stdcall [glEnable], GL_LIGHTING
+	stdcall [glLightf], GL_LIGHT0, GL_SPOT_EXPONENT, 0.0
+	stdcall [glLightf], GL_LIGHT0, GL_SPOT_CUTOFF, 180.0
+	stdcall [glEnable], GL_LIGHT0
+
+	stdcall [glLightfv], GL_LIGHT0, GL_POSITION, lightpos
+	stdcall [glLightfv], GL_LIGHT0, GL_SPOT_DIRECTION, lightdirect
+
+	stdcall [glEnable], GL_COLOR_MATERIAL
+
+	glpush  p3
+	stdcall [glClearDepth]
+	stdcall [glEnable], GL_CULL_FACE
+	stdcall [glEnable], GL_DEPTH_TEST
+
+	fninit
+
+	stdcall reshape, 600,380
+; *** end init ***
+
+
+align 4
+red_win:
+	call draw_window
+	mcall SF_THREAD_INFO, procinfo,-1
+	mov eax,dword[procinfo.box.height]
+	cmp eax,120
+	jge @f
+		mov eax,120 ;min size
+	@@:
+	sub eax,43
+	mov ebx,dword[procinfo.box.width]
+	cmp ebx,200
+	jge @f
+		mov ebx,200
+	@@:
+	sub ebx,10
+	stdcall reshape, ebx,eax
+
+align 16
+still:
+	call draw_3d
+	cmp dword[stop],1
+	je @f
+		stdcall Fps, 365,4
+
+		mov dword[esp-4],eax
+		fild dword[esp-4]
+		fmul dword[delt_3]
+		fchs
+		fadd dword[dangle]
+		fstp dword[dangle] ;dangle -= 0.01*Fps(x,y)
+
+		mcall SF_WAIT_EVENT_TIMEOUT, 1
+		jmp .end0
+align 4
+	@@:
+	mcall SF_WAIT_EVENT
+	.end0:
+	cmp al, EV_REDRAW
+	jz red_win
+	cmp al, EV_KEY
+	jz key
+	cmp al, EV_BUTTON
+	jz button
+
+	jmp still
+
+
+; new window size or exposure
+align 4
+proc reshape, width:dword, height:dword
+locals
+	dxy dq ?
+endl
+	stdcall [glViewport], 0, 0, [width], [height]
+	stdcall [glMatrixMode], GL_PROJECTION
+	call    [glLoadIdentity]
+	fild    dword[width]
+	fidiv   dword[height]
+	fstp    qword[dxy] ;dxy = width/height
+	glpush  p4
+	glpush  p3
+	glpush  dxy
+	glpush  p1
+	call    [gluPerspective] ;28.0, width/height, 1.0, 40.0
+
+	stdcall [glMatrixMode], GL_MODELVIEW
+	stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT
+	ret
+endp
+
+align 4
+draw_window:
+	pushad
+	mcall SF_REDRAW,SSF_BEGIN_DRAW
+
+	mcall SF_CREATE_WINDOW, (50 shl 16)+609,(30 shl 16)+425,0x33404040,,title1
+	call [kosglSwapBuffers]
+
+	;Title
+	mcall SF_DRAW_TEXT, (338 shl 16)+4, 0xc0c0c0, fps,    fps.end-fps
+	mcall SF_DRAW_TEXT,   (8 shl 16)+4, 0xc0c0c0, title2, title2.end-title2
+
+	mcall SF_REDRAW,SSF_END_DRAW
+	popad
+	ret
+
+align 4
+key:
+	mcall SF_GET_KEY
+
+	cmp ah,27 ;Esc
+	je button.exit
+
+	cmp ah,112 ;P
+	jne @f
+		xor dword[stop],1
+		jmp still
+	@@:
+
+	jmp still
+
+align 4
+button:
+	mcall SF_GET_BUTTON
+	cmp ah,1
+	jne still
+.exit:
+	mcall SF_TERMINATE_PROCESS
+
+
+align 4
+title1: db 'TinyGL in KolibriOS'
+.end: db 0
+title2: db 'ESC - exit, P - pause'
+.end: db 0
+fps:  db 'FPS:'
+.end: db 0
+
+align 16
+proc draw_3d uses ebx ecx edx esi edi
+locals
+	z dd ?
+endl
+	call    [glLoadIdentity]
+	stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT
+	stdcall [glTranslatef], 0.0, 0.0, -2.0
+	stdcall [glRotatef], 10.0, 0.0, 0.0, 1.0
+	stdcall [glRotatef], 43.0, 0.0, 1.0, 0.0
+	stdcall [glTranslatef], -0.6, -0.2, -0.1
+
+	mov     edi, logo+9*41 ;edi = logo[9][0]
+	mov     esi, 41        ;esi = i
+align 4
+.cycle0: ;for(int i=0;i<41;i++)
+	stdcall [glTranslatef], 0.045, 0.0, 0.0
+	call    [glPushMatrix]
+	fld     dword[angle]
+	fsin
+	fmul    dword[delt_1]
+	fstp    dword[z] ;= 0.08*sin(angle)
+
+	fld     dword[angle]
+	fadd    dword[delt_2]
+	fstp    dword[angle] ;angle += 0.2
+
+	mov     ecx, 9
+	mov     ebx, edi
+
+; ecx = j
+.cycle1: ;for(int j=9;j>=0;j--)
+	cmp     byte[ebx],0 ;if(logo[j][i])
+	je      @f
+	push    0.0 ;b
+	push    0.0 ;g
+	push    1.0 ;r
+	jmp     .end_c2
+@@:
+	push    0.945 ;b
+	push    0.855 ;g
+	push    0.859 ;r
+.end_c2:
+	call    [glColor3f]
+	stdcall [glTranslatef], 0.0, 0.045, 0.0
+	stdcall [glBegin], GL_QUADS
+	stdcall [glVertex3f], 0.0, -0.04,[z]
+	stdcall [glVertex3f], 0.04,-0.04,[z]
+	stdcall [glVertex3f], 0.04, 0.0, [z]
+	stdcall [glVertex3f], 0.0,  0.0, [z]
+	call    [glEnd]
+	add     ebx, -41
+	dec     ecx
+	jnz     .cycle1
+
+	call    [glPopMatrix]
+	inc     edi ;edi = logo[9][i]
+	dec     esi
+	jnz     .cycle0
+
+	mov     edx,dword[dangle]
+	mov     dword[angle],edx
+	call    [kosglSwapBuffers]
+
+	ret 
+endp
+
+align 4
+p1 dq 28.0
+p3 dq  1.0
+p4 dq 40.0
+       
+delt_1 dd 0.08
+delt_2 dd 0.2
+delt_3 dd 0.01
+
+lightpos dd 2.0, 0.0, -2.5, 1.0
+lightdirect dd 0.0, 0.0, -0.7
+angle dd 0.0
+dangle dd 0.0
+
+stop  dd 0
+
+;[10][41]
+logo db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,\
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+db 0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,1,0,1,0,0,0,0,1,0,1,0,1,0,0,1,1,1,0,0,0,1,1,1,0,0,0,\
+	0,0,1,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,0,0,1,0,1,0,0,0,1,0,0,\
+	0,0,1,0,1,0,0,0,0,1,1,0,0,1,0,1,0,1,1,1,0,0,1,0,0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,\
+	0,0,1,1,1,0,0,0,1,0,0,1,0,1,0,1,0,1,0,0,1,0,1,0,0,0,1,0,1,0,0,0,1,0,0,0,0,1,0,0,0,\
+	0,0,1,0,0,1,0,0,1,0,0,1,0,1,0,1,0,1,0,0,1,0,1,0,0,0,1,0,1,0,0,0,1,0,1,0,0,0,1,0,0,\
+	0,0,1,0,0,0,1,0,0,1,1,0,0,1,0,1,0,0,1,1,0,0,1,0,0,0,1,0,0,1,1,1,0,0,0,1,1,1,0,0,0
+db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,\
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+
+
+;--------------------------------------------------
+align 4
+import_tinygl:
+
+macro E_LIB n
+{
+if defined sz_#n
+	n dd sz_#n
+end if
+}
+include '../../develop/libraries/TinyGL/asm_fork/export.inc'
+	dd 0,0
+macro E_LIB n
+{
+if used n
+	sz_#n db `n,0
+end if
+}
+include '../../develop/libraries/TinyGL/asm_fork/export.inc'
+
+;--------------------------------------------------
+system_path db '/sys/lib/'
+name_tgl db 'tinygl.obj',0
+;--------------------------------------------------
+
+align 16
+i_end:
+ctx1 TinyGLContext
+procinfo process_information 
+cur_dir_path rb 4096
+library_path rb 4096
+	rb 4096
+stacktop:
+mem:
--- a/programs/demos/magnify/trunk/Tupfile.lua
+++ b/programs/demos/magnify/trunk/Tupfile.lua
@@ -1,7 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
-tup.include(HELPERDIR .. "/use_fasm.lua")
-add_include(tup.getvariantdir())
-
-tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en_US" or tup.getconfig("LANG")) .. " > %o", {"lang.inc"})
-tup.rule({"magnify.asm", extra_inputs = {"lang.inc"}}, FASM .. " %f %o " .. tup.getconfig("KPACK_CMD"), "magnify")
--- a/programs/demos/magnify/trunk/build_en.bat
+++ b/programs/demos/magnify/trunk/build_en.bat
@@ -1,6 +0,0 @@
-@erase lang.inc
-@echo lang fix en_US >lang.inc
-@fasm magnify.asm magnify
-@kpack magnify
-@erase lang.inc
-@pause
--- a/programs/demos/magnify/trunk/build_ru.bat
+++ b/programs/demos/magnify/trunk/build_ru.bat
@@ -1,6 +0,0 @@
-@erase lang.inc
-@echo lang fix ru_RU >lang.inc
-@fasm magnify.asm magnify
-@kpack magnify
-@erase lang.inc
-@pause
--- a/programs/demos/magnify/trunk/magnify.asm
+++ b/programs/demos/magnify/trunk/magnify.asm
@@ -1,156 +0,0 @@
-;---------------------------------------------------------------------
-;    MAGNIFY SCREEN v1.0
-;
-;    Version for KolibriOS 2005-2011
-;
-;    Version for Menuet to 2005
-;---------------------------------------------------------------------
-; last update:  08/18/2011
-; changed by:   Marat Zakiyanov aka Mario79, aka Mario
-; changes:      Checking for "rolled up" window
-;---------------------------------------------------------------------
-	use32
-	org     0x0
-	db      'MENUET01'              ; 8 byte id
-	dd      1                       ; header version
-	dd      START                   ; program start
-	dd      I_END                   ; program image size
-	dd      0x1000                  ; required amount of memory
-	dd      0x1000                  ; esp
-	dd      0, 0                    ; no parameters, no path
-;---------------------------------------------------------------------
-include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
-include '..\..\..\macros.inc'
-delay   equ     20
-
-magnify_width = 40
-magnify_height = 30
-;---------------------------------------------------------------------
-START:                          ; start of execution
-redraw:
-	call	draw_window
-still:
-	call	draw_magnify
-wtevent:
-	mcall	23,delay	; wait here for event with timeout
-	dec	eax
-	js	still
-	jz	redraw
-	dec	eax
-	jnz	button
-; key in buffer
-	mov	al, 2
-	mcall
-	jmp	wtevent
-;---------------------------------------------------------------------
-button:
-; we have only one button, close
-	or	eax, -1
-	mcall
-;---------------------------------------------------------------------
-;   *******  WINDOW DEFINITIONS AND DRAW ********
-;---------------------------------------------------------------------
-draw_window:
-	mcall	12,1
-
-	mov	al, 48          ; function 48 : graphics parameters
-	mov	bl, 4           ; subfunction 4 : get skin height
-	mcall
-					; DRAW WINDOW
-	mov	ebx, 100*65536 + 8*magnify_width + 8
-	lea	ecx, [eax + 100*65536 + 8*magnify_height + 3]
-	mov	edx, 0x34000000         ; color of work area RRGGBB
-	mov	edi, labelt             ; header
-	xor	eax, eax                ; function 0 : define and draw window
-	mcall
-
-	mcall	12,2
-	ret
-;---------------------------------------------------------------------
-draw_magnify:
-	mcall	9,procinfo,-1
-	mov	eax,[procinfo+70] ;status of window
-	test	eax,100b
-	jne	.end
-
-	mcall	14	; get screen size
-	movzx	ecx, ax
-	inc	ecx
-	mov	[size_y], ecx
-	shr	eax, 16
-	inc	eax
-	mov	[size_x], eax
-
-	xor	ebx, ebx
-	mcall	37	; get mouse coordinates
-	mov	ecx, eax
-	shr	ecx, 16         ; ecx = x
-	movzx	edx, ax         ; edx = y
-	inc	ecx
-	mov	[m_xe], ecx
-	inc	edx
-	mov	[m_ye], edx
-	sub	ecx, magnify_width
-	sub	edx, magnify_height
-	mov	[m_x], ecx
-	mov	[m_y], edx
-.loop_y:
-.loop_x:
-	xor	eax, eax        ; assume black color for invalid pixels
-	test	ecx, ecx
-	js	.nopix
-	cmp	ecx, [size_x]
-	jge	.nopix
-	test	edx, edx
-	js	.nopix
-	cmp	edx, [size_y]
-	jge	.nopix
-	mov	ebx, edx
-	imul	ebx, [size_x]
-	add	ebx, ecx
-	mcall	35	; read pixel
-.nopix:
-	push	ecx edx
-	sub	ecx, [m_x]
-	sub	edx, [m_y]
-	mov	ebx, ecx
-	shl	ebx, 3+16
-	mov	bl, 8
-	mov	ecx, edx
-	shl	ecx, 3+16
-	mov	cl, 8
-	mov	edx, eax
-	mcall	13
-	pop	edx ecx
-	inc	ecx
-	cmp	ecx, [m_xe]
-	jnz	.loop_x
-	mov	ecx, [m_x]
-	inc	edx
-	cmp	edx, [m_ye]
-	jnz	.loop_y
-.end:
-	ret
-;---------------------------------------------------------------------
-; DATA AREA
-;---------------------------------------------------------------------
-if lang eq ru_RU
-labelt:
-    db   'Magnifier - <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20>㯠', 0
-else ; Default to en_US
-labelt:
-    db   'Magnifier', 0
-end if
-
-I_END:
-align 4
-m_x     dd      ?
-m_y     dd      ?
-m_xe    dd      ?
-m_ye    dd      ?
-size_x  dd      ?
-size_y  dd      ?
-;---------------------------------------------------------------------
-procinfo:
-	rb 1024
-;---------------------------------------------------------------------
--- a/programs/develop/asciivju/trunk/Tupfile.lua
+++ b/programs/develop/asciivju/trunk/Tupfile.lua
--- a/programs/develop/asciivju/trunk/asciivju.asm
+++ b/programs/develop/asciivju/trunk/asciivju.asm
@@ -1,10 +1,14 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+
 use32
    org 0x0
    db  'MENUET01'
    dd  0x01,start,i_end,e_end,e_end,0,0

-include '../../../proc32.inc'
-include '../../../macros.inc'
+include '../../proc32.inc'
+include '../../macros.inc'

 BUTTON_SIDE          = 28      ; button are squares
 BUTTON_SPACE         = 34      ; space between cols and rows
--- a/programs/develop/cObj/trunk/Tupfile.lua
+++ b/programs/develop/cObj/trunk/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())

--- a/programs/develop/cObj/trunk/build_en.bat
+++ b/programs/develop/cObj/trunk/build_en.bat
--- a/programs/develop/cObj/trunk/build_ru.bat
+++ b/programs/develop/cObj/trunk/build_ru.bat
--- a/programs/develop/cObj/trunk/cObj.asm
+++ b/programs/develop/cObj/trunk/cObj.asm
--- a/programs/develop/cedit/CEDIT
+++ b/programs/develop/cedit/CEDIT
--- a/programs/develop/cedit/SRC/CEdit.ob07
+++ b/programs/develop/cedit/SRC/CEdit.ob07
@@ -28,7 +28,7 @@ IMPORT
    RW, Ini, EB := EditBox, Tabs, Toolbar, SB := StatusBar;

 CONST
-    HEADER = "CEdit (27-feb-2025)";
+    HEADER = "CEdit (30-apr-2025)";

    ShellFilter = "";
    EditFilter = "sh|inc|txt|asm|ob07|c|cpp|h|pas|pp|lua|ini|json";
@@ -1320,7 +1320,7 @@ BEGIN
    |menuBoard:
        K.Run("/sys/develop/board", "")
    |menuSysFunc:
-        K.Run("/sys/docpack", "f")
+        K.Run("/sys/docpack", "e")
    |menuLineNumbers:
        T.toggleNumbers;
        Ini.setInt("settings", "line_numbers", ORD(T.lineNumbers))
--- a/programs/develop/charsets/Tupfile.lua
+++ b/programs/develop/charsets/Tupfile.lua
@@ -1,2 +1,4 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("charsets.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "charsets")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
+tup.include(HELPERDIR .. "/use_fasm.lua")
+tup.rule("charsets.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o" .. tup.getconfig("KPACK_CMD"), "%B")
--- a/programs/develop/charsets/changelog.txt
+++ b/programs/develop/charsets/changelog.txt
@@ -31,3 +31,19 @@ Development history
 - Renamed to Charsets Viewer/Charsets
 - Symbol highlight UI tweaks
 - Fixed rolled up bug
+
+30.03.2025 - 0.4.0
+- Localization for all system languages
+- Display all character scales
+- Abolity to copy character codes
+- Block on charpage 00 for CP866
+- New character code half markers
+- Navigation using keys (see hotkeys.txt)
+
+03.04.2025 - 0.4.1
+- Fixed bug with codes color subscription
+
+04.04.2025 - 0.4.2
+- Fixed bug with resetting UTF charpage to zero on double charset swap to CP866
+- Improved charpage blocking for CP866 UX 
+- Improved char codes copying UI
--- a/programs/develop/charsets/charsets.asm
+++ b/programs/develop/charsets/charsets.asm
--- a/programs/develop/charsets/hotkeys.txt
+++ b/programs/develop/charsets/hotkeys.txt
@@ -0,0 +1,12 @@
+Control hotkeys
+
+- Navigate inside charpage:
+  - Arrows
+  - Num2/4/6/8
+
+- Navigation between charpages:
+  - PgDN, PgUP - previous/next page
+  - Num0, Home - reset page to zero
+
+- Change symbol scale:
+  - Num- and Num+
--- a/programs/develop/examples/checkbox/trunk/Tupfile.lua
+++ b/programs/develop/examples/checkbox/trunk/Tupfile.lua
--- a/programs/develop/examples/checkbox/trunk/build_ru.bat
+++ b/programs/develop/examples/checkbox/trunk/build_ru.bat
--- a/programs/develop/examples/checkbox/trunk/check.inc
+++ b/programs/develop/examples/checkbox/trunk/check.inc
--- a/programs/develop/examples/checkbox/trunk/checkbox.asm
+++ b/programs/develop/examples/checkbox/trunk/checkbox.asm
@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;Ž¯â¨¬¨§¨à®¢ ë© ª®¬¯®¥â CheckBox (ˆáå®¤ë© ¢ à¨ â ®â Maxxxx32)
 ;Ž¯â¨¬¨§¨à®¢  ¢ë¢®¤ áâà®ª¨,  ¤¯¨á¨ ¤«ï CheckBox'a + â¥¯¥àì ¯à¨ ¯à®¢¥àª¥ ¥ ;¯à®¨áå®¤¨â ¯®¤áç¥â ª®«-¢  á¨¬¢®«®¢ ¢ áâà®ª¥
 ;Ž¯â¨¬¨§ æ¨ï ª®¬ ¤.
@@ -23,7 +29,7 @@ use32                ;
                 ;    ãª § â¥«ì   áâà®ªã, ¢ ª®â®àãî § ¯¨á  ¯ãâì,
                 ;    ®âªã¤  § ¯ãé¥® ¯à¨«®¦¥¨¥
 ;------------------
-        include '..\..\..\..\macros.inc'
+        include '..\..\..\macros.inc'
        include 'check.inc'     ;¢ª«îç¨âì ä ©« check.inc
 ;        version_ch             ;¥®¡å®¤¨¬ë© ¬ ªà®á ¤«ï ¢ª«îç¥¨ï "áâ à®©" ¢¥àá¨¨ check_box
        version_ch1             ;¥®¡å®¤¨¬ë© ¬ ªà®á ¤«ï ¢ª«îç¥¨ï new ¢¥àá¨¨ check_box1
--- a/programs/develop/examples/circle/trunk/Tupfile.lua
+++ b/programs/develop/examples/circle/trunk/Tupfile.lua
--- a/programs/develop/examples/circle/trunk/build.bat
+++ b/programs/develop/examples/circle/trunk/build.bat
--- a/programs/develop/examples/circle/trunk/circle.asm
+++ b/programs/develop/examples/circle/trunk/circle.asm
@@ -1,3 +1,7 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+
 ;
 ;    SHAPED WINDOW - BASIC EXAMPLE
 ;
@@ -16,7 +20,7 @@ use32
                dd      E_END                   ; esp
                dd      0, 0                    ; no params, no path

-include '..\..\..\..\macros.inc'
+include '..\..\..\macros.inc'



--- a/programs/develop/examples/cpuspeed/trunk/Tupfile.lua
+++ b/programs/develop/examples/cpuspeed/trunk/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())

--- a/programs/develop/examples/cpuspeed/trunk/build_en.bat
+++ b/programs/develop/examples/cpuspeed/trunk/build_en.bat
--- a/programs/develop/examples/cpuspeed/trunk/build_ru.bat
+++ b/programs/develop/examples/cpuspeed/trunk/build_ru.bat
--- a/programs/develop/examples/cpuspeed/trunk/cpuspeed.asm
+++ b/programs/develop/examples/cpuspeed/trunk/cpuspeed.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ;    CPU SPEED INDICATIOR
 ;
@@ -16,7 +19,7 @@
  dd     0x0,0x0                 ; I_Param , I_Icon

 include 'lang.inc'
-include '..\..\..\..\macros.inc'
+include '..\..\..\macros.inc'

 START:                          ; start of execution

@@ -123,4 +126,3 @@ title    db   'CPU SPEED',0
 I_END:

 sc system_colors
-
--- a/programs/develop/examples/editbox/trunk/FAQ.txt
+++ b/programs/develop/examples/editbox/trunk/FAQ.txt
--- a/programs/develop/examples/editbox/trunk/History
+++ b/programs/develop/examples/editbox/trunk/History
--- a/programs/develop/examples/editbox/trunk/Tupfile.lua
+++ b/programs/develop/examples/editbox/trunk/Tupfile.lua
--- a/programs/develop/examples/editbox/trunk/build_ru.bat
+++ b/programs/develop/examples/editbox/trunk/build_ru.bat
--- a/programs/develop/examples/editbox/trunk/editbox.asm
+++ b/programs/develop/examples/editbox/trunk/editbox.asm
@@ -1,9 +1,15 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ;<3B> á¯à®áâà ï¥âáï ¯® «¨æ¥§¨¨ GPL  SEE YOU File FAQ.txt and HISTORY. Good Like!
 ;Ž¯â¨¬¨§¨à®¢ ë© ª®¬¯®¥â EditBox (ˆáå®¤ë© ¢ à¨ â ®â Maxxxx32)
 ;Ž¯â¨¬¨§ æ¨ï ª®¬ ¤.
 ;<Lrz>  - ’¥¯«®¢ €«¥ªá¥©  www.lrz.land.ru
 ;§ £®«®¢®ª ¯à¨«®¦¥¨ï
-        include '..\..\..\..\macros.inc'
+        include '..\..\..\macros.inc'
        include 'editbox.inc'
 KOS_APP_START
 align 4
--- a/programs/develop/examples/editbox/trunk/editbox.inc
+++ b/programs/develop/examples/editbox/trunk/editbox.inc
--- a/programs/develop/examples/editbox/trunk/editbox.mac
+++ b/programs/develop/examples/editbox/trunk/editbox.mac
--- a/programs/develop/examples/example/trunk/build_en.bat
+++ b/programs/develop/examples/example/trunk/build_en.bat
--- a/programs/develop/examples/example/trunk/example.asm
+++ b/programs/develop/examples/example/trunk/example.asm
--- a/programs/develop/examples/example/trunk/rus/build_ru.bat
+++ b/programs/develop/examples/example/trunk/rus/build_ru.bat
--- a/programs/develop/examples/example/trunk/rus/example.asm
+++ b/programs/develop/examples/example/trunk/rus/example.asm
--- a/programs/develop/examples/example2/trunk/Tupfile.lua
+++ b/programs/develop/examples/example2/trunk/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())

--- a/programs/develop/examples/example2/trunk/build_en.bat
+++ b/programs/develop/examples/example2/trunk/build_en.bat
--- a/programs/develop/examples/example2/trunk/build_ru.bat
+++ b/programs/develop/examples/example2/trunk/build_ru.bat
--- a/programs/develop/examples/example2/trunk/dialogs1.inc
+++ b/programs/develop/examples/example2/trunk/dialogs1.inc
--- a/programs/develop/examples/example2/trunk/example2.asm
+++ b/programs/develop/examples/example2/trunk/example2.asm
@@ -1,3 +1,7 @@
+
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;
 ;   MENU / DIALOG EXAMPLE
@@ -18,7 +22,7 @@ use32
               dd     0x0 , 0x0               ; I_Param , I_Icon

 include 'lang.inc'
-include '..\..\..\..\macros.inc'
+include '..\..\..\macros.inc'
 include 'dialogs1.inc'

 menu_history dd 0x0
--- a/programs/develop/examples/example3/trunk/Tupfile.lua
+++ b/programs/develop/examples/example3/trunk/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())

--- a/programs/develop/examples/example3/trunk/build_en.bat
+++ b/programs/develop/examples/example3/trunk/build_en.bat
--- a/programs/develop/examples/example3/trunk/build_ru.bat
+++ b/programs/develop/examples/example3/trunk/build_ru.bat
--- a/programs/develop/examples/example3/trunk/example3.asm
+++ b/programs/develop/examples/example3/trunk/example3.asm
@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 ;
 ;   MENU EXAMPLE
 ;
@@ -13,11 +18,11 @@
  dd     mem, stacktop, file_name, sys_path

 include 'lang.inc'
-include '../../../../macros.inc'
-include '../../../../proc32.inc'
-include '../../../../KOSfuncs.inc'
-include '../../../../load_lib.mac'
-include '../../../../dll.inc'
+include '../../../macros.inc'
+include '../../../proc32.inc'
+include '../../../KOSfuncs.inc'
+include '../../../load_lib.mac'
+include '../../../dll.inc'

 KMENUITEM_NORMAL equ 0
 KMENUITEM_SUBMENU equ 1
--- a/programs/develop/examples/hello/trunk/Tupfile.lua
+++ b/programs/develop/examples/hello/trunk/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())

--- a/programs/develop/examples/hello/trunk/build_en.bat
+++ b/programs/develop/examples/hello/trunk/build_en.bat
--- a/programs/develop/examples/hello/trunk/build_ru.bat
+++ b/programs/develop/examples/hello/trunk/build_ru.bat
--- a/programs/develop/examples/hello/trunk/cmdipc.inc
+++ b/programs/develop/examples/hello/trunk/cmdipc.inc
@@ -1,4 +1,7 @@
-include "..\..\..\..\macros.inc"
+; SPDX-License-Identifier: NOASSERTION
+;
+
+include "..\..\..\macros.inc"

 initipc:
 mov eax,9
@@ -218,4 +221,3 @@ stripc: times 84 db 0
 fill_symbol db 0

 prc: times 52 db 0
-
--- a/programs/develop/examples/hello/trunk/hello.asm
+++ b/programs/develop/examples/hello/trunk/hello.asm
@@ -1,3 +1,9 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
+
 ; Hello, World! - Programm example for CMD shell
 ; Compile with FASM
 ;
--- a/programs/develop/examples/ipc/trunk/Tupfile.lua
+++ b/programs/develop/examples/ipc/trunk/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())

--- a/programs/develop/examples/ipc/trunk/build_en.bat
+++ b/programs/develop/examples/ipc/trunk/build_en.bat
--- a/programs/develop/examples/ipc/trunk/build_ru.bat
+++ b/programs/develop/examples/ipc/trunk/build_ru.bat
--- a/programs/develop/examples/ipc/trunk/ipc.asm
+++ b/programs/develop/examples/ipc/trunk/ipc.asm
@@ -1,10 +1,13 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ;   Example for Inter Process Communication
 ;
 ;   Compile with FASM
 ;
 include 'lang.inc'
-include '..\..\..\..\macros.inc'
+include '..\..\..\macros.inc'

  use32
  org    0x0
--- a/programs/develop/examples/ir/trunk/Tupfile.lua
+++ b/programs/develop/examples/ir/trunk/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())

--- a/programs/develop/examples/ir/trunk/build_en.bat
+++ b/programs/develop/examples/ir/trunk/build_en.bat
--- a/programs/develop/examples/ir/trunk/build_ru.bat
+++ b/programs/develop/examples/ir/trunk/build_ru.bat
--- a/programs/develop/examples/ir/trunk/ir.asm
+++ b/programs/develop/examples/ir/trunk/ir.asm
@@ -1,3 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;
 ;    INFRARED
 ;
@@ -17,7 +20,7 @@ use32
                dd      0, 0


-include '..\..\..\..\macros.inc'
+include '..\..\..\macros.inc'

 START:                          ; start of execution

--- a/programs/develop/examples/numcalc/trunk/@numcalc.asm
+++ b/programs/develop/examples/numcalc/trunk/@numcalc.asm
@@ -1,4 +1,10 @@
-include '..\..\..\..\macros.inc'
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page Windows 1251 - Cyrillic
+
+
+include '..\..\..\macros.inc'
 use32
        db      'MENUET01'
        dd      1
--- a/programs/develop/examples/numcalc/trunk/Tupfile.lua
+++ b/programs/develop/examples/numcalc/trunk/Tupfile.lua
--- a/programs/develop/examples/numcalc/trunk/build.bat
+++ b/programs/develop/examples/numcalc/trunk/build.bat
--- a/programs/develop/examples/radiobutton/trunk/Tupfile.lua
+++ b/programs/develop/examples/radiobutton/trunk/Tupfile.lua
--- a/programs/develop/examples/radiobutton/trunk/optionbox.asm
+++ b/programs/develop/examples/radiobutton/trunk/optionbox.asm
@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; Text encoded with Code Page 866 - Cyrillic
+
 ;ª®¬¯®¥â OptionBox (®á®¢    Checkbox)
 ;Ž£à®¬ ï ¡« £®¤ à®áâì Maxxxx32, Diamond, Heavyiron ¨ ¤àã£¨¬ ¯à®£à ¬¬¨áâ ¬, ¨ ¨å ¯à®£à ¬¬ ¬, ¡¥§
 ;ª®â®àëå ï ¥ á¬®£ ¡ë  ¯¨á âì íâ®â ª®¬¯®¥â.
@@ -23,7 +28,7 @@ use32		;
 		     ;    ãª § â¥«ì   áâà®ªã, ¢ ª®â®àãî § ¯¨á  ¯ãâì,
                 ;    ®âªã¤  § ¯ãé¥® ¯à¨«®¦¥¨¥
 ;------------------
-	include	'..\..\..\..\macros.inc'
+	include	'..\..\..\macros.inc'
 	include 'optionbox.inc'	;¢ª«îç¨âì ä ©« opeck.inc

      version_op              ;¢ à¨ â, ¯à¨ ª®â®à®¬ ¨á¯®«ì§ãîâáï æ¢¥â , ª®â®àë¥ § ¤ ¥â ¯®«ì§®¢ â¥«ì
--- a/programs/develop/examples/radiobutton/trunk/optionbox.bat
+++ b/programs/develop/examples/radiobutton/trunk/optionbox.bat
--- a/programs/develop/examples/radiobutton/trunk/optionbox.inc
+++ b/programs/develop/examples/radiobutton/trunk/optionbox.inc
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew	c3a31e39e4	develop/libraries/box_lib: Post-SVN tidy Some checks failed Build system / Check kernel codestyle (pull_request) Successful in 30s Details Build system / Build (pull_request) Failing after 48s Details - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-25 11:05:56 +01:00
Andrew	c8cc441230	develop/open_watcom: Post-SVN tidy All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 20s Details Build system / Build (pull_request) Successful in 4m19s Details - Move source code from `trunk` into program root directory. - Update build files. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-24 13:38:52 +01:00
Andrew	515d1e92ad	develop/sdk: Post-SVN tidy All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 22s Details Build system / Build (pull_request) Successful in 4m20s Details - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-24 13:31:24 +01:00
Andrew	8afb107ed1	develop/tinypad: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-24 13:21:19 +01:00
Andrew	e90464a2ae	develop/strcode: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-24 13:08:31 +01:00
Andrew	6045e90d24	develop/scancode: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-24 13:04:57 +01:00
Andrew	58f45efc24	develop/ktcc: Post-SVN tidy All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 24s Details Build system / Build (pull_request) Successful in 4m26s Details - Move source code from `trunk` into program root directory. - Update build files and include paths. - These changes also update the CI build files in `.gitea/workflows/`. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-24 12:12:13 +01:00
Andrew	46bcaca0b0	develop/keyascii: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-23 17:39:18 +01:00
Andrew	1d529167e7	develop/heed: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-23 17:29:03 +01:00
Andrew	1de0212bfb	develop/h2d2b: Post-SVN tidy All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 1m4s Details Build system / Build (pull_request) Successful in 5m3s Details - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-23 14:23:38 +01:00
Andrew	b565f7b807	develop/examples/template: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-23 04:15:08 +01:00
Andrew	f861b2020f	develop/examples/rdata: Post-SVN tidy All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 23s Details Build system / Build (pull_request) Successful in 4m14s Details - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-23 04:05:54 +01:00
Andrew	e34ff0ce52	develop/examples/radiobutton: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-23 03:20:02 +01:00
Andrew	bacbce5313	develop/examples/numcalc: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-23 03:10:49 +01:00
Andrew	40105bfb3b	develop/examples/ir: Post-SVN tidy All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 28s Details Build system / Build (pull_request) Successful in 4m16s Details - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-23 00:33:41 +01:00
Andrew	a58359ba87	develop/examples/thread: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-23 00:31:36 +01:00
Andrew	78a82bac5d	develop/examples/ipc: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-23 00:28:07 +01:00
Andrew	396ea0f059	develop/examples/hello: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-23 00:18:50 +01:00
Andrew	5677c7ed46	develop/examples/example3: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-23 00:12:00 +01:00
Andrew	51799b474a	develop/examples/example2: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-23 00:11:11 +01:00
Andrew	d30ed899ba	develop/examples/example: Post-SVN tidy All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 22s Details Build system / Build (pull_request) Successful in 4m18s Details - Move source code from `trunk` into program root directory. - Update build files.	2025-05-22 14:02:40 +01:00
Andrew	befabee761	develop/examples/editbox: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-22 13:58:12 +01:00
Andrew	92b71dacb2	develop/examples/cpuspeed: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-22 13:50:27 +01:00
Andrew	5db678854f	develop/examples/circle: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths.	2025-05-22 13:47:16 +01:00
Andrew	7273186d3d	develop/examples/checkbox: Post-SVN tidy All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 20s Details Build system / Build (pull_request) Successful in 4m14s Details - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-22 12:36:00 +01:00
Andrew	5a96f6efbb	develop/cObj: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files.	2025-05-22 11:41:22 +01:00
Andrew	d49a6b22ff	develop/asciivju: Post-SVN tidy - Move source code from `trunk` into program root directory. - Update build files and ASM include paths. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.	2025-05-22 11:36:12 +01:00
Andrew	7e63294b5e	Post-SVN clean up (#244 ) - Move source code from `trunk` into program root directory. - Fix build and ASM files. - Translated a few RU comments to en_US. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden. (Work towards #75, point 3) Reviewed-on: #244 Reviewed-by: Gleb Zaharov <risdeveau@codrs.ru> Reviewed-by: Burer <burer@kolibrios.org> Co-authored-by: Andrew <dent.ace@gmail.com> Co-committed-by: Andrew <dent.ace@gmail.com>	2025-05-20 17:36:10 +02:00
Burer	c148987224	Libs/http: Added all delim chars from RFC 3986 (#233 ) Original PR: https://github.com/KolibriOS/kolibrios/pull/34 Original issue: https://github.com/KolibriOS/kolibrios/issues/33 Co-authored-by: Sarveshwaar SS <94345639+Saru2003@users.noreply.github.com> Reviewed-on: https://git.kolibrios.org/KolibriOS/kolibrios/pulls/233 Reviewed-by: Mikhail Frolov <mixa.frolov2003@gmail.com> Reviewed-by: IgorA <igora@noreply.localhost> Co-authored-by: Burer <burer@kolibrios.org> Co-committed-by: Burer <burer@kolibrios.org>	2025-05-17 19:11:15 +02:00
Max Logaev	4550e15838	Magnify: Moved to programs/system All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 29s Details Build system / Build (pull_request) Successful in 8m45s Details Signed-off-by: Max Logaev <maxlogaev@proton.me>	2025-05-14 21:58:44 +03:00
Burer	cc867a0bb8	Magnify: Added visual grid. Changed magnify calc and display logic - Fully refactored codestyle; - Changed magnify calculations and display logic, now it is similar to Pipet; - Added proper copyrights; - Localization to all system languages; - Removed redundant .bat files; - Added visual grid (Leency). Co-authored-by: Kiril Lipatov <lipatov.kiril@gmail.com>	2025-05-14 21:58:24 +03:00
leency	16a0ef9543	WebView 3.91 (#230 ) - fix crash at the end of the page https://menuetos.net/docs.htm; - improve position of the line under text (and related code) for a various font sizes; - handle params width= and size= of <hr>; - update acid_0.1.htm page. Reviewed-on: #230 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: leency <lipatov.kiril@gmail.com> Co-committed-by: leency <lipatov.kiril@gmail.com>	2025-05-05 19:04:52 +02:00
Mikhail Frolov	51b150c9aa	Kernel: Fixed bug #221 - accept does not fill sockaddr	2025-05-05 18:14:22 +02:00
IgorA	c18da5afae	TinyGL: Added gluDisk. Fixed args in gluCylinder and gluSphere (#223 ) TinyGL: - Fixed setting of `GL_FRONT_AND_BACK` mode; - Fixed setting of `GL_SPOT_DIRECTION` angle; - Optimization of drawing triangles and lines; - Input parameters are adjusted to the OpenGL standard in `gluCylinder` and `gluSphere` functions; - Added `gluDisk` function (the gluDisk function draws a disk-shaped quadric figure); - Optimize function `calc_buf`. Flag: - Added lighting. info3ds, info3ds_u, test_glu0, test_glu1, test_glu2, textures0, textures1, textures2: - Updated programs using `gluCylinder` and `gluSphere`. Reviewed-on: #223 Reviewed-by: Ivan B <dunkaist@noreply.localhost> Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: IgorA <aie85playm@gmail.com> Co-committed-by: IgorA <aie85playm@gmail.com>	2025-05-04 20:00:04 +02:00
Ivan Baravy	cd1c2ce969	Fix docpack shortcut for sysfuncs in text editors All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 28s Details Build system / Build (pull_request) Successful in 6m54s Details Docpack app has several help files included. Tinypad and CEdit run the app to show one of sysfuncs.txt/sysfuncr.txt files. The text editors pass a one-letter argument to specify the text file. It used to be 'f' for sysfuncs, it has become 'e' recently. Update this one-letter argument both in tinypad and cedit. Resolve #216	2025-04-30 01:50:46 +01:00
IgorA	d7795a8961	Flag: demo program rewritten from C to FASM (#219 ) Original source: http://ftp.kolibrios.org/arch/libraries/TinyGL/examples/flag_src.7z Reviewed-on: #219 Reviewed-by: Max Logaev <maxlogaev@proton.me> Reviewed-by: Ivan B <dunkaist@noreply.localhost> Co-authored-by: IgorA <aie85playm@gmail.com> Co-committed-by: IgorA <aie85playm@gmail.com>	2025-04-22 15:11:55 +02:00
Burer	b948491fb3	Calc+: Fix list buttons UI (#220 ) - Fixed list buttons wrong position and size; - Fixed list buttons logic not working. Reviewed-on: #220 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: Burer <burer@kolibrios.org> Co-committed-by: Burer <burer@kolibrios.org>	2025-04-22 15:01:29 +02:00
IgorA	03cfdeb50f	TinyGL: Bug fixes. info3ds, info3ds_u, vox_tgl: Related changes (#210 ) TinyGL: - The `depth` parameter in the `glClearDepth` function is now `qword` instead of `dword`. - Fixed bug with z-buffer (the edges were cut off incorrectly, the coordinates in it were from 0 to 1, but should be from -1 to 1) - Optimized array functions: `glDrawArrays`, `glDrawElements` info3ds, info3ds_u, vox_tgl: - Removed unnecessary operations after fixing a bug with the z-buffer. Reviewed-on: #210 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: IgorA <aie85playm@gmail.com> Co-committed-by: IgorA <aie85playm@gmail.com>	2025-04-15 14:40:41 +02:00
Kiril Lipatov	e4cd8a4d74	Calc+ v1.0 (#189 ) All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 26s Details Build system / Build (pull_request) Successful in 7m1s Details - Bigger fonts - System colors - Code refactoring to make UI flexible and more readable - Move from ISO to IMG - Add to main menu, add to desktop instead of Calc, remove from App+ - Localization to all system languages - Source code file is now UTF-8 Co-authored-by: Burer <burer@kolibrios.org> Reviewed-on: #189 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: Kiril Lipatov <lipatov.kiril@gmail.com> Co-committed-by: Kiril Lipatov <lipatov.kiril@gmail.com>	2025-04-14 19:46:57 +02:00
IgorA	75b6663ce0	Ftpc: Update (#185 ) - fix for bugs with buffers 'remote_list_buf', 'buf_buffer2'; - fix stack leak when navigating files; - change sorting of folders and files, clean code; - added option to show\|hide log; - icons are taken from @reshare; - added icons to the 'disconnect' and 'search' buttons. Reviewed-on: #185 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: IgorA <aie85playm@gmail.com> Co-committed-by: IgorA <aie85playm@gmail.com>	2025-04-10 18:47:13 +02:00
Burer	df0c5d8f48	Сharsets: Updated to 0.4.2 (#196 ) 30.03.2025 - 0.4.0 - Localization for all system languages - Display all character scales - Abolity to copy character codes - Block on charpage 00 for CP866 - New character code half markers - Navigation using keys (see hotkeys.txt) 03.04.2025 - 0.4.1 - Fixed bug with codes color subscription 04.04.2025 - 0.4.2 - Fixed bug with resetting UTF charpage to zero on double charset swap to CP866 - Improved charpage blocking for CP866 UX - Improved char codes copying UI Reviewed-on: #196 Reviewed-by: Max Logaev <maxlogaev@proton.me> Co-authored-by: Burer <burer@kolibrios.org> Co-committed-by: Burer <burer@kolibrios.org>	2025-04-10 16:24:11 +02:00
leency	fcb9f49785	flood-it: Fixed buttons position (#193 ) Reviewed-on: #193 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 12:32:18 +02:00
leency	d6c44c6570	WebView 3.9 All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 31s Details Build system / Build (pull_request) Successful in 6m27s Details - new homepages - fix clash on a wrong <kosicon> number - set proper internal page sizes	2025-04-03 10:50:04 +02:00
Max Logaev	b8a1487bab	Fixed menu.dat (ru_RU) after moving the period app All checks were successful Build system / Check kernel codestyle (pull_request) Successful in 22s Details Build system / Build (pull_request) Successful in 6m24s Details Signed-off-by: Max Logaev <maxlogaev@proton.me>	2025-04-03 11:29:55 +03:00