webview-3.91

- fix crash on menuetos.net
- 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

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"},
@@ -157,7 +155,7 @@ extra_files = {
  {"kolibrios/3D/info3ds/OBJECTS.PNG", SRC_PROGS .. "/develop/info3ds/objects.png"},
  {"kolibrios/3D/info3ds/TOOLBAR.PNG", SRC_PROGS .. "/develop/info3ds/toolbar.png"},
  {"kolibrios/3D/info3ds/FONT8X9.BMP", SRC_PROGS .. "/fs/kfar/trunk/font8x9.bmp"},
- {"kolibrios/3D/blocks/", "../programs/bcc32/games/blocks/bin/*"},
+ {"kolibrios/3D/blocks/blocks.kex", "../programs/bcc32/games/blocks/bin/blocks.kex"},
  {"kolibrios/3D/blocks/models/", "../programs/bcc32/games/blocks/models/*"},
  {"kolibrios/3D/md2view/", "common/3d/md2view/*"},
  {"kolibrios/3D/md2view/md2_model/", "common/3d/md2view/md2_model/*"},
@@ -412,6 +410,7 @@ tup.append_table(img_files, {
  {"ACLOCK", VAR_PROGS .. "/demos/aclock/aclock"},
  {"APM", VAR_PROGS .. "/system/apm/apm"},
  {"CALC", VAR_PROGS .. "/other/calc/trunk/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"},
@@ -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,13 +628,12 @@ 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"}
 })
 -- For russian build, add russian-only programs.
 if build_type == "ru_RU" then tup.append_table(img_files, {
- {"PERIOD", VAR_PROGS .. "/other/period/trunk/period"},
  {"GAMES/KLAVISHA", VAR_PROGS .. "/games/klavisha/klavisha"},
  {"DEVELOP/EXAMPLES/TESTCON2", VAR_PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"},
 }) else tup.append_table(img_files, {
@@ -642,6 +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/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"},
 }) end
 

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

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

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

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

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

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

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

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

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

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

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

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
 
 ;-----------------------------------------------------------------;

programs/bcc32/games/blocks/Tupfile.lua

@@ -0,0 +1,2 @@
+if tup.getconfig("NO_FASM") ~= "" then return end
+tup.rule("block.asm", "fasm -m 65636 %f %o " .. tup.getconfig("KPACK_CMD"), "block.bin")

programs/bcc32/games/blocks/models/model_8911_bird.bjs

@@ -0,0 +1,229 @@
+// block name, color, step, coord: x,y,z, rotation: x,y,z
+
+const m1=16711680;
+const m2=16776960;
+const m3=655615;
+const m4=65315;
+const m5=16777215;
+const m6=16756655;
+const m7=16776367;
+const m8=0;
+const m9=65498;
+
+model_list=[
+['b2x3x1', m1,  0,  4,-20, 3, 0,0,90],
+['b2x3x1', m1,  0,  4,-12, 3, 0,0,90],
+['b2x3x1', m1,  0,  4, -4, 3, 0,0,90],
+['b2x3x1', m1,  0,  4,  4, 3, 0,0,90],
+['b2x3x1', m1,  0,  4, 12, 3, 0,0,90],
+['t2x3x1', m1,  0,  0, 20, 3, 0,0,90],
+['b1x1x1', m1,  0,  0, 28, 3, 0,0,0],
+['b1x1x1', m1,  0, -8,-16, 3, 0,0,0],
+['b1x1x1', m1,  0,  8,-16, 3, 0,0,0],
+['b2x4x1', m1,  0,-12,-12, 3, 0,0,0],
+['b2x4x1', m1,  0,  8,-12, 3, 0,0,0],
+['l2x2x1', m1,  0, -8,  4, 3, 0,0,90],
+['l2x2x1', m1,  0,  8,  4, 3, 0,0,0],
+['b1x6x1', m1,  1,  0, 20, 6, 0,0,0],
+['b1x6x1', m1,  1, -4, 16, 6, 0,0,0],
+['b1x6x1', m1,  1,  4, 16, 6, 0,0,0],
+['b1x10x1', m1,  1,  0,-24, 6, 0,0,0],
+['b2x8x1', m1,  1, -8,-16, 6, 0,0,0],
+['b2x8x1', m1,  1,  4,-16, 6, 0,0,0],
+['b2x3x1', m1,  1,-16, -8, 6, 0,0,0],
+['b2x3x1', m1,  1, 12, -8, 6, 0,0,0],
+['l2x2x1', m1,  1, -4,-20, 6, 0,0,-180],
+['l2x2x1', m1,  1,-12,-12, 6, 0,0,-180],
+['l2x2x1', m1,  1,-12,  4, 6, 0,0,90],
+['l2x2x1', m1,  1, 12,  4, 6, 0,0,0],
+['l2x2x1', m1,  1, 12,-12, 6, 0,0,-90],
+['l2x2x1', m1,  1,  4,-20, 6, 0,0,-90],
+['b2x3x1', m1,  2,  4,-24, 9, 0,0,90],
+['b1x3x1', m1,  2, -8,-24, 9, 0,0,0],
+['b1x3x1', m1,  2,  8,-24, 9, 0,0,0],
+['b1x4x1', m1,  2,-12,-20, 9, 0,0,0],
+['b1x4x1', m1,  2, 12,-20, 9, 0,0,0],
+['b1x6x1', m1,  2,-16,-16, 9, 0,0,0],
+['b1x6x1', m1,  2, 16,-16, 9, 0,0,0],
+['t2x3x1', m1,  2,-12,  8, 9, 0,0,90],
+['t2x3x1', m1,  2, 12,  8, 9, 0,0,90],
+['b2x4x1', m1,  2,  4, 12, 9, 0,0,90],
+['b1x2x1', m1,  2,  8, 12, 9, 0,0,0],
+['b1x3x1', m2,  2,  4, 20, 9, 0,0,90],
+['b1x3x1', m3,  2,  4, 24, 9, 0,0,90],
+['t2x3x1', m3,  2,  0, 28, 9, 0,0,90],
+['b2x3x1', m1,  3,  0,-28, 12, 0,0,90],
+['b2x2x1', m1,  3,  4,-28, 12, 0,0,0],
+['l2x2x1', m1,  3,-12,-20, 12, 0,0,-180],
+['l2x2x1', m1,  3, 12,-20, 12, 0,0,-90],
+['b2x4x1', m1,  3,-16,-16, 12, 0,0,0],
+['b2x4x1', m1,  3, 12,-16, 12, 0,0,0],
+['b1x3x1', m1,  3,-16,  0, 12, 0,0,0],
+['b1x3x1', m1,  3, 16,  0, 12, 0,0,0],
+['l2x2x1', m1,  3,-12, 12, 12, 0,0,-90],
+['l2x2x1', m1,  3, 12, 12, 12, 0,0,180],
+['b1x2x1', m2,  3, -4, 16, 12, 0,0,90],
+['b1x2x1', m2,  3,  8, 16, 12, 0,0,90],
+['t2x3x1', m3,  3,  0, 20, 12, 0,0,90],
+['b1x3x1', m1,  4,  4,-28, 15, 0,0,90],
+['l2x2x1', m1,  4, -8,-24, 15, 0,0,180],
+['l2x2x1', m1,  4,  8,-24, 15, 0,0,-90],
+['b1x2x1', m1,  4,-12,-20, 15, 0,0,90],
+['b1x2x1', m1,  4, 16,-20, 15, 0,0,90],
+['c1x2x1', m4,  4,-16,-16, 15, 0,0,90],
+['c1x2x1', m4,  4, 20,-16, 15, 0,0,90],
+['b1x4x1', m1,  4,-16,-12, 15, 0,0,0],
+['b1x4x1', m1,  4, 16,-12, 15, 0,0,0],
+['l2x2x1', m1,  4,-12,  4, 15, 0,0,90],
+['l2x2x1', m1,  4, 12,  4, 15, 0,0,0],
+['b1x1x1', m1,  4,-12, 12, 15, 0,0,0],
+['b1x1x1', m1,  4, 12, 12, 15, 0,0,0],
+['l2x2x1', m2,  4, -4, 12, 15, 0,0,90],
+['l2x2x1', m2,  4,  4, 12, 15, 0,0,0],
+['b1x2x1', m2,  4,  0, 16, 15, 0,0,0],
+['b1x6x1', m1,  5,-16,-20, 18, 0,0,0],
+['b1x6x1', m1,  5, 16,-20, 18, 0,0,0],
+['b1x3x1', m1,  5, -8,  4, 18, 0,0,90],
+['b1x3x1', m1,  5, 16,  4, 18, 0,0,90],
+['l2x2x1', m1,  5, -8, 12, 18, 0,0,-90],
+['l2x2x1', m1,  5,  8, 12, 18, 0,0,-180],
+['b1x3x1', m2,  5,  4, 16, 18, 0,0,90],
+['b1x2x1', m1,  5,-12,-24, 18, 0,0,0],
+['b1x2x1', m1,  5, 12,-24, 18, 0,0,0],
+['b2x3x1', m1,  5,  0,-28, 18, 0,0,90],
+['b2x2x1', m1,  5,  4,-28, 18, 0,0,0],
+['t2x3x1', m1,  6,  0,-28, 21, 0,0,90],
+['l2x2x1', m1,  6, -8,-24, 21, 0,0,0],
+['l2x2x1', m1,  6,-16,-20, 21, 0,0,0],
+['l2x2x1', m1,  6,  8,-24, 21, 0,0,90],
+['l2x2x1', m1,  6, 16,-20, 21, 0,0,90],
+['b1x3x1', m1,  6,-16,-12, 21, 0,0,0],
+['b1x3x1', m1,  6, 16,-12, 21, 0,0,0],
+['l2x2x1', m1,  6,-12,  0, 21, 0,0,90],
+['l2x2x1', m1,  6, -8,  8, 21, 0,0,-90],
+['l2x2x1', m1,  6, 12,  0, 21, 0,0,0],
+['l2x2x1', m1,  6,  8,  8, 21, 0,0,-180],
+['b1x3x1', m1,  6, -4, 12, 21, 0,0,-90],
+['b1x1x1', m1,  7, -8,  8, 24, 0,0,0],
+['b2x3x1', m1,  7, -4, 12, 24, 0,0,-90],
+['b1x1x1', m1,  7,  8,  8, 24, 0,0,0],
+['l2x2x1', m1,  7,-12,  4, 24, 0,0,-90],
+['l2x2x1', m1,  7, 12,  4, 24, 0,0,-180],
+['b1x3x1', m1,  7,-16,  0, 24, 0,0,180],
+['b1x3x1', m1,  7, 16,  0, 24, 0,0,180],
+['l2x2x1', m1,  7,-16,-16, 24, 0,0,0],
+['l2x2x1', m1,  7, 16,-16, 24, 0,0,90],
+['l2x2x1', m1,  7, -8,-20, 24, 0,0,180],
+['l2x2x1', m1,  7,  8,-20, 24, 0,0,-90],
+['b1x3x1', m3,  7,  4,-24, 24, 0,0,90],
+['b2x2x1', m5,  8, -8,-24, 27, 0,0,0],
+['b2x3x1', m5,  8,  8,-24, 27, 0,0,90],
+['b1x3x1', m1,  8,-12,-24, 27, 0,0,0],
+['b1x3x1', m1,  8, 12,-24, 27, 0,0,0],
+['b1x4x1', m1,  8,-16,-20, 27, 0,0,0],
+['b1x4x1', m1,  8, 16,-20, 27, 0,0,0],
+['l2x2x1', m1,  8,-16,  0, 27, 0,0,-90],
+['l2x2x1', m1,  8, 16,  0, 27, 0,0,-180],
+['l2x2x1', m1,  8,  8,  4, 27, 0,0,0],
+['b2x4x1', m1,  8,  4,  4, 27, 0,0,90],
+['b1x1x1', m1,  8,-12,  4, 27, 0,0,0],
+['r1x1x1', m5,  9,-16,-20, 30, 0,0,0],
+['r1x1x1', m5,  9, 16,-20, 30, 0,0,0],
+['b1x2x1', m5,  9, -8,-20, 30, 0,0,90],
+['b1x2x1', m5,  9, 12,-20, 30, 0,0,90],
+['t2x3x1', m5,  9,  0,-20, 30, 0,0,-90],
+['r1x1x1', m6,  9,-12,-24, 30, 0,0,0],
+['r1x1x1', m6,  9, 12,-24, 30, 0,0,0],
+['r1x2x1', m7,  9, -4,-28, 30, 0,0,0],
+['r1x2x1', m7,  9,  4,-28, 30, 0,0,0],
+['b1x4x1', m1,  9,-16,-16, 30, 0,0,0],
+['b1x4x1', m1,  9, 16,-16, 30, 0,0,0],
+['l2x2x1', m1,  9,-12,  0, 30, 0,0,90],
+['l2x2x1', m1,  9, 12,  0, 30, 0,0,0],
+['l2x2x1', m1,  9,  8,  8, 30, 0,0,-180],
+['b2x3x1', m1,  9,  0,  4, 30, 0,0,90],
+['l2x2x1', m5,  10, -4,-20, 33, 0,0,-180],
+['l2x2x1', m5,  10,-12,-16, 33, 0,0,-180],
+['l2x2x1', m5,  10,  4,-20, 33, 0,0,-90],
+['l2x2x1', m5,  10, 12,-16, 33, 0,0,-90],
+['a1x2x2', m7,  10,  0,-24, 30, 0,0,-180],
+['r1x2x1', m7,  10,  0,-24, 33, 0,0,0],
+['b1x2x1', m1,  10,-16,-12, 33, 0,0,0],
+['l2x2x1', m1,  10,-16,  0, 33, 0,0,-90],
+['b1x1x1', m1,  10,-12,  4, 33, 0,0,0],
+['b2x4x1', m1,  10,  4,  4, 33, 0,0,90],
+['l2x2x1', m1,  10,  8,  4, 33, 0,0,0],
+['b2x4x1', m1,  10, 12,-12, 33, 0,0,0],
+['b1x1x1', m1, 11,  0,-24, 36, 0,0,0],
+['b1x1x1', m5, 11, -4,-24, 36, 0,0,0],
+['b1x1x1', m5, 11,  4,-24, 36, 0,0,0],
+['b1x1x3', m8, 11, -8,-24, 30, 0,0,0],
+['b1x1x3', m8, 11,  8,-24, 30, 0,0,0],
+['l2x2x1', m5, 11,-12,-20, 36, 0,0,0],
+['l2x2x1', m5, 11, 12,-20, 36, 0,0,90],
+['r1x1x1', m5, 11,-16,-16, 36, 0,0,90],
+['r1x1x1', m5, 11, 16,-16, 36, 0,0,90],
+['b1x4x1', m1, 11,-16,-12, 36, 0,0,0],
+['b2x4x1', m1, 11, 12,-12, 36, 0,0,0],
+['b2x3x1', m1, 11,  4,  0, 36, 0,0,0],
+['l2x2x1', m1, 11, -8,  0, 36, 0,0,90],
+['b1x3x1', m1, 11,  0,  8, 36, 0,0,90],
+['b1x3x1', m1, 12,  4,-24, 39, 0,0,90],
+['r1x1x1', m5, 12, -8,-24, 39, 0,0,0],
+['r1x1x1', m5, 12,  8,-24, 39, 0,0,0],
+['b1x1x1', m5, 12,-12,-20, 39, 0,0,0],
+['b1x6x1', m5, 12, 12,-20, 39, 0,0,90],
+['b1x1x1', m1, 12,-12,-16, 39, 0,0,0],
+['l2x2x1', m1, 12,-16,-12, 39, 0,0,0],
+['l2x2x1', m1, 12,-12, -4, 39, 0,0,90],
+['b1x1x1', m1, 12, -8,  0, 39, 0,0,0],
+['l2x2x1', m1, 12, -4,  4, 39, 0,0,90],
+['l2x2x1', m1, 12,  4,  8, 39, 0,0,-180],
+['b1x1x1', m1, 12,  8,  4, 39, 0,0,0],
+['l2x2x1', m1, 12, 12,  0, 39, 0,0,-180],
+['b1x2x1', m1, 12, 16, -8, 39, 0,0,0],
+['l2x2x1', m1, 12, 12,-12, 39, 0,0,-90],
+['l2x2x1', m1, 13,  4,-20, 42, 0,0,-90],
+['l2x2x1', m1, 13, -4,-24, 42, 0,0,0],
+['b2x6x1', m1, 13,-12,-20, 42, 0,0,0],
+['b1x3x1', m1, 13,  0,  4, 42, 0,0,90],
+['b2x2x1', m1, 13,  4,  0, 42, 0,0,0],
+['b1x6x1', m1, 13, 12,-20, 42, 0,0,0],
+['b1x4x1', m1, 14,-12,-16, 45, 0,0,0],
+['b2x4x1', m1, 14,  4,-20, 45, 0,0,90],
+['b2x6x1', m1, 14, 12,-12, 45, 0,0,90],
+['b2x4x1', m1, 14,  4, -4, 45, 0,0,90],
+['b1x3x1', m1, 14,  4,  4, 45, 0,0,90],
+['l2x2x1', m1, 14,  8, -4, 45, 0,0,0],
+['l2x2x1', m1, 14,  8,-16, 45, 0,0,-90],
+['b2x4x1', m1, 15, -4,-16, 48, 0,0,0],
+['b1x3x1', m1, 15, -8,-12, 48, 0,0,0],
+['b1x3x1', m1, 15,  4,  0, 48, 0,0,90],
+['b2x2x1', m1, 15,  4, -8, 48, 0,0,0],
+['l2x2x1', m1, 15,  4,-12, 48, 0,0,-90],
+['b1x3x1', m2, 16,  8,-12, 0, 0,0,0],
+['b1x3x1', m2, 16, -8,-12, 0, 0,0,0],
+['c1x2x1', m9, 17, 20,-16, 12, 0,0,0],
+['b1x6x1', m4, 17,  0,  8, 0, 0,0,0, 1],
+['b1x6x1', m9, 17,  0,  4, -3, 0,0,0, 1],
+['b1x3x1', m4, 18,  0,  4, 3, 0,0,0, 1],
+['b1x3x1', m2, 18,  0, 16, 3, 0,0,0, 1],
+['c1x2x1', m4, 18,  0,  0, 6, 0,0,0, 1],
+['b1x1x1', m4, 18,  0,  8, 6, 0,0,0, 1],
+['b1x2x1', m2, 18,  0, 12, 6, 0,0,0, 1],
+['b1x3x1', m2, 18,  0,  4, 9, 0,0,0, 1],
+['c1x2x1', m9, 17, -20,-16, 12, 0,0,0],
+['b1x6x1', m4, 17,  0,  8, 0, 0,0,0, 1],
+['b1x6x1', m9, 17,  0,  4, -3, 0,0,0, 1],
+['b1x3x1', m4, 18,  0,  4, 3, 0,0,0, 1],
+['b1x3x1', m2, 18,  0, 16, 3, 0,0,0, 1],
+['c1x2x1', m4, 18,  0,  0, 6, 0,0,0, 1],
+['b1x1x1', m4, 18,  0,  8, 6, 0,0,0, 1],
+['b1x2x1', m2, 18,  0, 12, 6, 0,0,0, 1],
+['b1x3x1', m2, 18,  0,  4, 9, 0,0,0, 1],
+];
+
+model_animat=[
+[192,'rotation','z','Left', -1.570796327, 0, 0.017453293],
+[201,'rotation','z','Right', 0, 1.570796327, 0.017453293],
+];

programs/bcc32/games/blocks/models/model_a8404_castle_Neuschwanstein.bjs

@@ -0,0 +1,531 @@
+// block name, color, step, coord: x,y,z, rotation: x,y,z
+
+const m1=32768;
+const m2=9474192;
+const m3=16777215;
+const m4=2164260863;
+const m5=655615;
+const m6=255;
+const m7=16776960;
+const m8=10824234;
+const m9=16384;
+const m10=0xc97e3b;
+
+model_list=[
+['b2x4x1', m2,  0,-28, -4, 6, 0,0,90],
+['b2x3x1', m2,  0,-40,  4, 6, 0,0,0],
+['b2x3x1', m2,  0,-32,  8, 6, 0,0,0],
+['b2x6x1', m2,  0, -4,  8, 6, 0,0,90],
+['b1x3x1', m2,  0, -4,  4, 6, 0,0,90],
+['b2x4x1', m2,  0, -4, -4, 6, 0,0,90],
+['b1x2x1', m2,  0, -8, -8, 6, 0,0,90],
+['b2x3x1', m2,  0,-24, -8, 6, 0,0,0],
+['b2x4x1', m2,  1,-12, -8, 9, 0,0,0],
+['b2x2x1', m2,  1,-20, -4, 9, 0,0,0],
+['b1x2x1', m2,  1,-20, -8, 9, 0,0,90],
+['b2x3x1', m2,  1,-24, -4, 9, 0,0,90],
+['b2x3x1', m2,  1,-40, -4, 9, 0,0,0],
+['b1x2x1', m2,  1,-40,  8, 9, 0,0,0],
+['b2x4x1', m2,  1,-24,  8, 9, 0,0,90],
+['b1x2x1', m2,  1,-28, 16, 9, 0,0,90],
+['l2x2x1', m2,  2,  0,-12, 6, 0,0,-90],
+['l2x2x1', m2,  2,  8,-12, 6, 0,0,-90],
+['b2x4x1', m2,  2, 12, -8, 6, 0,0,90],
+['b2x4x1', m2,  2, 12,  0, 6, 0,0,90],
+['b2x4x1', m2,  2, 12,  8, 6, 0,0,90],
+['b2x4x1', m2,  2, 12, 16, 6, 0,0,90],
+['b2x4x1', m2,  2, 28, 16, 6, 0,0,90],
+['b2x4x1', m2,  2, 28,  8, 6, 0,0,90],
+['b2x4x1', m2,  2, 28,  0, 6, 0,0,90],
+['b1x4x1', m2,  2, 28, -4, 6, 0,0,90],
+['b1x2x1', m2,  2, 24, -8, 6, 0,0,90],
+['b2x2x1', m3,  3, 20, 16, 9, 0,0,0],
+['b2x2x1', m2,  3, 12, 16, 9, 0,0,0],
+['b1x3x1', m2,  3, 20, 12, 9, 0,0,90],
+['b1x2x1', m2,  3, 20,  4, 9, 0,0,0],
+['b1x3x1', m2,  3, 20, -8, 9, 0,0,0],
+['l2x2x1', m2,  3, 24, -4, 9, 0,0,-90],
+['b2x4x1', m2,  3, 12, -4, 9, 0,0,0],
+['b2x6x1', m2,  3,  4, -4, 9, 0,0,0],
+['b1x2x1', m2,  3,  8, 20, 9, 0,0,90],
+['b1x2x1', m2,  3,  0, 16, 9, 0,0,0],
+['b2x6x1', m2,  3,  0,  8, 9, 0,0,90],
+['b2x3x1', m2,  3, -4, -4, 9, 0,0,0],
+['b2x4x1', m2,  3, 12,-12, 9, 0,0,90],
+['b1x1x1', m2,  3,  8,-16, 9, 0,0,0],
+['b1x1x1', m2,  3,  0,-16, 9, 0,0,0],
+['b1x4x1', m2,  4,-28, -4, 3, 0,0,90],
+['b1x4x1', m2,  4,-40,  0, 3, 0,0,0],
+['b1x4x1', m2,  4,-24, 12, 3, 0,0,90],
+['b1x2x1', m2,  4,-28, 16, 3, 0,0,90],
+['b1x4x1', m2,  4, -8, 12, 3, 0,0,90],
+['l2x2x1', m2,  4,  0, 12, 3, 0,0,90],
+['b1x4x1', m2,  4, 12, 20, 3, 0,0,90],
+['b1x3x1', m2,  4, 24, 20, 3, 0,0,90],
+['b1x3x1', m2,  4, 28, 12, 3, 0,0,0],
+['b1x3x1', m2,  4, 28,  0, 3, 0,0,0],
+['b1x4x1', m2,  4, 28, -4, 3, 0,0,90],
+['b1x2x1', m2,  4, 24, -8, 3, 0,0,90],
+['b1x3x1', m2,  4, 12,-12, 3, 0,0,0],
+['l2x2x1', m2,  4,  8,-12, 3, 0,0,-180],
+['b1x4x1', m2,  4,  0,-16, 3, 0,0,0],
+['b1x2x1', m2,  4, -4, -4, 3, 0,0,90],
+['b1x2x1', m2,  4, -8, -8, 3, 0,0,90],
+['b1x4x1', m2,  4,-12, -4, 3, 0,0,90],
+['b1x2x1', m2,  4,-20, -8, 3, 0,0,90],
+['b20x20x1', m1,  5,-40,-40, 0, 0,0,0],
+['b1x4x1', m3,  6,-28, -4, 12, 0,0,90],
+['b2x4x1', m2,  6,-40,  0, 12, 0,0,0],
+['b2x4x1', m2,  6,-32,  4, 12, 0,0,0],
+['b2x6x1', m2,  6,-24, -8, 12, 0,0,0],
+['b2x4x1', m2,  6, -4,  8, 12, 0,0,90],
+['b2x4x1', m2,  6, -4, -4, 12, 0,0,90],
+['b1x2x1', m2,  6, -8, -8, 12, 0,0,90],
+['b1x3x1', m2,  6,  0, -8, 12, 0,0,0],
+['b1x2x1', m2,  6,  0,-16, 12, 0,0,0],
+['b1x2x1', m2,  6,  4,-12, 12, 0,0,0],
+['b1x4x1', m2,  6,  8,-16, 12, 0,0,0],
+['b1x4x1', m2,  6, 12,-12, 12, 0,0,0],
+['b1x2x1', m2,  6, 20, -4, 12, 0,0,90],
+['b1x2x1', m2,  6, 24, -8, 12, 0,0,90],
+['b2x4x1', m2,  6, 16,  0, 12, 0,0,0],
+['b1x2x1', m2,  6, 16, 16, 12, 0,0,0],
+['b2x2x1', m3,  6, 20, 16, 12, 0,0,0],
+['b2x4x1', m2,  6,  8,  8, 12, 0,0,0],
+['b2x4x1', m2,  6,  0,  8, 12, 0,0,0],
+['b2x6x1', m3,  7, 24, 16, 15, 0,0,90],
+['b1x2x1', m3,  7,  0, 16, 15, 0,0,0],
+['b1x4x1', m2,  7, 20,  0, 15, 0,0,0],
+['b1x4x1', m2,  7, 16, 12, 15, 0,0,90],
+['b2x4x1', m2,  7, 16,  4, 15, 0,0,90],
+['b2x4x1', m2,  7, 16, -4, 15, 0,0,90],
+['b2x4x1', m2,  7, -4,  0, 15, 0,0,0],
+['b1x4x1', m2,  7, -8, 12, 15, 0,0,90],
+['b1x4x1', m3,  7,-24, 12, 15, 0,0,90],
+['b1x3x1', m3,  7,-40,  4, 15, 0,0,0],
+['l2x2x1', m3,  7,-40, -4, 15, 0,0,0],
+['b1x4x1', m3,  7,-20, -4, 15, 0,0,90],
+['l2x2x1', m2,  7,-12, -4, 15, 0,0,180],
+['l2x2x1', m2,  7, -8, -4, 15, 0,0,-90],
+['b1x4x1', m2,  7,  0,-16, 15, 0,0,0],
+['b1x2x1', m2,  7,  4,-12, 15, 0,0,0],
+['b1x2x1', m2,  7,  8,-16, 15, 0,0,0],
+['b1x2x1', m2,  7, 12,-12, 15, 0,0,0],
+['b1x1x1', m3,  8, 24, 16, 18, 0,0,0],
+['c1x1x1', m4,  8, 24, 20, 18, 0,0,0],
+['b2x2x1', m3,  8, 16, 16, 18, 0,0,0],
+['c1x1x1', m4,  8, 12, 20, 18, 0,0,0],
+['c1x1x1', m4,  8, 12, 16, 18, 0,0,0],
+['b1x2x1', m3,  8,  8, 16, 18, 0,0,0],
+['c1x1x1', m4,  8,  4, 20, 18, 0,0,0],
+['c1x1x1', m4,  8,  4, 16, 18, 0,0,0],
+['b1x2x1', m3,  8,  0, 16, 18, 0,0,0],
+['b1x2x1', m3,  8, -4, 12, 18, 0,0,90],
+['b1x4x1', m3,  8,-12, 12, 18, 0,0,90],
+['b1x4x1', m3,  8,-28, 12, 18, 0,0,90],
+['b1x4x1', m3,  8,-40, -4, 18, 0,0,0],
+['b1x4x1', m3,  8,-24, -4, 18, 0,0,90],
+['b1x2x1', m3,  8,-16, -4, 18, 0,0,90],
+['b2x2x1', m3,  8,-12, -8, 18, 0,0,0],
+['b1x4x1', m3,  8, -4, -4, 18, 0,0,0],
+['b2x4x1', m3,  8, 12,-12, 18, 0,0,90],
+['b1x1x1', m3,  8,  0,-16, 18, 0,0,0],
+['b1x1x1', m3,  8,  8,-16, 18, 0,0,0],
+['b2x2x1', m3,  9, 20, 16, 21, 0,0,0],
+['b1x2x1', m5,  9, 16, 16, 21, 0,0,0],
+['b2x2x1', m3,  9,  8, 16, 21, 0,0,0],
+['b2x2x1', m5,  9,  0, 16, 21, 0,0,0],
+['b1x1x1', m3,  9, -4, 12, 21, 0,0,0],
+['c1x1x1', m4,  9, -8, 12, 21, 0,0,0],
+['b1x1x1', m3,  9,-12, 12, 21, 0,0,0],
+['c1x1x1', m4,  9,-16, 12, 21, 0,0,0],
+['b1x1x1', m3,  9,-20, 12, 21, 0,0,0],
+['c1x1x1', m4,  9,-24, 12, 21, 0,0,0],
+['b1x2x1', m3,  9,-28, 12, 21, 0,0,90],
+['c1x1x1', m4,  9,-36, 12, 21, 0,0,0],
+['b1x1x1', m3,  9,-40, 12, 21, 0,0,0],
+['b2x3x1', m3,  9,-44,  0, 21, 0,0,0],
+['b1x1x1', m3,  9,-40, -4, 21, 0,0,0],
+['c1x1x1', m4,  9,-36, -4, 21, 0,0,0],
+['b1x1x1', m3,  9,-32, -4, 21, 0,0,0],
+['c1x1x1', m4,  9,-28, -4, 21, 0,0,0],
+['b1x2x1', m3,  9,-20, -4, 21, 0,0,90],
+['c1x1x1', m4,  9,-16, -4, 21, 0,0,0],
+['b1x2x1', m3,  9,-12, -8, 21, 0,0,0],
+['c1x1x1', m4,  9, -8, -8, 21, 0,0,0],
+['b1x2x1', m3,  9, -4, -4, 21, 0,0,90],
+['c1x1x1', m4,  9, -4,  0, 21, 0,0,0],
+['b1x1x1', m3,  9, -4,  4, 21, 0,0,0],
+['c1x1x1', m4,  9, -4,  8, 21, 0,0,0],
+['b2x4x1', m3,  9, 12,-12, 21, 0,0,90],
+['c1x1x1', m4,  9,  0,-16, 21, 0,0,0],
+['c1x1x1', m4,  9,  8,-16, 21, 0,0,0],
+['c1x1x1', m4, 10, 24, 20, 24, 0,0,0],
+['l2x2x1', m3, 10, 20, 16, 24, 0,0,0],
+['c1x1x1', m4, 10, 12, 20, 24, 0,0,0],
+['c1x1x1', m4, 10,  8, 20, 24, 0,0,0],
+['c1x1x1', m4, 10,  8, 16, 24, 0,0,0],
+['c1x1x1', m4, 10, 12, 16, 24, 0,0,0],
+['b1x4x1', m3, 10, -4,  0, 24, 0,0,0],
+['b1x4x1', m3, 10, -8, 12, 24, 0,0,90],
+['b1x4x1', m3, 10,-24, 12, 24, 0,0,90],
+['b1x4x1', m3, 10,-40,  0, 24, 0,0,0],
+['c1x1x1', m4, 10,-44,  8, 24, 0,0,0],
+['c1x1x1', m4, 10,-44,  4, 24, 0,0,0],
+['c1x1x1', m4, 10,-44,  0, 24, 0,0,0],
+['b1x2x1', m3, 10,-36, -4, 24, 0,0,90],
+['b1x4x1', m3, 10,-20, -4, 24, 0,0,90],
+['b1x4x1', m3, 10, -4, -4, 24, 0,0,90],
+['b1x2x1', m3, 10, -8, -8, 24, 0,0,90],
+['l2x2x1', m3, 10,  4, -8, 24, 0,0,180],
+['b1x2x1', m5, 10,  0,-16, 24, 0,0,0],
+['l2x2x1', m3, 10, 12, -8, 24, 0,0,180],
+['b1x2x1', m5, 10,  8,-16, 24, 0,0,0],
+['b2x2x1', m3, 11, 24, 16, 27, 0,0,90],
+['b2x2x1', m5, 11,  8, 16, 27, 0,0,0],
+['b1x1x1', m3, 11, -4, 12, 27, 0,0,0],
+['c1x1x1', m4, 11, -8, 12, 27, 0,0,0],
+['b1x1x1', m3, 11,-12, 12, 27, 0,0,0],
+['c1x1x1', m4, 11,-16, 12, 27, 0,0,0],
+['b1x1x1', m3, 11,-20, 12, 27, 0,0,0],
+['c1x1x1', m4, 11,-24, 12, 27, 0,0,0],
+['b1x2x1', m3, 11,-28, 12, 27, 0,0,90],
+['c1x1x1', m4, 11,-36, 12, 27, 0,0,0],
+['b1x1x1', m3, 11,-40, 12, 27, 0,0,0],
+['b2x3x1', m3, 11,-44,  0, 27, 0,0,0],
+['b1x1x1', m3, 11,-40, -4, 27, 0,0,0],
+['c1x1x1', m4, 11,-36, -4, 27, 0,0,0],
+['b1x1x1', m3, 11,-32, -4, 27, 0,0,0],
+['c1x1x1', m4, 11,-28, -4, 27, 0,0,0],
+['b1x2x1', m3, 11,-20, -4, 27, 0,0,90],
+['c1x1x1', m4, 11,-16, -4, 27, 0,0,0],
+['b1x2x1', m3, 11,-12, -8, 27, 0,0,0],
+['c1x1x1', m4, 11, -8, -8, 27, 0,0,0],
+['b1x2x1', m3, 11, -4, -4, 27, 0,0,90],
+['c1x1x1', m4, 11, -4,  0, 27, 0,0,0],
+['b1x1x1', m3, 11, -4,  4, 27, 0,0,0],
+['c1x1x1', m4, 11, -4,  8, 27, 0,0,0],
+['b1x2x1', m5, 11,  0,-12, 27, 0,0,0],
+['c1x1x1', m5, 11,  0,-16, 27, 0,0,0],
+['f1x2x1', m5, 11,  4,-12, 27, 0,0,0],
+['f1x2x1', m5, 11,  8,-12, 27, 0,0,0],
+['c1x1x1', m5, 11,  8,-16, 27, 0,0,0],
+['b1x2x1', m5, 11, 12,-12, 27, 0,0,0],
+['b2x2x1', m3, 12, 20, 16, 30, 0,0,0],
+['b1x4x1', m3, 12, -4,  0, 30, 0,0,0],
+['b1x4x1', m3, 12, -8, 12, 30, 0,0,90],
+['b1x4x1', m3, 12,-24, 12, 30, 0,0,90],
+['b1x4x1', m3, 12,-40,  0, 30, 0,0,0],
+['c1x1x1', m4, 12,-44,  8, 30, 0,0,0],
+['c1x1x1', m4, 12,-44,  4, 30, 0,0,0],
+['c1x1x1', m4, 12,-44,  0, 30, 0,0,0],
+['b1x2x1', m3, 12,-36, -4, 30, 0,0,90],
+['b1x4x1', m3, 12,-20, -4, 30, 0,0,90],
+['b1x4x1', m3, 12, -4, -4, 30, 0,0,90],
+['b1x2x1', m3, 12, -8, -8, 30, 0,0,90],
+['b1x2x1', m5, 12,  8,-10, 30, 0,0,90],
+['b2x2x1', m3, 13, -4, 12, 33, 0,0,0],
+['c1x1x1', m4, 13, -8, 12, 33, 0,0,0],
+['b1x1x1', m3, 13,-12, 12, 33, 0,0,0],
+['c1x1x1', m4, 13,-16, 12, 33, 0,0,0],
+['b1x1x1', m3, 13,-20, 12, 33, 0,0,0],
+['c1x1x1', m4, 13,-24, 12, 33, 0,0,0],
+['b1x2x1', m3, 13,-28, 12, 33, 0,0,90],
+['c1x1x1', m4, 13,-36, 12, 33, 0,0,0],
+['b1x1x1', m3, 13,-40, 12, 33, 0,0,0],
+['b2x3x1', m3, 13,-44,  0, 33, 0,0,0],
+['b1x1x1', m3, 13,-40, -4, 33, 0,0,0],
+['c1x1x1', m4, 13,-36, -4, 33, 0,0,0],
+['b1x1x1', m3, 13,-32, -4, 33, 0,0,0],
+['c1x1x1', m4, 13,-28, -4, 33, 0,0,0],
+['b1x2x1', m3, 13,-20, -4, 33, 0,0,90],
+['c1x1x1', m4, 13,-16, -4, 33, 0,0,0],
+['b1x2x1', m3, 13,-12, -8, 33, 0,0,0],
+['c1x1x1', m4, 13, -8, -8, 33, 0,0,0],
+['b1x1x1', m3, 13, -8, -4, 33, 0,0,90],
+['c1x1x1', m4, 13, -4,  0, 33, 0,0,0],
+['b1x1x1', m3, 13, -4,  4, 33, 0,0,0],
+['c1x1x1', m4, 13, -4,  8, 33, 0,0,0],
+['b2x2x1', m3, 13, -4, -8, 33, 0,0,0],
+['b2x4x1', m3, 13, 28, 16, 33, 0,0,90],
+['b1x2x1', m3, 14, 24, 12, 33, 0,0,90],
+['b1x2x1', m3, 14, 24, 24, 33, 0,0,90],
+['b2x4x1', m6, 14, 20, 12, 36, 0,0,0],
+['b1x2x1', m6, 14, 28, 16, 36, 0,0,0],
+['b1x2x1', m6, 14, 16, 16, 36, 0,0,0],
+['c1x1x1', m4, 14,  0, 16, 36, 0,0,0],
+['b1x1x1', m3, 14, -4, 16, 36, 0,0,0],
+['b1x1x1', m3, 14,  0, 12, 36, 0,0,0],
+['b1x4x1', m3, 14, -8, 12, 36, 0,0,90],
+['b1x4x1', m3, 14,-24, 12, 36, 0,0,90],
+['b1x4x1', m3, 14,-40,  0, 36, 0,0,0],
+['b1x2x1', m3, 14,-36, -4, 36, 0,0,90],
+['b1x4x1', m3, 14,-20, -4, 36, 0,0,90],
+['b1x4x1', m3, 14, -4, -4, 36, 0,0,90],
+['b1x4x1', m3, 14, -4,  0, 36, 0,0,0],
+['b1x1x1', m3, 14,  0, -4, 36, 0,0,0],
+['c1x1x1', m4, 14,  0, -8, 36, 0,0,0],
+['b1x1x1', m3, 14, -4, -8, 36, 0,0,0],
+['b1x2x1', m6, 14, -8, -8, 36, 0,0,90],
+['b2x2x1', m3, 15, -4, 12, 39, 0,0,0],
+['c1x1x1', m4, 15, -8, 12, 39, 0,0,0],
+['b1x1x1', m3, 15,-12, 12, 39, 0,0,0],
+['c1x1x1', m4, 15,-16, 12, 39, 0,0,0],
+['b1x1x1', m3, 15,-20, 12, 39, 0,0,0],
+['c1x1x1', m4, 15,-24, 12, 39, 0,0,0],
+['b1x2x1', m3, 15,-28, 12, 39, 0,0,90],
+['c1x1x1', m4, 15,-36, 12, 39, 0,0,0],
+['b1x1x1', m3, 15,-40, 12, 39, 0,0,0],
+['b1x1x1', m3, 15,-40,  4, 39, 0,0,0],
+['b1x1x1', m3, 15,-40, -4, 39, 0,0,0],
+['c1x1x1', m4, 15,-36, -4, 39, 0,0,0],
+['b1x1x1', m3, 15,-32, -4, 39, 0,0,0],
+['c1x1x1', m4, 15,-28, -4, 39, 0,0,0],
+['b1x2x1', m3, 15,-20, -4, 39, 0,0,90],
+['c1x1x1', m4, 15,-16, -4, 39, 0,0,0],
+['b1x1x1', m3, 15,-12, -4, 39, 0,0,0],
+['c1x1x1', m4, 15,-40,  8, 39, 0,0,0],
+['c1x1x1', m4, 15, -4,  0, 39, 0,0,0],
+['b1x1x1', m3, 15, -4,  4, 39, 0,0,0],
+['c1x1x1', m4, 15, -4,  8, 39, 0,0,0],
+['b2x2x1', m3, 15, -4, -8, 39, 0,0,0],
+['c1x1x1', m4, 15,-40,  0, 39, 0,0,0],
+['c1x1x1', m4, 15, -8, -4, 39, 0,0,0],
+['c1x1x1', m4, 16,  0, 16, 42, 0,0,0],
+['b1x1x1', m3, 16, -4, 16, 42, 0,0,0],
+['b1x1x1', m3, 16,  0, 12, 42, 0,0,0],
+['b1x4x1', m3, 16, -8, 12, 42, 0,0,90],
+['b1x4x1', m3, 16,-24, 12, 42, 0,0,90],
+['b1x4x1', m3, 16,-40,  0, 42, 0,0,0],
+['b1x2x1', m3, 16,-36, -4, 42, 0,0,90],
+['b1x4x1', m3, 16,-20, -4, 42, 0,0,90],
+['b1x4x1', m3, 16, -4, -4, 42, 0,0,90],
+['b1x4x1', m3, 16, -4,  0, 42, 0,0,0],
+['b1x1x1', m3, 16,  0, -4, 42, 0,0,0],
+['c1x1x1', m4, 16,  0, -8, 42, 0,0,0],
+['b1x1x1', m3, 16, -4, -8, 42, 0,0,0],
+['b2x2x1', m3, 17, -4, 12, 45, 0,0,0],
+['b2x3x1', m6, 17, -8, 12, 45, 0,0,90],
+['b2x2x1', m6, 17,-24, 12, 45, 0,0,0],
+['b1x2x1', m6, 17,-28, 12, 45, 0,0,90],
+['b2x2x1', m6, 17,-40, 12, 45, 0,0,0],
+['b1x1x1', m3, 17,-40,  8, 45, 0,0,0],
+['c1x1x1', m4, 17,-40,  4, 45, 0,0,0],
+['b1x1x1', m3, 17,-40,  0, 45, 0,0,0],
+['b2x4x1', m6, 17,-28, -8, 45, 0,0,90],
+['b1x2x1', m6, 17,-20, -4, 45, 0,0,90],
+['b2x3x1', m6, 17, -8, -8, 45, 0,0,90],
+['b2x2x1', m3, 17, -4, -8, 45, 0,0,0],
+['b1x1x1', m3, 17, -4,  0, 45, 0,0,0],
+['c1x1x1', m4, 17, -4,  4, 45, 0,0,0],
+['b1x1x1', m3, 17, -4,  8, 45, 0,0,0],
+['c1x1x1', m3, 18,-24, -8, 15, 0,0,0],
+['c1x1x1', m3, 18,-20, -8, 15, 0,0,0],
+['c1x1x1', m3, 18,-32, 16, 15, 0,0,0],
+['c1x1x1', m3, 18,-28, 16, 15, 0,0,0],
+['c1x1x1', m3, 18,-24, -8, 18, 0,0,0],
+['c1x1x1', m3, 18,-20, -8, 18, 0,0,0],
+['c1x1x1', m3, 18,-32, 16, 18, 0,0,0],
+['c1x1x1', m3, 18,-28, 16, 18, 0,0,0],
+['c1x1x1', m3, 18,-24, -8, 21, 0,0,0],
+['c1x1x1', m3, 18,-20, -8, 21, 0,0,0],
+['c1x1x1', m3, 18,-32, 16, 21, 0,0,0],
+['c1x1x1', m3, 18,-28, 16, 21, 0,0,0],
+['c1x1x1', m4, 19,-24, -8, 24, 0,0,0],
+['c1x1x1', m4, 19,-20, -8, 24, 0,0,0],
+['c1x1x1', m4, 19,-32, 16, 24, 0,0,0],
+['c1x1x1', m4, 19,-28, 16, 24, 0,0,0],
+['c1x1x1', m3, 19,-24, -8, 27, 0,0,0],
+['c1x1x1', m3, 19,-20, -8, 27, 0,0,0],
+['c1x1x1', m3, 19,-32, 16, 27, 0,0,0],
+['c1x1x1', m3, 19,-28, 16, 27, 0,0,0],
+['c1x1x1', m3, 19,-24, -8, 30, 0,0,0],
+['c1x1x1', m3, 19,-20, -8, 30, 0,0,0],
+['c1x1x1', m3, 19,-32, 16, 30, 0,0,0],
+['c1x1x1', m3, 19,-28, 16, 30, 0,0,0],
+['c1x1x1', m4, 20,-24, -8, 33, 0,0,0],
+['c1x1x1', m4, 20,-20, -8, 33, 0,0,0],
+['c1x1x1', m4, 20,-32, 16, 33, 0,0,0],
+['c1x1x1', m4, 20,-28, 16, 33, 0,0,0],
+['c1x1x1', m3, 20,-24, -8, 36, 0,0,0],
+['c1x1x1', m3, 20,-20, -8, 36, 0,0,0],
+['c1x1x1', m3, 20,-32, 16, 36, 0,0,0],
+['c1x1x1', m3, 20,-28, 16, 36, 0,0,0],
+['c1x1x1', m3, 20,-24, -8, 39, 0,0,0],
+['c1x1x1', m3, 20,-20, -8, 39, 0,0,0],
+['c1x1x1', m3, 20,-32, 16, 39, 0,0,0],
+['c1x1x1', m3, 20,-28, 16, 39, 0,0,0],
+['c1x1x1', m4, 21,-24, -8, 42, 0,0,0],
+['c1x1x1', m4, 21,-20, -8, 42, 0,0,0],
+['c1x1x1', m4, 21,-32, 16, 42, 0,0,0],
+['c1x1x1', m4, 21,-28, 16, 42, 0,0,0],
+['c1x1x1', m3, 21,-24, -8, 45, 0,0,0],
+['c1x1x1', m3, 21,-20, -8, 45, 0,0,0],
+['c1x1x1', m3, 21,-32, 16, 45, 0,0,0],
+['c1x1x1', m3, 21,-28, 16, 45, 0,0,0],
+['c1x1x1', m3, 21,-24, -8, 48, 0,0,0],
+['c1x1x1', m3, 21,-20, -8, 48, 0,0,0],
+['c1x1x1', m3, 21,-32, 16, 48, 0,0,0],
+['c1x1x1', m3, 21,-28, 16, 48, 0,0,0],
+['c1x1x1', m3, 22, 20, 16, 39, 0,0,0],
+['c1x1x1', m3, 22, 24, 16, 39, 0,0,0],
+['c1x1x1', m3, 22, 24, 20, 39, 0,0,0],
+['c1x1x1', m3, 22, 20, 20, 39, 0,0,0],
+['b2x2x1', m3, 22, 20, 16, 42, 0,0,0],
+['f1x2x1', m6, 22, 20, 16, 45, 0,0,0],
+['f1x2x1', m6, 22, 24, 16, 45, 0,0,0],
+['f1x2x1', m6, 23, 24, 18, 48, 0,0,90],
+['c1x1x1', m6, 23,  0, 16, 48, 0,0,0],
+['b1x3x1', m6, 23, -4, 12, 48, 0,0,90],
+['b1x1x1', m3, 23, -8, 16, 48, 0,0,0],
+['b2x4x1', m6, 23,-16,  8, 48, 0,0,90],
+['b1x3x1', m6, 23,-32, 12, 48, 0,0,90],
+['b1x1x1', m3, 23,-40, 16, 48, 0,0,0],
+['b1x3x1', m3, 23,-40,  0, 48, 0,0,0],
+['b1x3x1', m6, 23,-32, -4, 48, 0,0,90],
+['b1x1x1', m3, 23,-40, -8, 48, 0,0,0],
+['b2x4x1', m6, 23,-16, -4, 48, 0,0,90],
+['b1x3x1', m6, 23, -4, -4, 48, 0,0,90],
+['b1x1x1', m3, 23, -8, -8, 48, 0,0,0],
+['c1x1x1', m6, 23,  0, -8, 48, 0,0,0],
+['b1x3x1', m3, 23, -4,  0, 48, 0,0,0],
+['c1x1x1', m6, 24, 22, 18, 51, 0,0,0],
+['c1x1x1', m6, 24,  0, 16, 51, 0,0,90],
+['c1x1x1', m6, 24, -8, 16, 51, 0,0,0],
+['b2x6x1', m6, 24, -4,  8, 51, 0,0,90],
+['b1x2x1', m6, 24,-28,  8, 51, 0,0,90],
+['b2x2x1', m3, 24,-32, 12, 51, 0,0,0],
+['b2x2x1', m6, 24,-40,  8, 51, 0,0,0],
+['c1x1x1', m6, 24,-40, 16, 51, 0,0,0],
+['b1x1x1', m3, 24,-40,  4, 51, 0,0,0],
+['b2x4x1', m6, 24,-28, -4, 51, 0,0,90],
+['c1x1x1', m6, 24,-40, -8, 51, 0,0,0],
+['b1x2x1', m6, 24,-20,  0, 51, 0,0,90],
+['b2x2x1', m3, 24,-24, -8, 51, 0,0,0],
+['b2x4x1', m6, 24, -4, -4, 51, 0,0,90],
+['c1x1x1', m6, 24, -8, -8, 51, 0,0,0],
+['c1x1x1', m6, 24,  0, -8, 51, 0,0,0],
+['b1x1x1', m3, 24, -4,  4, 51, 0,0,0],
+['c1x1x1', m7, 25, 22, 18, 54, 0,0,0],
+['b1x1x1', m3, 25, -4,  4, 54, 0,0,0],
+['b1x3x1', m5, 25, -4,  8, 54, 0,0,90],
+['b1x3x1', m5, 25, -4,  0, 54, 0,0,90],
+['b2x3x1', m5, 25,-20,  0, 54, 0,0,0],
+['b2x3x1', m5, 25,-28,  0, 54, 0,0,0],
+['b1x3x1', m5, 25,-32,  8, 54, 0,0,90],
+['b1x1x1', m3, 25,-40,  4, 54, 0,0,0],
+['b1x3x1', m5, 25,-32,  0, 54, 0,0,90],
+['c1x1x1', m3, 25,-32, 12, 54, 0,0,0],
+['c1x1x1', m3, 25,-28, 12, 54, 0,0,0],
+['c1x1x1', m3, 25,-28, 16, 54, 0,0,0],
+['c1x1x1', m3, 25,-32, 16, 54, 0,0,0],
+['c1x1x1', m3, 25,-24, -4, 54, 0,0,0],
+['c1x1x1', m3, 25,-20, -4, 54, 0,0,0],
+['c1x1x1', m3, 25,-20, -8, 54, 0,0,0],
+['c1x1x1', m3, 25,-24, -8, 54, 0,0,0],
+['c1x1x1', m3, 26,-32, 12, 57, 0,0,0],
+['c1x1x1', m3, 26,-28, 12, 57, 0,0,0],
+['c1x1x1', m3, 26,-28, 16, 57, 0,0,0],
+['c1x1x1', m3, 26,-32, 16, 57, 0,0,0],
+['c1x1x1', m3, 26,-24, -4, 57, 0,0,0],
+['c1x1x1', m3, 26,-20, -4, 57, 0,0,0],
+['c1x1x1', m3, 26,-20, -8, 57, 0,0,0],
+['c1x1x1', m3, 26,-24, -8, 57, 0,0,0],
+['f1x2x1', m6, 27,-20, -8, 60, 0,0,90],
+['f1x2x1', m6, 27,-20, -4, 60, 0,0,90],
+['f1x2x1', m6, 27,-22, -8, 63, 0,0,0],
+['c1x1x1', m6, 27,-22, -6, 66, 0,0,0],
+['c1x1x1', m7, 27,-22, -6, 69, 0,0,0],
+['b2x2x1', m3, 28,-32, 12, 60, 0,0,0],
+['b2x2x1', m5, 28,-32, 12, 63, 0,0,0],
+['c1x1x1', m3, 28,-32, 12, 66, 0,0,0],
+['c1x1x1', m3, 28,-28, 12, 66, 0,0,0],
+['c1x1x1', m3, 28,-28, 16, 66, 0,0,0],
+['c1x1x1', m3, 28,-32, 16, 66, 0,0,0],
+['b2x2x1', m3, 28,-32, 12, 69, 0,0,0],
+['f1x2x1', m5, 29,-28, 12, 72, 0,0,90],
+['f1x2x1', m5, 29,-28, 16, 72, 0,0,90],
+['f1x2x1', m5, 29,-30, 12, 75, 0,0,0],
+['c1x1x1', m5, 29,-30, 12, 78, 0,0,0],
+['c1x1x1', m5, 29,-30, 12, 81, 0,0,0],
+['c1x1x1', m7, 29,-30, 12, 84, 0,0,0],
+['b2x3x1', m5, 30, -8,  0, 57, 0,0,0],
+['b2x3x1', m5, 30,-16,  0, 57, 0,0,0],
+['b2x3x1', m5, 30,-24,  0, 57, 0,0,0],
+['b2x3x1', m5, 30,-32,  0, 57, 0,0,0],
+['b2x3x1', m5, 30,-40,  0, 57, 0,0,0],
+['b1x4x1', m5, 30, -4,  4, 60, 0,0,90],
+['b1x2x1', m5, 30,-20,  4, 60, 0,0,90],
+['b1x4x1', m5, 30,-28,  4, 60, 0,0,90],
+['b1x3x1', m5, 31, -4,  4, 63, 0,0,90],
+['b1x4x1', m5, 31,-16,  4, 63, 0,0,90],
+['b1x3x1', m5, 31,-32,  4, 63, 0,0,90],
+['c1x1x1', m7, 31, -4,  4, 66, 0,0,0],
+['c1x1x1', m7, 31,-40,  4, 66, 0,0,0],
+['c1x1x1', m8, 32,-32,-36, 3, 0,0,0],
+['b1x2x1', m9, 32,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 32,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 32,  0,  0, 9, 0,0,45, 1],
+['c1x1x1', m9, 32,  0,  0, 12, 0,0,0, 1],
+['c1x1x1', m8, 33,-12,-24, 3, 0,0,0],
+['b1x2x1', m9, 33,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 33,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 33,  0,  0, 9, 0,0,45, 1],
+['b1x2x1', m9, 33,  0,  0, 12, 0,0,-45, 1],
+['b1x2x1', m9, 33,  0,  0, 15, 0,0,45, 1],
+['c1x1x1', m9, 33,  0,  0, 18, 0,0,0, 1],
+['c1x1x1', m8, 34, 16,-36, 3, 0,0,0],
+['b1x2x1', m9, 34,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 34,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 34,  0,  0, 9, 0,0,45, 1],
+['c1x1x1', m9, 34,  0,  0, 12, 0,0,0, 1],
+['c1x1x1', m8, 35, 32,-24, 3, 0,0,0],
+['b1x2x1', m9, 35,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 35,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 35,  0,  0, 9, 0,0,45, 1],
+['b1x2x1', m9, 35,  0,  0, 12, 0,0,-45, 1],
+['b1x2x1', m9, 35,  0,  0, 15, 0,0,45, 1],
+['c1x1x1', m9, 35,  0,  0, 18, 0,0,0, 1],
+['c1x1x1', m8, 36,-20, 28, 3, 0,0,0],
+['b1x2x1', m9, 36,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 36,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 36,  0,  0, 9, 0,0,45, 1],
+['b1x2x1', m9, 36,  0,  0, 12, 0,0,-45, 1],
+['b1x2x1', m9, 36,  0,  0, 15, 0,0,45, 1],
+['c1x1x1', m9, 36,  0,  0, 18, 0,0,0, 1],
+['c1x1x1', m8, 37, 16, 32, 3, 0,0,0],
+['b1x2x1', m9, 37,  0,  0, 3, 0,0,45, 1],
+['b1x2x1', m9, 37,  0,  0, 6, 0,0,-45, 1],
+['b1x2x1', m9, 37,  0,  0, 9, 0,0,45, 1],
+['c1x1x1', m9, 37,  0,  0, 12, 0,0,0, 1],
+['c1x1x1', m3, 38, 36, -4, 3, 0,0,0],
+['b1x2x1', m10, 38, 36,  0, 3, 0,0,90],
+['b1x2x1', m10, 38, 36, 12, 3, 0,0,90],
+['c1x1x1', m3, 38, 36, 16, 3, 0,0,0],
+['c1x1x1', m3, 39, 36, -4, 6, 0,0,0],
+['b1x2x1', m10, 39, 36, 0, 6, 0,0,90],
+['b1x2x1', m10, 39, 36, 12, 6, 0,0,90],
+['c1x1x1', m3, 39, 36, 16, 6, 0,0,0],
+['c1x1x1', m3, 40, 36, -4, 9, 0,0,0],
+['b1x2x1', m10, 40, 36,  0, 9, 0,0,90],
+['b1x2x1', m10, 40, 36, 12, 9, 0,0,90],
+['c1x1x1', m3, 40, 36, 16, 9, 0,0,0],
+['c1x1x1', m3, 41, 36, -4, 12, 0,0,0],
+['b1x2x1', m10, 41, 36,  0, 12, 0,0,90],
+['b1x2x1', m10, 41, 36, 12, 12, 0,0,90],
+['c1x1x1', m3, 41, 36, 16, 12, 0,0,0],
+['b2x2x1', m3, 41, 32,  4, 12, 0,0,0],
+['c1x1x1', m3, 42, 36, -4, 15, 0,0,0],
+['b2x4x1', m10, 42, 32, 0, 15, 0,0,0],
+['c1x1x1', m3, 42, 36, 16, 15, 0,0,0],
+['b1x1x1', m3, 43, 36, -4, 18, 0,0,0],
+['b1x2x1', m6, 43, 36,  0, 18, 0,0,90],
+['b1x2x1', m6, 43, 36, 12, 18, 0,0,90],
+['b1x1x1', m3, 43, 36, 16, 18, 0,0,0],
+['b2x2x1', m10, 43, 32,  4, 18, 0,0,0],
+['c1x1x1', m6, 44, 36, -4, 21, 0,0,0],
+['c1x1x1', m6, 44, 36, 16, 21, 0,0,0],
+['f1x2x1', m6, 44, 36,  4, 21, 0,0,0],
+['f1x2x1', m6, 44, 32,  4, 21, 0,0,0],
+['f1x2x1', m6, 44, 36,  6, 24, 0,0,90],
+];

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{

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")) {

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:

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,11 +286,15 @@ 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 (draw_x + 18 > canvas.bufw) NewLine();
-		canvas.DrawImage(draw_x, draw_y-2, 18, 18, 18*18*4*tag.number+shared_i18);
-		draw_x += 22;
+		if (tag.number < maxicon) {
+			if (draw_x + 18 > canvas.bufw) NewLine();
+			canvas.DrawImage(draw_x, draw_y-1, 18, 18, 18*18*4*tag.number+shared_i18);
+			draw_x += 22;			
+		}
 	}
 
 }

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();

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";

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));

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>

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>

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>

programs/cmm/eolite/Eolite.c

@@ -1,9 +1,8 @@
-//Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2022
+//Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2025
 //GNU GPL license.
 
 /*
 BUGS:
-- F1 in KFM (move Properties to an external app)
 - Ctrl+1+2+3+4 in KFM
 - Highlight another commands on Ctrl|Shift in KFM like in Classic KFM
 TODO:
@@ -11,9 +10,9 @@ TODO:
   http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334
 */
 
-#define ABOUT_TITLE "EOLITE 5.30"
-#define TITLE_EOLITE "Eolite File Manager 5.30"
-#define TITLE_KFM "Kolibri File Manager 2.30";
+#define ABOUT_TITLE "Eolite 5.32"
+#define TITLE_EOLITE "Eolite File Manager 5.32"
+#define TITLE_KFM "Kolibri File Manager 2.32";
 
 #define MEMSIZE 1024 * 250
 #include "../lib/clipboard.h"
@@ -444,6 +443,9 @@ void main()
 							}
 							EventDriveClick(key_scancode);
 							break;
+					case SCAN_CODE_KEY_P:
+							EventCopyItemPath();
+							break;
 					case SCAN_CODE_KEY_X:
 							CopyFilesListToClipboard(CUT);
 							break;
@@ -716,7 +718,7 @@ void DrawFilePanels()
 		DrawButtonsAroundList();
 		path = location[active_panel^1];
 		active_panel ^= 1;
-		OpenDir2(WITH_REDRAW);
+		OpenDir_without_unselect(WITH_REDRAW);
 		active_panel ^= 1;
 		if (!getSelectedCount()) files_inactive.count = files.count;
 		llist_copy(#files, #files_active);
@@ -729,38 +731,22 @@ void DrawFilePanels()
 
 		DrawButtonsAroundList();
 		path = location[active_panel];
-		OpenDir2(WITH_REDRAW);
+		OpenDir_without_unselect(WITH_REDRAW);
 	}
 }
 
-void OpenDir2(char redraw){
-	if (buf) free(buf);
-	if (GetDir(#buf, #files.count, path, DIRS_NOROOT)) {
-		Write_Error(EAX);
-		history.add(path);
-		EventHistoryGoBack();
-		return;
-	}
-	SetCurDir(path);
-	if (files.count>0) && (files.cur_y-files.first==-1) files.cur_y=0;
-	files.visible = math.min(files.h / files.item_h, files.count);
-	if (!strncmp(path, "/rd/1",5)) || (!strncmp(path, "/sys/",4))
-		dir_at_fat16 = true; else dir_at_fat16 = false;
-	Sorting();
-	SystemDiscs.Draw();
-	list_full_redraw = true;
-	List_ReDraw();
-	DrawPathBar();
-}
-
-
-void OpenDir(char redraw){
-	int errornum;
+void OpenDir(char redraw) {
 	unselectAll();
+	OpenDir_without_unselect(redraw);
+}
+
+
+void OpenDir_without_unselect(char redraw) {
+	int errornum;
+
 	if (buf) free(buf);
 	if (errornum = GetDir(#buf, #files.count, path, DIRS_NOROOT)) {
 		history.add(path);
-		//EventHistoryGoBack();
 		Dir_Up();
 		Write_Error(errornum);
 		return;
@@ -1055,7 +1041,6 @@ void EventHistoryGoForward()
 	}
 }
 
-
 void ShowOpenWithDialog()
 {
 	byte open_param[4097];
@@ -1149,6 +1134,7 @@ void ShowPopinForm(byte _popin_type)
 				break;
 		case POPIN_DELETE:
 				if (!files.count) return;
+				popin_string[0] = -1;
 				if (!getSelectedCount()) && (!strncmp(#file_name,"..",2)) return;
 				popinx = DrawEolitePopup(T_YES, T_NO);
 				WriteTextCenter(popinx, 178, POPIN_W, sc.work_text, T_DELETE_FILE);
@@ -1346,6 +1332,12 @@ void EventOpenSearch()
 	RunProgram(#program_path, #param);	
 }
 
+
+void EventCopyItemPath()
+{
+	Clipboard__CopyText(#file_path);
+}
+
 void ProceedMouseGestures()
 {
 	char stats;

programs/cmm/eolite/include/menu.h

@@ -4,9 +4,11 @@ char file_actions[]=
 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>           |Enter
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>  |Ctrl+Ent
 -
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD><EFBFBD>         |Ctrl+C
-<EFBFBD><EFBFBD>१<EFBFBD><EFBFBD><EFBFBD>           |Ctrl+X
-<EFBFBD><EFBFBD>⠢<EFBFBD><EFBFBD><EFBFBD>           |Ctrl+V
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>    |Ctrl+P
+-
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD><EFBFBD>|Ctrl+C
+<EFBFBD><EFBFBD>१<EFBFBD><EFBFBD><EFBFBD>|Ctrl+X
+<EFBFBD><EFBFBD>⠢<EFBFBD><EFBFBD><EFBFBD>|Ctrl+V
 -
 <EFBFBD><EFBFBD>२<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>      |F2
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>            |Del
@@ -15,8 +17,10 @@ char empty_folder_actions[]=
 "<EFBFBD><EFBFBD>⠢<EFBFBD><EFBFBD><EFBFBD>      |Ctrl+V";
 char burger_menu_items[] = 
 "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>|Ctrl+N
+-
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>᮫<EFBFBD>|Ctrl+G
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|Ctrl+R
+<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>|Ctrl+F
+-
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ன<EFBFBD><EFBFBD>|F10
 <EFBFBD> <EFBFBD>ணࠬ<EFBFBD><EFBFBD>";
 
@@ -25,6 +29,8 @@ char file_actions[]=
 "Ava           |Enter
 Ava ...        |Ctrl+Ent
 -
+Copy path      |Ctrl+P
+-
 Kopeeri        |Ctrl+C
 L<EFBFBD>ika          |Ctrl+X
 Aseta          |Ctrl+V
@@ -36,8 +42,10 @@ char empty_folder_actions[]=
 "Aseta         |Ctrl+V";
 char burger_menu_items[] = 
 "New window|Ctrl+N
+-
 Open console here|Ctrl+G
-V<EFBFBD>rskenda|Ctrl+R
+Search|Ctrl+F
+-
 Settings|F10
 About";
 
@@ -46,6 +54,8 @@ char file_actions[]=
 "Open         |Enter
 Open with...  |Ctrl+Ent
 -
+Copy path     |Ctrl+P
+-
 Copy          |Ctrl+C
 Cut           |Ctrl+X
 Paste         |Ctrl+V
@@ -57,8 +67,10 @@ char empty_folder_actions[]=
 "Paste        |Ctrl+V";
 char burger_menu_items[] = 
 "New window|Ctrl+N
+-
 Open console here|Ctrl+G
-Refresh folder|Ctrl+R
+Search|Ctrl+F
+-
 Settings|F10
 About";
 #endif
@@ -76,17 +88,18 @@ void EventMenuClick(dword _id)
 	if (active_menu == MENU_FILE) switch(_id) {
 		case 1: EventOpen(0); break;
 		case 2: ShowOpenWithDialog(); break;
-		case 3: CopyFilesListToClipboard(COPY); break;
-		case 4: CopyFilesListToClipboard(CUT); break;
-		case 5: EventPaste(path); break;
-		case 6: FnProcess(2); break;
-		case 7: ShowPopinForm(POPIN_DELETE); break;
-		case 8: FnProcess(1); break;
+		case 3: EventCopyItemPath(); break;
+		case 4: CopyFilesListToClipboard(COPY); break;
+		case 5: CopyFilesListToClipboard(CUT); break;
+		case 6: EventPaste(path); break;
+		case 7: FnProcess(2); break;
+		case 8: ShowPopinForm(POPIN_DELETE); break;
+		case 9: FnProcess(1); break;
 	}
 	if (active_menu == MENU_BURGER) switch(_id) {
 		case 1: EventOpenNewEolite(); break;
 		case 2: EventOpenConsoleHere(); break;
-		case 3: EventRefreshDisksAndFolders(); break;
+		case 3: EventOpenSearch(); break;
 		case 4: FnProcess(10); break;
 		case 5: EventShowAbout(); break;		
 	}

programs/cmm/eolite/include/settings.h

@@ -69,7 +69,7 @@ void settings_dialog()
 			case evKey:
 				GetKeys();
 				if (key_scancode==SCAN_CODE_ESC) ExitSettings();
-        edit_box_key_c stdcall (#path_start_ed,key_ascii << 8);	
+				edit_box_key_c stdcall (#path_start_ed,key_editbox);	
 				break;
 				
 			case evReDraw:

programs/cmm/eolite/search.c

@@ -50,10 +50,6 @@ opendialog open_folder_dialog =
   NULL
 };
 
-#define TOOLBAR_H 100
-#define LISTX 0
-#define LISTY TOOLBAR_H
-
 //===================================================//
 //                                                   //
 //                      RESULTS                      //
@@ -95,9 +91,7 @@ void SearchThread()
 {  
 	int prev_first, prev_cur_y;
 
-#ifndef __COFF__
 	load_dll(Proc_lib, #OpenDialog_init,0);
-#endif
 	OpenDialog_init stdcall (#open_folder_dialog);
 
 	if (!ESBYTE[path]) strcpy(path, "/sys");
@@ -107,28 +101,43 @@ void SearchThread()
 	loop() switch(@WaitEvent())
 	{
 	  	case evMouse:
+
 			edit_box_mouse stdcall (#edit_name);
 			edit_box_mouse stdcall (#edit_path);
+
+
+			prev_cur_y = select_list.cur_y;
+
 			if (SelectList_ProcessMouse()) {
 				SelectList_Draw();
 			} else {
 				SelectList_DrawLine(select_list.cur_y);
-			}
-			if (mouse.key&MOUSE_RIGHT) && (mouse.up) && (select_list.MouseOver()) EventOpenFile(false);
-	  		break;
 				
+				if (select_list.MouseOver(mouse.x, mouse.y)) 
+				{
+						if (mouse.key&MOUSE_LEFT) && (mouse.up) {
+							if (prev_cur_y == select_list.cur_y) EventRunFile();
+						}
+
+						if (mouse.key&MOUSE_RIGHT) && (mouse.up) {
+							EventShowFileInFolder();
+						}
+				}
+			}
+	  		
+	  	break;
 		case evButton:
 			switch (@GetButtonID()) {
 				case 1: @ExitProcess(); break;
 				case BTN_SEARCH: EventSearch(); break;
 				case BTN_CHOOSE_PATH: EventChooseSearchInPath();
 			}
-			break;
 
+			break;	  
 		case evKey:
-			@GetKeys(); 
-			edit_box_key_c stdcall (#edit_name);
-			edit_box_key_c stdcall (#edit_path);
+			GetKeys(); 
+			edit_box_key_c stdcall (#edit_name, key_editbox);
+			edit_box_key_c stdcall (#edit_path, key_editbox);
 			if (key_scancode == SCAN_CODE_TAB) {
 				if (edit_name.flags & ed_focus) {
 					edit_name.flags >< edit_path.flags;
@@ -143,7 +152,7 @@ void SearchThread()
 			if (edit_name.flags & ed_focus) || (edit_path.flags & ed_focus) {
 				if (SCAN_CODE_ENTER == key_scancode) EventSearch();
 			} else {
-				if (SCAN_CODE_ENTER == key_scancode) EventOpenFile(true);
+				if (SCAN_CODE_ENTER == key_scancode) EventRunFile();
 				prev_first = select_list.first;
 				prev_cur_y = select_list.cur_y;
 				if (select_list.ProcessKey(key_scancode)) {
@@ -169,17 +178,24 @@ void SearchThread()
    }
 }
 
+#define TOOLBAR_H 100
+#define PAD 10
+#define LISTX PAD
+#define LISTY TOOLBAR_H
+
 void draw_window_search()
 {
-	SelectList_Init(LISTX, LISTY, Form.cwidth-scroll1.size_x-1, Form.cheight-TOOLBAR_H-1);
+	SelectList_Init(LISTX, LISTY, Form.cwidth-scroll1.size_x-LISTX-LISTX, Form.cheight-TOOLBAR_H-PAD);
 	SelectList_Draw();
-	DrawBar(0, TOOLBAR_H-1, Form.cwidth, 1, sc.line);
+	DrawWideRectangle(0, LISTY-PAD-1, Form.cwidth, Form.cheight-TOOLBAR_H+PAD+1, 9, sc.work);
+	DrawRectangle(PAD-1, LISTY-1, select_list.w+1, select_list.h+1, sc.line);
+
 	DrawBar(0, 0, Form.cwidth, TOOLBAR_H-1, sc.work);
 	DrawEditBox(#edit_name);
 	WriteText(edit_name.left-2, edit_name.top-20, 0x90, sc.work_text, T_SEARCH_NAME);
 	edit_path.width = Form.cwidth - 314;
+	DrawStandartCaptButton(PAD, 63, BTN_SEARCH, T_BUTTON_SEARCH);
 	DrawFileBox(#edit_path, T_SEARCH_PATH, BTN_CHOOSE_PATH);
-	DrawStandartCaptButton(10, 63, BTN_SEARCH, T_BUTTON_SEARCH);
 }
 
 void SelectList_DrawLine(dword i)
@@ -224,6 +240,12 @@ void SelectList_LineChanged()
 	return;
 }
 
+void getfullpath(dword to, path, name) {
+	strcpy(to, path);
+	chrcat(to, '/');
+	strcat(to, name);
+}
+
 //===================================================//
 //                                                   //
 //                     EVENTS                        //
@@ -238,22 +260,21 @@ void EventChooseSearchInPath()
 	}
 }
 
-void getfullpath(dword to, path, name) {
-	strcpy(to, path);
-	chrcat(to, '/');
-	strcat(to, name);
-}
-
-void EventOpenFile(int run_file_not_show_in_folder)
+void EventShowFileInFolder()
 {
 	char full_path[4096];
 	int pos = select_list.cur_y;
 	getfullpath(#full_path, results.path.get(pos), results.name.get(pos));
-	if (run_file_not_show_in_folder) {
-		RunProgram("/sys/@open", #full_path);
-	} else {
-		RunProgram("/sys/file managers/eolite", #full_path);	
-	}
+	RunProgram(#program_path, #full_path);	
+}
+
+void EventRunFile()
+{
+	char full_path[4096];
+	int pos = select_list.cur_y;
+	getfullpath(#full_path, results.path.get(pos), results.name.get(pos));
+	if (dir_exists(#full_path)) chrcat(#full_path, '/');
+	RunProgram("/sys/@open", #full_path);
 }
 
 void EventSearch()

programs/cmm/lib/kolibri.h

@@ -9,7 +9,6 @@
 #pragma option -CPA
 #initallvar 0
 
-#ifndef __COFF__
 #jumptomain FALSE
 
 #startaddress 0
@@ -30,17 +29,6 @@ dword  I_Param      = #param;
 dword  I_Path       = #program_path;
 char param[4096];
 char program_path[4096];
-#else
-extern dword            __argv;
-extern dword            __path;
-
-dword  I_Param      =   #__argv;
-dword  I_Path       =   #__path;
-
-#define param           __argv
-#define program_path    __path
-#define ______INIT______  start
-#endif
 
 #define bool      int
 
@@ -403,6 +391,7 @@ inline fastcall int TestBit( EAX, CL)
 
 //------------------------------------------------------------------------------
 
+#define MINIMIZED 0x02
 #define ROLLED_UP 0x04
 :void DefineAndDrawWindow(dword _x, _y, _w, _h, _window_type, _bgcolor, _title, _flags)
 {

programs/cmm/lib/mouse.h

@@ -116,17 +116,10 @@
 	EAX = 37;
 	EBX = 2;
 	$int	64
-	$mov	ebx, eax
-	$mov	ecx, eax
 	key = EAX;
-	$and	eax, 0x00000001
-	$shr	ebx, 1
-	$and	ebx, 0x00000001
-	$shr	ecx, 2
-	$and	ecx, 0x00000001
-	lkm = EAX;
-	pkm = EBX;
-	mkm = ECX;
+	lkm = EAX&MOUSE_LEFT;
+	pkm = EAX&MOUSE_RIGHT;
+	mkm = EAX&MOUSE_MIDDLE;
 	
 	//when you release the MOUSE button
 	// Mouse Move Event

programs/cmm/lib/obj/box_lib.h

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

programs/cmm/lib/patterns/select_list.h

@@ -44,15 +44,14 @@ signed SelectList_ProcessMouse()
 		return true;
 	}
 
-	if (mouse.up) && (mouse.click) 
-		if (select_list.ProcessMouse(mouse.x, mouse.y)) {
-			SelectList_LineChanged();
-			return true;
-		}
+	if (mouse.up) && (select_list.ProcessMouse(mouse.x, mouse.y)) {
+		SelectList_LineChanged();
+		return true;
+	}
 	return false;
 }
 
-void SelectList_DrawBorder() {
+:void SelectList_DrawBorder() {
 	DrawRectangle3D(select_list.x-2, select_list.y-2,
 		select_list.w+3+scroll1.size_x, select_list.h+3, 
 		sc.dark, sc.light);
@@ -61,8 +60,8 @@ void SelectList_DrawBorder() {
 
 void SelectList_DrawScroller()
 {
-	scroll1.bckg_col = MixColors(sc.work, 0xBBBbbb, 80);
-	scroll1.frnt_col = MixColors(sc.work,0xFFFfff,120);
+	scroll1.bckg_col = sc.dark;  // MixColors(sc.work, 0xBBBbbb, 80);
+	scroll1.frnt_col = sc.light; // MixColors(sc.work,0xFFFfff,120);
 	scroll1.line_col = sc.line;
 
 	scroll1.max_area = select_list.count;

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")

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:

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))

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")

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

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+

programs/develop/info3ds/info3ds.asm

@@ -12,6 +12,7 @@ include '../../develop/libraries/libs-dev/libimg/libimg.inc'
 include '../../load_img.inc'
 include '../../load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../develop/libraries/TinyGL/asm_fork/kosgl.inc'
 include '../../develop/libraries/TinyGL/asm_fork/opengl_const.inc'
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
 include 'info_fun_float.inc'
@@ -235,7 +236,7 @@ start:
 	call [gluNewQuadric]
 	mov [qObj],eax
 
-	mov eax,dword[ctx1] ;eax -> TinyGLContext.GLContext
+	mov eax,[ctx1.gl_context]
 	mov eax,[eax] ;eax -> ZBuffer
 	mov eax,[eax+ZBuffer.pbuf]
 	mov dword[buf_ogl],eax
@@ -1082,7 +1083,7 @@ l_libs_start:
 	lib_2 l_libs lib_name_2, file_name, system_dir_2, import_box_lib
 	lib_3 l_libs lib_name_3, file_name, system_dir_3, import_buf2d
 	lib_4 l_libs lib_name_4, file_name, system_dir_4, import_libkmenu
-	lib_5 l_libs lib_name_5, file_name, system_dir_5, import_lib_tinygl
+	lib_5 l_libs lib_name_5, file_name, system_dir_5, import_tinygl
 	lib_6 l_libs lib_name_6, file_name, system_dir_6, import_libini
 l_libs_end:
 
@@ -1287,16 +1288,20 @@ dd 0,0
 	akmenuitem_draw 		db 'kmenuitem_draw',0
 
 align 4
-import_lib_tinygl:
+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'
 
@@ -1343,7 +1348,7 @@ buf_1:
 align 4
 el_focus dd tree1
 tree1 tree_list size_one_list,300+2, tl_key_no_edit+tl_draw_par_line,\
-	16,16, 0xffffff,0xb0d0ff,0x400040, 5,35,195-16,250, 16,list_offs_text,0,\
+	16,16, 0xffffff,0xb0d0ff,0x10400040, 5,35,195-16,250, 16,list_offs_text,0,\
 	el_focus,w_scr_t1,0
 
 align 4
@@ -1362,14 +1367,14 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ;
 lmodel_ambient dd 0.3, 0.3, 0.3, 1.0 ; <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> 䮭<><E4AEAD><EFBFBD><EFBFBD><EFBFBD> <20>ᢥ饭<E1A2A5><E9A5AD>
 
 if lang eq ru_RU
-capt db 'info 3ds <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 29.09.20',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+capt db 'info 3ds <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 04.05.25',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 else ; Default to en_US
-capt db 'info 3ds version 29.09.20',0 ;window caption
+capt db 'info 3ds version 04.05.25',0 ;window caption
 end if
 
 align 16
 i_end:
-	ctx1 rb 28 ;sizeof.TinyGLContext = 28
+	ctx1 TinyGLContext
 	procinfo process_information
 	run_file_70 FileInfoBlock
 	sc system_colors

programs/develop/info3ds/info3ds_u.asm

@@ -1408,7 +1408,7 @@ buf_1:
 align 4
 el_focus dd tree1
 tree1 tree_list size_one_list,300+2, tl_key_no_edit+tl_draw_par_line,\
-	16,16, 0xffffff,0xb0d0ff,0x400040, 5,47,195-16,250, 16,list_offs_text,0, el_focus,\
+	16,16, 0xffffff,0xb0d0ff,0x10400040, 5,47,195-16,250, 16,list_offs_text,0, el_focus,\
 	w_scr_t1,0
 
 align 4
@@ -1427,9 +1427,9 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ;
 lmodel_ambient dd 0.3, 0.3, 0.3, 1.0 ; <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> 䮭<><E4AEAD><EFBFBD><EFBFBD><EFBFBD> <20>ᢥ饭<E1A2A5><E9A5AD>
 
 if lang eq ru_RU
-capt db 'info 3ds [user] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 29.09.20',0 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+capt db 'info 3ds [user] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 14.04.25',0 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 else ; Default to en_US
-capt db 'info 3ds [user] version 29.09.20',0 ; Window caption
+capt db 'info 3ds [user] version 14.04.25',0 ; Window caption
 end if
 
 align 16

programs/develop/info3ds/info_o3d.inc

@@ -306,7 +306,7 @@ align 4
 		faddp
 		fild dword[rad_c]
 		fdivp ;radius=(size.x+size.y)/rad_c
-		fstp dword[sph_radius]
+		fstp qword[sph_radius]
 
 	;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>⠡ <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> x <EFBFBD> y, <EFBFBD><EFBFBD><EFBFBD>-<EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>蠫<EFBFBD><EFBFBD><EFBFBD> <EFBFBD>ய<EFBFBD><EFBFBD>樨 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ࠦ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 	fld dword[edi+obj_3d.y_scale]
@@ -812,9 +812,8 @@ proc draw_3d uses eax ebx ecx edi, o_data:dword
 	@@:
 		stdcall [glDisable],GL_LIGHTING
 	.end_l:
-	stdcall [glTranslatef], 0.0,0.0,0.5 ;correct for z
 	stdcall [glScalef], [edi+obj_3d.x_scale],[edi+obj_3d.y_scale],[edi+obj_3d.z_scale]
-	stdcall [glScalef], 1.0,1.0,0.7 ;correct for z
+	stdcall [glScalef], 1.0,1.0,1.4 ;correct for z
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0
@@ -976,7 +975,10 @@ if version_edit eq 1
 		stdcall [glColor3ub],[color_select+2],[color_select+1],[color_select]
 		call [glPushMatrix]
 			stdcall [glTranslatef], [eax],[eax+4],[eax+8]
-			stdcall [gluSphere], [qObj], [sph_radius], 8,8
+			push 8
+			push 8
+			glpush sph_radius
+			stdcall [gluSphere], [qObj]
 		call [glPopMatrix]
 	@@:
 
@@ -997,7 +999,10 @@ align 4
 			mov eax,[eax]
 			call [glPushMatrix]
 				stdcall [glTranslatef], [eax],[eax+4],[eax+8]
-				stdcall [gluSphere], [qObj], [sph_radius], 4,4
+				push 4
+				push 4
+				glpush sph_radius
+				stdcall [gluSphere], [qObj]
 			call [glPopMatrix]
 			dec ecx
 			jz .end_select
@@ -1345,5 +1350,5 @@ delt_size dd 3.0 ;
 mouse_drag dd 0 ;०<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD>業<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD>६<EFBFBD>饭<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 mouse_x dd 0
 mouse_y dd 0
-sph_radius dd 0 ;ࠤ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD>뤥<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>⨢<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>窨
+sph_radius dq 0 ;radius of the sphere for selecting the active point
 

programs/develop/libraries/TinyGL/asm_fork/api.asm

@@ -951,13 +951,12 @@ endl
 endp
 
 align 4
-proc glClearDepth uses eax, depth:dword
+proc glClearDepth uses eax, depth:qword
 locals
 	p rd 2
 endl
 	mov dword[p],OP_ClearDepth
-	mov eax,[depth]
-	fld qword[eax]
+	fld qword[depth]
 	fstp dword[p+4]
 
 	lea eax,[ebp-8] ;=sizeof(dd)*2

programs/develop/libraries/TinyGL/asm_fork/arrays.asm

@@ -23,8 +23,7 @@ endl
 		imul ecx,ebx
 		shl ecx,2
 		add ecx,[eax+GLContext.color_array] ;ecx = &context.color_array[i]
-		mov ebx,ebp
-		sub ebx,20 ;=sizeof(dd)*5
+		lea ebx,[ebp-20] ;=sizeof(dd)*5
 		mov edx,[ecx]
 		mov [ebx+4],edx
 		mov edx,[ecx+4]
@@ -48,8 +47,7 @@ endl
 		imul esi,ebx
 		shl esi,2
 		add esi,[eax+GLContext.normal_array] ;esi = &normal_array[ebx * (3 + c->normal_array_stride)]
-		mov edi,eax
-		add edi,GLContext.current_normal
+		lea edi,[eax+GLContext.current_normal]
 		mov ecx,3
 		rep movsd
 		mov dword[edi],0.0
@@ -92,8 +90,7 @@ endl
 		imul ecx,ebx
 		shl ecx,2
 		add ecx,[eax+GLContext.vertex_array] ;ecx = &context.vertex_array[i]
-		mov ebx,ebp
-		sub ebx,20 ;=sizeof(dd)*5
+		lea ebx,[ebp-20] ;=sizeof(dd)*5
 		mov edx,[ecx]
 		mov [ebx+4],edx
 		mov edx,[ecx+4]
@@ -130,8 +127,7 @@ endl
 	mov eax,[i]
 	mov dword[p+4],eax
 
-	mov eax,ebp
-	sub eax,8 ;=sizeof(dd)*2
+	lea eax,[ebp-8] ;=sizeof(dd)*2
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -139,10 +135,9 @@ endp
 align 4
 proc glopDrawArrays, context:dword, param:dword
 locals
-	vi dd ?
 	idx dd ?
 	states dd ?
-	size dd ?
+	a_size dd ?
 	p rd 8 ;функция glopColor требует 8 параметров, другие функции требуют меньше, берем по максимуму что-бы не портить стек
 endl
 pushad
@@ -155,132 +150,19 @@ pushad
 	mov [idx],eax ;param[2].i
 	mov eax,[ebx+4]
 	mov [p+4],eax ;p[1].i = param[1].i
-	mov eax,ebp
-	sub eax,32 ;=sizeof(dd)*8
+	lea eax,[ebp-32] ;=sizeof(dd)*8
 	stdcall glopBegin, edx,eax
 
-	mov dword[vi],0
+	cmp ecx,1
+	jl @f
 align 4
 	.cycle_0: ;for (int vi=0; vi<count; vi++)
-	cmp dword[vi],ecx
-	jge .cycle_0_end
-		bt dword[states],1 ;2^1=COLOR_ARRAY
-		jnc @f
-			mov esi,[edx+GLContext.color_array_size]
-			mov [size],esi
-			add esi,[edx+GLContext.color_array_stride]
-			imul esi,[idx] ;esi = i
-			shl esi,2
-			add esi,[edx+GLContext.color_array] ;esi = &context.color_array[i]
-			mov edi,ebp
-			sub edi,28 ;edi = &p[1]
-			mov ebx,[esi+8]
-			mov [edi],ebx   ;p[1].f = context.color_array[i+2]
-			mov ebx,[esi+4]
-			mov [edi+4],ebx ;p[2].f = context.color_array[i+1]
-			mov ebx,[esi]
-			mov [edi+8],ebx ;p[3].f = context.color_array[i]
-			add edi,12
-			cmp dword[size],3
-			jle .e1
-				add esi,12
-				movsd
-				jmp .e2
-			.e1:
-				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
-			.e2:
-			mov edi,ebp
-			sub edi,32 ;edi = &p[0]
-			mov ebx,ebp
-			sub ebx,12 ;ebp-12 = &p[5]
-			push ebx
-			add ebx,4 ;ebp-8 = &p[6]
-			push ebx
-			add ebx,4 ;ebp-4 = &p[7]
-			push ebx
-			stdcall RGBFtoRGBI,[edi+12],[edi+8],[edi+4] ;call: r,g,b,&p[7],&p[6],&p[5]
-			stdcall glopColor, edx,edi ;(context, p(op,rf,gf,bf,af,ri,gi,bi))
-		@@:
-		bt dword[states],2 ;2^2=NORMAL_ARRAY
-		jnc @f
-			mov esi,[edx+GLContext.normal_array_stride]
-			add esi,3
-			imul esi,[idx]
-			shl esi,2
-			add esi,[edx+GLContext.normal_array] ;esi = &context.normal_array[ idx * (3 + context.normal_array_stride) ]
-			mov edi,edx
-			add edi,GLContext.current_normal
-			movsd ;context.current_normal.X = context.normal_array[i]
-			movsd
-			movsd
-			mov dword[edi],0.0 ;context.current_normal.W = 0.0f
-		@@:
-		bt dword[states],3 ;2^3=TEXCOORD_ARRAY
-		jnc @f
-			mov esi,[edx+GLContext.texcoord_array_size]
-			mov [size],esi
-			add esi,[edx+GLContext.texcoord_array_stride]
-			imul esi,[idx] ;esi = i
-			shl esi,2
-			add esi,[edx+GLContext.texcoord_array] ;esi = &context.texcoord_array[i]
-			mov edi,edx
-			add edi,GLContext.current_tex_coord
-			movsd ;context.current_tex_coord.X = ccontext.texcoord_array[i]
-			movsd
-			cmp dword[size],2
-			jle .e3
-				movsd
-				jmp .e4
-			.e3:
-				mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
-				add edi,4
-			.e4:
-			cmp dword[size],3
-			jle .e5
-				movsd
-				jmp @f
-			.e5:
-				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
-		@@:
-		bt dword[states],0 ;2^0=VERTEX_ARRAY
-		jnc @f
-			mov esi,[edx+GLContext.vertex_array_size]
-			mov [size],esi
-			add esi,[edx+GLContext.vertex_array_stride]
-			imul esi,[idx] ;esi = i
-			shl esi,2
-			add esi,[edx+GLContext.vertex_array] ;esi = &context.vertex_array[i]
-			mov edi,ebp
-			sub edi,28 ;edi = &p[1]
-			movsd ;p[1].f = context.vertex_array[i]
-			movsd
-			cmp dword[size],2
-			jle .e6
-				movsd
-				jmp .e7
-			.e6:
-				mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
-				add edi,4
-				jmp .e8 ;и 4-й тоже ставим по умолчанию
-			.e7:
-			cmp dword[size],3
-			jle .e8
-				movsd
-				sub edi,20 ;edi=&p[0]
-				jmp .e9
-			.e8:
-				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
-				sub edi,16 ;edi=&p[0]
-			.e9:
-			stdcall glopVertex, edx,edi
-		@@:
+		call CopyArrayElementByIndex
 		inc dword[idx]
-	inc dword[vi]
-	jmp .cycle_0
-	.cycle_0_end:
+		loop .cycle_0
+	@@:
 
-	;mov eax,ebp
-	;sub eax,32 ;=sizeof(dd)*8
+	lea eax,[ebp-32] ;=sizeof(dd)*8
 	stdcall glopEnd, edx,eax
 popad
 	ret
@@ -299,8 +181,7 @@ endl
 	mov eax,[count]
 	mov dword[p+12],eax
 
-	mov eax,ebp
-	sub eax,16 ;=sizeof(dd)*4
+	lea eax,[ebp-16] ;=sizeof(dd)*4
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -308,12 +189,12 @@ endp
 align 4
 proc glopDrawElements, context:dword, param:dword
 locals
+	type dd ?
+	indices dd ? ;указатель на 16 или 32 битные индексы
 	ii dd ?
 	idx dd ?
 	states dd ?
-	type dd ?
-	size dd ?
-	indices dd ? ;указатель на 16 или 32 битные индексы
+	a_size dd ?
 	p rd 8
 endl
 pushad
@@ -328,8 +209,7 @@ pushad
 	mov [type],eax ;type = param[3].i
 	mov eax,[ebx+16]
 	mov [indices],eax ;*indices = param[4].p
-	mov eax,ebp
-	sub eax,32 ;=sizeof(dd)*8
+	lea eax,[ebp-32] ;=sizeof(dd)*8
 	stdcall glopBegin, edx,eax
 
 	mov dword[ii],0
@@ -351,127 +231,133 @@ align 4
 		.end_0:
 		mov [idx],esi
 
-		bt dword[states],1 ;2^1=COLOR_ARRAY
-		jnc @f
-			mov esi,[edx+GLContext.color_array_size]
-			mov [size],esi
-			add esi,[edx+GLContext.color_array_stride]
-			imul esi,[idx] ;esi = i
-			shl esi,2
-			add esi,[edx+GLContext.color_array] ;esi = &context.color_array[i]
-			mov edi,ebp
-			sub edi,28 ;edi = &p[1]
-			mov ebx,[esi+8]
-			mov [edi],ebx   ;p[1].f = context.color_array[i+2]
-			mov ebx,[esi+4]
-			mov [edi+4],ebx ;p[2].f = context.color_array[i+1]
-			mov ebx,[esi]
-			mov [edi+8],ebx ;p[3].f = context.color_array[i]
-			add edi,12
-			cmp dword[size],3
-			jle .e1
-				add esi,12
-				movsd
-				jmp .e2
-			.e1:
-				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
-			.e2:
-			mov edi,ebp
-			sub edi,32 ;edi = &p[0]
-			mov ebx,ebp
-			sub ebx,12 ;ebp-12 = &p[5]
-			push ebx
-			add ebx,4 ;ebp-8 = &p[6]
-			push ebx
-			add ebx,4 ;ebp-4 = &p[7]
-			push ebx
-			stdcall RGBFtoRGBI,[edi+12],[edi+8],[edi+4] ;call: r,g,b,&p[7],&p[6],&p[5]
-			stdcall glopColor, edx,edi ;(context, p(op,rf,gf,bf,af,ri,gi,bi)) 
-		@@:
-		bt dword[states],2 ;2^2=NORMAL_ARRAY
-		jnc @f
-			mov esi,[edx+GLContext.normal_array_stride]
-			add esi,3
-			imul esi,[idx] ;esi = idx * (3 + context.normal_array_stride)
-			shl esi,2
-			add esi,[edx+GLContext.normal_array]
-			mov edi,edx
-			add edi,GLContext.current_normal
-			movsd ;context.current_normal.X = context.normal_array[i]
-			movsd
-			movsd
-			mov dword[edi],0.0 ;context.current_normal.W = 0.0f
-		@@:
-		bt dword[states],3 ;2^3=TEXCOORD_ARRAY
-		jnc @f
-			mov esi,[edx+GLContext.texcoord_array_size]
-			mov [size],esi
-			add esi,[edx+GLContext.texcoord_array_stride]
-			imul esi,[idx] ;esi = i
-			shl esi,2
-			add esi,[edx+GLContext.texcoord_array] ;esi = &context.texcoord_array[i]
-			mov edi,edx
-			add edi,GLContext.current_tex_coord
-			movsd ;context.current_tex_coord.X = ccontext.texcoord_array[i]
-			movsd
-			cmp dword[size],2
-			jle .e3
-				movsd
-				jmp .e4
-			.e3:
-				mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
-				add edi,4
-			.e4:
-			cmp dword[size],3
-			jle .e5
-				movsd
-				jmp @f
-			.e5:
-				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
-		@@:
-		bt dword[states],0 ;2^0=VERTEX_ARRAY
-		jnc @f
-			mov esi,[edx+GLContext.vertex_array_size]
-			mov [size],esi
-			add esi,[edx+GLContext.vertex_array_stride]
-			imul esi,[idx] ;esi = i
-			shl esi,2
-			add esi,[edx+GLContext.vertex_array] ;esi = &context.vertex_array[i]
-			mov edi,ebp
-			sub edi,28 ;edi = &p[1]
-			movsd ;p[1].f = context.vertex_array[i]
-			movsd
-			cmp dword[size],2
-			jle .e6
-				movsd
-				jmp .e7
-			.e6:
-				mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
-				add edi,4
-				jmp .e8 ;и 4-й тоже ставим по умолчанию
-			.e7:
-			cmp dword[size],3
-			jle .e8
-				movsd
-				sub edi,20 ;edi=&p[0]
-				jmp .e9
-			.e8:
-				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
-				sub edi,16 ;edi=&p[0]
-			.e9:
-			stdcall glopVertex, edx,edi
-		@@:
+		call CopyArrayElementByIndex
 	inc dword[ii]
 	jmp .cycle_0
 	.cycle_0_end:
 
-	mov eax,ebp
-	sub eax,32 ;=sizeof(dd)*8
+	lea eax,[ebp-32] ;=sizeof(dd)*8
 	stdcall glopEnd, edx,eax
 popad
 	ret
 endp
 
+;input:
+; edx - GLContext
+idx    equ ebp-44
+states equ ebp-40
+a_size equ ebp-36
+align 4
+CopyArrayElementByIndex:
+	bt dword[states],1 ;2^1=COLOR_ARRAY
+	jnc @f
+		mov esi,[edx+GLContext.color_array_size]
+		mov [a_size],esi
+		add esi,[edx+GLContext.color_array_stride]
+		imul esi,[idx] ;esi = i
+		shl esi,2
+		add esi,[edx+GLContext.color_array] ;esi = &context.color_array[i]
+		lea edi,[ebp-28] ;edi = &p[1]
+		mov ebx,[esi+8]
+		mov [edi],ebx   ;p[1].f = context.color_array[i+2]
+		mov ebx,[esi+4]
+		mov [edi+4],ebx ;p[2].f = context.color_array[i+1]
+		mov ebx,[esi]
+		mov [edi+8],ebx ;p[3].f = context.color_array[i]
+		add edi,12
+		cmp dword[a_size],3
+		jle .e1
+			add esi,12
+			movsd
+			jmp .e2
+		.e1:
+			mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
+		.e2:
+		lea edi,[ebp-32] ;edi = &p[0]
+		lea ebx,[ebp-12] ;ebp-12 = &p[5]
+		push ebx
+		add ebx,4 ;ebp-8 = &p[6]
+		push ebx
+		add ebx,4 ;ebp-4 = &p[7]
+		push ebx
+		stdcall RGBFtoRGBI,[edi+12],[edi+8],[edi+4] ;call: r,g,b,&p[7],&p[6],&p[5]
+		stdcall glopColor, edx,edi ;(context, p(op,rf,gf,bf,af,ri,gi,bi)) 
+	@@:
+	bt dword[states],2 ;2^2=NORMAL_ARRAY
+	jnc @f
+		mov esi,[edx+GLContext.normal_array_stride]
+		add esi,3
+		imul esi,[idx] ;esi = idx * (3 + context.normal_array_stride)
+		shl esi,2
+		add esi,[edx+GLContext.normal_array] ;esi = &context.normal_array[ idx * (3 + context.normal_array_stride) ]
+		lea edi,[edx+GLContext.current_normal]
+		movsd ;context.current_normal.X = context.normal_array[i]
+		movsd
+		movsd
+		mov dword[edi],0.0 ;context.current_normal.W = 0.0f
+	@@:
+	bt dword[states],3 ;2^3=TEXCOORD_ARRAY
+	jnc @f
+		mov esi,[edx+GLContext.texcoord_array_size]
+		mov [a_size],esi
+		add esi,[edx+GLContext.texcoord_array_stride]
+		imul esi,[idx] ;esi = i
+		shl esi,2
+		add esi,[edx+GLContext.texcoord_array] ;esi = &context.texcoord_array[i]
+		lea edi,[edx+GLContext.current_tex_coord]
+		movsd ;context.current_tex_coord.X = ccontext.texcoord_array[i]
+		movsd
+		cmp dword[a_size],2
+		jle .e3
+			movsd
+			jmp .e4
+		.e3:
+			mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
+			add edi,4
+		.e4:
+		cmp dword[a_size],3
+		jle .e5
+			movsd
+			jmp @f
+		.e5:
+			mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
+	@@:
+	bt dword[states],0 ;2^0=VERTEX_ARRAY
+	jnc @f
+		mov esi,[edx+GLContext.vertex_array_size]
+		mov [a_size],esi
+		add esi,[edx+GLContext.vertex_array_stride]
+		imul esi,[idx] ;esi = i
+		shl esi,2
+		add esi,[edx+GLContext.vertex_array] ;esi = &context.vertex_array[i]
+		lea edi,[ebp-28] ;edi = &p[1]
+		movsd ;p[1].f = context.vertex_array[i]
+		movsd
+		cmp dword[a_size],2
+		jle .e6
+			movsd
+			jmp .e7
+		.e6:
+			mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
+			add edi,4
+			jmp .e8 ;и 4-й тоже ставим по умолчанию
+		.e7:
+		cmp dword[a_size],3
+		jle .e8
+			movsd
+			sub edi,20 ;edi=&p[0]
+			jmp .e9
+		.e8:
+			mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
+			sub edi,16 ;edi=&p[0]
+		.e9:
+		stdcall glopVertex, edx,edi
+	@@:
+	ret
+purge idx
+purge states
+purge a_size
+
 align 4
 proc glDrawElements uses eax, mode:dword, count:dword, type:dword, indices:dword
 locals
@@ -488,8 +374,7 @@ endl
 	mov eax,[indices]
 	mov dword[p+16],eax
 
-	mov eax,ebp
-	sub eax,20 ;=sizeof(dd)*5
+	lea eax,[ebp-20] ;=sizeof(dd)*5
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -533,8 +418,7 @@ endl
 		;assert(0);
 	.end_f:
 
-	mov eax,ebp
-	sub eax,8 ;=sizeof(dd)*2
+	lea eax,[ebp-8] ;=sizeof(dd)*2
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -578,8 +462,7 @@ endl
 		;assert(0);
 	.end_f:
 
-	mov eax,ebp
-	sub eax,8 ;=sizeof(dd)*2
+	lea eax,[ebp-8] ;=sizeof(dd)*2
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -612,8 +495,7 @@ endl
 	mov eax,[pointer]
 	mov dword[p+12],eax
 
-	mov eax,ebp
-	sub eax,16 ;=sizeof(dd)*4
+	lea eax,[ebp-16] ;=sizeof(dd)*4
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -646,8 +528,7 @@ endl
 	mov eax,[pointer]
 	mov dword[p+12],eax
 
-	mov eax,ebp
-	sub eax,16 ;=sizeof(dd)*4
+	lea eax,[ebp-16] ;=sizeof(dd)*4
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -676,8 +557,7 @@ endl
 	mov eax,[pointer]
 	mov dword[p+8],eax
 
-	mov eax,ebp
-	sub eax,12 ;=sizeof(dd)*3
+	lea eax,[ebp-12] ;=sizeof(dd)*3
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -710,8 +590,7 @@ endl
 	mov eax,[pointer]
 	mov dword[p+12],eax
 
-	mov eax,ebp
-	sub eax,16 ;=sizeof(dd)*4
+	lea eax,[ebp-16] ;=sizeof(dd)*4
 	stdcall gl_add_op,eax
 	ret
 endp

programs/develop/libraries/TinyGL/asm_fork/clip.asm

@@ -21,7 +21,7 @@ proc gl_transform_to_viewport uses eax ebx ecx, context:dword,v:dword
 	fmul st0,st1
 	fmul dword[eax+GLContext.viewport+GLViewport.scale+offs_X]
 	fadd dword[eax+GLContext.viewport+GLViewport.trans+offs_X]
-	fistp dword[ebx+GLVertex.zp] ;v.zp.x = st0, st0 = st1
+	fistp dword[ebx+GLVertex.zp+ZBufferPoint.x] ;v.zp.x = st0, st0 = st1
 
 	fld dword[ebx+GLVertex.pc+offs_Y] ;st0 = v.pc.Y
 	fmul st0,st1
@@ -62,14 +62,14 @@ align 4
 	je @f
 		mov eax,[eax+GLContext.current_texture] ;eax = &context.current_texture
 		mov eax,[eax] ;eax = context.current_texture
-		;[eax+offs_text_images] = im = &context.current_texture.images[0]
+		;[eax+GLTexture.images] = im = &context.current_texture.images[0]
 
-		fild dword[eax+offs_text_images+offs_imag_s_bound]
+		fild dword[eax+GLTexture.images+GLImage.s_bound]
 		fmul dword[ebx+GLVertex.tex_coord+offs_X]
 		fistp dword[ebx+GLVertex.zp+ZBufferPoint.s]
 		;v.zp.s=(int)(v.tex_coord.X * im.s_bound)
 
-		fild dword[eax+offs_text_images+offs_imag_t_bound]
+		fild dword[eax+GLTexture.images+GLImage.t_bound]
 		fmul dword[ebx+GLVertex.tex_coord+offs_Y]
 		fistp dword[ebx+GLVertex.zp+ZBufferPoint.t]
 		;v.zp.t=(int)(v.tex_coord.Y * im.t_bound)
@@ -138,12 +138,12 @@ macro interpolate q, p0, p1, t
 {
 	fld dword[t]
 
-	; интерполяция по координатам
-	fld dword[p1+GLVertex.pc]
-	fsub dword[p0+GLVertex.pc]
+	; interpolation by coordinates
+	fld dword[p1+GLVertex.pc+offs_X]
+	fsub dword[p0+GLVertex.pc+offs_X]
 	fmul st0,st1
-	fadd dword[p0+GLVertex.pc]
-	fstp dword[q+GLVertex.pc] ;q.pc.X = p0.pc.X + (p1.pc.X - p0.pc.X) * t
+	fadd dword[p0+GLVertex.pc+offs_X]
+	fstp dword[q+GLVertex.pc+offs_X] ;q.pc.X = p0.pc.X + (p1.pc.X - p0.pc.X) * t
 
 	fld dword[p1+GLVertex.pc+offs_Y]
 	fsub dword[p0+GLVertex.pc+offs_Y]
@@ -163,7 +163,7 @@ macro interpolate q, p0, p1, t
 	fadd dword[p0+GLVertex.pc+offs_W]
 	fstp dword[q+GLVertex.pc+offs_W]
 
-	; интерполяция по цвету
+	; color interpolation
 	fld dword[p1+GLVertex.color]
 	fsub dword[p0+GLVertex.color]
 	fmul st0,st1
@@ -228,7 +228,7 @@ align 4
 		fstsw ax
 		sahf
 		jae .r1_f1
-			fstp dword[ebx] ;if (t<*tmin) *tmax=t
+			fstp dword[ebx] ;if (t<*tmax) *tmax=t
 		jmp .r1
 align 4
 	.els_1: ;else if (num>0)
@@ -1028,9 +1028,11 @@ if PROFILE eq 1
 end if
 		mov eax,[edx+GLContext.current_texture]
 		mov eax,[eax] ;переход по указателю
-		;так как offs_text_images+offs_imag_pixmap = 0 то context.current_texture.images[0].pixmap = [eax]
-		stdcall ZB_setTexture, [edx+GLContext.zb], [eax],\
-			[eax+offs_imag_s_bound],[eax+offs_imag_t_bound],[eax+offs_imag_xsize_log2]
+		stdcall ZB_setTexture, [edx+GLContext.zb],\
+			[eax+GLTexture.images+GLImage.pixmap],\
+			[eax+GLTexture.images+GLImage.s_bound],\
+			[eax+GLTexture.images+GLImage.t_bound],\
+			[eax+GLTexture.images+GLImage.xsize_log2]
 		mov eax,[p0]
 		add eax,GLVertex.zp
 		push ecx

programs/develop/libraries/TinyGL/asm_fork/examples/gears.asm

@@ -1,3 +1,7 @@
+; SPDX-License-Identifier: GPL-2.0-only
+; Gears - 3D gear wheels
+; Copyright (C) 2014-2025 KolibriOS team
+
 use32
 	org 0
 	db 'MENUET01'
@@ -8,6 +12,7 @@ include '../../../../../macros.inc'
 include '../../../../../KOSfuncs.inc'
 include '../../../../../load_lib.mac'
 include '../../../../../dll.inc'
+include '../kosgl.inc'
 include '../opengl_const.inc'
 include 'fps.inc'
 
@@ -18,7 +23,7 @@ macro matr_cell c_funct,c_param,funct,param, dia
 	dia dword[esp-4*(c_param*(c_funct-funct)+(1+c_param-param))]
 }
 
-;Макрос для параметров типа double (8 байт)
+;Macro for double type parameters (8 bytes)
 macro glpush GLDoubleVar {
 	push dword[GLDoubleVar+4]
 	push dword[GLDoubleVar]
@@ -83,8 +88,7 @@ red_win:
 		mov ebx,200
 	@@:
 	sub ebx,10
-		stdcall reshape, ebx,eax
-	.end0:
+	stdcall reshape, ebx,eax
 
 align 16
 still:
@@ -165,8 +169,7 @@ draw_window:
 
 	;Title
 	mcall SF_DRAW_TEXT,(338 shl 16)+4,0xc0c0c0,fps,   fps.end-fps
-	mcall SF_DRAW_TEXT,(8 shl 16)+4,0xc0c0c0,title3,title3.end-title3
-	;mcall SF_DRAW_TEXT,(180 shl 16)+4,0xc0c0c0,title2,title2.end-title2
+	mcall SF_DRAW_TEXT,(8 shl 16)+4,0xc0c0c0,title2,title2.end-title2
 
 	mcall SF_REDRAW,SSF_END_DRAW
 	popad
@@ -247,9 +250,7 @@ button:
 align 4
 title1: db 'TinyGL in KolibriOS'
 .end: db 0
-;title2: db 'F full screen'
-;.end: db 0
-title3: db 'ESC - exit, Arrow keys - rotate, +/- zoom, P - pause'
+title2: db 'ESC - exit, Arrow keys - rotate, +/- zoom, P - pause'
 .end: db 0
 fps:	db 'FPS:'
 .end: db 0
@@ -922,8 +923,7 @@ name_tgl db 'tinygl.obj',0
 
 align 16
 i_end:
-ctx1 db 28 dup (0) ;TinyGLContext or KOSGLContext
-;sizeof.TinyGLContext = 28
+ctx1 TinyGLContext
 procinfo process_information 
 cur_dir_path rb 4096
 library_path rb 4096

programs/develop/libraries/TinyGL/asm_fork/examples/test_array1.asm

@@ -12,6 +12,15 @@ include '../opengl_const.inc'
 
 @use_library
 
+;Constants describing the house.3ds file (obtained using the info_3ds program)
+VERTICES_OFFSET =  0x33 ;offset along which the coordinates of the vertices go
+FACES_COUNT	= 0x162 ;number of faces
+FACES_OFFSET	= 0x96b ;offset along which information about the edges goes
+
+HOUSE_FILE_SIZE = 5297
+txt_error_file_size db '"House.3ds file size does not match" -tE',0
+
+
 align 4
 start:
 	load_library name_tgl, library_path, system_path, import_tinygl
@@ -20,20 +29,20 @@ start:
 
 	mcall SF_SET_EVENTS_MASK,0x27
 
-	;заполняем массив индексов из файла house.3ds (который вшит внутрь данной программы)
+	;we fill the array of indices from the house.3ds file (which is embedded inside this program)
 	mov esi,house_3ds
-	add esi,0x1798 ;смещение по которому идет информация о гранях в файле 3ds (получено с использованием программы info_3ds)
+	add esi,FACES_OFFSET
 	mov edi,Indices
-	mov eax,0x1a6 ;число граней в файле 3ds (получено с использованием программы info_3ds)
+	mov eax,FACES_COUNT
 	@@:
 		movsd
 		movsw
-		add esi,2 ;пропускаем свойства грани
+		add esi,2 ;skip face properties
 		dec eax
 		or eax,eax
 	jnz @b
 
-	;первоначальные настройки контекста tinygl
+	;tinygl initial context settings
 	stdcall [kosglMakeCurrent], 10,10,400,350,ctx1
 	stdcall [glEnable], GL_DEPTH_TEST
 	stdcall [glClearColor], 0.0,0.0,0.0,0.0
@@ -48,13 +57,13 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp al,1
-	jz red_win
-	cmp al,2
-	jz key
-	cmp al,3
-	jz button
-	jmp still
+	cmp   al,EV_REDRAW
+	jz    red_win
+	cmp   al,EV_KEY
+	jz    key
+	cmp   al,EV_BUTTON
+	jz    button
+	jmp   still
 
 align 4
 draw_window:
@@ -140,29 +149,34 @@ caption db 'Test opengl 1.1 arrays, [Esc] - exit, [<-],[->],[Up],[Down] - rotate
 
 align 4
 draw_3d:
-stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины
+stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;clear the color and depth buffer
+mov eax,house_3ds.end-house_3ds
+cmp eax,HOUSE_FILE_SIZE
+je @f
+	notify_window_run txt_error_file_size
+	ret
+@@:
 call [glPushMatrix]
 
-	;масштаб и повороты
-	stdcall [glTranslatef], 0.0,0.0,0.5
+	;scale and rotations
 	stdcall [glScalef], [scale], [scale], [scale]
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0
 
-	;рисование через индексный массив
-	mov eax,house_3ds ;начало внедренного файла 3ds
-	add eax,0xeb ;смещение по которому идут координаты вершин (получено с использованием программы info_3ds)
-	stdcall [glVertexPointer], 3, GL_FLOAT, 0, eax ;задаем массив для вершин, 3 - число координат для одной вершины
-	stdcall [glEnableClientState], GL_VERTEX_ARRAY ;включаем режим рисования вершин
-	stdcall [glDrawElements], GL_TRIANGLES, 0x1a6*3, GL_UNSIGNED_SHORT, Indices ;mode, count, type, *indices
-	stdcall [glDisableClientState], GL_VERTEX_ARRAY ;отключаем режим рисования вершин
+	;drawing via index array
+	mov eax,house_3ds ;start of embedded 3ds file
+	add eax,VERTICES_OFFSET
+	stdcall [glVertexPointer], 3, GL_FLOAT, 0, eax ;we set an array for the vertices, 3 is the number of coordinates for one vertex
+	stdcall [glEnableClientState], GL_VERTEX_ARRAY ;turn on the vertex drawing mode
+	stdcall [glDrawElements], GL_TRIANGLES, FACES_COUNT*3, GL_UNSIGNED_SHORT, Indices ;mode, count, type, *indices
+	stdcall [glDisableClientState], GL_VERTEX_ARRAY ;disable vertex drawing mode
 
 call [glPopMatrix]
 ret
 
 align 4
-scale dd 0.0065 ;начальный масштаб (в идеальном случае должен вычислятся, но для даного примера подобран в ручную на глаз)
+scale dd 0.07 ;initial scale (ideally should be calculated)
 delt_sc dd 0.0005
 angle_z dd 90.0
 angle_y dd 90.0
@@ -170,10 +184,11 @@ angle_x dd 0.0
 delt_size dd 3.0
 
 align 4
-house_3ds: ;внедряем файл внутрь программы (в идеальном случае должен открыватся через окно диалога, но для облегчения примера вшит внутрь)
+house_3ds: ;we embed the file inside the program (ideally it should open through a dialog box)
 file '../../../../../demos/view3ds/3ds_objects/House.3ds'
+.end:
 align 4
-Indices rb 0x1a6*6 ;0x1a6 - число граней, на каждую грань по 3 точки, индекс точки 2 байта
+Indices rb FACES_COUNT*6 ;3 points per edge, point index 2 bytes
 
 ;--------------------------------------------------
 align 4

programs/develop/libraries/TinyGL/asm_fork/examples/test_glu0.asm

@@ -1,3 +1,7 @@
+; SPDX-License-Identifier: GPL-2.0-only
+; Test glu0 - gluSphere functionality testing
+; Copyright (C) 2014-2025 KolibriOS team
+
 use32
 	org 0
 	db 'MENUET01'
@@ -8,6 +12,7 @@ include '../../../../../macros.inc'
 include '../../../../../KOSfuncs.inc'
 include '../../../../../load_lib.mac'
 include '../../../../../dll.inc'
+include '../kosgl.inc'
 include '../opengl_const.inc'
 
 @use_library
@@ -36,13 +41,13 @@ red_win:
 align 16
 still:
 	mcall SF_WAIT_EVENT
-	cmp al,1
-	jz red_win
-	cmp al,2
-	jz key
-	cmp al,3
-	jz button
-	jmp still
+	cmp   al,EV_REDRAW
+	jz    red_win
+	cmp   al,EV_KEY
+	jz    key
+	cmp   al,EV_BUTTON
+	jz    button
+	jmp   still
 
 align 4
 draw_window:
@@ -131,9 +136,6 @@ button:
 	mcall SF_TERMINATE_PROCESS
 
 
-align 4
-caption db 'Test gluSphere, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
-
 align 4
 draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины
@@ -141,25 +143,37 @@ stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим б
 stdcall [glColor3f], 1.0, 1.0, 0.0
 
 call [glPushMatrix]
-	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]
 
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
-	stdcall [gluSphere], [qObj], 1.0, 16,16
+	push 16
+	push 16
+	glpush rad1
+	stdcall [gluSphere], [qObj]
 
 	stdcall [glColor3f], 1.0, 0.0, 0.0
 	stdcall [glTranslatef], -1.6,0.0,0.0
-	stdcall [gluSphere], [qObj], 0.55, 8,8
+	push 8
+	push 8
+	glpush rad2
+	stdcall [gluSphere], [qObj]
 
 	stdcall [glColor3f], 0.0, 0.0, 1.0
 	stdcall [glTranslatef], 3.2,0.0,0.0
-	stdcall [gluSphere], [qObj], 0.55, 8,8
+	push 8
+	push 8
+	glpush rad2
+	stdcall [gluSphere], [qObj]
 call [glPopMatrix]
 ret
 
 align 4
-qObj dd 0
+caption db 'Test gluSphere, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
+
+align 4
+rad1 dq 1.0
+rad2 dq 0.55
 
 scale dd 0.4
 delt_sc dd 0.05
@@ -173,13 +187,17 @@ import_tinygl:
 
 macro E_LIB n
 {
+if defined sz_#n
 	n dd sz_#n
+end if
 }
 include '../export.inc'
 	dd 0,0
 macro E_LIB n
 {
+if used n
 	sz_#n db `n,0
+end if
 }
 include '../export.inc'
 
@@ -190,7 +208,8 @@ name_tgl db 'tinygl.obj',0
 
 align 16
 i_end:
-	ctx1 rb 28 ;sizeof.TinyGLContext = 28
+	ctx1 TinyGLContext
+	qObj dd 0
 cur_dir_path rb 4096
 library_path rb 4096
 	rb 2048

programs/develop/libraries/TinyGL/asm_fork/examples/test_glu1.asm

@@ -1,3 +1,7 @@
+; SPDX-License-Identifier: GPL-2.0-only
+; Test glu1 - gluCylinder and gluDisk functionality testing
+; Copyright (C) 2014-2025 KolibriOS team
+
 use32
 	org 0
 	db 'MENUET01'
@@ -8,24 +12,24 @@ include '../../../../../macros.inc'
 include '../../../../../KOSfuncs.inc'
 include '../../../../../load_img.inc'
 include '../../../../../load_lib.mac'
+include '../kosgl.inc'
 include '../opengl_const.inc'
 include '../zbuffer.inc'
 include '../../../../../develop/info3ds/info_fun_float.inc'
 
+3d_wnd_l equ   0 ;tinygl buffer left indent
+3d_wnd_t equ  30 ;tinygl buffer top indent
+3d_wnd_w equ 500
+3d_wnd_h equ 400
+
 @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 
 IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3
 
-;Макрос для параметров типа double (8 байт)
-macro glpush GLDoubleVar {
-	push dword[GLDoubleVar+4]
-	push dword[GLDoubleVar]
-}
-
 align 4
 start:
 load_libraries l_libs_start,l_libs_end
-	;проверка на сколько удачно загузились библиотеки
+	;checking how successfully the libraries were loaded
 	mov	ebp,lib_0
 	.test_lib_open:
 	cmp	dword [ebp+ll_struc_size-4],0
@@ -39,16 +43,24 @@ load_libraries l_libs_start,l_libs_end
 	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors
 	mcall SF_SET_EVENTS_MASK,0x27
 
-	stdcall [kosglMakeCurrent], 5,30,[buf_ogl.w],[buf_ogl.h],ctx1
+	finit
+	fild dword[buf_ogl.w]
+	fdiv dword[fl_180]
+	fstp dword[angle_dzm]
+	fild dword[buf_ogl.h]
+	fdiv dword[fl_180]
+	fstp dword[angle_dym]
+
+	stdcall [kosglMakeCurrent], 3d_wnd_l,3d_wnd_t,[buf_ogl.w],[buf_ogl.h],ctx1
 	stdcall [glEnable], GL_DEPTH_TEST
-	stdcall [glEnable], GL_NORMALIZE ;делам нормали одинаковой величины во избежание артефактов
+	stdcall [glEnable], GL_NORMALIZE ;normals of the same size to avoid artifacts
 	call [gluNewQuadric]
 	mov [qObj],eax
 
 	stdcall [glClearColor], 0.25,0.25,0.25,0.0
 	stdcall [glShadeModel], GL_SMOOTH
 
-	mov eax,dword[ctx1] ;eax -> TinyGLContext.GLContext
+	mov eax,[ctx1.gl_context]
 	mov eax,[eax] ;eax -> ZBuffer
 	mov eax,[eax+ZBuffer.pbuf]
 	mov dword[buf_ogl],eax
@@ -60,6 +72,15 @@ load_libraries l_libs_start,l_libs_end
 	stdcall [buf2d_convert_text_matrix], buf_1
 
 	load_image_file 'toolb_1.png', image_data_toolbar
+
+	fld dword[scale]
+	stdcall update_number, txt_scale.v
+	fld dword[angle_y]
+	stdcall update_number, txt_angle_y.v
+	fld dword[angle_z]
+	stdcall update_number, txt_angle_z.v
+
+	call SetLight
 	call draw_3d
 
 align 4
@@ -69,19 +90,30 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp al,1
-	jz red_win
-	cmp al,2
-	jz key
-	cmp al,3
-	jz button
-	jmp still
+	cmp   al,EV_REDRAW
+	jz    red_win
+	cmp   al,EV_KEY
+	jz    key
+	cmp   al,EV_BUTTON
+	jz    button
+	cmp   al,EV_MOUSE
+	jne   still
+	call  mouse
+	jmp   still
 
 align 4
 draw_window:
 	pushad
 	mcall SF_REDRAW,SSF_BEGIN_DRAW
-	mcall SF_CREATE_WINDOW,(50 shl 16)+420,(30 shl 16)+410,0x33ffffff,,caption
+	
+	mcall SF_STYLE_SETTINGS,SSF_GET_SKIN_HEIGHT
+	mov ebx,[buf_ogl.w]
+	add ebx,(50 shl 16)+9
+	mov ecx,[buf_ogl.h]
+	add ecx,(30 shl 16)+4
+	add ecx,eax
+	add cx,[buf_ogl.t]
+	mcall SF_CREATE_WINDOW,,,0x33ffffff,,caption
 
 	mov esi,[sc.work_button]
 	mcall SF_DEFINE_BUTTON,(6 shl 16)+19,(6 shl 16)+19,3+0x40000000 ;вершины вкл.
@@ -128,11 +160,7 @@ key:
 		fld dword[angle_y]
 		fadd dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 		jmp still
@@ -143,11 +171,7 @@ key:
 		fld dword[angle_y]
 		fsub dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 		jmp still
@@ -158,11 +182,7 @@ key:
 		fld dword[angle_z]
 		fadd dword[delt_size]
 		fst dword[angle_z]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_z.v],0
-		stdcall str_cat, txt_angle_z.v,Data_String
+		stdcall update_number, txt_angle_z.v
 		call draw_3d
 		call [kosglSwapBuffers]
 		jmp still
@@ -173,11 +193,7 @@ key:
 		fld dword[angle_z]
 		fsub dword[delt_size]
 		fst dword[angle_z]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_z.v],0
-		stdcall str_cat, txt_angle_z.v,Data_String
+		stdcall update_number, txt_angle_z.v
 		call draw_3d
 		call [kosglSwapBuffers]
 		;jmp still
@@ -220,6 +236,104 @@ button:
 	stdcall mem.Free,[image_data_toolbar]
 	mcall SF_TERMINATE_PROCESS
 
+align 4
+mouse:
+	push eax ebx
+	mcall SF_MOUSE_GET,SSF_BUTTON_EXT
+	bt eax,0
+	jnc .end_m
+		;mouse l. but. move
+		cmp dword[mouse_drag],1
+		jne .end_m
+
+		mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
+		mov ebx,eax
+		sar ebx,16 ;mouse.x
+		cmp ebx,3d_wnd_l
+		jg @f
+			mov ebx,3d_wnd_l
+		@@:
+		sub ebx,3d_wnd_l
+		cmp ebx,3d_wnd_w
+		jle @f
+			mov ebx,3d_wnd_w
+		@@:
+		movsx eax,ax ;mouse.y
+		cmp eax,3d_wnd_t
+		jg @f
+			mov eax,3d_wnd_t
+		@@:
+		sub eax,3d_wnd_t
+		cmp eax,3d_wnd_h
+		jle @f
+			mov eax,3d_wnd_h
+		@@:
+		finit
+		fild  dword[mouse_y]
+		mov   [mouse_y],eax
+		fisub dword[mouse_y]
+		fdiv  dword[angle_dzm] ;if the cursor moves along the y-axis (up or down)
+		fadd  dword[angle_z]
+		fst   dword[angle_z]
+		stdcall update_number, txt_angle_z.v
+
+		fild  dword[mouse_x]
+		mov   [mouse_x],ebx
+		fisub dword[mouse_x]
+		fdiv  dword[angle_dym] ;if the cursor moves along the z-axis (left or right)
+		fadd  dword[angle_y]
+		fst   dword[angle_y]
+		stdcall update_number, txt_angle_y.v
+
+		call draw_3d
+		call [kosglSwapBuffers]
+		jmp .end_d
+	.end_m:
+	bt eax,16
+	jnc @f
+		;mouse l. but. up
+		mov dword[mouse_drag],0
+		jmp .end_d
+	@@:
+	bt eax,8
+	jnc .end_d
+		;mouse l. but. press
+		mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
+		mov ebx,eax
+		sar ebx,16 ;mouse.x
+		cmp ebx,3d_wnd_l
+		jl .end_d
+		sub ebx,3d_wnd_l
+		cmp ebx,3d_wnd_w
+		jg .end_d
+		movsx eax,ax ;mouse.y
+		cmp eax,3d_wnd_t
+		jl .end_d
+		sub eax,3d_wnd_t
+		cmp eax,3d_wnd_h
+		jg .end_d
+		mov dword[mouse_drag],1
+		mov dword[mouse_x],ebx
+		mov dword[mouse_y],eax
+	.end_d:
+
+	pop ebx eax
+	ret
+
+;input:
+; st0 - number
+; txt_addr - pointer to text buffer
+align 4
+proc update_number uses eax, txt_addr:dword
+	mov word[NumberSymbolsAD],3
+	fstp qword[Data_Double]
+	call DoubleFloat_to_String
+	mov eax,[txt_addr]
+	mov byte[eax],0
+	stdcall str_cat, eax,Data_String
+	ret
+endp
+
 align 4
 but_st_point:
 	stdcall [gluQuadricDrawStyle], [qObj],GLU_POINT
@@ -255,11 +369,7 @@ but_zoom_p:
 		fld dword[sc_max]
 	@@:
 	fst dword[scale]
-	mov word[NumberSymbolsAD],3
-	fstp qword[Data_Double]
-	call DoubleFloat_to_String
-	mov byte[txt_scale.v],0
-	stdcall str_cat, txt_scale.v,Data_String
+	stdcall update_number, txt_scale.v
 	call draw_3d
 	call [kosglSwapBuffers]
 	ret
@@ -278,50 +388,54 @@ but_zoom_m:
 		fld dword[sc_min]
 	@@:
 	fst dword[scale]
-	mov word[NumberSymbolsAD],3
-	fstp qword[Data_Double]
-	call DoubleFloat_to_String
-	mov byte[txt_scale.v],0
-	stdcall str_cat, txt_scale.v,Data_String
+	stdcall update_number, txt_scale.v
 	call draw_3d
 	call [kosglSwapBuffers]
 	ret
 
 
-align 4
-caption db 'Test gluCylinder, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
-
-align 4
-rad1 dq 1.0
-rad2 dq 0.55
-rad3 dq 0.15
-hei1 dq 2.0 ;высота цилиндра
-hei2 dq 1.25
-
 align 4
 draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины
 
 call [glPushMatrix]
-	call SetLight
-
-	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]
-	stdcall [glScalef], 1.0, 1.0, 0.5
 
 	stdcall [glColor3f], 1.0, 1.0, 0.0
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glTranslatef], 0.0,0.0,-1.0 ;опускаем цилинды вниз
-	stdcall [gluCylinder], [qObj], rad1,rad1,hei1, 32,8
+	push 8
+	push 32
+	glpush hei1
+	glpush rad1
+	glpush rad1
+	stdcall [gluCylinder], [qObj]
+
+	stdcall [glTranslatef], 0.0,0.0,2.0
+	push 4
+	push 32
+	glpush rad1
+	glpush rad3
+	stdcall [gluDisk], [qObj]
 
 	stdcall [glColor3f], 1.0, 0.0, 0.0
-	stdcall [glTranslatef], -1.6,0.0,0.0
-	stdcall [gluCylinder], [qObj], rad2,rad3,hei2, 16,8
+	stdcall [glTranslatef], -1.6,0.0,-2.0
+	push 8
+	push 16
+	glpush hei2
+	glpush rad3
+	glpush rad2
+	stdcall [gluCylinder], [qObj]
 
 	stdcall [glColor3f], 0.0, 0.0, 1.0
 	stdcall [glTranslatef], 3.2,0.0,0.0
-	stdcall [gluCylinder], [qObj], rad2,rad3,hei2, 16,8
+	push 8
+	push 16
+	glpush hei2
+	glpush rad3
+	glpush rad2
+	stdcall [gluCylinder], [qObj]
 call [glPopMatrix]
 
 	stdcall [buf2d_draw_text], buf_ogl, buf_1,txt_scale,5,5,0xffff00
@@ -347,10 +461,22 @@ SetLight:
 	stdcall [glEnable],GL_LIGHT0
 ret
 
-scale dd 0.4 ;начальный масштаб
-sc_delt dd 0.05 ;изменение масштаба при нажатии
-sc_min dd 0.1 ;минимальный масштаб
-sc_max dd 1.1 ;максимальный масштаб
+align 4
+caption db 'Test gluCylinder and gluDisk, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
+
+align 4
+rad1 dq 1.0
+rad2 dq 0.55
+rad3 dq 0.15
+hei1 dq 2.0 ;высота цилиндра
+hei2 dq 1.25
+
+fl_180 dd 180.0
+
+scale dd 0.4 ;initial scale
+sc_delt dd 0.05 ;zoom on click
+sc_min dd 0.1 ;minimum scale
+sc_max dd 1.1 ;maximum scale
 angle_z dd -45.0
 angle_y dd -150.0
 delt_size dd 3.0
@@ -369,13 +495,17 @@ import_tinygl:
 
 macro E_LIB n
 {
+if defined sz_#n
 	n dd sz_#n
+end if
 }
 include '../export.inc'
 	dd 0,0
 macro E_LIB n
 {
+if used n
 	sz_#n db `n,0
+end if
 }
 include '../export.inc'
 
@@ -493,28 +623,23 @@ lib_name_2 db 'libimg.obj',0
 
 txt_scale:
 db 'Scale: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_z:
 db 'Rotate z: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_y:
 db 'Rotate y: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 align 4
 buf_ogl:
 	dd 0 ;указатель на буфер изображения
-	dw 10,10 ;+4 left,top
-.w: dd 400
-.h: dd 350
+	dw 3d_wnd_l ;+4 left
+.t: dw 3d_wnd_t ;+6 top
+.w: dd 3d_wnd_w
+.h: dd 3d_wnd_h
 	dd 0,24 ;+16 color,bit in pixel
 
 align 4
@@ -533,9 +658,14 @@ l_libs_end:
 
 align 4
 i_end:
-	ctx1 rb 28 ;sizeof.TinyGLContext = 28
+	ctx1 TinyGLContext
 	image_data_toolbar dd 0
 	qObj dd 0
+	mouse_drag dd 0 ;scene rotation mode based on mouse cursor movement
+	mouse_x dd 0
+	mouse_y dd 0
+	angle_dzm dd 0 ;~ 3d_wnd_w/180 - adding scene rotation angles when rotating the mouse
+	angle_dym dd 0 ;~ 3d_wnd_h/180
 	run_file_70 FileInfoBlock
 	sc system_colors
 align 16

programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm

@@ -1,3 +1,7 @@
+; SPDX-License-Identifier: GPL-2.0-only
+; Test glu2 - gluSphere functionality testing
+; Copyright (C) 2015-2025 KolibriOS team
+
 use32
 	org 0
 	db 'MENUET01'
@@ -8,24 +12,24 @@ include '../../../../../macros.inc'
 include '../../../../../KOSfuncs.inc'
 include '../../../../../load_img.inc'
 include '../../../../../load_lib.mac'
+include '../kosgl.inc'
 include '../opengl_const.inc'
 include '../zbuffer.inc'
 include '../../../../../develop/info3ds/info_fun_float.inc'
 
+3d_wnd_l equ   0 ;tinygl buffer left indent
+3d_wnd_t equ  30 ;tinygl buffer top indent
+3d_wnd_w equ 500
+3d_wnd_h equ 400
+
 @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 
 IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3
 
-;Макрос для параметров типа double (8 байт)
-macro glpush GLDoubleVar {
-	push dword[GLDoubleVar+4]
-	push dword[GLDoubleVar]
-}
-
 align 4
 start:
 load_libraries l_libs_start,l_libs_end
-	;проверка на сколько удачно загузились библиотеки
+	;checking how successfully the libraries were loaded
 	mov	ebp,lib_0
 	.test_lib_open:
 	cmp	dword [ebp+ll_struc_size-4],0
@@ -39,16 +43,24 @@ load_libraries l_libs_start,l_libs_end
 	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors
 	mcall SF_SET_EVENTS_MASK,0x27
 
-	stdcall [kosglMakeCurrent], 5,30,[buf_ogl.w],[buf_ogl.h],ctx1
+	finit
+	fild dword[buf_ogl.w]
+	fdiv dword[fl_180]
+	fstp dword[angle_dzm]
+	fild dword[buf_ogl.h]
+	fdiv dword[fl_180]
+	fstp dword[angle_dym]
+
+	stdcall [kosglMakeCurrent], 3d_wnd_l,3d_wnd_t,[buf_ogl.w],[buf_ogl.h],ctx1
 	stdcall [glEnable], GL_DEPTH_TEST
-	stdcall [glEnable], GL_NORMALIZE ;делам нормали одинаковой величины во избежание артефактов
+	stdcall [glEnable], GL_NORMALIZE ;normals of the same size to avoid artifacts
 	call [gluNewQuadric]
 	mov [qObj],eax
 
 	stdcall [glClearColor], 0.25,0.25,0.25,0.0
 	stdcall [glShadeModel], GL_SMOOTH
 
-	mov eax,dword[ctx1] ;eax -> TinyGLContext.GLContext
+	mov eax,[ctx1.gl_context]
 	mov eax,[eax] ;eax -> ZBuffer
 	mov eax,[eax+ZBuffer.pbuf]
 	mov dword[buf_ogl],eax
@@ -60,6 +72,15 @@ load_libraries l_libs_start,l_libs_end
 	stdcall [buf2d_convert_text_matrix], buf_1
 
 	load_image_file 'toolb_1.png', image_data_toolbar
+
+	fld dword[scale]
+	stdcall update_number, txt_scale.v
+	fld dword[angle_y]
+	stdcall update_number, txt_angle_y.v
+	fld dword[angle_z]
+	stdcall update_number, txt_angle_z.v
+
+	call SetLight
 	call draw_3d
 
 align 4
@@ -69,19 +90,30 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp al,1
-	jz red_win
-	cmp al,2
-	jz key
-	cmp al,3
-	jz button
-	jmp still
+	cmp   al,EV_REDRAW
+	jz    red_win
+	cmp   al,EV_KEY
+	jz    key
+	cmp   al,EV_BUTTON
+	jz    button
+	cmp   al,EV_MOUSE
+	jne   still
+	call  mouse
+	jmp   still
 
 align 4
 draw_window:
 	pushad
 	mcall SF_REDRAW,SSF_BEGIN_DRAW
-	mcall SF_CREATE_WINDOW,(50 shl 16)+420,(30 shl 16)+410,0x33ffffff,,caption
+
+	mcall SF_STYLE_SETTINGS,SSF_GET_SKIN_HEIGHT
+	mov ebx,[buf_ogl.w]
+	add ebx,(50 shl 16)+9
+	mov ecx,[buf_ogl.h]
+	add ecx,(30 shl 16)+4
+	add ecx,eax
+	add cx,[buf_ogl.t]
+	mcall SF_CREATE_WINDOW,,,0x33ffffff,,caption
 
 	mov esi,[sc.work_button]
 	mcall SF_DEFINE_BUTTON,(6 shl 16)+19,(6 shl 16)+19,3+0x40000000 ;вершины вкл.
@@ -128,11 +160,7 @@ key:
 		fld dword[angle_y]
 		fadd dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 		jmp still
@@ -143,11 +171,7 @@ key:
 		fld dword[angle_y]
 		fsub dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 		jmp still
@@ -158,11 +182,7 @@ key:
 		fld dword[angle_z]
 		fadd dword[delt_size]
 		fst dword[angle_z]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_z.v],0
-		stdcall str_cat, txt_angle_z.v,Data_String
+		stdcall update_number, txt_angle_z.v
 		call draw_3d
 		call [kosglSwapBuffers]
 		jmp still
@@ -173,11 +193,7 @@ key:
 		fld dword[angle_z]
 		fsub dword[delt_size]
 		fst dword[angle_z]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_z.v],0
-		stdcall str_cat, txt_angle_z.v,Data_String
+		stdcall update_number, txt_angle_z.v
 		call draw_3d
 		call [kosglSwapBuffers]
 		;jmp still
@@ -220,6 +236,104 @@ button:
 	stdcall mem.Free,[image_data_toolbar]
 	mcall SF_TERMINATE_PROCESS
 
+align 4
+mouse:
+	push eax ebx
+	mcall SF_MOUSE_GET,SSF_BUTTON_EXT
+	bt eax,0
+	jnc .end_m
+		;mouse l. but. move
+		cmp dword[mouse_drag],1
+		jne .end_m
+
+		mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
+		mov ebx,eax
+		sar ebx,16 ;mouse.x
+		cmp ebx,3d_wnd_l
+		jg @f
+			mov ebx,3d_wnd_l
+		@@:
+		sub ebx,3d_wnd_l
+		cmp ebx,3d_wnd_w
+		jle @f
+			mov ebx,3d_wnd_w
+		@@:
+		movsx eax,ax ;mouse.y
+		cmp eax,3d_wnd_t
+		jg @f
+			mov eax,3d_wnd_t
+		@@:
+		sub eax,3d_wnd_t
+		cmp eax,3d_wnd_h
+		jle @f
+			mov eax,3d_wnd_h
+		@@:
+		finit
+		fild  dword[mouse_y]
+		mov   [mouse_y],eax
+		fisub dword[mouse_y]
+		fdiv  dword[angle_dzm] ;if the cursor moves along the y-axis (up or down)
+		fadd  dword[angle_z]
+		fst   dword[angle_z]
+		stdcall update_number, txt_angle_z.v
+
+		fild  dword[mouse_x]
+		mov   [mouse_x],ebx
+		fisub dword[mouse_x]
+		fdiv  dword[angle_dym] ;if the cursor moves along the z-axis (left or right)
+		fadd  dword[angle_y]
+		fst   dword[angle_y]
+		stdcall update_number, txt_angle_y.v
+
+		call draw_3d
+		call [kosglSwapBuffers]
+		jmp .end_d
+	.end_m:
+	bt eax,16
+	jnc @f
+		;mouse l. but. up
+		mov dword[mouse_drag],0
+		jmp .end_d
+	@@:
+	bt eax,8
+	jnc .end_d
+		;mouse l. but. press
+		mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
+		mov ebx,eax
+		sar ebx,16 ;mouse.x
+		cmp ebx,3d_wnd_l
+		jl .end_d
+		sub ebx,3d_wnd_l
+		cmp ebx,3d_wnd_w
+		jg .end_d
+		movsx eax,ax ;mouse.y
+		cmp eax,3d_wnd_t
+		jl .end_d
+		sub eax,3d_wnd_t
+		cmp eax,3d_wnd_h
+		jg .end_d
+		mov dword[mouse_drag],1
+		mov dword[mouse_x],ebx
+		mov dword[mouse_y],eax
+	.end_d:
+
+	pop ebx eax
+	ret
+
+;input:
+; st0 - number
+; txt_addr - pointer to text buffer
+align 4
+proc update_number uses eax, txt_addr:dword
+	mov word[NumberSymbolsAD],3
+	fstp qword[Data_Double]
+	call DoubleFloat_to_String
+	mov eax,[txt_addr]
+	mov byte[eax],0
+	stdcall str_cat, eax,Data_String
+	ret
+endp
+
 align 4
 but_st_point:
 	stdcall [gluQuadricDrawStyle], [qObj],GLU_POINT
@@ -255,11 +369,7 @@ but_zoom_p:
 		fld dword[sc_max]
 	@@:
 	fst dword[scale]
-	mov word[NumberSymbolsAD],3
-	fstp qword[Data_Double]
-	call DoubleFloat_to_String
-	mov byte[txt_scale.v],0
-	stdcall str_cat, txt_scale.v,Data_String
+	stdcall update_number, txt_scale.v
 	call draw_3d
 	call [kosglSwapBuffers]
 	ret
@@ -278,41 +388,40 @@ but_zoom_m:
 		fld dword[sc_min]
 	@@:
 	fst dword[scale]
-	mov word[NumberSymbolsAD],3
-	fstp qword[Data_Double]
-	call DoubleFloat_to_String
-	mov byte[txt_scale.v],0
-	stdcall str_cat, txt_scale.v,Data_String
+	stdcall update_number, txt_scale.v
 	call draw_3d
 	call [kosglSwapBuffers]
 	ret
 
 
-align 4
-caption db 'Test gluSphere, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
-
 align 4
 draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины
 
 call [glPushMatrix]
-	call SetLight
-
-	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]
 
 	stdcall [glColor3f], 1.0, 1.0, 0.0
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
-	stdcall [gluSphere], [qObj], 1.0, 32,32
+	push 32
+	push 32
+	glpush rad1
+	stdcall [gluSphere], [qObj]
 
 	stdcall [glColor3f], 1.0, 0.0, 0.0
 	stdcall [glTranslatef], -1.6,0.0,0.0
-	stdcall [gluSphere], [qObj], 0.55, 16,16
+	push 16
+	push 16
+	glpush rad2
+	stdcall [gluSphere], [qObj]
 
 	stdcall [glColor3f], 0.0, 0.0, 1.0
 	stdcall [glTranslatef], 3.2,0.0,0.0
-	stdcall [gluSphere], [qObj], 0.55, 16,16
+	push 16
+	push 16
+	glpush rad2
+	stdcall [gluSphere], [qObj]
 call [glPopMatrix]
 
 	stdcall [buf2d_draw_text], buf_ogl, buf_1,txt_scale,5,5,0xffff00
@@ -338,10 +447,19 @@ SetLight:
 	stdcall [glEnable],GL_LIGHT0
 ret
 
-scale dd 0.4 ;начальный масштаб
-sc_delt dd 0.05 ;изменение масштаба при нажатии
-sc_min dd 0.1 ;минимальный масштаб
-sc_max dd 1.1 ;максимальный масштаб
+align 4
+caption db 'Test gluSphere, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
+
+align 4
+rad1 dq 1.0
+rad2 dq 0.55
+
+fl_180 dd 180.0
+
+scale dd 0.4 ;initial scale
+sc_delt dd 0.05 ;zoom on click
+sc_min dd 0.1 ;minimum scale
+sc_max dd 1.1 ;maximum scale
 angle_z dd 0.0
 angle_y dd 0.0
 delt_size dd 3.0
@@ -360,13 +478,17 @@ import_tinygl:
 
 macro E_LIB n
 {
+if defined sz_#n
 	n dd sz_#n
+end if
 }
 include '../export.inc'
 	dd 0,0
 macro E_LIB n
 {
+if used n
 	sz_#n db `n,0
+end if
 }
 include '../export.inc'
 
@@ -484,28 +606,23 @@ lib_name_2 db 'libimg.obj',0
 
 txt_scale:
 db 'Scale: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_z:
 db 'Rotate z: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_y:
 db 'Rotate y: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 align 4
 buf_ogl:
 	dd 0 ;указатель на буфер изображения
-	dw 10,10 ;+4 left,top
-.w: dd 400
-.h: dd 350
+	dw 3d_wnd_l ;+4 left
+.t: dw 3d_wnd_t ;+6 top
+.w: dd 3d_wnd_w
+.h: dd 3d_wnd_h
 	dd 0,24 ;+16 color,bit in pixel
 
 align 4
@@ -524,9 +641,14 @@ l_libs_end:
 
 align 4
 i_end:
-	ctx1 rb 28 ;sizeof.TinyGLContext = 28
+	ctx1 TinyGLContext
 	image_data_toolbar dd 0
 	qObj dd 0
+	mouse_drag dd 0 ;scene rotation mode based on mouse cursor movement
+	mouse_x dd 0
+	mouse_y dd 0
+	angle_dzm dd 0 ;~ 3d_wnd_w/180 - adding scene rotation angles when rotating the mouse
+	angle_dym dd 0 ;~ 3d_wnd_h/180
 	run_file_70 FileInfoBlock
 	sc system_colors
 align 16

programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm

@@ -1,3 +1,7 @@
+; SPDX-License-Identifier: GPL-2.0-only
+; Textures0 - example of texture mapping on a sphere and cube
+; Copyright (C) 2015-2025 KolibriOS team
+
 use32
 	org 0
 	db 'MENUET01'
@@ -8,24 +12,24 @@ include '../../../../../macros.inc'
 include '../../../../../KOSfuncs.inc'
 include '../../../../../load_img.inc'
 include '../../../../../load_lib.mac'
+include '../kosgl.inc'
 include '../opengl_const.inc'
 include '../zbuffer.inc'
 include '../../../../../develop/info3ds/info_fun_float.inc'
 
-@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
+3d_wnd_l equ   0 ;tinygl buffer left indent
+3d_wnd_t equ  30 ;tinygl buffer top indent
+3d_wnd_w equ 500
+3d_wnd_h equ 400
 
-;Макрос для параметров типа double (8 байт)
-macro glpush GLDoubleVar {
-	push dword[GLDoubleVar+4]
-	push dword[GLDoubleVar]
-}
+@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 
 IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3
 
 align 4
 start:
 load_libraries l_libs_start,l_libs_end
-	;проверка на сколько удачно загузились библиотеки
+	;checking how successfully the libraries were loaded
 	mov	ebp,lib_0
 	.test_lib_open:
 	cmp	dword [ebp+ll_struc_size-4],0
@@ -39,9 +43,9 @@ load_libraries l_libs_start,l_libs_end
 	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors
 	mcall SF_SET_EVENTS_MASK,0x27
 
-	stdcall [kosglMakeCurrent], 5,30,[buf_ogl.w],[buf_ogl.h],ctx1
+	stdcall [kosglMakeCurrent], 3d_wnd_l,3d_wnd_t,[buf_ogl.w],[buf_ogl.h],ctx1
 	stdcall [glEnable], GL_DEPTH_TEST
-	stdcall [glEnable], GL_NORMALIZE ;делам нормали одинаковой величины во избежание артефактов
+	stdcall [glEnable], GL_NORMALIZE ;normals of the same size to avoid artifacts
 	call [gluNewQuadric]
 	mov [qObj],eax
 	stdcall [gluQuadricTexture], eax,GL_TRUE
@@ -49,7 +53,7 @@ load_libraries l_libs_start,l_libs_end
 	stdcall [glClearColor], 0.25,0.25,0.25,0.0
 	stdcall [glShadeModel], GL_SMOOTH
 
-	mov eax,dword[ctx1] ;eax -> TinyGLContext.GLContext
+	mov eax,[ctx1.gl_context]
 	mov eax,[eax] ;eax -> ZBuffer
 	mov eax,[eax+ZBuffer.pbuf]
 	mov dword[buf_ogl],eax
@@ -63,6 +67,11 @@ load_libraries l_libs_start,l_libs_end
 	load_image_file 'toolb_1.png', image_data_toolbar
 	load_image_file 'text_1.png', texture, text_w,text_h ;открытие файла текстуры
 
+	fld dword[angle_y]
+	stdcall update_number, txt_angle_y.v
+	fld dword[angle_z]
+	stdcall update_number, txt_angle_z.v
+
 	;* Setup texturing *
 	stdcall [glTexEnvi], GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL
   
@@ -88,19 +97,27 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp al,1
-	jz red_win
-	cmp al,2
-	jz key
-	cmp al,3
-	jz button
-	jmp still
+	cmp   al,EV_REDRAW
+	jz    red_win
+	cmp   al,EV_KEY
+	jz    key
+	cmp   al,EV_BUTTON
+	jz    button
+	jmp   still
 
 align 4
 draw_window:
 	pushad
 	mcall SF_REDRAW,SSF_BEGIN_DRAW
-	mcall SF_CREATE_WINDOW,(50 shl 16)+420,(30 shl 16)+410,0x33ffffff,,caption
+
+	mcall SF_STYLE_SETTINGS,SSF_GET_SKIN_HEIGHT
+	mov ebx,[buf_ogl.w]
+	add ebx,(50 shl 16)+9
+	mov ecx,[buf_ogl.h]
+	add ecx,(30 shl 16)+4
+	add ecx,eax
+	add cx,[buf_ogl.t]
+	mcall SF_CREATE_WINDOW,,,0x33ffffff,,caption
 
 	mov esi,[sc.work_button]
 	mcall SF_DEFINE_BUTTON,(6 shl 16)+19,(6 shl 16)+19,3+0x40000000 ;сферы
@@ -144,11 +161,7 @@ key:
 		fld dword[angle_y]
 		fadd dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -158,11 +171,7 @@ key:
 		fld dword[angle_y]
 		fsub dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -172,11 +181,7 @@ key:
 		fld dword[angle_z]
 		fadd dword[delt_size]
 		fst dword[angle_z]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_z.v],0
-		stdcall str_cat, txt_angle_z.v,Data_String
+		stdcall update_number, txt_angle_z.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -186,11 +191,7 @@ key:
 		fld dword[angle_z]
 		fsub dword[delt_size]
 		fst dword[angle_z]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_z.v],0
-		stdcall str_cat, txt_angle_z.v,Data_String
+		stdcall update_number, txt_angle_z.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -227,6 +228,20 @@ button:
 	stdcall mem.Free,[image_data_toolbar]
 	mcall SF_TERMINATE_PROCESS
 
+;input:
+; st0 - number
+; txt_addr - pointer to text buffer
+align 4
+proc update_number uses eax, txt_addr:dword
+	mov word[NumberSymbolsAD],2
+	fstp qword[Data_Double]
+	call DoubleFloat_to_String
+	mov eax,[txt_addr]
+	mov byte[eax],0
+	stdcall str_cat, eax,Data_String
+	ret
+endp
+
 align 4
 but_dr_0:
 	mov dword[dr_figure],0
@@ -287,15 +302,12 @@ but_zoom_m:
 	call [kosglSwapBuffers]
 	ret
 
-align 4
-caption db 'Test textures, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
 
 align 4
 draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины
 
 call [glPushMatrix]
-	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
@@ -304,15 +316,24 @@ cmp dword[dr_figure],0
 jne @f
 	; рисование сфер
 	stdcall [glColor3f], 1.0, 1.0, 0.0
-	stdcall [gluSphere], [qObj], 1.0, 32,32
+	push 32
+	push 32
+	glpush rad1
+	stdcall [gluSphere], [qObj]
 
 	stdcall [glColor3f], 1.0, 0.0, 0.0
 	stdcall [glTranslatef], -1.6,0.0,0.0
-	stdcall [gluSphere], [qObj], 0.55, 16,16
+	push 16
+	push 16
+	glpush rad2
+	stdcall [gluSphere], [qObj]
 
 	stdcall [glColor3f], 0.0, 0.0, 1.0
 	stdcall [glTranslatef], 3.2,0.0,0.0
-	stdcall [gluSphere], [qObj], 0.55, 16,16
+	push 16
+	push 16
+	glpush rad2
+	stdcall [gluSphere], [qObj]
 @@:
 cmp dword[dr_figure],1
 jne @f
@@ -388,6 +409,13 @@ call [glPopMatrix]
 	stdcall [buf2d_draw_text], buf_ogl, buf_1,txt_angle_y,5,25,0xffff00
 	ret
 
+align 4
+caption db 'Test textures, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
+
+align 4
+rad1 dq 1.0
+rad2 dq 0.55
+ 
 scale dd 0.4 ;начальный масштаб
 sc_delt dd 0.05 ;изменение масштаба при нажатии
 sc_min dd 0.1 ;минимальный масштаб
@@ -410,13 +438,17 @@ import_tinygl:
 
 macro E_LIB n
 {
+if defined sz_#n
 	n dd sz_#n
+end if
 }
 include '../export.inc'
 	dd 0,0
 macro E_LIB n
 {
+if used n
 	sz_#n db `n,0
+end if
 }
 include '../export.inc'
 
@@ -534,28 +566,23 @@ lib_name_2 db 'libimg.obj',0
 
 txt_scale:
 db 'Scale: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_z:
 db 'Rotate z: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_y:
 db 'Rotate y: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 align 4
 buf_ogl:
 	dd 0 ;указатель на буфер изображения
-	dw 10,10 ;+4 left,top
-.w: dd 400
-.h: dd 350
+	dw 3d_wnd_l ;+4 left
+.t: dw 3d_wnd_t ;+6 top
+.w: dd 3d_wnd_w
+.h: dd 3d_wnd_h
 	dd 0,24 ;+16 color,bit in pixel
 
 align 4
@@ -574,7 +601,7 @@ l_libs_end:
 
 align 4
 i_end:
-	ctx1 rb 28 ;sizeof.TinyGLContext = 28
+	ctx1 TinyGLContext
 	image_data_toolbar dd 0
 	dr_figure dd 0
 	qObj dd 0

programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm

@@ -1,3 +1,8 @@
+; SPDX-License-Identifier: GPL-2.0-only
+; Textures1 - drawing the earth with and without meridians.
+;             Texture size 1024*512 pixels is used.
+; Copyright (C) 2015-2025 KolibriOS team
+
 use32
 	org 0
 	db 'MENUET01'
@@ -8,24 +13,24 @@ include '../../../../../macros.inc'
 include '../../../../../KOSfuncs.inc'
 include '../../../../../load_img.inc'
 include '../../../../../load_lib.mac'
+include '../kosgl.inc'
 include '../opengl_const.inc'
 include '../zbuffer.inc'
 include '../../../../../develop/info3ds/info_fun_float.inc'
 
-@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
+3d_wnd_l equ   0 ;tinygl buffer left indent
+3d_wnd_t equ  30 ;tinygl buffer top indent
+3d_wnd_w equ 450
+3d_wnd_h equ 400
 
-;Макрос для параметров типа double (8 байт)
-macro glpush GLDoubleVar {
-	push dword[GLDoubleVar+4]
-	push dword[GLDoubleVar]
-}
+@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 
 IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3
 
 align 4
 start:
 load_libraries l_libs_start,l_libs_end
-	;проверка на сколько удачно загузились библиотеки
+	;checking how successfully the libraries were loaded
 	mov	ebp,lib_0
 	.test_lib_open:
 	cmp	dword [ebp+ll_struc_size-4],0
@@ -39,9 +44,9 @@ load_libraries l_libs_start,l_libs_end
 	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors
 	mcall SF_SET_EVENTS_MASK,0x27
 
-	stdcall [kosglMakeCurrent], 5,30,[buf_ogl.w],[buf_ogl.h],ctx1
+	stdcall [kosglMakeCurrent], 3d_wnd_l,3d_wnd_t,[buf_ogl.w],[buf_ogl.h],ctx1
 	stdcall [glEnable], GL_DEPTH_TEST
-	stdcall [glEnable], GL_NORMALIZE ;делам нормали одинаковой величины во избежание артефактов
+	stdcall [glEnable], GL_NORMALIZE ;normals of the same size to avoid artifacts
 	call [gluNewQuadric]
 	mov [qObj],eax
 	stdcall [gluQuadricTexture], eax,GL_TRUE
@@ -49,7 +54,7 @@ load_libraries l_libs_start,l_libs_end
 	stdcall [glClearColor], 0.0,0.0,0.0,0.0
 	stdcall [glShadeModel], GL_SMOOTH
 
-	mov eax,dword[ctx1] ;eax -> TinyGLContext.GLContext
+	mov eax,[ctx1.gl_context]
 	mov eax,[eax] ;eax -> ZBuffer
 	mov eax,[eax+ZBuffer.pbuf]
 	mov dword[buf_ogl],eax
@@ -63,6 +68,11 @@ load_libraries l_libs_start,l_libs_end
 	load_image_file 'toolb_1.png', image_data_toolbar
 	load_image_file 'text_2.png', texture, text_w,text_h ;открытие файла текстуры
 
+	fld dword[angle_x]
+	stdcall update_number, txt_angle_x.v
+	fld dword[angle_y]
+	stdcall update_number, txt_angle_y.v
+
 	;* Setup texturing *
 	stdcall [glTexEnvi], GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL
   
@@ -88,19 +98,27 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp al,1
-	jz red_win
-	cmp al,2
-	jz key
-	cmp al,3
-	jz button
-	jmp still
+	cmp   al,EV_REDRAW
+	jz    red_win
+	cmp   al,EV_KEY
+	jz    key
+	cmp   al,EV_BUTTON
+	jz    button
+	jmp   still
 
 align 4
 draw_window:
 	pushad
 	mcall SF_REDRAW,SSF_BEGIN_DRAW
-	mcall SF_CREATE_WINDOW,(50 shl 16)+420,(30 shl 16)+410,0x33ffffff,,caption
+
+	mcall SF_STYLE_SETTINGS,SSF_GET_SKIN_HEIGHT
+	mov ebx,[buf_ogl.w]
+	add ebx,(50 shl 16)+9
+	mov ecx,[buf_ogl.h]
+	add ecx,(30 shl 16)+4
+	add ecx,eax
+	add cx,[buf_ogl.t]
+	mcall SF_CREATE_WINDOW,,,0x33ffffff,,caption
 
 	mov esi,[sc.work_button]
 	mcall SF_DEFINE_BUTTON,(6 shl 16)+19,(6 shl 16)+19,3+0x40000000 ;земля с меридиан.
@@ -146,11 +164,7 @@ key:
 		fld dword[angle_y]
 		fadd dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -160,11 +174,7 @@ key:
 		fld dword[angle_y]
 		fsub dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -174,11 +184,7 @@ key:
 		fld dword[angle_x]
 		fadd dword[delt_size]
 		fst dword[angle_x]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_x.v],0
-		stdcall str_cat, txt_angle_x.v,Data_String
+		stdcall update_number, txt_angle_x.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -188,11 +194,7 @@ key:
 		fld dword[angle_x]
 		fsub dword[delt_size]
 		fst dword[angle_x]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_x.v],0
-		stdcall str_cat, txt_angle_x.v,Data_String
+		stdcall update_number, txt_angle_x.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -229,6 +231,20 @@ button:
 	stdcall mem.Free,[image_data_toolbar]
 	mcall SF_TERMINATE_PROCESS
 
+;input:
+; st0 - number
+; txt_addr - pointer to text buffer
+align 4
+proc update_number uses eax, txt_addr:dword
+	mov word[NumberSymbolsAD],2
+	fstp qword[Data_Double]
+	call DoubleFloat_to_String
+	mov eax,[txt_addr]
+	mov byte[eax],0
+	stdcall str_cat, eax,Data_String
+	ret
+endp
+
 align 4
 but_dr_0:
 	mov dword[dr_figure],0
@@ -289,34 +305,40 @@ but_zoom_m:
 	call [kosglSwapBuffers]
 	ret
 
-align 4
-caption db 'Test textures, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
 
 align 4
 draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины
 
 call [glPushMatrix]
-	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]
-	stdcall [glScalef], 1.0, 1.0, 0.1 ;прижимаем сферу, что-бы сразу не вылазила при увеличении
+	stdcall [glScalef], 1.0, 1.0, 0.2 ;прижимаем сферу, что-бы сразу не вылазила при увеличении
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0
 
 cmp dword[dr_figure],0
 jne @f
-	; рисование земли с меридианами
+	; drawing earth with meridians
 	stdcall [glColor3f], 0.0, 0.0, 1.0
 	stdcall [gluQuadricDrawStyle], [qObj],GLU_LINE
-	stdcall [gluSphere], [qObj], 1.0, 24,18 ;меридианы
+	push 18
+	push 24
+	glpush rad1
+	stdcall [gluSphere], [qObj] ;meridians
 	stdcall [gluQuadricDrawStyle], [qObj],GLU_FILL
-	stdcall [gluSphere], [qObj], 0.995, 24,18 ;земля
+	push 24
+	push 18
+	glpush rad2
+	stdcall [gluSphere], [qObj] ;Earth
 @@:
 cmp dword[dr_figure],1
 jne @f
-	; рисование земли
+	; drawing the earth
 	stdcall [gluQuadricDrawStyle], [qObj],GLU_FILL
-	stdcall [gluSphere], [qObj], 1.0, 64,64
+	push 64
+	push 64
+	glpush rad1
+	stdcall [gluSphere], [qObj]
 @@:
 call [glPopMatrix]
 
@@ -325,6 +347,13 @@ call [glPopMatrix]
 	stdcall [buf2d_draw_text], buf_ogl, buf_1,txt_angle_x,5,25,0xffff00
 	ret
 
+align 4
+caption db 'Test textures, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
+
+align 4
+rad1 dq 1.0
+rad2 dq 0.995
+
 scale dd 0.95 ;начальный масштаб
 sc_delt dd 0.05 ;изменение масштаба при нажатии
 sc_min dd 0.1 ;минимальный масштаб
@@ -340,13 +369,17 @@ import_tinygl:
 
 macro E_LIB n
 {
+if defined sz_#n
 	n dd sz_#n
+end if
 }
 include '../export.inc'
 	dd 0,0
 macro E_LIB n
 {
+if used n
 	sz_#n db `n,0
+end if
 }
 include '../export.inc'
 
@@ -464,34 +497,27 @@ lib_name_2 db 'libimg.obj',0
 
 txt_scale:
 db 'Scale: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_z:
 db 'Rotate z: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_x:
 db 'Rotate x: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_y:
 db 'Rotate y: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 align 4
 buf_ogl:
 	dd 0 ;указатель на буфер изображения
-	dw 10,10 ;+4 left,top
-.w: dd 400
-.h: dd 350
+	dw 3d_wnd_l ;+4 left
+.t: dw 3d_wnd_t ;+6 top
+.w: dd 3d_wnd_w
+.h: dd 3d_wnd_h
 	dd 0,24 ;+16 color,bit in pixel
 
 align 4
@@ -510,7 +536,7 @@ l_libs_end:
 
 align 4
 i_end:
-	ctx1 rb 28 ;sizeof.TinyGLContext = 28
+	ctx1 TinyGLContext
 	image_data_toolbar dd 0
 	dr_figure dd 0
 	qObj dd 0

programs/develop/libraries/TinyGL/asm_fork/examples/textures2.asm

@@ -1,3 +1,7 @@
+; SPDX-License-Identifier: GPL-2.0-only
+; Textures2 - example of creating a spherical panorama using texture
+; Copyright (C) 2015-2025 KolibriOS team
+
 use32
 	org 0
 	db 'MENUET01'
@@ -8,24 +12,24 @@ include '../../../../../macros.inc'
 include '../../../../../KOSfuncs.inc'
 include '../../../../../load_img.inc'
 include '../../../../../load_lib.mac'
+include '../kosgl.inc'
 include '../opengl_const.inc'
 include '../zbuffer.inc'
 include '../../../../../develop/info3ds/info_fun_float.inc'
 
-@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
+3d_wnd_l equ   0 ;tinygl buffer left indent
+3d_wnd_t equ  30 ;tinygl buffer top indent
+3d_wnd_w equ 450
+3d_wnd_h equ 400
 
-;Макрос для параметров типа double (8 байт)
-macro glpush GLDoubleVar {
-	push dword[GLDoubleVar+4]
-	push dword[GLDoubleVar]
-}
+@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 
 IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3
 
 align 4
 start:
 load_libraries l_libs_start,l_libs_end
-	;проверка на сколько удачно загузились библиотеки
+	;checking how successfully the libraries were loaded
 	mov	ebp,lib_0
 	.test_lib_open:
 	cmp	dword [ebp+ll_struc_size-4],0
@@ -39,9 +43,9 @@ load_libraries l_libs_start,l_libs_end
 	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors
 	mcall SF_SET_EVENTS_MASK,0x27
 
-	stdcall [kosglMakeCurrent], 5,30,[buf_ogl.w],[buf_ogl.h],ctx1
+	stdcall [kosglMakeCurrent], 3d_wnd_l,3d_wnd_t,[buf_ogl.w],[buf_ogl.h],ctx1
 	stdcall [glEnable], GL_DEPTH_TEST
-	stdcall [glEnable], GL_NORMALIZE ;делам нормали одинаковой величины во избежание артефактов
+	stdcall [glEnable], GL_NORMALIZE ;normals of the same size to avoid artifacts
 	call [gluNewQuadric]
 	mov [qObj],eax
 	stdcall [gluQuadricDrawStyle], eax,GLU_FILL
@@ -50,7 +54,7 @@ load_libraries l_libs_start,l_libs_end
 	stdcall [glClearColor], 0.0,0.0,0.0,0.0
 	stdcall [glShadeModel], GL_SMOOTH
 
-	mov eax,dword[ctx1] ;eax -> TinyGLContext.GLContext
+	mov eax,[ctx1.gl_context]
 	mov eax,[eax] ;eax -> ZBuffer
 	mov eax,[eax+ZBuffer.pbuf]
 	mov dword[buf_ogl],eax
@@ -64,6 +68,11 @@ load_libraries l_libs_start,l_libs_end
 	load_image_file 'toolb_1.png', image_data_toolbar
 	load_image_file 'text_3.png', texture, text_w,text_h ;открытие файла текстуры
 
+	fld dword[angle_x]
+	stdcall update_number, txt_angle_x.v
+	fld dword[angle_y]
+	stdcall update_number, txt_angle_y.v
+
 	;* Setup texturing *
 	stdcall [glTexEnvi], GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL
   
@@ -89,19 +98,27 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp al,1
-	jz red_win
-	cmp al,2
-	jz key
-	cmp al,3
-	jz button
-	jmp still
+	cmp   al,EV_REDRAW
+	jz    red_win
+	cmp   al,EV_KEY
+	jz    key
+	cmp   al,EV_BUTTON
+	jz    button
+	jmp   still
 
 align 4
 draw_window:
 	pushad
 	mcall SF_REDRAW,SSF_BEGIN_DRAW
-	mcall SF_CREATE_WINDOW,(50 shl 16)+420,(30 shl 16)+410,0x33ffffff,,caption
+
+	mcall SF_STYLE_SETTINGS,SSF_GET_SKIN_HEIGHT
+	mov ebx,[buf_ogl.w]
+	add ebx,(50 shl 16)+9
+	mov ecx,[buf_ogl.h]
+	add ecx,(30 shl 16)+4
+	add ecx,eax
+	add cx,[buf_ogl.t]
+	mcall SF_CREATE_WINDOW,,,0x33ffffff,,caption
 
 	mov esi,[sc.work_button]
 	mcall SF_DEFINE_BUTTON,(6 shl 16)+19,(6 shl 16)+19,3+0x40000000 ;масштаб +
@@ -141,11 +158,7 @@ key:
 		fld dword[angle_y]
 		fadd dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -155,11 +168,7 @@ key:
 		fld dword[angle_y]
 		fsub dword[delt_size]
 		fst dword[angle_y]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_y.v],0
-		stdcall str_cat, txt_angle_y.v,Data_String
+		stdcall update_number, txt_angle_y.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -169,11 +178,7 @@ key:
 		fld dword[angle_x]
 		fadd dword[delt_size]
 		fst dword[angle_x]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_x.v],0
-		stdcall str_cat, txt_angle_x.v,Data_String
+		stdcall update_number, txt_angle_x.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -183,11 +188,7 @@ key:
 		fld dword[angle_x]
 		fsub dword[delt_size]
 		fst dword[angle_x]
-		mov word[NumberSymbolsAD],2
-		fstp qword[Data_Double]
-		call DoubleFloat_to_String
-		mov byte[txt_angle_x.v],0
-		stdcall str_cat, txt_angle_x.v,Data_String
+		stdcall update_number, txt_angle_x.v
 		call draw_3d
 		call [kosglSwapBuffers]
 	@@:
@@ -214,6 +215,20 @@ button:
 	stdcall mem.Free,[image_data_toolbar]
 	mcall SF_TERMINATE_PROCESS
 
+;input:
+; st0 - number
+; txt_addr - pointer to text buffer
+align 4
+proc update_number uses eax, txt_addr:dword
+	mov word[NumberSymbolsAD],2
+	fstp qword[Data_Double]
+	call DoubleFloat_to_String
+	mov eax,[txt_addr]
+	mov byte[eax],0
+	stdcall str_cat, eax,Data_String
+	ret
+endp
+
 align 4
 but_zoom_p:
 	finit
@@ -260,21 +275,25 @@ but_zoom_m:
 	call [kosglSwapBuffers]
 	ret
 
-align 4
-caption db 'Test textures, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
 
 align 4
 draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины
 
 call [glPushMatrix]
+	stdcall [glTranslatef], 0.0,0.0,-1.0 ;двигаем сферу на себя, что-бы отсечь переднюю часть
 	stdcall [glScalef], [scale], [scale], [scale]
-	stdcall [glScalef], 1.0, 1.0, 0.1 ;прижимаем сферу, что-бы сразу не вылазила при увеличении
+	stdcall [glScalef], 1.0, 1.0, 0.2 ;прижимаем сферу, что-бы сразу не вылазила при увеличении
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0
 
 	; рисование панорамы
-	stdcall [gluSphere], [qObj], 1.0, 64,64
+	push 64
+	push 64
+	add esp,-8
+	fld1
+	fstp qword[esp]
+	stdcall [gluSphere], [qObj]
 call [glPopMatrix]
 
 	stdcall [buf2d_draw_text], buf_ogl, buf_1,txt_scale,5,5,0xffff00
@@ -282,6 +301,10 @@ call [glPopMatrix]
 	stdcall [buf2d_draw_text], buf_ogl, buf_1,txt_angle_x,5,25,0xffff00
 	ret
 
+align 4
+caption db 'Test textures, [Esc] - exit, [<-],[->],[Up],[Down] - rotate',0
+
+align 4
 scale dd 1.5 ;начальный масштаб
 sc_delt dd 0.05 ;изменение масштаба при нажатии
 sc_min dd 0.95 ;минимальный масштаб
@@ -297,13 +320,17 @@ import_tinygl:
 
 macro E_LIB n
 {
+if defined sz_#n
 	n dd sz_#n
+end if
 }
 include '../export.inc'
 	dd 0,0
 macro E_LIB n
 {
+if used n
 	sz_#n db `n,0
+end if
 }
 include '../export.inc'
 
@@ -421,34 +448,27 @@ lib_name_2 db 'libimg.obj',0
 
 txt_scale:
 db 'Scale: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_z:
 db 'Rotate z: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_x:
 db 'Rotate x: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 txt_angle_y:
 db 'Rotate y: '
-.v:
-db 0
-rb 10
+.v: rb 11
 
 align 4
 buf_ogl:
 	dd 0 ;указатель на буфер изображения
-	dw 10,10 ;+4 left,top
-.w: dd 400
-.h: dd 350
+	dw 3d_wnd_l ;+4 left
+.t: dw 3d_wnd_t ;+6 top
+.w: dd 3d_wnd_w
+.h: dd 3d_wnd_h
 	dd 0,24 ;+16 color,bit in pixel
 
 align 4
@@ -467,7 +487,7 @@ l_libs_end:
 
 align 4
 i_end:
-	ctx1 rb 28 ;sizeof.TinyGLContext = 28
+	ctx1 TinyGLContext
 	image_data_toolbar dd 0
 	qObj dd 0
 	TexObj dd 0 ;массив указателей на текстуры (в данном случае 1 шт.)

programs/develop/libraries/TinyGL/asm_fork/export.inc

@@ -168,7 +168,8 @@ E_LIB gluQuadricDrawStyle
 E_LIB gluQuadricOrientation
 E_LIB gluQuadricTexture
 E_LIB gluCylinder ;(GLUquadricObj, double, double, double, int, int)
-E_LIB gluSphere ;(GLUquadricObj, float, int, int)
+E_LIB gluDisk ;(GLUquadricObj, double, double, int, int)
+E_LIB gluSphere ;(GLUquadricObj, double, int, int)
 
 ;
 ; KolibriOS functions

programs/develop/libraries/TinyGL/asm_fork/glu.asm

@@ -6,29 +6,9 @@ struct GLUquadricObj
 	ErrorFunc   dd ? ; Error handler callback function
 ends
 
-offs_qobj_DrawStyle equ 0
-offs_qobj_Orientation equ 4
-offs_qobj_TextureFlag equ 8
-offs_qobj_Normals equ 12
-offs_qobj_ErrorFunc equ 16
-
-;Так как некоторые извращенческие функции OpenGL воспринимают только параметры
-;типа double (8 байт) то придется пихать их в стек макросом glpush
-macro glpush GLDoubleVar {
-	push dword[GLDoubleVar+4]
-	push dword[GLDoubleVar]
-}
-
-;void drawTorus(float rc, int numc, float rt, int numt)
-;{
-;}
-
-;static void normal3f(GLfloat x, GLfloat y, GLfloat z )
-;{
-;}
-
 align 4
-an360f dd 360.0
+fl_0_5 dd 0.5
+fl_360 dd 360.0
 
 align 16
 proc gluPerspective, fovy:qword, aspect:qword, zNear:qword, zFar:qword
@@ -40,7 +20,7 @@ locals
 endl
 	fldpi
 	fmul qword[fovy]
-	fdiv dword[an360f]
+	fdiv dword[fl_360]
 	fptan
 	ffree st0 ;выкидываем 1.0 которая осталось после вычисления тангенса
 	fincstp
@@ -76,11 +56,11 @@ gluNewQuadric:
 	stdcall gl_malloc, sizeof.GLUquadricObj
 	or eax,eax
 	jz @f
-		mov dword[eax+offs_qobj_DrawStyle],GLU_FILL
-		mov dword[eax+offs_qobj_Orientation],GLU_OUTSIDE
-		mov dword[eax+offs_qobj_TextureFlag],GL_FALSE
-		mov dword[eax+offs_qobj_Normals],GLU_SMOOTH
-		mov dword[eax+offs_qobj_ErrorFunc],0 ;NULL
+		mov dword[eax+GLUquadricObj.DrawStyle],GLU_FILL
+		mov dword[eax+GLUquadricObj.Orientation],GLU_OUTSIDE
+		mov dword[eax+GLUquadricObj.TextureFlag],GL_FALSE
+		mov dword[eax+GLUquadricObj.Normals],GLU_SMOOTH
+		mov dword[eax+GLUquadricObj.ErrorFunc],0 ;NULL
 	@@:
 	ret
 
@@ -114,7 +94,7 @@ proc gluQuadricDrawStyle uses eax ebx, qobj:dword, drawStyle:dword
 	jmp .err_q
 align 4
 	@@:
-		mov dword[eax+offs_qobj_DrawStyle],ebx
+		mov dword[eax+GLUquadricObj.DrawStyle],ebx
 		jmp @f
 align 4
 	.err_q:
@@ -139,7 +119,7 @@ proc gluQuadricOrientation uses eax ebx, qobj:dword, orientation:dword
 	jmp .err_q
 align 4
 	@@:
-		mov dword[eax+offs_qobj_Orientation],ebx
+		mov dword[eax+GLUquadricObj.Orientation],ebx
 		jmp @f
 align 4
 	.err_q:
@@ -159,7 +139,7 @@ proc gluQuadricTexture uses eax ebx, qobj:dword, texture:dword
 	cmp ebx,GL_FALSE
 	je @f
 	@@:
-		mov dword[eax+offs_qobj_TextureFlag],ebx
+		mov dword[eax+GLUquadricObj.TextureFlag],ebx
 		jmp @f
 align 4
 	.err_q:
@@ -169,7 +149,7 @@ align 4
 endp
 
 align 16
-proc gluCylinder qobj:dword, baseRadius:dword, topRadius:dword, height:dword,\
+proc gluCylinder qobj:dword, baseRadius:qword, topRadius:qword, height:qword,\
 	slices:dword, stacks:dword
 locals
 	da dq ? ;double
@@ -193,7 +173,7 @@ endl
 pushad
 	mov edx,[qobj]
 	fld1
-	cmp dword[edx+offs_qobj_Orientation],GLU_INSIDE
+	cmp dword[edx+GLUquadricObj.Orientation],GLU_INSIDE
 	jne @f
 		fchs
 	@@:
@@ -203,14 +183,12 @@ pushad
 	fadd st0,st0
 	fidiv dword[slices]
 	fstp qword[da] ;da = 2.0*M_PI / slices
-	mov ebx,[topRadius]
-	fld qword[ebx]
-	mov ecx,[baseRadius]
-	fsub qword[ecx]
+	fld qword[topRadius]
+	fsub qword[baseRadius]
 	fld st0 ;copy: topRadius-baseRadius
 	fidiv dword[stacks]
 	fstp qword[dr] ;dr = (topRadius-baseRadius) / stacks
-	mov eax,[height]
+	lea eax,[height]
 	fld qword[eax]
 	fidiv dword[stacks]
 	fstp qword[dz] ;dz = height / stacks
@@ -218,7 +196,7 @@ pushad
 	fdiv qword[eax]
 	fstp dword[nz] ;nz = (baseRadius-topRadius) / height ; Z component of normal vectors
 
-	cmp dword[edx+offs_qobj_DrawStyle],GLU_POINT
+	cmp dword[edx+GLUquadricObj.DrawStyle],GLU_POINT
 	jne .else0
 		stdcall glBegin,GL_POINTS
 		mov ebx,[slices]
@@ -245,8 +223,7 @@ align 4
 			call glNormal3f ;x*nsign, y*nsign, nz*nsign
 
 			mov dword[z],0.0
-			mov ecx,[baseRadius]
-			fld qword[ecx]
+			fld qword[baseRadius]
 			fstp qword[r] ;r = baseRadius
 			mov ecx,[stacks]
 			inc ecx
@@ -277,16 +254,15 @@ align 4
 		call glEnd
 		jmp .end_f
 	.else0:
-	cmp dword[edx+offs_qobj_DrawStyle],GLU_LINE
+	cmp dword[edx+GLUquadricObj.DrawStyle],GLU_LINE
 	je @f
-	cmp dword[edx+offs_qobj_DrawStyle],GLU_SILHOUETTE
+	cmp dword[edx+GLUquadricObj.DrawStyle],GLU_SILHOUETTE
 	je .else2
 		jmp .else1
 	@@:
 		; Draw rings
 		mov dword[z],0.0
-		mov ecx,[baseRadius]
-		fld qword[ecx]
+		fld qword[baseRadius]
 		fstp qword[r] ;r = baseRadius
 		mov ecx,[stacks]
 		inc ecx
@@ -342,28 +318,100 @@ align 4
 align 4
 		.else2:
 		; draw one ring at each end
-;     if (baseRadius!=0.0) {
+		lea ecx,[baseRadius]
+		fld qword[ecx]
+		ftst
+		fnstsw ax
+		ffree st0
+		fincstp
+		sahf
+		je .rad_b0
 			stdcall glBegin,GL_LINE_LOOP
+			mov ebx,[slices]
+			mov dword[i],0
 align 4
 			.cycle_4: ;for (i=0;i<slices;i++)
-;		{
-;           x = cos(i*da);
-;           y = sin(i*da);
-;           normal3f( x*nsign, y*nsign, nz*nsign );
-;           glVertex3f( x*baseRadius, y*baseRadius, 0.0 );
-;        }
+				cmp  [i],ebx
+				jge  .cycle_4_end
+				fild dword[i]
+				fmul qword[da]
+				fld  st0
+				fcos
+				fstp dword[x] ;x = cos(i*da)
+				fsin
+				fstp dword[y] ;y = sin(i*da)
+				fld  dword[nsign]
+				fmul dword[nz]
+				fstp dword[esp-4]
+				fld  dword[nsign]
+				fmul dword[y]
+				fstp dword[esp-8]
+				fld  dword[nsign]
+				fmul dword[x]
+				fstp dword[esp-12]
+				add  esp,-12
+				call glNormal3f ;x*nsign, y*nsign, nz*nsign
+				push 0.0
+				fld  qword[ecx]
+				fmul dword[y]
+				fstp dword[esp-4]
+				fld  qword[ecx]
+				fmul dword[x]
+				fstp dword[esp-8]
+				add  esp,-8
+				call glVertex3f ;x*baseRadius, y*baseRadius, 0.0
+				inc  dword[i]
+				jmp  .cycle_4
+			.cycle_4_end:
 			call glEnd
+		.rad_b0:
+		lea ecx,[topRadius]
+		fld qword[ecx]
+		ftst
+		fnstsw ax
+		ffree st0
+		fincstp
+		sahf
+		je .else2_end
 			stdcall glBegin,GL_LINE_LOOP
+			mov ebx,[slices]
+			mov dword[i],0
 align 4
 			.cycle_5: ;for (i=0;i<slices;i++)
-;		{
-;           x = cos(i*da);
-;           y = sin(i*da);
-;           normal3f( x*nsign, y*nsign, nz*nsign );
-;           glVertex3f( x*topRadius, y*topRadius, height );
-;        }
+				cmp  [i],ebx
+				jge  .cycle_5_end
+				fild dword[i]
+				fmul qword[da]
+				fld  st0
+				fcos
+				fstp dword[x] ;x = cos(i*da)
+				fsin
+				fstp dword[y] ;y = sin(i*da)
+				fld  dword[nsign]
+				fmul dword[nz]
+				fstp dword[esp-4]
+				fld  dword[nsign]
+				fmul dword[y]
+				fstp dword[esp-8]
+				fld  dword[nsign]
+				fmul dword[x]
+				fstp dword[esp-12]
+				add  esp,-12
+				call glNormal3f ;x*nsign, y*nsign, nz*nsign
+				fld  qword[height]
+				fstp dword[esp-4]
+				fld  qword[ecx]
+				fmul dword[y]
+				fstp dword[esp-8]
+				fld  qword[ecx]
+				fmul dword[x]
+				fstp dword[esp-12]
+				add  esp,-12
+				call glVertex3f ;x*topRadius, y*topRadius, height
+				inc  dword[i]
+				jmp  .cycle_5
+			.cycle_5_end:
 			call glEnd
-;     }
 		.else2_end:
 		; draw length lines
 		stdcall glBegin,GL_LINES
@@ -390,8 +438,7 @@ align 4
 			sub esp,12
 			call glNormal3f ;x*nsign, y*nsign, nz*nsign
 			mov dword[esp-4],0.0
-			mov ecx,[baseRadius]
-			fld qword[ecx]
+			fld qword[baseRadius]
 			fld st0
 			fmul dword[y]
 			fstp dword[esp-8]
@@ -399,11 +446,9 @@ align 4
 			fstp dword[esp-12]
 			sub esp,12
 			call glVertex3f ;x*baseRadius, y*baseRadius, 0.0
-			mov eax,[height]
-			fld qword[eax]
+			fld qword[height]
 			fstp dword[esp-4]
-			mov ecx,[topRadius]
-			fld qword[ecx]
+			fld qword[topRadius]
 			fld st0
 			fmul dword[y]
 			fstp dword[esp-8]
@@ -419,7 +464,7 @@ align 4
 		jmp .end_f
 align 4
 	.else1:
-	cmp dword[edx+offs_qobj_DrawStyle],GLU_FILL
+	cmp dword[edx+GLUquadricObj.DrawStyle],GLU_FILL
 	jne .end_f
 		fld1
 		fidiv dword[slices]
@@ -453,8 +498,7 @@ align 4
 			fchs
 			fstp dword[x2] ;x2 = -sin((i+1)*da)
 			mov dword[z],0.0
-			mov ecx,[baseRadius]
-			fld qword[ecx]
+			fld qword[baseRadius]
 			fstp qword[r] ;r = baseRadius
 			mov dword[tcy],0.0
 			stdcall glBegin,GL_QUAD_STRIP
@@ -479,7 +523,7 @@ align 4
 					fstp dword[esp-12]
 					sub esp,12
 					call glNormal3f ;x1*nsign, y1*nsign, nz*nsign
-					cmp dword[edx+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+					cmp dword[edx+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 					je @f
 						stdcall glTexCoord2f, [tcx],[tcy]
 					@@:
@@ -504,7 +548,7 @@ align 4
 					fstp dword[esp-12]
 					sub esp,12
 					call glNormal3f ;x2*nsign, y2*nsign, nz*nsign
-					cmp dword[edx+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+					cmp dword[edx+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 					je @f
 						push dword[tcy]
 						fld dword[tcx]
@@ -535,7 +579,7 @@ align 4
 					fstp dword[esp-12]
 					sub esp,12
 					call glNormal3f ;x2*nsign, y2*nsign, nz*nsign
-					cmp dword[edx+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+					cmp dword[edx+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 					je @f
 						stdcall glTexCoord2f, [tcx],[tcy]
 					@@:
@@ -560,7 +604,7 @@ align 4
 					fstp dword[esp-12]
 					sub esp,12
 					call glNormal3f ;x1*nsign, y1*nsign, nz*nsign
-					cmp dword[edx+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+					cmp dword[edx+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 					je @f
 						push dword[tcy]
 						fld dword[tcx]
@@ -605,18 +649,164 @@ endp
 
 ; Disk (adapted from Mesa)
 
-;void gluDisk(GLUquadricObj *qobj, GLdouble innerRadius, GLdouble outerRadius, GLint slices, GLint loops )
-;{
-;}
+align 16
+proc gluDisk uses eax ebx ecx edx esi, qobj:dword,\
+	innerRadius:qword, outerRadius:qword, slices:dword, loops:dword
+locals
+	a   dq ?
+	da  dq ?
+	dr  dd ?
+	r1  dd ?
+	r2  dd ?
+	dtc dd ?
+	s   dd ? ;int
+	sa  dd ?
+	ca  dd ?
+endl
+	;ebx = s
+	;ecx = l
+	;esi = slices
+	mov   ecx,[loops]
+	cmp   ecx,1
+	jl    .end_f
+	mov   esi,[slices]
+	cmp   esi,1
+	jl    .end_f
+
+	mov edx,[qobj]
+	cmp dword[edx+GLUquadricObj.DrawStyle],GLU_FILL
+	jne .no_fill
+	fld1
+	cmp dword[edx+GLUquadricObj.Orientation],GLU_OUTSIDE
+	je @f
+	fchs
+@@:
+	add   esp,-4
+	fstp  dword[esp]
+	stdcall glNormal3f,0.0,0.0
+
+	fldpi
+	fadd  st0,st0
+	fidiv dword[slices]
+	fstp  qword[da] ;da = 2.0*M_PI / slices
+	fld   qword[outerRadius]
+	fsub  qword[innerRadius]
+	fild  dword[loops]
+	fdivp st1,st
+	fstp  dword[dr] ;dr = (outerRadius-innerRadius) / loops
+
+	; texture of a gluDisk is a cut out of the texture unit square
+	; x, y in [-outerRadius, +outerRadius]; s, t in [0, 1] (linear mapping)
+	fld1
+	fadd  st0,st0
+	fmul  qword[outerRadius]
+	fstp  dword[dtc] ;dtc = 2.0*outerRadius
+	fld   qword[innerRadius]
+	fstp  dword[r1]
+
+align 4
+.cycle_0: ;for (l=loops;l>0;l--)
+	fld   dword[r1]
+	fadd  dword[dr]
+	fstp  dword[r2] ;r2 = r1 + dr
+	stdcall glBegin,GL_QUAD_STRIP
+	xor   ebx,ebx
+.cycle_1: ;for (s=0;s<=slices;s++)
+	cmp   esi,ebx
+	jne   .u1
+	fldz
+	fstp  qword[a]
+	jmp   .u2
+align 4
+.u1:
+	mov   [s],ebx
+	fild  dword[s]
+	fmul  qword[da]
+	fstp  qword[a]
+.u2:
+	fld   qword[a]
+	fld   st0
+	fsin
+	fstp  dword[sa] ;sa = sin(a)
+	fcos
+	fstp  dword[ca] ;ca = cos(a)
+	cmp dword[edx+GLUquadricObj.TextureFlag],0
+	je @f
+	fld   dword[ca]
+	fmul  dword[r2]
+	fdiv  dword[dtc]
+	fadd  dword[fl_0_5]
+	fstp  dword[esp-4]
+	fld   dword[sa]
+	fmul  dword[r2]
+	fdiv  dword[dtc]
+	fadd  dword[fl_0_5]
+	add   esp,-8
+	fstp  dword[esp]
+	call  glTexCoord2f ;0.5+sa*r2/dtc,0.5+ca*r2/dtc
+@@:
+	fld   dword[r2]
+	fmul  dword[ca]
+	fstp  dword[esp-4]
+	fld   dword[r2]
+	fmul  dword[sa]
+	add   esp,-8
+	fstp  dword[esp]
+	call  glVertex2f ;r2*sa, r2*ca
+
+	cmp dword[edx+GLUquadricObj.TextureFlag],0
+	je @f
+	fld   dword[ca]
+	fmul  dword[r1]
+	fdiv  dword[dtc]
+	fadd  dword[fl_0_5]
+	fstp  dword[esp-4]
+	fld   dword[sa]
+	fmul  dword[r1]
+	fdiv  dword[dtc]
+	fadd  dword[fl_0_5]
+	add   esp,-8
+	fstp  dword[esp]
+	call  glTexCoord2f ;0.5+sa*r1/dtc,0.5+ca*r1/dtc
+@@:
+	fld   dword[r1]
+	fmul  dword[ca]
+	fstp  dword[esp-4]
+	fld   dword[r1]
+	fmul  dword[sa]
+	add   esp,-8
+	fstp  dword[esp]
+	call  glVertex2f ;r1*sa, r1*ca
+	inc   ebx
+	cmp   esi,ebx
+	jge   .cycle_1
+.cycle_1_end:
+	call  glEnd
+	mov   eax,[r2]
+	mov   [r1],eax
+	dec   ecx
+	jnz   .cycle_0
+	jmp   .end_f
+align 4
+.no_fill:
+	push  [loops]
+	push  [slices]
+	sub   esp,8
+	fldz
+	fstp  qword[esp]
+	glpush innerRadius
+	glpush outerRadius
+	stdcall gluCylinder, [qobj]
+.end_f:
+	ret
+endp
 
-;
 ; Sphere (adapted from Mesa)
-;
 
 ;input:
-; float radius, int slices, int stacks
+; double radius, int slices, int stacks
 align 16
-proc gluSphere qobj:dword, radius:dword, slices:dword, stacks:dword
+proc gluSphere qobj:dword, radius:qword, slices:dword, stacks:dword
 locals
 	rho dd ? ;float
 	drho dd ? 
@@ -638,7 +828,7 @@ endl
 pushad
 
 	mov eax,[qobj]
-	cmp dword[eax+offs_qobj_Normals],GLU_NONE ;if (qobj.Normals==GLU_NONE)
+	cmp dword[eax+GLUquadricObj.Normals],GLU_NONE ;if (qobj.Normals==GLU_NONE)
 	jne .els_0
 		mov dword[normals],GL_FALSE
 		jmp @f
@@ -646,7 +836,7 @@ align 4
 	.els_0:
 		mov dword[normals],GL_TRUE
 	@@:
-	cmp dword[eax+offs_qobj_Orientation],GLU_INSIDE ;if (qobj.Orientation==GLU_INSIDE)
+	cmp dword[eax+GLUquadricObj.Orientation],GLU_INSIDE ;if (qobj.Orientation==GLU_INSIDE)
 	jne .els_1
 		mov dword[nsign],-1.0
 		jmp @f
@@ -666,7 +856,7 @@ align 4
 	ffree st0
 	fincstp
 
-	cmp dword[eax+offs_qobj_DrawStyle],GLU_FILL ;if (qobj.DrawStyle==GLU_FILL)
+	cmp dword[eax+GLUquadricObj.DrawStyle],GLU_FILL ;if (qobj.DrawStyle==GLU_FILL)
 	jne .if_glu_line
 
 	; draw +Z end as a triangle fan
@@ -675,13 +865,13 @@ align 4
 	jne @f
 		stdcall glNormal3f, 0.0, 0.0, 1.0
 	@@:
-	cmp dword[eax+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+	cmp dword[eax+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 	je @f
 		stdcall glTexCoord2f, 0.5,1.0
 	@@:
 	sub esp,4
 	fld dword[nsign]
-	fmul dword[radius]
+	fmul qword[radius]
 	fstp dword[esp]
 	stdcall glVertex3f, 0.0, 0.0 ;, nsign * radius
 	fld dword[drho]
@@ -728,7 +918,7 @@ align 4
 			sub esp,12
 			stdcall glNormal3f ;x*nsign, y*nsign, z*nsign
 		@@:
-		fld dword[radius]
+		fld qword[radius]
 		fld dword[z]
 		fmul st0,st1
 		fstp dword[esp-4]
@@ -754,7 +944,7 @@ align 4
 	fstp dword[d_t] ;1.0 / stacks
 	mov dword[t],1.0 ; because loop now runs from 0
 	mov ebx,[stacks]
-	cmp dword[eax+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+	cmp dword[eax+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 	je .els_2
 		mov dword[i],0
 		mov [imax],ebx
@@ -820,11 +1010,11 @@ align 4
 			sub esp,12
 			stdcall glNormal3f ;x*nsign, y*nsign, z*nsign
 		@@:
-		cmp dword[eax+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+		cmp dword[eax+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 		je @f
 			stdcall glTexCoord2f, [s],[t]
 		@@:
-		fld dword[radius]
+		fld qword[radius]
 		fld dword[z]
 		fmul st0,st1
 		fstp dword[esp-4]
@@ -868,7 +1058,7 @@ align 4
 			sub esp,12
 			stdcall glNormal3f ;x*nsign, y*nsign, z*nsign
 		@@:
-		cmp dword[eax+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+		cmp dword[eax+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 		je @f
 			fld dword[t]
 			fsub dword[d_t]
@@ -879,7 +1069,7 @@ align 4
 			fadd dword[d_s]
 			fstp dword[s]
 		@@:
-		fld dword[radius]
+		fld qword[radius]
 		fld dword[z]
 		fmul st0,st1
 		fstp dword[esp-4]
@@ -910,7 +1100,7 @@ align 4
 	jne @f
 		stdcall glNormal3f, 0.0, 0.0, -1.0
 	@@:
-	cmp dword[eax+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+	cmp dword[eax+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 	je @f
 		stdcall glTexCoord2f, 0.5,0.0
 		mov dword[s],1.0
@@ -918,7 +1108,7 @@ align 4
 		mov [t],ebx
 	@@:
 	sub esp,4
-	fld dword[radius]
+	fld qword[radius]
 	fchs
 	fmul dword[nsign]
 	fstp dword[esp]
@@ -970,14 +1160,14 @@ align 4
 			fincstp
 			stdcall glNormal3f ;x*nsign, y*nsign, z*nsign
 		@@:
-		cmp dword[eax+offs_qobj_TextureFlag],0 ;if (qobj.TextureFlag)
+		cmp dword[eax+GLUquadricObj.TextureFlag],0 ;if (qobj.TextureFlag)
 		je @f
 			stdcall glTexCoord2f, [s],[t]
 			fld dword[s]
 			fsub dword[d_s]
 			fstp dword[s]
 		@@:
-		fld dword[radius]
+		fld qword[radius]
 		fld dword[z]
 		fmul st0,st1
 		fstp dword[esp-4]
@@ -998,9 +1188,9 @@ align 4
 
 align 4
 	.if_glu_line:
-	cmp dword[eax+offs_qobj_DrawStyle],GLU_LINE ;if (qobj.DrawStyle==GLU_LINE)
+	cmp dword[eax+GLUquadricObj.DrawStyle],GLU_LINE ;if (qobj.DrawStyle==GLU_LINE)
 	je @f
-	cmp dword[eax+offs_qobj_DrawStyle],GLU_SILHOUETTE ;if (qobj.DrawStyle==GLU_SILHOUETTE)
+	cmp dword[eax+GLUquadricObj.DrawStyle],GLU_SILHOUETTE ;if (qobj.DrawStyle==GLU_SILHOUETTE)
 	je @f
 	jmp .if_glu_point
 align 4
@@ -1056,7 +1246,7 @@ align 4
 				sub esp,12
 				stdcall glNormal3f ;x*nsign, y*nsign, z*nsign
 			@@:
-			fld dword[radius]
+			fld qword[radius]
 			fld dword[z]
 			fmul st0,st1
 			fstp dword[esp-4]
@@ -1123,7 +1313,7 @@ align 4
 				sub esp,12
 				stdcall glNormal3f ;x*nsign, y*nsign, z*nsign
 			@@:
-			fld dword[radius]
+			fld qword[radius]
 			fld dword[z]
 			fmul st0,st1
 			fstp dword[esp-4]
@@ -1148,7 +1338,7 @@ align 4
 
 align 4
 	.if_glu_point:
-	cmp dword[eax+offs_qobj_DrawStyle],GLU_POINT ;if (qobj.DrawStyle==GLU_POINT)
+	cmp dword[eax+GLUquadricObj.DrawStyle],GLU_POINT ;if (qobj.DrawStyle==GLU_POINT)
 	jne .end_f
 
 	; top and bottom-most points
@@ -1157,7 +1347,10 @@ align 4
 	jne @f
 		stdcall glNormal3f, 0.0,0.0,dword[nsign]
 	@@:
-	stdcall glVertex3f, 0.0,0.0,dword[radius]
+	sub esp,4
+	fld qword[radius]
+	fstp dword[esp]
+	stdcall glVertex3f, 0.0,0.0
 	cmp dword[normals],GL_TRUE
 	jne @f
 		sub esp,4
@@ -1167,7 +1360,7 @@ align 4
 		stdcall glNormal3f, 0.0,0.0 ;,-nsign
 	@@:
 	sub esp,4
-	fld dword[radius]
+	fld qword[radius]
 	fchs
 	fstp dword[esp]
 	stdcall glVertex3f, 0.0,0.0 ;,-radius
@@ -1220,7 +1413,7 @@ align 4
 				sub esp,12
 				stdcall glNormal3f ;x*nsign, y*nsign, z*nsign
 			@@:
-			fld dword[radius]
+			fld qword[radius]
 			fld dword[z]
 			fmul st0,st1
 			fstp dword[esp-4]

programs/develop/libraries/TinyGL/asm_fork/kosgl.asm

@@ -1,15 +1,6 @@
 ; simple gl like driver for TinyGL and KolibriOS - porting iadn
 
-
-struct TinyGLContext
-	gl_context dd ?
-	xsize dd ? ;+4
-	ysize dd ? ;+8
-	d_x dd ? ;+12
-	d_y dd ? ;+16
-	x dd ? ;+20
-	y dd ? ;+24
-ends
+include 'kosgl.inc'
 
 ;KOSGLContext kosglCreateContext(KOSGLContext shareList, int flags)
 ;{

programs/develop/libraries/TinyGL/asm_fork/kosgl.inc

@@ -0,0 +1,15 @@
+;Macro for double type parameters (8 bytes)
+macro glpush GLDoubleVar {
+	push dword[GLDoubleVar+4]
+	push dword[GLDoubleVar]
+}
+
+struct TinyGLContext
+	gl_context dd ?
+	xsize dd ? ;+4
+	ysize dd ? ;+8
+	d_x   dd ? ;+12
+	d_y   dd ? ;+16
+	x     dd ? ;+20
+	y     dd ? ;+24
+ends

programs/develop/libraries/TinyGL/asm_fork/light.asm

@@ -1,5 +1,6 @@
 align 4
-sp128f dd 128.0
+fl_128  dd 128.0
+fl_1e_3 dd 1.0e-3
 
 align 4
 proc glopMaterial uses eax ebx ecx edi esi, context:dword, p:dword
@@ -11,8 +12,7 @@ proc glopMaterial uses eax ebx ecx edi esi, context:dword, p:dword
 	cmp ecx,GL_FRONT_AND_BACK ;if (mode == GL_FRONT_AND_BACK)
 	jne @f
 		mov dword[ebx+4],GL_FRONT ;p[1].i=GL_FRONT
-		lea edi,[ebp+12]
-		stdcall glopMaterial,eax,edi
+		stdcall glopMaterial,eax,ebx
 		mov ecx,GL_BACK
 	@@:
 	lea edi,[eax+GLContext.materials]
@@ -58,7 +58,7 @@ align 4
 		add edi,GLMaterial.shininess
 		movsd
 		mov dword[edi],SPECULAR_BUFFER_RESOLUTION
-		fdiv dword[sp128f]
+		fdiv dword[fl_128]
 		fimul dword[edi]
 		fistp dword[edi] ;m.shininess_i = (v[0]/128.0f)*SPECULAR_BUFFER_RESOLUTION
 		jmp .end_f
@@ -185,15 +185,15 @@ align 4
 	cmp ecx,GL_SPOT_EXPONENT
 	jne @f
 		mov ecx,[ebx+12]
-		mov [edi+GLLight.spot_exponent],ecx ;l.spot_exponent=p[3]
+		mov [edx+GLLight.spot_exponent],ecx ;l.spot_exponent=p[3]
 		jmp .end_f
 align 4
 	@@:
 	cmp ecx,GL_SPOT_CUTOFF
 	jne .end_spot_c
-		fld dword[ebp+12] ;float a=v.v[0]
+		fld dword[ebx+12] ;float a=v.v[0]
 ;      assert(a == 180 || (a>=0 && a<=90));
-		fst dword[edi+GLLight.spot_cutoff] ;l.spot_cutoff=a
+		fst dword[edx+GLLight.spot_cutoff] ;l.spot_cutoff=a
 		fcom dword[an180f] ;if (a != 180)
 		fstsw ax
 		sahf
@@ -202,7 +202,7 @@ align 4
 			fmulp
 			fdiv dword[an180f]
 			fcos
-			fstp dword[edi+GLLight.cos_spot_cutoff] ;l.cos_spot_cutoff=cos(a * M_PI / 180.0)
+			fstp dword[edx+GLLight.cos_spot_cutoff] ;l.cos_spot_cutoff=cos(a * M_PI / 180.0)
 			jmp .end_f
 		@@:
 		ffree st0
@@ -213,21 +213,21 @@ align 4
 	cmp ecx,GL_CONSTANT_ATTENUATION
 	jne @f
 		mov ecx,[ebx+12]
-		mov [edi+GLLight.attenuation],ecx ;l->attenuation[0]=p[3]
+		mov [edx+GLLight.attenuation],ecx ;l->attenuation[0]=p[3]
 		jmp .end_f
 align 4
 	@@:
 	cmp ecx,GL_LINEAR_ATTENUATION
 	jne @f
 		mov ecx,[ebx+12]
-		mov [edi+GLLight.attenuation+4],ecx ;l->attenuation[1]=p[3]
+		mov [edx+GLLight.attenuation+4],ecx ;l->attenuation[1]=p[3]
 		jmp .end_f
 align 4
 	@@:
 	cmp ecx,GL_QUADRATIC_ATTENUATION
 	jne @f
 		mov ecx,[ebx+12]
-		mov [edi+GLLight.attenuation+8],ecx ;l->attenuation[2]=p[3]
+		mov [edx+GLLight.attenuation+8],ecx ;l->attenuation[2]=p[3]
 		jmp .end_f
 align 4
 	@@: ;default:
@@ -356,22 +356,18 @@ align 4
 	ret
 endp
 
-align 4
-fl_1e_3 dd 1.0e-3
-
 ; non optimized lightening model
 align 16
 proc gl_shade_vertex, context:dword, v:dword
 locals
-	R dd ? ;float ebp-96
-	G dd ? ;float ebp-92
-	B dd ? ;float ebp-88
-	A dd ? ;float ebp-84
-	s V3 ;ebp-80
-	d V3 ;ebp-68
-	tmp dd ? ;float ebp-56
-	att dd ? ;float ebp-52
-	dot_spot dd ? ;float ebp-48
+	R dd ? ;float ebp-92
+	G dd ? ;float ebp-88
+	B dd ? ;float ebp-84
+	A dd ? ;float ebp-80
+	s V3 ;ebp-76
+	d V3 ;ebp-64
+	tmp dd ? ;float ebp-52
+	att dd ? ;float ebp-48
 	lR dd ? ;float ebp-44
 	lB dd ? ;float ebp-40
 	lG dd ? ;float ebp-36
@@ -396,8 +392,7 @@ pushad
 
 	mov esi,[v]
 	mov edx,[context]
-	mov ecx,edx
-	add ecx,GLContext.materials ;ecx(m) = &context.materials[0]
+	lea ecx,[edx+GLContext.materials] ;ecx(m) = &context.materials[0]
 	mov eax,[edx+GLContext.light_model_two_side]
 	mov [twoside],eax
 
@@ -410,7 +405,7 @@ pushad
 
 	fld dword[edx+GLContext.ambient_light_model]
 	fmul dword[ecx+GLMaterial.ambient]
-	fadd dword[ecx] ;GLMaterial.emission=0
+	fadd dword[ecx+GLMaterial.emission]
 	fstp dword[R] ;R=m.emission.v[0]+m.ambient.v[0]*context.ambient_light_model.v[0]
 	fld dword[edx+GLContext.ambient_light_model+4]
 	fmul dword[ecx+GLMaterial.ambient+4]
@@ -430,7 +425,7 @@ pushad
 
 		; ambient
 		fld dword[ecx+GLMaterial.ambient]
-		fmul dword[ebx] ;GLLight.ambient=0
+		fmul dword[ebx+GLLight.ambient]
 		fstp dword[lR] ;lR=l.ambient.v[0] * m.ambient.v[0]
 		fld dword[ecx+GLMaterial.ambient+4]
 		fmul dword[ebx+GLLight.ambient+4]
@@ -447,8 +442,8 @@ pushad
 			; light at infinity
 			ffree st0 ;l.position.v[3]
 			fincstp
-			mov eax,[ebx+GLLight.norm_position]
-			mov [d],eax ;d.X=l.norm_position.v[0]
+			mov eax,[ebx+GLLight.norm_position+offs_X]
+			mov [d+offs_X],eax ;d.X=l.norm_position.v[0]
 			mov eax,[ebx+GLLight.norm_position+offs_Y]
 			mov [d+offs_Y],eax ;d.Y=l.norm_position.v[1]
 			mov eax,[ebx+GLLight.norm_position+offs_Z]
@@ -460,9 +455,9 @@ align 4
 			; distance attenuation
 			ffree st0 ;l.position.v[3]
 			fincstp
-			fld dword[ebx+GLLight.position]
-			fsub dword[esi+GLVertex.ec]
-			fstp dword[d] ;d.X=l.position.v[0]-v.ec.v[0]
+			fld dword[ebx+GLLight.position+offs_X]
+			fsub dword[esi+GLVertex.ec+offs_X]
+			fstp dword[d+offs_X] ;d.X=l.position.v[0]-v.ec.v[0]
 			fld dword[ebx+GLLight.position+offs_Y]
 			fsub dword[esi+GLVertex.ec+offs_Y]
 			fstp dword[d+offs_Y] ;d.Y=l.position.v[1]-v.ec.v[1]
@@ -484,9 +479,9 @@ align 4
 			jbe @f ;if (dist>1.0e-3)
 				fld1
 				fdiv st0,st1
-				fld dword[d]
+				fld dword[d+offs_X]
 				fmul st0,st1
-				fstp dword[d]
+				fstp dword[d+offs_X]
 				fld dword[d+offs_Y]
 				fmul st0,st1
 				fstp dword[d+offs_Y]
@@ -509,8 +504,8 @@ align 4
 			ffree st0 ;dist
 			fincstp
 		.els_0_end:
-		fld dword[d]
-		fmul dword[n]
+		fld dword[d+offs_X]
+		fmul dword[n+offs_X]
 		fld dword[d+offs_Y]
 		fmul dword[n+offs_Y]
 		faddp
@@ -563,7 +558,6 @@ align 4
 				fmul dword[d+offs_Z]
 				faddp
 				fchs
-				fst dword[dot_spot]
 				cmp dword[twoside],0 ;if (twoside && dot_spot < 0)
 				je @f
 				ftst ;if (dot_spot<0)
@@ -702,7 +696,7 @@ align 4
 				@@:
 				shl dword[idx],2
 				add edi,dword[idx]
-				fld dword[edi+offs_spec_buf] ;dot_spec = specbuf.buf[idx]
+				fld dword[edi+GLSpecBuf.buf] ;dot_spec = specbuf.buf[idx]
 				fld dword[ebx+GLLight.specular]
 				fmul st0,st1
 				fmul dword[ecx+GLMaterial.specular]

programs/develop/libraries/TinyGL/asm_fork/list.asm

@@ -57,12 +57,13 @@ proc delete_list uses eax ebx ecx edx, context:dword, list:dword
 	; free param buffer
 	mov eax,[edx] ;eax = GLList.first_op_buffer
 	@@:
-	cmp eax,0
-	je .end_w
-		mov ecx,[eax+offs_gpbu_next]
+	or eax,eax
+	jz .end_w
+		mov ecx,[eax+GLParamBuffer.next]
 		stdcall gl_free,eax
 		mov eax,ecx
 		jmp @b
+align 4
 	.end_w:
 
 	stdcall gl_free,edx
@@ -79,10 +80,10 @@ proc alloc_list uses ebx ecx, context:dword, list:dword
 	mov ecx,eax
 	stdcall gl_zalloc,sizeof.GLList
 
-	mov dword[ecx+offs_gpbu_next],0 ;ob.next=NULL
+	mov dword[ecx+GLParamBuffer.next],0 ;ob.next=NULL
 	mov dword[eax],ecx ;l.first_op_buffer=ob
 
-	mov dword[ecx+offs_gpbu_ops],OP_EndList ;ob.ops[0].op=OP_EndList
+	mov dword[ecx+GLParamBuffer.ops],OP_EndList ;ob.ops[0].op=OP_EndList
 
 	mov ebx,[context]
 	mov ebx,[ebx+GLContext.shared_state]
@@ -138,12 +139,12 @@ pushad
 	jle @f
 		mov edi,eax
 		stdcall gl_zalloc,sizeof.GLParamBuffer
-		mov dword[eax+offs_gpbu_next],0 ;=NULL
+		mov dword[eax+GLParamBuffer.next],0 ;=NULL
 
-		mov dword[edi+offs_gpbu_next],eax
+		mov dword[edi+GLParamBuffer.next],eax
 		lea esi,[edi+4*ebx]
-		mov dword[esi+offs_gpbu_ops],OP_NextBuffer
-		mov dword[esi+offs_gpbu_ops+4],eax
+		mov dword[esi+GLParamBuffer.ops],OP_NextBuffer
+		mov dword[esi+GLParamBuffer.ops+4],eax
 
 		mov dword[edx+GLContext.current_op_buffer],eax
 		xor ebx,ebx
@@ -168,8 +169,8 @@ push edi esi
 	mov ebx,[ebx]
 	lea eax,[op_table_str]
 	@@:
-		cmp ebx,0
-		je @f
+		or ebx,ebx
+		jz @f
 		cmp byte[eax],0
 		jne .no_dec
 			dec ebx
@@ -197,21 +198,24 @@ push edi esi
 			add ebx,4
 			inc esi
 
-			cmp byte[esi],'f'
+			cmp byte[esi],'f' ;float
 			jne @f
 				fld dword[ebx]
 				fstp qword[Data_Double]
 				call DoubleFloat_to_String
 				stdcall str_cat, edi,Data_String
 			@@:
-			cmp byte[esi],'d'
-			jne @f
+			cmp byte[esi],'C' ;const
+			je @f
+			cmp byte[esi],'d' ;integer
+			je @f
+			jmp .no_param
+			@@:
 				stdcall str_len,edi
 				add edi,eax
 				sub ecx,eax
 				mov eax,dword[ebx]
 				stdcall convert_int_to_str,ecx
-			@@:
 		.no_param:
 		inc esi
 		cmp byte[esi],0
@@ -307,8 +311,8 @@ proc glNewList uses eax ebx, list:dword, mode:dword
 ;  assert(ebx->compile_flag == 0);
 
 	stdcall find_list,ebx,[list]
-	cmp eax,0
-	je @f
+	or eax,eax
+	jz @f
 		stdcall delete_list,ebx,[list]
 	@@:
 	stdcall alloc_list,ebx,[list]
@@ -347,8 +351,8 @@ align 4
 proc glIsList, list:dword
 	call gl_get_context
 	stdcall find_list, eax,[list]
-	cmp eax,0 ;NULL
-	je @f
+	or eax,eax ;NULL
+	jz @f
 		mov eax,1
 	@@:
 	ret

programs/develop/libraries/TinyGL/asm_fork/specbuf.asm

@@ -1,5 +1,5 @@
 ;
-; функции для вычисления зеркального цвета (блики)
+; functions for calculating specular color (glare)
 ;
 
 align 4
@@ -10,49 +10,41 @@ locals
 endl
 	mov dword[f_inc],SPECULAR_BUFFER_SIZE
 	mov ebx,[buf]
-	add ebx,offs_spec_buf
+	add ebx,GLSpecBuf.buf
 	mov dword[ebx],0.0 ;buf.buf[0] = 0.0
 	xor ecx,ecx
-	inc ecx
-	fld dword[shininess] ;сначала берем y
 	fld1
 	fidiv dword[f_inc]
-	fst dword[f_inc] ;f_inc = 1.0f/SPECULAR_BUFFER_SIZE
-	fst dword[val]
+	fstp dword[f_inc] ;f_inc = 1.0f/SPECULAR_BUFFER_SIZE
+	mov dword[val],0.0
 align 4
-	.cycle_0: ;for (i = 1; i <= SPECULAR_BUFFER_SIZE; i++)
+	.cycle_0: ;for (i = 1; i < SPECULAR_BUFFER_SIZE; i++)
+	inc ecx
 	cmp ecx,SPECULAR_BUFFER_SIZE
-	jg @f
-		;Вычисляем x^y
+	jge @f
+		fld dword[shininess]
+		fld dword[val]
+		fadd dword[f_inc]
+		fst dword[val] ;val += f_inc
+		;need to calculate pow(val, shininess)
 
-		fyl2x ;Стек FPU теперь содержит: st0=z=y*log2(x):
-		;Теперь считаем 2**z:
-		fld st0 ;Создаем еще одну копию z
-		frndint ;Округляем
+		fyl2x ;the FPU stack now contains: st0=z=y*log2(x):
+		;now we count 2**z:
+		fld st0 ;copy z
+		frndint
 		fsubr st0,st1  ;st1=z, st0=z-trunc(z)
 		f2xm1  ;st1=z, st0=2**(z-trunc(z))-1
 		fld1
 		faddp  ;st1=z, st0=2**(z-trunc(z))
 		fscale ;st1=z, st0=(2**trunc(z))*(2**(z-trunc(z)))=2**t
 		fxch st1
-		fstp st ;Результат остается на вершине стека st0
+		fstp st ;the result remains on the top of the stack st0
 
 		add ebx,4
 		fstp dword[ebx] ;buf.buf[i] = pow(val, shininess)
-		ffree st0 ;испорченный shininess
-		fincstp
-
-		fld dword[shininess] ;сначала берем y
-		fld dword[val]
-		fadd dword[f_inc]
-		fst dword[val] ;val += f_inc
-	inc ecx
 	jmp .cycle_0
 	@@:
-	ffree st0 ;val
-	fincstp
-	ffree st0 ;shininess
-	fincstp
+	mov dword[ebx+4],1.0
 	ret
 endp
 
@@ -70,22 +62,22 @@ endl
 	.cycle_0:
 	or eax,eax ;while (found)
 	jz @f
-	cmp [eax+offs_spec_shininess_i],ebx ;while (found.shininess_i != shininess_i)
+	cmp [eax+GLSpecBuf.shininess_i],ebx ;while (found.shininess_i != shininess_i)
 	je @f
 		mov ecx,[oldest]
-		mov ecx,[ecx+offs_spec_last_used]
-		cmp [eax+offs_spec_last_used],ecx ;if (found.last_used < oldest.last_used)
+		mov ecx,[ecx+GLSpecBuf.last_used]
+		cmp [eax+GLSpecBuf.last_used],ecx ;if (found.last_used < oldest.last_used)
 		jge .end_0
 			mov [oldest],eax ;oldest = found
 		.end_0:
-		mov eax,[eax+offs_spec_next] ;found = found.next
+		mov eax,[eax+GLSpecBuf.next] ;found = found.next
 		jmp .cycle_0
 	@@:
 	cmp dword[found],0 ;if (found) /* hey, found one! */
 	je @f
 		mov eax,[found]
 		mov ecx,[edx+GLContext.specbuf_used_counter]
-		mov [eax+offs_spec_last_used],ecx ;found.last_used = context.specbuf_used_counter
+		mov [eax+GLSpecBuf.last_used],ecx ;found.last_used = context.specbuf_used_counter
 		inc dword[edx+GLContext.specbuf_used_counter]
 		jmp .end_f ;return found
 	@@:
@@ -102,21 +94,21 @@ endl
 	@@:
 	inc dword[edx+GLContext.specbuf_num_buffers]
 	mov ecx,[edx+GLContext.specbuf_first]
-	mov [eax+offs_spec_next],ecx
+	mov [eax+GLSpecBuf.next],ecx
 	mov [edx+GLContext.specbuf_first],eax
 	mov ecx,[edx+GLContext.specbuf_used_counter]
-	mov [eax+offs_spec_last_used],ecx
+	mov [eax+GLSpecBuf.last_used],ecx
 	inc dword[edx+GLContext.specbuf_used_counter]
-	mov [eax+offs_spec_shininess_i],ebx
+	mov [eax+GLSpecBuf.shininess_i],ebx
 	stdcall calc_buf, eax,dword[shininess]
 	jmp .end_f
 	.end_1:
 	; overwrite the lru buffer
 	;tgl_trace("overwriting spec buffer :(\n");
 	mov eax,[oldest]
-	mov [eax+offs_spec_shininess_i],ebx
+	mov [eax+GLSpecBuf.shininess_i],ebx
 	mov ecx,[edx+GLContext.specbuf_used_counter]
-	mov [eax+offs_spec_last_used],ecx
+	mov [eax+GLSpecBuf.last_used],ecx
 	inc dword[edx+GLContext.specbuf_used_counter]
 	stdcall calc_buf, eax,dword[shininess]
 	.end_f:

programs/develop/libraries/TinyGL/asm_fork/texture.asm

@@ -17,9 +17,9 @@ proc find_texture uses ebx ecx, context:dword, h:dword
 		cmp dword[eax],0
 		je .no_found
 		mov ebx,[eax]
-		cmp dword[ebx+offs_text_handle],ecx
+		cmp dword[ebx+GLTexture.handle],ecx
 		je .found
-		mov eax,[ebx+offs_text_next]
+		mov eax,[ebx+GLTexture.next]
 		jmp @b
 	.no_found:
 	xor eax,eax ;ret NULL
@@ -32,36 +32,36 @@ proc free_texture uses eax ebx ecx edx, context:dword, h:dword
 	mov edx,[context]
 
 	stdcall find_texture,edx,[h] ;t=find_texture(context,h)
-	cmp dword[eax+offs_text_prev],0 ;if (t.prev==NULL)
+	cmp dword[eax+GLTexture.prev],0 ;if (t.prev==NULL)
 	jne .else
 		mov edx,[edx+GLContext.shared_state+4] ;edx = &context.shared_state.texture_hash_table[0]
-		mov ebx,[eax+offs_text_handle]
+		mov ebx,[eax+GLTexture.handle]
 		and ebx,0xff
 		shl ebx,2
 		add edx,ebx ;edx = &context.shared_state.texture_hash_table[t.handle % TEXTURE_HASH_TABLE_SIZE]
-		mov ebx,[eax+offs_text_next]
+		mov ebx,[eax+GLTexture.next]
 		mov [edx],ebx ;*ht=t.next
 		jmp @f
 	.else:
-		mov ebx,[eax+offs_text_prev]
-		mov ecx,[eax+offs_text_next]
-		mov [ebx+offs_text_next],ecx ;t.prev.next=t.next
+		mov ebx,[eax+GLTexture.prev]
+		mov ecx,[eax+GLTexture.next]
+		mov [ebx+GLTexture.next],ecx ;t.prev.next=t.next
 	@@:
-	cmp dword[eax+offs_text_next],0 ;if (t.next!=NULL)
+	cmp dword[eax+GLTexture.next],0 ;if (t.next!=NULL)
 	je @f
-		mov ebx,[eax+offs_text_next]
-		mov ecx,[eax+offs_text_prev]
-		mov [ebx+offs_text_prev],ecx ;t.next.prev=t.prev
+		mov ebx,[eax+GLTexture.next]
+		mov ecx,[eax+GLTexture.prev]
+		mov [ebx+GLTexture.prev],ecx ;t.next.prev=t.prev
 	@@:
 
 	xor ebx,ebx
-	mov ecx,[eax+offs_text_images] ;im=&t.images[0]
+	mov ecx,[eax+GLTexture.images] ;im=&t.images[0]
 	.cycle_0: ;for(i=0;i<MAX_TEXTURE_LEVELS;i++)
 	cmp ebx,MAX_TEXTURE_LEVELS
 	jge .cycle_0_end
-		cmp dword[ecx+offs_imag_pixmap],0 ;if (im.pixmap != NULL)
+		cmp dword[ecx+GLImage.pixmap],0 ;if (im.pixmap != NULL)
 		je @f
-			stdcall gl_free,[ecx+offs_imag_pixmap]
+			stdcall gl_free,[ecx+GLImage.pixmap]
 		@@:
 		add ecx,sizeof.GLImage
 		inc ebx
@@ -87,16 +87,16 @@ proc alloc_texture uses ebx ecx, context:dword, h:dword
 	add ecx,ebx ;ecx = &context.shared_state.texture_hash_table[h % TEXTURE_HASH_TABLE_SIZE]
 
 	mov ebx,[ecx]
-	mov [eax+offs_text_next],ebx
-	mov dword[eax+offs_text_prev],0 ;NULL
-	cmp dword[eax+offs_text_next],0 ;NULL
+	mov [eax+GLTexture.next],ebx
+	mov dword[eax+GLTexture.prev],0 ;NULL
+	cmp dword[eax+GLTexture.next],0 ;NULL
 	je @f
-		mov [eax+offs_text_prev],eax
+		mov [eax+GLTexture.prev],eax
 	@@:
 	mov [ecx],eax
 
 	mov ebx,[h]
-	mov [eax+offs_text_handle],ebx
+	mov [eax+GLTexture.handle],ebx
 
 	ret
 endp
@@ -129,11 +129,11 @@ proc glGenTextures uses eax ebx ecx edx esi, n:dword, textures:dword
 		.cycle_1: ;while (t!=NULL)
 		or edx,edx
 		jz .cycle_1_end
-			cmp [edx+offs_text_handle],ebx ;if (t.handle>max)
+			cmp [edx+GLTexture.handle],ebx ;if (t.handle>max)
 			jle @f
-				mov ebx,[edx+offs_text_handle] ;max=t.handle
+				mov ebx,[edx+GLTexture.handle] ;max=t.handle
 			@@:
-			mov edx,[edx+offs_text_next] ;t=t.next
+			mov edx,[edx+GLTexture.next] ;t=t.next
 			jmp .cycle_1
 		.cycle_1_end:
 		inc ecx
@@ -266,22 +266,22 @@ align 4
 
 	mov ecx,[context]
 	mov ecx,[ecx+GLContext.current_texture]
-	add ecx,offs_text_images
+	add ecx,GLTexture.images
 	imul ebx,sizeof.GLTexture
 	add ecx,ebx ;ecx = &context.current_texture.images[level]
-	mov [ecx+offs_imag_xsize],edx ;im.xsize=width
-	mov [ecx+offs_imag_ysize],esi ;im.ysize=height
+	mov [ecx+GLImage.xsize],edx ;im.xsize=width
+	mov [ecx+GLImage.ysize],esi ;im.ysize=height
 	mov ebx,edx
 	dec ebx
 	shl ebx,ZB_POINT_TEXEL_SIZE
-	mov [ecx+offs_imag_s_bound],ebx ;im.s_bound = (unsigned int)(width-1)
+	mov [ecx+GLImage.s_bound],ebx ;im.s_bound = (unsigned int)(width-1)
 	shr ebx,ZB_POINT_TEXEL_SIZE
 
-	mov dword[ecx+offs_imag_xsize_log2],ZB_POINT_TEXEL_SIZE
+	mov dword[ecx+GLImage.xsize_log2],ZB_POINT_TEXEL_SIZE
 	or ebx,ebx
 	jz .set_l2
 	@@:
-		dec dword[ecx+offs_imag_xsize_log2]
+		dec dword[ecx+GLImage.xsize_log2]
 		shr ebx,1
 		or ebx,ebx
 		jnz @b
@@ -289,18 +289,18 @@ align 4
 	;im.xsize_log2 = ZB_POINT_TEXEL_SIZE-log_2(width)
 	dec esi
 	shl esi,ZB_POINT_TEXEL_SIZE
-	mov [ecx+offs_imag_t_bound],esi ;im.t_bound = (unsigned int)(height-1)
+	mov [ecx+GLImage.t_bound],esi ;im.t_bound = (unsigned int)(height-1)
 	shr esi,ZB_POINT_TEXEL_SIZE
 	inc esi
-	cmp dword[ecx+offs_imag_pixmap],0 ;if (im.pixmap!=NULL) 
+	cmp dword[ecx+GLImage.pixmap],0 ;if (im.pixmap!=NULL) 
 	je @f
-		stdcall gl_free, [ecx+offs_imag_pixmap]
+		stdcall gl_free, [ecx+GLImage.pixmap]
 	@@:
 if TGL_FEATURE_RENDER_BITS eq 24
 	imul edx,esi
 	imul edx,3
 	stdcall gl_malloc,edx
-	mov [ecx+offs_imag_pixmap],eax ;im.pixmap = gl_malloc(width*height*3)
+	mov [ecx+GLImage.pixmap],eax ;im.pixmap = gl_malloc(width*height*3)
 	or eax,eax ;if(im.pixmap)
 	jz @f
 		mov edi,eax
@@ -314,7 +314,7 @@ if TGL_FEATURE_RENDER_BITS eq 32
 	imul edx,esi
 	shl edx,2
 	stdcall gl_malloc,edx
-	mov [ecx+offs_imag_pixmap],eax ;im.pixmap = gl_malloc(width*height*4)
+	mov [ecx+GLImage.pixmap],eax ;im.pixmap = gl_malloc(width*height*4)
 	or eax,eax ;if(im.pixmap)
 	jz @f
 ;gl_convertRGB_to_8A8R8G8B(eax,[pixels1],ebx,esi)

programs/develop/libraries/TinyGL/asm_fork/vertex.asm

@@ -86,14 +86,14 @@ endl
 	fdiv st0,st1 ;st0 = 0.5
 
 	fild dword[eax+GLViewport.xsize]
-	fsub st0,st1
+	fsub dword[fl_1e_3]
 	fdiv st0,st2
 	fst dword[eax+GLViewport.scale+offs_X]
 	fiadd dword[eax+GLViewport.xmin]
 	fstp dword[eax+GLViewport.trans+offs_X]
 
 	fild dword[eax+GLViewport.ysize]
-	fsub st0,st1
+	fsub dword[fl_1e_3]
 	fdiv st0,st2
 	fchs
 	fst dword[eax+GLViewport.scale+offs_Y]
@@ -134,21 +134,13 @@ endl
 
 	cmp dword[edx+GLContext.lighting_enabled],0 ;if(context.lighting_enabled)
 	jne .if_0
-	cmp dword[eax+GLContext.texture_2d_enabled],0
-	jne .if_0
-		jmp @f
+	cmp dword[edx+GLContext.texture_2d_enabled],0
+	je @f
 align 4
 	.if_0:
-if DEBUG ;context.matrix_stack_ptr[0]
-	stdcall gl_print_matrix,dword[edx+GLContext.matrix_stack_ptr],4
-end if
 		; precompute inverse modelview
 		lea ebx,[ebp-sizeof.M4]
 		stdcall gl_M4_Inv, ebx,dword[edx+GLContext.matrix_stack_ptr]
-if DEBUG ;tmp
-	stdcall dbg_print,txt_sp,txt_nl
-	stdcall gl_print_matrix,ebx,4
-end if
 		push ebx
 		lea ebx,[edx+GLContext.matrix_model_view_inv]
 		stdcall gl_M4_Transpose, ebx
@@ -253,8 +245,7 @@ pushad
 	cmp dword[eax+GLContext.lighting_enabled],0 ;if (context.lighting_enabled)
 	jne @f
 	cmp dword[eax+GLContext.texture_2d_enabled],0
-	jne @f
-		jmp .els_0
+	je .els_0
 align 4
 	@@:
 		; eye coordinates needed for lighting

programs/develop/libraries/TinyGL/asm_fork/zgl.inc

@@ -51,14 +51,9 @@ struct GLSpecBuf
 	next dd ? ;struct GLSpecBuf*
 ends
 
-offs_spec_shininess_i equ 0
-offs_spec_last_used equ 4
-offs_spec_buf equ 8
-offs_spec_next equ 8+4*(SPECULAR_BUFFER_SIZE+1)
-
 struct GLLight
-	ambient V4
-	diffuse V4
+	ambient  V4
+	diffuse  V4
 	specular V4
 	position V4
 	spot_direction V3
@@ -102,9 +97,6 @@ struct GLParamBuffer
 	next dd ? ;struct GLParamBuffer*
 ends
 
-offs_gpbu_ops equ 0
-offs_gpbu_next equ 4*OP_BUFFER_MAX_SIZE
-
 struct GLList
 	first_op_buffer dd ? ;GLParamBuffer*
 	; TODO: extensions for an hash table or a better allocating scheme
@@ -133,29 +125,17 @@ struct GLImage
 	t_bound dd ? ;unsigned int
 ends
 
-offs_imag_pixmap equ 0
-offs_imag_xsize equ 4
-offs_imag_ysize equ 8
-offs_imag_xsize_log2 equ 12
-offs_imag_s_bound equ 16
-offs_imag_t_bound equ 20
-
 ; textures
 
 TEXTURE_HASH_TABLE_SIZE equ 256 ;должно быть кратное 2, в коде берется остаток от деления (через and быстрее чем div)
 
 struct GLTexture
-	images rb sizeof.GLImage * MAX_TEXTURE_LEVELS ;GLImage[MAX_TEXTURE_LEVELS]
+	images rd (sizeof.GLImage * MAX_TEXTURE_LEVELS)/4 ;GLImage[MAX_TEXTURE_LEVELS]
 	handle dd ? ;int
 	next dd ? ;struct GLTexture*
 	prev dd ? ;struct GLTexture*
 ends
 
-offs_text_images equ 0
-offs_text_handle equ sizeof.GLImage*MAX_TEXTURE_LEVELS
-offs_text_next equ 4+offs_text_handle
-offs_text_prev equ 8+offs_text_handle
-
 ; shared state
 
 struct GLSharedState

programs/develop/libraries/TinyGL/asm_fork/zline.asm

@@ -17,7 +17,7 @@ proc ZB_plot uses eax ebx ecx edx edi, zb:dword, p:dword
 	mov edi,[ebx+ZBufferPoint.z]
 	shr edi,ZB_POINT_Z_FRAC_BITS
 	cmp di,word[ecx]
-	jl .end_f
+	jb .end_f
 if TGL_FEATURE_RENDER_BITS eq 24
 	mov eax,[ebx+ZBufferPoint.r]
 	mov byte[edx],ah

programs/develop/libraries/TinyGL/asm_fork/zline.inc

@@ -101,7 +101,7 @@ local .end_0
 	mov [zz],eax
 	mov ebx,[pz]
 	cmp ax,word[ebx]
-	jl .end_0
+	jb .end_0
 		RGBPIXEL
 		mov eax,dword[zz]
 		mov ebx,[pz]
@@ -114,9 +114,7 @@ end if
 
 macro DRAWLINE d_x,d_y,inc_1,inc_2
 {
-local .mz_0
 local .mz_1
-local .mz_2
 
 	mov eax,d_x
 	mov [n],eax
@@ -124,26 +122,12 @@ if INTERP_Z eq 1
 	mov ebx,[p1]
 	mov eax,[p2]
 	mov eax,[eax+ZBufferPoint.z]
-	cmp eax,[ebx+ZBufferPoint.z]
-	jg .mz_0
-	je .mz_1
-		;if(p2.z<p1.z)
-		sub eax,[ebx+ZBufferPoint.z]
-		neg eax
-		inc eax
-		xor edx,edx
-		div dword[n]
-		neg eax
-		inc eax
-		jmp .mz_2
-	.mz_0:
 	sub eax,[ebx+ZBufferPoint.z]
-	xor edx,edx
-	div dword[n]
-	jmp .mz_2
+	jz .mz_1
+		;if(p2.z!=p1.z)
+		cdq
+		idiv dword[n]
 	.mz_1:
-		xor eax,eax
-	.mz_2:
 	mov [zinc],eax ;zinc=(p2.z-p1.z)/n
 end if
 	shl dword d_y,1

programs/develop/libraries/TinyGL/asm_fork/zline_r.inc

@@ -102,7 +102,7 @@ local .end_0
 	mov [zz],eax
 	mov ebx,[pz]
 	cmp ax,word[ebx]
-	jl .end_0
+	jb .end_0
 		RGBPIXEL
 		mov eax,dword[zz]
 		mov ebx,[pz]
@@ -115,18 +115,10 @@ end if
 
 macro DRAWLINE d_x,d_y,inc_1,inc_2
 {
-local .mz_0
 local .mz_1
-local .mz_2
-local .mr_0
 local .mr_1
-local .mr_2
-local .mg_0
 local .mg_1
-local .mg_2
-local .mb_0
 local .mb_1
-local .mb_2
 
 	mov eax,d_x
 	mov [n],eax
@@ -135,103 +127,44 @@ local .mb_2
 	mov ecx,[p2]
 if INTERP_Z eq 1
 	mov eax,[ecx+ZBufferPoint.z]
-	cmp eax,[ebx+ZBufferPoint.z]
-	jg .mz_0
-	je .mz_1
-		;if(p2.z<p1.z)
-		sub eax,[ebx+ZBufferPoint.z]
-		neg eax
-		inc eax
-		xor edx,edx
-		div dword[n]
-		neg eax
-		inc eax
-		jmp .mz_2
-	.mz_0:
 	sub eax,[ebx+ZBufferPoint.z]
-	xor edx,edx
-	div dword[n]
-	jmp .mz_2
+	jz .mz_1
+		;if(p2.z!=p1.z)
+		cdq
+		idiv dword[n]
 	.mz_1:
-		xor eax,eax
-	.mz_2:
 	mov [zinc],eax ;zinc=(p2.z-p1.z)/n
 end if
 
 	;ebx=&p1, ecx=&p2
 	mov eax,[ecx+ZBufferPoint.r]
-	cmp eax,[ebx+ZBufferPoint.r]
-	jg .mr_0
-	je .mr_1
-		;if(p2.r<p1.r)
-		sub eax,[ebx+ZBufferPoint.r]
-		neg eax
-		inc eax
-		shl eax,8
-		xor edx,edx
-		div dword[n]
-		neg eax
-		inc eax
-		jmp .mr_2
-	.mr_0:
 	sub eax,[ebx+ZBufferPoint.r]
-	shl eax,8
-	xor edx,edx
-	div dword[n]
-	jmp .mr_2
+	jz .mr_1
+		;if(p2.r!=p1.r)
+		shl eax,8
+		cdq
+		idiv dword[n]
 	.mr_1:
-		xor eax,eax
-	.mr_2:
 	mov [rinc],eax ;rinc=((p2.r-p1.r)<<8)/n
 
 	mov eax,[ecx+ZBufferPoint.g]
-	cmp eax,[ebx+ZBufferPoint.g]
-	jg .mg_0
-	je .mg_1
-		;if(p2.g<p1.g)
-		sub eax,[ebx+ZBufferPoint.g]
-		neg eax
-		inc eax
-		shl eax,8
-		xor edx,edx
-		div dword[n]
-		neg eax
-		inc eax
-		jmp .mg_2
-	.mg_0:
 	sub eax,[ebx+ZBufferPoint.g]
-	shl eax,8
-	xor edx,edx
-	div dword[n]
-	jmp .mg_2
+	jz .mg_1
+		;if(p2.g!=p1.g)
+		shl eax,8
+		cdq
+		idiv dword[n]
 	.mg_1:
-		xor eax,eax
-	.mg_2:
 	mov [ginc],eax ;ginc=((p2.g-p1.g)<<8)/n
 
 	mov eax,[ecx+ZBufferPoint.b]
-	cmp eax,[ebx+ZBufferPoint.b]
-	jg .mb_0
-	je .mb_1
-		;if(p2.b<p1.b)
-		sub eax,[ebx+ZBufferPoint.b]
-		neg eax
-		inc eax
-		shl eax,8
-		xor edx,edx
-		div dword[n]
-		neg eax
-		inc eax
-		jmp .mb_2
-	.mb_0:
 	sub eax,[ebx+ZBufferPoint.b]
-	shl eax,8
-	xor edx,edx
-	div dword[n]
-	jmp .mb_2
+	jz .mb_1
+		;if(p2.b!=p1.b)
+		shl eax,8
+		cdq
+		idiv dword[n]
 	.mb_1:
-		xor eax,eax
-	.mb_2:
 	mov [binc],eax ;binc=((p2.b-p1.b)<<8)/n
 
 	shl dword d_y,1

programs/develop/libraries/TinyGL/asm_fork/ztriangle.asm

@@ -58,7 +58,7 @@ end if
 	mov eax,[z]
 	shr eax,ZB_POINT_Z_FRAC_BITS
 	cmp ax,word[esi+2*_a] ;if (zz >= pz[_a])
-	jl .end_0
+	jb .end_0
 		;edi = pp
 		mov word[esi+2*_a],ax ;пишем в буфер глубины новое значение
 if TGL_FEATURE_RENDER_BITS eq 24
@@ -103,7 +103,7 @@ local .end_0
 	mov eax,[z]
 	shr eax,ZB_POINT_Z_FRAC_BITS
 	cmp ax,word[esi+2*_a] ;if (zz >= pz[_a])
-	jl .end_0
+	jb .end_0
 		;edi = pp
 		mov word[esi+2*_a],ax ;пишем в буфер глубины новое значение
 if TGL_FEATURE_RENDER_BITS eq 24
@@ -171,7 +171,7 @@ local .end_0
 	mov eax,[z]
 	shr eax,ZB_POINT_Z_FRAC_BITS
 	cmp ax,word[esi+2*_a] ;if (zz >= pz[_a])
-	jl .end_0
+	jb .end_0
 		;edi = pp
 		mov word[esi+2*_a],ax ;пишем в буфер глубины новое значение
 if TGL_FEATURE_RENDER_BITS eq 24
@@ -251,7 +251,7 @@ local .end_0
 	mov eax,[z]
 	shr eax,ZB_POINT_Z_FRAC_BITS
 	cmp ax,word[esi+2*_a] ;if (zz >= pz[_a])
-	jl .end_0
+	jb .end_0
 		;edi = pp
 		mov word[esi+2*_a],ax ;пишем в буфер глубины новое значение
 if TGL_FEATURE_RENDER_BITS eq 24

programs/develop/libraries/TinyGL/asm_fork/ztriangle.inc

@@ -393,20 +393,9 @@ align 4
 		mov [dx1],eax ;dx1 = l2.x - l1.x
 		cmp edx,0 ;if (dy1 > 0) 
 		jle .els_3
-			xor edx,edx
-			cmp eax,0
-			jl .otr_dx1
 			shl eax,16
-			div dword[dy1] ;eax = (dx1 << 16) / dy1
-			jmp .end_3
-align 4
-			.otr_dx1:
-			neg eax
-			inc eax
-			shl eax,16
-			div dword[dy1] ;eax = (-dx1 << 16) / dy1
-			neg eax
-			inc eax
+			cdq
+			idiv dword[dy1] ;eax = (dx1 << 16) / dy1
 			jmp .end_3
 align 4
 		.els_3:
@@ -505,7 +494,6 @@ end if
 	.end_upd_l:
 
 	; compute values for the right edge
-
 	cmp dword[update_right],0 ;if(update_right)
 	je .end_upd_r
 		mov ebx,[pr1]
@@ -521,20 +509,9 @@ end if
 		mov [dy2],edx ;dy2 = pr2.y - pr1.y
 		cmp edx,0 ;if (dy2 > 0) 
 		jle .els_4
-			xor edx,edx
-			cmp eax,0
-			jl .otr_dx2
 			shl eax,16
-			div dword[dy2] ;eax = (dx2 << 16) / dy2
-			jmp .end_4
-align 4
-			.otr_dx2:
-			neg eax
-			inc eax ;dx2 *= -1
-			shl eax,16
-			div dword[dy2] ;eax = (-dx2 << 16) / dy2
-			neg eax
-			inc eax
+			cdq
+			idiv dword[dy2] ;eax = (dx2 << 16) / dy2
 			jmp .end_4
 align 4
 		.els_4:

programs/develop/libraries/box_lib/trunk/tree_list.asm

@@ -1,7 +1,6 @@
-; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> TreeList <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪<EFBFBD> box_lib.obj
-; <EFBFBD><EFBFBD> <20><><EFBFBD> <20>ਬ<EFBFBD><E0A8AC><EFBFBD><EFBFBD><EFBFBD> GPL2 <20><>業<EFBFBD><E6A5AD><EFBFBD>
-; <EFBFBD><EFBFBD>᫥<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD> 12.01.2021 IgorA
-
+; SPDX-License-Identifier: GPL-2.0-only
+; TreeList: used as a ListBox or Tree control (determined by settings)
+; Copyright (C) 2009-2025  IgorA <aie85playm@gmail.com>
 
 struct TreeNode
 	type dw ? ;+ 0 ⨯ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> 㧫<>
@@ -14,6 +13,52 @@ struct TreeNode
 ends
 
 
+;input:
+; ecx - 0xXX...... font options
+;output:
+; eax - font height in pixels
+align 4
+proc get_font_h uses ebx
+	mov eax,ecx
+	shr eax,24
+	bt eax,4
+	jc @f
+	bt eax,5
+	jc @f
+		mov ebx,9
+		jmp .siz0
+	@@:
+		mov ebx,16
+	.siz0:
+	and eax,7
+	inc eax
+	imul eax,ebx
+	ret
+endp
+
+;input:
+; ecx - 0xXX...... font options
+;output:
+; eax - font width in pixels
+align 4
+proc get_font_w uses ebx
+	mov eax,ecx
+	shr eax,24
+	bt eax,4
+	jc @f
+	bt eax,5
+	jc @f
+		mov ebx,6
+		jmp .siz0
+	@@:
+		mov ebx,8
+	.siz0:
+	and eax,7
+	inc eax
+	imul eax,ebx
+	ret
+endp
+
 ;<3B>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᯨ᪠ <20> <20>᭮<EFBFBD><E1ADAE><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ଠ樨 (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
 align 16
 proc tl_data_init uses eax ecx edi, tlist:dword
@@ -125,6 +170,7 @@ proc tl_key uses ebx ecx edi, tlist:dword
 	cmp tl_on_press,0
 	je @f
 		call tl_on_press
+		jmp .no_edit
 	@@:
 	cmp ah,byte[ecx+1] ;Space
 	jne @f
@@ -463,34 +509,24 @@ proc tl_draw, tlist:dword
 
 	cmp tl_capt_cy,9 ;9 - minimum caption height
 	jl @f
-	mov ebx,edi ;calculate cursor position
-	mov eax,tl_cur_pos
-	inc eax
-	lea edi,[txt_capt_cur.v]
-	stdcall tl_convert_to_str, 5
-
-	mov edi,ebx
+	call tl_draw_caption_cur_pos
 	mov eax,tl_tim_undo
+	or eax,eax
+	jz @f
+	mov ebx,edi ;save edi
 	lea edi,[txt_capt_otm.v]
 	stdcall tl_convert_to_str, 5
 	mov edi,ebx ;restore edi
 
-	mov eax,SF_DRAW_TEXT ;captions
-	mov ebx,tl_box_left
-	shl ebx,16
-	add ebx,5*65536+3
-	add ebx,tl_box_top
-	mov ecx,tl_col_txt
-	or  ecx,0x80000000
-	lea edx,[txt_capt_cur]
-	int 0x40
-
 	mov ebx,tl_box_left
 	shl ebx,16
 	add ebx,100*65536+3
+	mov ecx,tl_col_txt
+	and ecx,0x00ffffff
+	or  ecx,0x80000000
 	add ebx,tl_box_top
 	lea edx,[txt_capt_otm]
-	int 0x40
+	mcall SF_DRAW_TEXT ;undo
 	@@:
 
 	;cycle to nodes
@@ -1163,10 +1199,11 @@ proc tl_draw_node_caption uses ebx ecx edx esi
 		ror ecx,16
 		mov ebx,ecx
 		add bx,tl_img_cy ;<3B><>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>࠭<EFBFBD><E0A0AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-		sub bx,9 ;<3B>⭨<EFBFBD><E2ADA8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥪<><E2A5AA><EFBFBD>
 		mov ecx,tl_col_txt
-		and ecx,0xffffff
-		mcall SF_DRAW_TEXT
+		call get_font_h
+		sub bx,ax ;<3B>⭨<EFBFBD><E2ADA8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⥪<><E2A5AA><EFBFBD>
+		and ecx,0x37ffffff
+		mcall SF_DRAW_TEXT ;node text
 	@@:
 	ret
 endp
@@ -1179,13 +1216,15 @@ endp
 align 4
 proc tl_get_draw_text_len uses eax ecx edx
 	mov esi,eax ;<3B><>६ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ப<EFBFBD>
+	mov ecx,tl_col_txt
+	call get_font_w
+	mov ecx,eax
 	mov eax,tl_box_left
 	add eax,tl_box_width
 	cmp eax,ebx
 	jle .text_null ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><>࠭<EFBFBD><E0A0AD>
 		sub eax,ebx
 		xor edx,edx
-		mov ecx,6 ;<3B><>ਭ<EFBFBD> <20><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 		div ecx ;ᬮ<>ਬ ᪮<>쪮 ᨬ<><E1A8AC><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>࠭<EFBFBD>
 		cmp esi,eax
 		jl @f
@@ -1858,10 +1897,8 @@ pushad
 			.po8:
 				call tl_node_move_po8 ;㧫<> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>塞 8 <20><>뫮<EFBFBD>
 			.cur_mov:
-				push dword edi
-				call tl_cur_perv
-				push dword edi
-				call tl_draw
+				stdcall tl_cur_perv, edi
+				stdcall tl_draw, edi
 	@@:
 popad
 	ret
@@ -1981,10 +2018,11 @@ tl_draw_caption_cur_pos:
 		add ebx,5*65536+3
 		add ebx,tl_box_top
 		mov ecx,tl_col_txt
+		and ecx,0x00ffffff
 		or  ecx,0xc0000000 ;0x40000000 <20><><EFBFBD><EFBFBD><EFBFBD>訢<EFBFBD><E8A8A2><EFBFBD> 䮭 梥⮬ edi
 		lea edx,[txt_capt_cur]
 		mov edi,tl_col_zag
-		mcall SF_DRAW_TEXT ;captions
+		mcall SF_DRAW_TEXT ;row number
 	popad
 	@@:
 	ret
@@ -2253,6 +2291,6 @@ align 4
 	jge @f
 		or al,0x30  ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 ᨬ<><E1A8AC><EFBFBD> '0'
 		stosb       ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> al <20> <20>祪<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [edi]
-		mov byte[edi],0
+		mov word[edi],' ' ;add space symbol and 0
 	@@:
 	ret

programs/develop/libraries/menuetlibc/src/libm/ef_exp.s

@@ -6,7 +6,7 @@ MK_C_SYM(__ieee754_expf)
 	fstl	%st(1)
 	frndint				
 	fstl	%st(2)
-	fsubrp				
+	fsubp				
 	f2xm1				 
 	fld1
 	faddp				

programs/develop/tinypad/trunk/data/tp-idata.inc

@@ -13,7 +13,7 @@ sz app_board   ,'/sys/develop/board',0
 sz app_tinypad ,'/sys/tinypad',0
 sz app_docpak  ,'/sys/docpack',0
 
-sz sysfuncs_param,'f',0
+sz sysfuncs_param,'e',0
 
 include 'tp-tables.inc'
 include 'tp-locale.inc'

programs/fs/unz/unz.asm

@@ -41,6 +41,7 @@ dd     1, start, init_end, end_mem, stack_top, params,	0
 include 'lang.inc' ; Language support for locales: ru_RU (CP866), es_ES, en_US.
 include '../../macros.inc'
 include '../../proc32.inc'
+include "../../string.inc"
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../dll.inc'
 ;include '../../debug.inc'
@@ -369,6 +370,12 @@ endl
 
 	mcall	30,4,,1
 	jmp	.n
+@@:
+	stdcall string.length, pathOut
+	add     eax, pathOut
+	cmpne   [eax - 1], byte '/', @f
+	mov     [eax - 1], byte 0
+	dec     dword[edtUnpPath.size]
 @@:
 	mcall	30,4,pathOut,1
 .n:

programs/games/flood-it/build.bat

@@ -0,0 +1,5 @@
+@del *.
+@For /R %%i In (*.c) Do c-- "%%i"
+@rename *.com *.
+@pause
+@del warning.txt

programs/games/flood-it/compile_eng.bat

@@ -1,9 +0,0 @@
-@del lang.h--
-@echo #define LANG_ENG 1 >lang.h--
-C-- flood-it.c
-@del flood-it
-@rename flood-it.com flood-it
-@kpack flood-it
-@del lang.h--
-@del warning.txt
-@pause

programs/games/flood-it/compile_rus.bat

@@ -1,9 +0,0 @@
-@del lang.h--
-@echo #define LANG_RUS 1 >lang.h--
-C-- flood-it.c
-@del flood-it
-@rename flood-it.com flood-it
-@kpack flood-it
-@del lang.h--
-@del warning.txt
-@pause

programs/games/flood-it/flood-it.c

@@ -1,49 +1,44 @@
-//Leency 06.10.2011, Flood-it! v2.41, GPL
+// SPDX-License-Identifier: GPL-2.0-only
+// Flood-it! - Strategy game: Flood the board with one color, within a step limit.
+// Copyright (C) 2011-2025  Leency <lipatov.kiril@gmail.com>
 
 #include "lib\kolibri.h" 
 #include "lib\random.h"
 
-#ifndef AUTOBUILD
-#include "lang.h--"
-#endif
-
 system_colors sc;
 proc_info Form;
-dword stak[100]; //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+dword help_window_stak[100];
 
-//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-int DIFFICULTY_LEV_PARAMS[]={ 28, 14, 25,  //<2F><><EFBFBD><EFBFBD><EFBFBD>
-                              17, 28, 50}; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+#define DEFAULT_BLOCK_COUNT 14
+#define DEFAULT_MAX_CLICKS 25
+#define MAX_BLOCK_SIZE 28
+char board_size = -1;
+int BLOCK_SIZE; //cell size
+int BLOCKS_NUM; //number of cells by X and Y
+int MAX_CLICKS; //max clicks for win
+int CLICKS;     //how many clicks user already did
+int game_end;
 
-//<2F><>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> "<22><><EFBFBD><EFBFBD><EFBFBD>"
-int BLOCK_SIZE = 28; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-int BLOCKS_NUM = 14; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20> <20><> Y
-int MAX_CLICKS = 25; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+#define USER_PANEL_WIDTH 144
 
-int CLICKS = 0;      //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
-
-#define USER_PANEL_WIDTH 119
-
-//<2F><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD> <20><><EFBFBD><EFBFBD>,
-//<2F><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-dword FIELD_COLORS[]= {0xf18db6, 0x605ca8, 0xfddc80, 0xdc4a20, 0x46b1e2, 0x7e9d1e,   0x232323, 0};
-char *BOARD_SIZES[]={ "S", "L", 0 };
+//six colors are used in a game for a cells
+//and seventh color is used to mark a cell during filling process
+dword FIELD_COLORS[] = {0xf18db6, 0x605ca8, 0xfddc80, 0xdc4a20, 0x46b1e2, 0x7e9d1e, 0x232323};
+char BOARD_SIZES[] = "S\0L";
 
 
 #ifdef LANG_RUS
 	char *BUTTON_CAPTIONS[]={ " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [F2]", " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [F1]", " <20><>室 [Esc]", 0}; 
-	char CLICKS_TEXT[]=" <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:   /";
-	char LEVELS_TEXT[]="<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:";
+	char CLICKS_TEXT[]="<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:   /";
+	char LEVELS_TEXT[]=" <EFBFBD><EFBFBD><EFBFBD><EFBFBD>:";
 	
 	char HELP_WINDOW_CAPTION[]="<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>";
 	char *HELP_TEXT[]={	"<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> Flood-it?",
 	"",
-	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 梥⮬ <20><> <20><>࠭<EFBFBD>祭<EFBFBD><EFBFBD><EFBFBD> <20><>᫮ 室<><E5AEA4>.",
-	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>稭<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD>孥<EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⪨. <20>롥<EFBFBD><EBA1A5><EFBFBD><EFBFBD> 梥<>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>",
-	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⨪<EFBFBD><EFBFBD> ᫥<EFBFBD><EFBFBD>, <20> <EFBFBD><EFBFBD><EFBFBD>⪨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>⨬ 梥⮬ - ⠪ <20><> <EFBFBD><EFBFBD><EFBFBD>ᮥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
-	"<EFBFBD><EFBFBD>ᥤ<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⪨ ⮩ <20><> <20><><EFBFBD><EFBFBD>᪨. <20><>墠<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>㦭<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>쭮<EFBFBD>",
-	"<EFBFBD><EFBFBD>᫮ 室<><E5AEA4>. <20><>蠣<EFBFBD><E8A0A3><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>⥣<EFBFBD><E2A5A3> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ਭ樯<E0A8AD><E6A8AF> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,",
-	"<EFBFBD>⮡<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!",
+	"<EFBFBD>롥<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 梥<>, <20><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⨪<EFBFBD><EFBFBD>. <20><><EFBFBD>⪨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+	"<EFBFBD>⨬ 梥⮬ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> - ⠪ <20><> <20><><EFBFBD>ᮥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",
+	"<EFBFBD><EFBFBD>ᥤ<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>⪨ ⮩ <EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>᪨. <20><>墠<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD><EFBFBD><EFBFBD> <20>㦭<EFBFBD> <20><>",
+	"<EFBFBD><EFBFBD>࠭<EFBFBD>祭<EFBFBD><EFBFBD><EFBFBD> <20><>᫮ 室<><E5AEA4>. <20><><EFBFBD><EFBFBD>㯭<EFBFBD> <20><><EFBFBD> ࠧ<><E0A0A7><EFBFBD><EFBFBD> <20><>᪨.",
 	"",
 	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ⠪<><E2A0AA> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>蠬<EFBFBD>:",
 	"[Q] [W] [E]",
@@ -62,28 +57,25 @@ char *BOARD_SIZES[]={ "S", "L", 0 };
 	"vajutades nuppudele vasakul. Kui sa muudad v<>rvi pragusel alal,",
 	"siis iga kokkupuutuv sama v<>rv muutub samaks. Nii saad ujutada",
 	"teised alad m<>nguv<75>ljal <20>le. Valida saad 2 m<>nguv<75>lja suuruse",
-	"vahel. Proovi v<>li <20>le ujutada etteandtud k<>ikude arvuga!",
-	"Kaasahaarav ja l<>bus!",
+	"vahel.",
 	"",
 	"M<EFBFBD>ngida saab ka klaviatuuriga:",
 	"[Q] [W] [E]",
 	"[A] [S] [D]",
 	0}; 
 #else
-	char *BUTTON_CAPTIONS[]={ "New Game [F2]", "Help     [F1]", "Exit    [Esc]", 0}; 
+	char *BUTTON_CAPTIONS[]={ "Restart [F2]", " Help  [F1]", " Exit  [Esc]", 0}; 
 	char CLICKS_TEXT[]="Clicks:   /";
 	char LEVELS_TEXT[]="Board:";
 	
 	char HELP_WINDOW_CAPTION[]="Help";
 	char *HELP_TEXT[]={	"How to play Flood-it?",
 	"",
-	"Flood the whole board with one color within the allowed steps.",
-	"You start from the top left corner and progress by selecting one",
+	"You start from the TOP LEFT corner and progress by selecting one",
 	"of the colored buttons on the left. When you change your current area",
 	"color, every adjacent square with the same color also changes, that",
-	"way you can flood other areas of the board. Select from 3 sizes of",
+	"way you can flood other areas of the board. Select from 2 sizes of",
 	"the board and try to flood-it in the least amount of steps!",
-	"Addictive and Fun!",
 	"",
 	"You can also play with keyboard:",
 	"[Q] [W] [E]",
@@ -92,7 +84,7 @@ char *BOARD_SIZES[]={ "S", "L", 0 };
 #endif
 
 
-unsigned char color_matrix[28*28]; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+unsigned char color_matrix[28*28]; //our field
 
 unsigned char loss_matrix[14*14]={
 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -132,152 +124,162 @@ void main()
 {   
 	int key, id;
 	
+	set_board_size(0); //small board by default
 	new_game();
    
-	loop()
+	loop() switch(WaitEvent()) 
 	{
-		switch(WaitEvent()) 
-		{
-			case evButton:
-				id = GetButtonID(); 
-				IF (id==1) || (id==4) ExitProcess();
-				IF (id==2) goto _NEW_GAME_MARK;
-				IF (id==3) goto _HELP_MARK;
-				IF (id>=100)
-				{
-					make_turn(id-100);
+		case evButton:
+			id = GetButtonID(); 
+			IF (id==1) || (id==4) ExitProcess();
+			IF (id==2) goto _NEW_GAME_MARK;
+			IF (id==3) goto _HELP_MARK;
+			IF (id>=100) {
+				make_turn(id-100);
+			}
+			if (id==10) set_board_size(0);
+			if (id==11) set_board_size(1);
+			break;
+		case evKey:
+			key = GetKeyScancode();
+			IF (key==01) //Escape
+				 ExitProcess();
+			IF (key==59) //F1
+			{
+				_HELP_MARK:
+					CreateThread(#help_thread,#help_window_stak);
 					break;
-				}
-				if (id>=10)
-				{
-					id=id-10*3;
-					
-					IF (BLOCK_SIZE == DIFFICULTY_LEV_PARAMS[id]) break; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-					
-					BLOCK_SIZE = DIFFICULTY_LEV_PARAMS[id]; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-					BLOCKS_NUM = DIFFICULTY_LEV_PARAMS[id+1]; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20> <20><> Y
-					MAX_CLICKS = DIFFICULTY_LEV_PARAMS[id+2]; //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-					
+			}
+			IF (key==60) //F2
+			{
+				_NEW_GAME_MARK:
 					new_game();
+					draw_clicks_num();
+					draw_field();
+					break;
+			}
+			IF (key==16) make_turn(0); //Q
+			IF (key==17) make_turn(1); //W
+			IF (key==18) make_turn(2); //E
+			IF (key==30) make_turn(3); //A
+			IF (key==31) make_turn(4); //S
+			IF (key==32) make_turn(5); //D
+			break;
+		case evReDraw:
+			draw_window();
+	}
+}
 
-					MoveSize(-1, -1, BLOCK_SIZE*BLOCKS_NUM +14+USER_PANEL_WIDTH, BLOCK_SIZE*BLOCKS_NUM +GetSkinHeight()+14);
-				}
-				break;
-			case evKey:
-				key = GetKeyScancode();
-				IF (key==01) //Escape
-					 ExitProcess();
-				IF (key==59) //F1
-				{
-					_HELP_MARK:
-						CreateThread(#help,#stak); 
-				}
-				IF (key==60) //F2
-				{
-					_NEW_GAME_MARK:
-						new_game();
-						draw_clicks_num();
-						draw_field();
-				}
-				IF (key==16) make_turn(0); //Q
-				IF (key==17) make_turn(1); //W
-				IF (key==18) make_turn(2); //E
-				IF (key==30) make_turn(3); //A
-				IF (key==31) make_turn(4); //S
-				IF (key==32) make_turn(5); //D
-				break;
-			case evReDraw:
-				draw_window();
-		}
+void set_board_size(char s)
+{
+	if (board_size != s) {
+		board_size = s;
+		
+		BLOCKS_NUM = board_size + 1 * DEFAULT_BLOCK_COUNT;
+		MAX_CLICKS = board_size + 1 * DEFAULT_MAX_CLICKS;
+		
+		BLOCK_SIZE = GetScreenHeight() - 70 / BLOCKS_NUM; 
+		if (BLOCK_SIZE > MAX_BLOCK_SIZE) BLOCK_SIZE = MAX_BLOCK_SIZE;
+		
+		new_game();
+		
+		MoveSize(-1, -1, BLOCK_SIZE*BLOCKS_NUM +14+USER_PANEL_WIDTH, 
+		BLOCK_SIZE*BLOCKS_NUM +GetSkinHeight()+14);		
 	}
 }
 
 
 void make_turn(int turn_id)
 {
-	IF (color_matrix[0]==turn_id) return; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>
-	IF (CLICKS>=MAX_CLICKS) return; //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
-	CLICKS++;
-	draw_clicks_num();
-	
-	fill_field(turn_id);
-	draw_field();
-	check_for_end(); //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>	
+	IF (color_matrix[0]==turn_id) return; //ignore no-sence click: first item color is equal to a new color
+	IF (!game_is_ended()) {
+		CLICKS++;
+		draw_clicks_num();
+		fill_field(turn_id);
+		if (!game_is_ended()) draw_field();
+	}
 }
 
-
 void draw_window()
 {
-	int i, j;
+	int i;
 	#define BUTTON_SIZE 28
 	
 	sc.get();
 		
-	DefineAndDrawWindow(300,176, BLOCK_SIZE*BLOCKS_NUM +14+USER_PANEL_WIDTH, BLOCK_SIZE*BLOCKS_NUM +GetSkinHeight()+14, 0x74,sc.work,0,0,"Flood-it!"); 
+	DefineAndDrawWindow(300,176, BLOCK_SIZE*BLOCKS_NUM +14+USER_PANEL_WIDTH, 
+	BLOCK_SIZE*BLOCKS_NUM +GetSkinHeight()+14, 0x74,0,"Flood-it!"); 
 	
-	//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	// Fix rolled-up bug
 	GetProcessInfo(#Form, SelfInfo);
 	IF (Form.status_window==4) return;
 	
-	//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> -> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+	// Fill background to reduce window redraw
 	for (i=0;i<=4;i++)
 	{
-		IF (i<>4)
-			DrawRegion(USER_PANEL_WIDTH+i-5,i, BLOCK_SIZE*BLOCKS_NUM +9-i-i, BLOCK_SIZE*BLOCKS_NUM+9-i-i, sc.work);
-		else
-			DrawRegion(USER_PANEL_WIDTH+i-5,i, BLOCK_SIZE*BLOCKS_NUM +9-i-i, BLOCK_SIZE*BLOCKS_NUM+9-i-i, sc.work_graph); //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+		ESI = sc.work; 
+		IF (i==4) ESI = sc.work_graph;
+		DrawRegion(USER_PANEL_WIDTH+i-5,i, BLOCK_SIZE*BLOCKS_NUM +9-i-i, ESI);
 	}
 	DrawBar(0,0, USER_PANEL_WIDTH-5, BLOCK_SIZE*BLOCKS_NUM+10, sc.work);
 
-	//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	for (i=0;i<2;i++)
-		for (j=0;j<3;j++)
-			DefineButton(j*BUTTON_SIZE+17,i*BUTTON_SIZE+15,BUTTON_SIZE,BUTTON_SIZE, i*3+j+100,FIELD_COLORS[i*3+j]);
-
-	//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	for (j=0;j<3;j++)
-	{
-		DefineButton(17,j*25+120, 13*6+6, 20, j+2,sc.work_button);
-		WriteText(17+4,j*25+127,0x80,sc.work_button_text,BUTTON_CAPTIONS[j],0);
+	// Main buttons to fill the board
+	#define FILL_BUTTON_SIZE BUTTON_SIZE+8
+	for (i=0;i<6;i++) {
+		DefineButton(i%3*FILL_BUTTON_SIZE+17,calc(i/3)*FILL_BUTTON_SIZE+15,
+			FILL_BUTTON_SIZE,FILL_BUTTON_SIZE, i+100,FIELD_COLORS[i]);
 	}
 
-	//<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	WriteText(17,BLOCKS_NUM*BLOCK_SIZE-20+7,0x80,sc.work_text,#LEVELS_TEXT,0);
-	for (j=0;j<2;j++)
+	// Menu buttons
+	for (i=0;i<3;i++)
 	{
-		DefineButton(j*25+56,BLOCKS_NUM*BLOCK_SIZE-20, 20,20, j+10,sc.work_button);
+		DefineButton(17,i*31+140, 13*8+6, 25, i+2,sc.work_button);
+		WriteText(17+4,i*31+146,0x90,sc.work_button_text,BUTTON_CAPTIONS[i],0);
+	}
 
-		IF (BLOCK_SIZE == DIFFICULTY_LEV_PARAMS[j*3]) EDI=0x800080;
-			else EDI=sc.work_button_text;
+	// Board size
+	WriteText(17,BLOCKS_NUM*BLOCK_SIZE-25+7,0x90,sc.work_text,#LEVELS_TEXT,0);
+	for (i=0;i<2;i++)
+	{
+		IF (board_size == i) {
+			ESI=sc.work_button;
+			EDI=sc.work_button_text;
+		} ELSE {
+			ESI = sc.work;
+			EDI = sc.work_text;
+		}
 
-		WriteText(j*25+56+8,BLOCKS_NUM*BLOCK_SIZE-20+7,0x80,EDI,BOARD_SIZES[j],0);
-		WriteText(j*25+56+9,BLOCKS_NUM*BLOCK_SIZE-20+7,0x80,EDI,BOARD_SIZES[j],0);
+		DefineButton(i*32+69,BLOCKS_NUM*BLOCK_SIZE-24, 26,25, i+10,ESI);		
+		WriteText(i*32+69+9,BLOCKS_NUM*BLOCK_SIZE-24+6,0x90,EDI,#BOARD_SIZES+i+i,0);
+		$add ebx, 1<<16 //bold
+		$int 0x40
 	}
 	
 	draw_clicks_num();	
-	
 	draw_field();
-
 }
 
+void randomly_fill_the_board()
+{
+	int i;
+	for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) {
+		color_matrix[i] = random(6);
+	}		
+}
 
 void new_game()
 {
-	int i;
-	
 	CLICKS = 0;
-	
-	for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) 
-			color_matrix[i] = random(6);
+	game_end = false;
+	randomly_fill_the_board();	
 }
 
-
 void fill_field(int new_color_id)
 {
 	int i, j,
 	old_color_id=color_matrix[0],
 	restart;
+	int cur_cell;
 	#define MARKED 6
 	
 	color_matrix[0]=MARKED;
@@ -289,15 +291,16 @@ void fill_field(int new_color_id)
 	for (i=0;i<BLOCKS_NUM;i++)
 		for (j=0;j<BLOCKS_NUM;j++)
 		{
-			IF (color_matrix[i*BLOCKS_NUM+j]<>old_color_id) continue; //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			IF (color_matrix[i*BLOCKS_NUM+j]==MARKED) continue; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
+			cur_cell = i*BLOCKS_NUM+j;
+			IF (color_matrix[cur_cell]<>old_color_id) continue; //if not a needed color then continue
+			IF (color_matrix[cur_cell]==MARKED) continue; //if already marked then continue
 			
-			IF (j>0) && (color_matrix[i*BLOCKS_NUM+j-1]==MARKED) color_matrix[i*BLOCKS_NUM+j]=MARKED; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>
-			IF (i>0) && (color_matrix[i-1*BLOCKS_NUM+j]==MARKED) color_matrix[i*BLOCKS_NUM+j]=MARKED; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			IF (j<BLOCKS_NUM-1) && (color_matrix[i*BLOCKS_NUM+j+1]==MARKED) color_matrix[i*BLOCKS_NUM+j]=MARKED; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			IF (i<BLOCKS_NUM-1) && (color_matrix[i+1*BLOCKS_NUM+j]==MARKED) color_matrix[i*BLOCKS_NUM+j]=MARKED; //<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			IF (j>0) && (color_matrix[i*BLOCKS_NUM+j-1]==MARKED) color_matrix[cur_cell]=MARKED; //left
+			IF (i>0) && (color_matrix[i-1*BLOCKS_NUM+j]==MARKED) color_matrix[cur_cell]=MARKED; //top
+			IF (j<BLOCKS_NUM-1) && (color_matrix[i*BLOCKS_NUM+j+1]==MARKED) color_matrix[cur_cell]=MARKED; //right
+			IF (i<BLOCKS_NUM-1) && (color_matrix[i+1*BLOCKS_NUM+j]==MARKED) color_matrix[cur_cell]=MARKED; //bottom
 			
-			IF (color_matrix[i*BLOCKS_NUM+j]==MARKED) restart=1; //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+			IF (color_matrix[cur_cell]==MARKED) restart=1;
 		}
 	IF (restart) goto _RESTART_MARK;
 
@@ -305,101 +308,83 @@ void fill_field(int new_color_id)
 			IF (color_matrix[i]==MARKED) color_matrix[i]=new_color_id;
 }
 
-
-int check_for_end()
+void draw_win_or_loose_animation(dword matrix)
 {
 	int i, j, ii, jj;
-
-	if (CLICKS>=MAX_CLICKS) //<2F><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	{
-		IF (CLICKS==MAX_CLICKS) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
-		{
-			for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-					IF (color_matrix[i]<>color_matrix[0]) goto _loss_MARK;
-			goto _WIN_MARK;
-		}
-		
-		_loss_MARK:
-		
-		for (i=0;i<14;i++)
-			for (j=0;j<14;j++)
-			{
-				IF (BLOCK_SIZE == DIFFICULTY_LEV_PARAMS[0])
-				{
-					ii=i;
-					jj=j;
-				}
-				else
-				{
-					ii=i*2;
-					jj=j*2;
-				}
-				color_matrix[ii*BLOCKS_NUM+jj]=loss_matrix[i*14+j];
-				color_matrix[ii+1*BLOCKS_NUM+jj]=loss_matrix[i*14+j];
-				color_matrix[ii*BLOCKS_NUM+jj+1]=loss_matrix[i*14+j];
-				color_matrix[ii+1*BLOCKS_NUM+jj+1]=loss_matrix[i*14+j];
-				draw_field();
-				//Pause(5);				
-			}	
-			
-		return 1;
-	}
-	
-	for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			IF (color_matrix[i]<>color_matrix[0]) return 0;
-
-	//<2F><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MAX_CLICKS -> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-	
-	_WIN_MARK:
-	
-	for (i=0;i<25;i++)
-	{
-		new_game();
-		draw_field();
-		Pause(7);
-	}
-
-	CLICKS=MAX_CLICKS;
-	
-	for (i=0;i<14;i++)
+	for (i=0;i<14;i++) {
 		for (j=0;j<14;j++)
 		{
-			IF (BLOCK_SIZE == DIFFICULTY_LEV_PARAMS[0]) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-			{
-				ii=i;
-				jj=j;
-			}
-			else
-			{
-				ii=i*2;
-				jj=j*2;
-			}
-			color_matrix[ii*BLOCKS_NUM+jj]=win_matrix[i*14+j];
-			color_matrix[ii+1*BLOCKS_NUM+jj]=win_matrix[i*14+j];
-			color_matrix[ii*BLOCKS_NUM+jj+1]=win_matrix[i*14+j];
-			color_matrix[ii+1*BLOCKS_NUM+jj+1]=win_matrix[i*14+j];
+			ii = board_size * 2 + i;
+			jj = board_size * 2 + j;
+			color_matrix[ii*BLOCKS_NUM+jj]=
+			color_matrix[ii+1*BLOCKS_NUM+jj]=
+			color_matrix[ii*BLOCKS_NUM+jj+1]=
+			color_matrix[ii+1*BLOCKS_NUM+jj+1]=ESBYTE[i*14+j+matrix];
 			draw_field();			
-			//Pause(5);				
 		}
-	return 1;
+	}
+}
+
+int field_is_solid()
+{
+	int i;
+	if (game_end) return 1;
+	game_end = 1;
+	for (i=0;i<BLOCKS_NUM*BLOCKS_NUM;i++) {
+		IF (color_matrix[i]<>color_matrix[0]) game_end = 0;
+	}
+	return game_end;
+}
+
+int game_is_ended()
+{
+	int i;
+	
+	if (game_end) return 1;
+
+	if (CLICKS>=MAX_CLICKS) //check for game end via max_clicks
+	{
+		IF (CLICKS==MAX_CLICKS) //probably user won on the last step
+		{
+			if (field_is_solid()) goto _WIN_MARK;
+		}
+		draw_win_or_loose_animation(#loss_matrix);			
+		return 1;
+	} else {
+		if (!field_is_solid()) return 0;
+		
+		//field is solid and CLICKS<MAX_CLICKS -> win
+		
+		_WIN_MARK:
+		
+		for (i=0;i<25;i++)
+		{
+			randomly_fill_the_board();
+			draw_field();
+			Pause(7);
+		}
+		
+		draw_win_or_loose_animation(#win_matrix);	
+		return 1;
+	}
 }
 
 
 void draw_clicks_num()
 {
-	#define TEXT_X 21
-	#define TEXT_Y 92
+	#define TEXT_X 19
+	#define TEXT_Y 100
 	
-	DrawBar(TEXT_X, TEXT_Y, USER_PANEL_WIDTH-TEXT_X-3,9, sc.work);
+	DrawBar(TEXT_X, TEXT_Y, USER_PANEL_WIDTH-TEXT_X-5,16, sc.work);
 	
-	WriteText(TEXT_X,TEXT_Y,0x80,sc.work_text,#CLICKS_TEXT,0);
+	WriteText(TEXT_X,TEXT_Y,0x90,sc.work_text,#CLICKS_TEXT,0);
 
-	IF (CLICKS<10) EBX=9*6+TEXT_X;
-		else EBX=8*6+TEXT_X;
+	IF (CLICKS<10) EBX=9*8+TEXT_X;
+	          else EBX=8*8+TEXT_X;
 	
-	WriteText(EBX,TEXT_Y,0x80,sc.work_text,IntToStr(CLICKS),0);
+	WriteText(EBX,TEXT_Y,0x90,sc.work_text,itoa_nosign(CLICKS),0);
 	
-	WriteText(11*6+TEXT_X,TEXT_Y,0x80,sc.work_text,IntToStr(MAX_CLICKS),0);
+	WriteText(11*8+TEXT_X,TEXT_Y,0x90,sc.work_text,itoa_nosign(MAX_CLICKS),0);
 }
 
 
@@ -417,7 +402,7 @@ void draw_field()
 }
 
 
-void help()
+void help_thread()
 {  
 	int i;
 	
@@ -429,10 +414,10 @@ void help()
 				IF (GetKeyScancode()==001) ExitProcess(); //Esc
 				break;
 		case evReDraw:
-				for (i=0; HELP_TEXT[i]<>0; i++;) {};
-				DefineAndDrawWindow(400,200,610,i*19+25+GetSkinHeight(),0x34,sc.work,0,0,#HELP_WINDOW_CAPTION);
-				WriteText(6,12,0x90,sc.work_text,HELP_TEXT[0],0); //<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-				for (i=0; HELP_TEXT[i]<>0; i++;) WriteText(5,i*19+12,0x90,sc.work_text,HELP_TEXT[i],0);
+				//for (i=0; HELP_TEXT[i]<>0; i++;) {}; //calculate line numbers, predefined i=12 used to reduce size
+				DefineAndDrawWindow(400,200,612,12*19+25+GetSkinHeight(),0x34,sc.work,#HELP_WINDOW_CAPTION);
+				WriteText(6,12,0x90,sc.work_text,HELP_TEXT[0],0); //for a bold text
+				for (i=0; HELP_TEXT[i]<>0; i++;) WriteText(7,i*19+12,0x90,sc.work_text,HELP_TEXT[i],0);
 	}
 }
 

programs/games/flood-it/lib/kolibri.h

@@ -23,6 +23,12 @@ dword  I_Path       = 0;
 #define BT_HIDE		0x40000000
 #define BT_NOFRAME	0x20000000
 
+#define bool char
+#define true 1
+#define false 0
+
+inline fastcall dword calc(EAX) { return EAX; }
+
 //-------------------------------------------------------------------------
 
 
@@ -94,16 +100,11 @@ inline fastcall Pause(dword EBX)
 
 //------------------------------------------------------------------------------
 
-char buffer[11]="";
-inline fastcall dword IntToStr(dword ESI)
+char buffer[5];
+inline fastcall dword itoa_nosign(dword ESI)
 {
      $mov     edi, #buffer
      $mov     ecx, 10
-     $test     esi, esi
-     $jns     f1
-     $mov     al, '-'
-     $stosb
-     $neg     esi
 f1:
      $mov     eax, esi
      $push     -'0'
@@ -126,7 +127,7 @@ f3:
 //------------------------------------------------------------------------------
 
 
-void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType,dword mainAreaColour,byte headerType,dword headerColour,EDI)
+void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType,dword mainAreaColour,EDI)
 {
 	EAX = 12;              // function 12:tell os about windowdraw
 	EBX = 1;
@@ -135,7 +136,7 @@ void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType,dword mainAreaC
 	EBX = x << 16 + sizeX;
 	ECX = y << 16 + sizeY;
 	EDX = mainAreaType << 24 | mainAreaColour;
-	ESI = headerType << 24 | headerColour;
+	ESI = 0;
 	$xor eax,eax
 	$int 0x40
 
@@ -166,6 +167,13 @@ dword GetSkinHeight()
 	$pop  ebx
 }
 
+inline fastcall int GetScreenHeight()
+{
+	$mov eax, 14
+	$int 0x40
+	$and eax,0x0000FFFF
+}
+
 void WriteText(dword x,y,byte fontType, dword color, EDX, ESI)
 {
 	EAX = 4;
@@ -190,12 +198,20 @@ void DefineButton(dword x,y,w,h,EDX,ESI)
  	$int 0x40
 }
 
-void DrawRegion(dword x,y,width,height,EDX)
+void DrawRegion(dword x,y,s,EDX)
 {
-	DrawBar(x,y,width,1,EDX);
-	DrawBar(x,y+height,width,1,EDX);
-	DrawBar(x,y,1,height,EDX);
-	DrawBar(x+width,y,1,height+1,EDX);
+	EAX = 13;
+	EBX = x<<16+s;
+	ECX = y<<16+1;
+ 	$int 0x40
+ 	ECX = y+s<<16+1;
+ 	$int 0x40
+ 	EBX = x<<16+1;
+	ECX = y<<16+s;
+ 	$int 0x40
+  	EBX = x+s<<16+1;
+	ECX = y<<16+s+1;
+ 	$int 0x40	
 }
 
 inline fastcall dword WriteDebug(dword EDX)

programs/games/floppybird/floppybird.cpp

@@ -343,7 +343,7 @@ void kos_Main()
 
 void drawGameWindow()
 {
-	kos_DefineAndDrawWindow(windowX, windowY, WINDOW_WIDTH, WINDOW_HEIGHT, 0x34, 0x00FFFF, 0, 0, (Dword)HEADER_STRING);
+	kos_DefineAndDrawWindow(windowX, windowY, WINDOW_WIDTH, WINDOW_HEIGHT, 0x33, 0x00FFFF, 0, 0, (Dword)HEADER_STRING);
 	bird.draw();
 	for (int i = 0; i < tubeNumber; ++i)
 		tubes[i].draw();
@@ -370,7 +370,7 @@ void redrawGameWindow()
 
 void drawGameoverWindow()
 {
-	kos_DefineAndDrawWindow(windowX, windowY, WINDOW_WIDTH, WINDOW_HEIGHT, 0x34, 0x000000, 0, 0, (Dword)HEADER_STRING);
+	kos_DefineAndDrawWindow(windowX, windowY, WINDOW_WIDTH, WINDOW_HEIGHT, 0x33, 0x000000, 0, 0, (Dword)HEADER_STRING);
 	kos_WriteTextToWindow(125, 50, 0x82, 0xFFFFFF, GAMEOVER_STRING, 0);
 	kos_WriteTextToWindow(135, 100, 0x81, 0xFFFFFF, scoreString, 0);
 	kos_WriteTextToWindow(50, 150, 0x81, 0xFFFFFF, ANY_KEY_STRING, 0);
@@ -387,7 +387,7 @@ void WriteBorderedText(Word x, Word y, Byte fontType, Dword textColor, const cha
 
 void drawMenuWindow()
 {
-	kos_DefineAndDrawWindow(windowX, windowY, WINDOW_WIDTH, WINDOW_HEIGHT, 0x34, 0x00FFFF, 0, 0, (Dword)HEADER_STRING);
+	kos_DefineAndDrawWindow(windowX, windowY, WINDOW_WIDTH, WINDOW_HEIGHT, 0x33, 0x00FFFF, 0, 0, (Dword)HEADER_STRING);
 	
 	WriteBorderedText(85, 40, 0x4, 0xFFFFFF, HEADER_STRING, 6, 0x000000, 2);
 	WriteBorderedText(185, 80, 0x84, 0xFFFFFF, HEADER_STRING + 7, 0, 0x000000, 2);

programs/media/voxel_editor/utilites/vox_tgl.asm

@@ -16,9 +16,9 @@ include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.
 
 @use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 if lang eq ru_RU
-caption db '<27><><EFBFBD>ᬮ<EFBFBD><E1ACAE> <20><><EFBFBD>ᥫ<EFBFBD><E1A5AB> 11.11.20',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+caption db '<27><><EFBFBD>ᬮ<EFBFBD><E1ACAE> <20><><EFBFBD>ᥫ<EFBFBD><E1A5AB> 14.04.25',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 else ; Default to en_US
-caption db 'Voxel viewer 11.11.20',0
+caption db 'Voxel viewer 14.04.25',0
 end if
 
 3d_wnd_l equ   5 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> tinygl <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᫥<><E1ABA5>
@@ -750,12 +750,8 @@ draw_3d:
 	je @f
 		call SetLight
 	@@:
-	stdcall [glTranslatef], 0.0,0.0,0.5 ;<3B><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> z <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD> <20><> 0.0 <20><> 1.0, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20>㤥<EFBFBD> <20><>ᥪ<EFBFBD><E1A5AA><EFBFBD><EFBFBD><EFBFBD>
-		;<3B><><EFBFBD>ᥫ<EFBFBD><E1A5AB><EFBFBD><EFBFBD> <20><>ꥪ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> -0.5 <20><> 0.5, <20><>⮬<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> +0.5
-		;<3B><> <20><><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ᥪ<EFBFBD><E1A5AA><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뫥<EFBFBD><EBABA5><EFBFBD> <20><> <20>।<EFBFBD><E0A5A4><EFBFBD> <20><><EFBFBD>᪮<EFBFBD>⥩ <20><><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD>
-		;<3B> <20><><EFBFBD>ᨨ opengl <20><><EFBFBD> Win <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> -1.0 <20><> 1.0 <20><>⮬<EFBFBD> ⠬ <20>⮣<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>㦭<EFBFBD>
 	stdcall [glScalef], [scale], [scale], [scale] ;㢥<><E3A2A5>稢<EFBFBD><E7A8A2><EFBFBD> <20><><EFBFBD>ᥫ<EFBFBD><E1A5AB><EFBFBD><EFBFBD> <20><>ꥪ<EFBFBD>, <20><><EFBFBD>-<2D><> <20><> <20><><EFBFBD> <20>祭<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>쪨<EFBFBD>
-	stdcall [glScalef], 1.0, 1.0, 0.25 ;<3B><><EFBFBD>-<2D><> <20><><EFBFBD><EFBFBD> <20><>ꥪ<EFBFBD><EAA5AA> <20><> <20>뫠<EFBFBD><EBABA0><EFBFBD><EFBFBD> <20><> <20>࠭<EFBFBD> <20><><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD>
+	stdcall [glScalef], 1.0, 1.0, 0.5 ;<3B><><EFBFBD>-<2D><> <20><><EFBFBD><EFBFBD> <20><>ꥪ<EFBFBD><EAA5AA> <20><> <20>뫠<EFBFBD><EBABA0><EFBFBD><EFBFBD> <20><> <20>࠭<EFBFBD> <20><><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD>
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0

programs/network/ftpc/console.inc

@@ -105,7 +105,6 @@ console: ;//////////////////////////////////////////////////////////////////////
         mov     eax, [esp+36]
         call    write_to_file
 
-      @@:
         popad
         ret     4
 

programs/network/ftpc/ftpc.asm

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2013-2021. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2013-2025. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  ftpc.asm - FTP client for KolibriOS                            ;;
@@ -36,8 +36,8 @@ use32
         dd      1               ; header version
         dd      start           ; entry point
         dd      i_end           ; initialized size
-        dd      mem+0x1000      ; required memory
-        dd      mem+0x1000      ; stack pointer
+        dd      mem             ; required memory
+        dd      stacktop        ; stack pointer
         dd      buf_cmd         ; parameters
         dd      path            ; path
 
@@ -83,12 +83,12 @@ start: ;////////////////////////////////////////////////////////////////////////
 ;< none                                                                                           ;;
 ;;================================================================================================;;
 ; initialize heap for using dynamic blocks
-        mcall   68, 11
+        mcall   SF_SYS_MISC, SSF_HEAP_INIT
         test    eax, eax
         je      exit2
         
 ; disable all events except network event
-        mcall   40, EV_STACK
+        mcall   SF_SET_EVENTS_MASK, EV_STACK
 ; load libraries
         stdcall dll.Load, @IMPORT
         test    eax, eax
@@ -125,16 +125,16 @@ start: ;////////////////////////////////////////////////////////////////////////
         mov     [acti_port_stop], ax
 
         invoke  ini.get_str, path, str_general, str_dir, buf_buffer1, BUFFERSIZE, 0
-        mcall   30, 1, buf_buffer1                      ; set working directory
+        mcall   SF_CURRENT_FOLDER, SSF_SET_CF, buf_buffer1 ; set working directory
 
         ; initialize log file
         invoke  ini.get_str, path, str_general, str_logfile, log_file, 512, 0
-        mov     [filestruct2.subfn], 2
+        mov     [filestruct2.subfn], SSF_CREATE_FILE
         mov     [filestruct2.offset], 0
         mov     [filestruct2.size], 0
         mov     [filestruct2.ptr], 0
         mov     [filestruct2.name], log_file
-        mcall   70, filestruct2
+        mcall   SF_FILE, filestruct2
 
 ; Usage: ftpc [-cli] [ftp://username:password@server:port/path]
 
@@ -355,7 +355,7 @@ wait_for_servercommand: ;///////////////////////////////////////////////////////
 
 ; receive socket data with timeout
   .receive:
-        mcall   26, 9
+        mcall   SF_SYSTEM_GET, SSF_TIME_COUNT
         add     eax, TIMEOUT*100
         mov     [timeout], eax
   .again:
@@ -365,11 +365,11 @@ wait_for_servercommand: ;///////////////////////////////////////////////////////
         je      .closed
         cmp     ebx, EWOULDBLOCK
         jne     .sock_err
-        mcall   26, 9
+        mcall   SF_SYSTEM_GET, SSF_TIME_COUNT
         mov     ebx, [timeout]
         sub     ebx, eax
         jle     .timeout
-        mcall   23      ; Wait for event with timeout
+        mcall   SF_WAIT_EVENT_TIMEOUT ; Wait for event with timeout
         jmp     .again
 
   .sock_err:
@@ -524,7 +524,7 @@ transfer_queued:
 
         ; Error occured, we reached the end of the buffer before [queued] reached 0
         mov     [queued], 0
-        mcall   68, 13, [ptr_fname]             ; free buffer
+        mcall   SF_SYS_MISC, SSF_MEM_FREE, [ptr_fname] ; free buffer
         test    eax, eax
         jz      error_heap
         jmp     wait_for_usercommand
@@ -535,7 +535,7 @@ transfer_queued:
         dec     [queued]
         jnz     cmd_retr
 
-        mcall   68, 13, [ptr_fname]             ; free buffer
+        mcall   SF_SYS_MISC, SSF_MEM_FREE, [ptr_fname] ; free buffer
         test    eax, eax
         jz      error_heap
         jmp     cmd_retr
@@ -655,12 +655,12 @@ write_to_file: ;////////////////////////////////////////////////////////////////
         mov     eax, 0
         ret
       @@:
-        mov     [filestruct2.subfn], 3
+        mov     [filestruct2.subfn], SSF_WRITE_FILE
         m2m     [filestruct2.offset], [logfile_offset]
         mov     [filestruct2.size], ecx
         mov     [filestruct2.ptr], eax
         mov     [filestruct2.name], log_file
-        mcall   70, filestruct2
+        mcall   SF_FILE, filestruct2
         test    eax, eax
         jz      @f
         mov     [logfile_offset], -1 ; disable logging
@@ -754,13 +754,13 @@ wait_for_keypress:
 exit:
         mcall   close, [controlsocket]
 exit2:  
-        mcall   -1
+        mcall   SF_TERMINATE_PROCESS
 
 
 
 ; data
 str_title       db 'FTP client for KolibriOS',0
-str_welcome     db 'FTP client for KolibriOS v0.16',10
+str_welcome     db 'FTP client for KolibriOS v0.18',10
                 db 10,0
 str_srv_addr    db 'Please enter ftp server address.',10,0
 
@@ -971,6 +971,7 @@ param_path      rb 1024
 param_port      rb 6
 
 sc system_colors
-rb 1024
-
+align 16
+rb 4096
+stacktop:
 mem:

programs/network/ftpc/gui.inc

@@ -7,6 +7,9 @@ include '../../load_lib.mac'
  
 icon_tl_sys dd 0
 icon_tl_nod dd 0
+icon_buttons dd 0
+lbl_after_enter dd 0
+show_log    db 0 ; 0 - hide log, 1 - show log
 
 TLIST_SZ = 325+16 ;=341. 16 is x-size of scroll bar
 TLIST1_X = 50
@@ -15,6 +18,9 @@ BT_SZ_X  = 40
 SYS_COL  = 0xe6e6e6
 BT_COL   = 0xcccccc
 STR_COL  = 0x595959 ;0x000000
+ICON_TOP_B  = 2 ; top border
+ICON_LEFT_B = 2 ; left border
+ICON_SIZE   = (18+ICON_LEFT_B)*(18+ICON_TOP_B)*3
 
 ; TODO: automatic resizing of GUI elements on window resizing
 
@@ -45,8 +51,8 @@ gui: ;//////////////////////////////////////////////////////////////////////////
         test    eax, eax
         jnz     .exit
 
-        mcall   48, 3, sc, sizeof.system_colors
-        mcall   40, 0xC0000027 ; set event mask
+        mcall   SF_STYLE_SETTINGS, SSF_GET_COLORS, sc, sizeof.system_colors
+        mcall   SF_SET_EVENTS_MASK, 0xC0000027 ; set event mask
         ret
 
     .server_addr:
@@ -74,36 +80,41 @@ gui: ;//////////////////////////////////////////////////////////////////////////
         stdcall [tl_data_init], tree1
         stdcall [tl_data_init], tree2
 
-		or dword[tree1.style], 8 ;tl_cursor_pos_limited - restrict cursor move to existing nodes
-		or dword[tree2.style], 8 ;tl_cursor_pos_limited
+        or dword[tree1.style], 8 ;tl_cursor_pos_limited - restrict cursor move to existing nodes
+        or dword[tree2.style], 8 ;tl_cursor_pos_limited
         
         ; read icons
-        load_image_file 'ftpc_sys.png', icon_tl_sys
+        mcall   SF_SYS_MISC, SSF_MEM_OPEN, str_icon_18,, 0
+        or      eax, eax
+        jz      @f
+        mov     esi, eax
+        mov     ecx, ICON_SIZE*11
+        mcall   SF_SYS_MISC, SSF_MEM_ALLOC
+        mov     ecx, eax
+        mov     [icon_tl_sys], eax
+        stdcall copy_icon, eax,esi,31 ;active cursor
+        add     eax, ICON_SIZE*3 ;skip not used icons
+        stdcall img_to_gray, ecx, eax, ICON_SIZE/3 ;not active cursor
 
-        mov     [filestruct.ptr], eax
-        mov     [filestruct.subfn], 0
-        mov     [filestruct.offset], 54
-        mov     [filestruct.size], ecx
-        mcall   70, filestruct
-        cmp     ebx, 0
-        jl      @f
         m2m     dword[tree1.data_img_sys], dword[icon_tl_sys]
         m2m     dword[tree2.data_img_sys], dword[icon_tl_sys]
 
-      @@:
         ; read nodes icon file
-        load_image_file 'ftpc_nod.png', icon_tl_nod
+        mov     ecx, ICON_SIZE*2
+        mcall   SF_SYS_MISC, SSF_MEM_ALLOC
+        mov     [icon_tl_nod], eax
+        stdcall copy_icon, eax,esi,2
+        stdcall copy_icon, eax,esi,0
 
-        mov     [filestruct.ptr], eax
-        ;mov    [filestruct.subfn], 0
-        ;mov    [filestruct.offset], 54
-        mov     [filestruct.size], ecx
-        mcall   70, filestruct
-        cmp     ebx, 0
-        jl      @f
         m2m     dword[tree1.data_img], dword[icon_tl_nod]
         m2m     dword[tree2.data_img], dword[icon_tl_nod]
 
+        ; initialize icon buttons
+        mov     ecx, 18*18*4*2
+        mcall   SF_SYS_MISC, SSF_MEM_ALLOC
+        mov     [icon_buttons], eax
+        stdcall copy_icon_w, eax,esi, 4 ;disconnect
+        stdcall copy_icon_w, eax,esi,49 ;search
       @@:
         call    .draw
         ; create initial tree list for root_dir
@@ -117,11 +128,11 @@ gui: ;//////////////////////////////////////////////////////////////////////////
         jmp     cmd_list
 
     .redraw:
-        call     .draw
+        call    .draw
 
     align 4
     .still:
-        mcall   10
+        mcall   SF_WAIT_EVENT
 
         dec     eax
         jz      .redraw
@@ -146,65 +157,86 @@ gui: ;//////////////////////////////////////////////////////////////////////////
 
     align 4
     .draw:
-        mcall   12, 1
+        mcall   SF_REDRAW, SSF_BEGIN_DRAW
         ; main window
-        mcall   0, <35,830>, <20,555>, 0x34000000+SYS_COL, 0x805080DD, str_title
+        mcall   SF_CREATE_WINDOW, <35,830>, <20,555-160>, 0x34000000+SYS_COL, 0x805080DD, str_title
 
         ;-------------------------
         ; textedit components
         ;-------------------------
-        mcall   9, procinfo, -1
+        mcall   SF_THREAD_INFO, procinfo, -1
         mov     edi, tedit0
         call    EvSize
 
         movzx   ebx,word[procinfo.client_box.width]
         inc     bx
-        mcall   13, , ted_wnd_t
-        stdcall [ted_draw], tedit0
+        mcall   SF_DRAW_RECT, , ted_wnd_t
 
         ; draw "disconnect" button
-        mcall   8, <50,95>, <25,25>, 3, BT_COL
+        mcall   SF_DEFINE_BUTTON, <50,114>, <25,25>, 3, BT_COL
+        ; icon
+        mcall   SF_PUT_IMAGE_EXT, [icon_buttons], <18, 18>, <54, 29>, 32,, 0
         ; string "disconnect"
-        mcall   4, <50+5,25+5>, 0xb0000000+STR_COL, str_disconnect
+        mcall   SF_DRAW_TEXT, <50+18+10,25+5>, 0xb0000000+STR_COL, str_disconnect
+
+        ; draw "Show|Hide log" button
+        mcall   SF_DEFINE_BUTTON, <50,79>, <326,25>, 10, BT_COL
+        ; string "Show|Hide log"
+        cmp     [show_log],0
+        je      @f
+        stdcall [ted_draw], tedit0
+        mov     edx, str_hide_log
+        jmp     .end_log_1
+        @@:
+        mov     edx, str_show_log
+        .end_log_1:
+        mcall   SF_DRAW_TEXT, <50+5,326+5>, 0xb0000000+STR_COL
+        cmp     [show_log],0
+        je @f
         ; draw "Copy" button
-        mcall   8, <50,40>, <326,25>, 4, BT_COL
+        mcall   SF_DEFINE_BUTTON, <129+5,40>, <326,25>, 4, BT_COL
         ; string "copy"
-        mcall   4, <50+5,326+5>, 0xb0000000+STR_COL, str_copy
+        mcall   SF_DRAW_TEXT, <129+10,326+5>, 0xb0000000+STR_COL, str_copy
+        @@:
         ; draw "Search" button
-        mcall   8, <TLIST2_X+TLIST_SZ-55,55>, <20,25>, 5, BT_COL
+        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-25,25>, <20,25>, 5, BT_COL
+        ; icon
+        mov     ebx, [icon_buttons]
+        add     ebx, 18*18*4
+        mcall   SF_PUT_IMAGE_EXT,, <18, 18>, <730, 24>, 32,, 0
         ; string "Search"
-        mcall   4, <TLIST2_X+TLIST_SZ-55+5,20+5>, 0xb0000000+STR_COL, str_search
+        ;mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-55+5,20+5>, 0xb0000000+STR_COL, str_search
 
         ; draw "LIST" button
-        mcall   8, <TLIST2_X+TLIST_SZ-4*BT_SZ_X-15,BT_SZ_X>, <50,25>, 12, BT_COL
+        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-4*BT_SZ_X-15,BT_SZ_X>, <50,25>, 12, BT_COL
         ; string "LIST"
-        mcall   4, <TLIST2_X+TLIST_SZ-4*BT_SZ_X-15+5,50+5>, 0xb0000000+STR_COL, str_list
+        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-4*BT_SZ_X-15+5,50+5>, 0xb0000000+STR_COL, str_list
         ; draw "DELE" button
-        mcall   8, <TLIST2_X+TLIST_SZ-3*BT_SZ_X-10,BT_SZ_X>, <50,25>, 7, BT_COL
+        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-3*BT_SZ_X-10,BT_SZ_X>, <50,25>, 7, BT_COL
         ; string "DELE"
-        mcall   4, <TLIST2_X+TLIST_SZ-3*BT_SZ_X-10+5,50+5>, 0xb0000000+STR_COL, str_dele
+        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-3*BT_SZ_X-10+5,50+5>, 0xb0000000+STR_COL, str_dele
         ; draw "RDIR" button
-        mcall   8, <TLIST2_X+TLIST_SZ-2*BT_SZ_X-5,BT_SZ_X>, <50,25>, 8, BT_COL
+        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-2*BT_SZ_X-5,BT_SZ_X>, <50,25>, 8, BT_COL
         ; string "RDIR"
-        mcall   4, <TLIST2_X+TLIST_SZ-2*BT_SZ_X-5+5,50+5>, 0xb0000000+STR_COL, str_rdir
+        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-2*BT_SZ_X-5+5,50+5>, 0xb0000000+STR_COL, str_rdir
         ; draw "RMD" button
-        mcall   8, <TLIST2_X+TLIST_SZ-BT_SZ_X,BT_SZ_X>, <50,25>, 9, BT_COL
+        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-BT_SZ_X,BT_SZ_X>, <50,25>, 9, BT_COL
         ; string "RMD"
-        mcall   4, <TLIST2_X+TLIST_SZ-BT_SZ_X+5,50+5>, 0xb0000000+STR_COL, str_rmd
+        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-BT_SZ_X+5,50+5>, 0xb0000000+STR_COL, str_rmd
 
         ; draw "mkd" button
-        mcall   8, <TLIST2_X+TLIST_SZ-BT_SZ_X,BT_SZ_X>, <80,20>, 6, BT_COL
+        mcall   SF_DEFINE_BUTTON, <TLIST2_X+TLIST_SZ-BT_SZ_X,BT_SZ_X>, <80,20>, 6, BT_COL
         ; string "mkd"
-        mcall   4, <TLIST2_X+TLIST_SZ-BT_SZ_X+5,80+5>, 0xb0000000+STR_COL, str_mkd
+        mcall   SF_DRAW_TEXT, <TLIST2_X+TLIST_SZ-BT_SZ_X+5,80+5>, 0xb0000000+STR_COL, str_mkd
         
         ; draw "cancel" button
-        ;mcall   8, <555,55>, <308,25>, 10, BT_COL
+        ;mcall   SF_DEFINE_BUTTON, <555,55>, <308,25>, 10, BT_COL
         ; string "Cancel"
-        ;mcall   4, <555+5,308+5>, 0xb0000000+STR_COL, str_abort
+        ;mcall   SF_DRAW_TEXT, <555+5,308+5>, 0xb0000000+STR_COL, str_abort
         ; draw "change volume" button
-        mcall   8, <TLIST1_X+TLIST_SZ-55,55>, <100-20,22>, 11, BT_COL
+        mcall   SF_DEFINE_BUTTON, <TLIST1_X+TLIST_SZ-55,55>, <100-20,22>, 11, BT_COL
         ; string "Change"
-        mcall   4, <TLIST1_X+TLIST_SZ-55+5,100-20+5>, 0xb0000000+STR_COL, str_change
+        mcall   SF_DRAW_TEXT, <TLIST1_X+TLIST_SZ-55+5,100-20+5>, 0xb0000000+STR_COL, str_change
 
         ;--------------------------
         ; tree list components
@@ -222,12 +254,12 @@ gui: ;//////////////////////////////////////////////////////////////////////////
         stdcall [edit_box_draw], edit_volume
         stdcall [edit_box_draw], edit_search
 
-        mcall   12,2
+        mcall   SF_REDRAW, SSF_END_DRAW
         ret
 
     align 16
     .mouse:
-        mcall   37, 1
+        mcall   SF_MOUSE_GET, SSF_WINDOW_POSITION
         cmp     word[tedit0.wnd.top], ax
         jg      .no_edit
 
@@ -235,7 +267,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
         cmp     word[tedit0.wnd.left], ax
         jg      .no_edit
 
-        mcall   37, 3
+        mcall   SF_MOUSE_GET, SSF_BUTTON_EXT
         bt      eax, 24
         jnc     @f
 
@@ -243,12 +275,19 @@ gui: ;//////////////////////////////////////////////////////////////////////////
         jmp     .still
 
       @@:
+        cmp     [show_log],0
+        je      .still
         stdcall [ted_mouse], tedit0
         jmp     .still
 
       .no_edit:
+        mov     [lbl_after_enter], 0
         stdcall [tl_mouse], tree1
         stdcall [tl_mouse], tree2
+        cmp     [lbl_after_enter], 0
+        jz      @f
+        jmp     [lbl_after_enter]
+      @@:
         stdcall [edit_box_mouse], edit_mkd
         stdcall [edit_box_mouse], edit_volume
         stdcall [edit_box_mouse], edit_search
@@ -256,9 +295,14 @@ gui: ;//////////////////////////////////////////////////////////////////////////
 
     align 16
     .key:
-        mcall   2
+        mcall   SF_GET_KEY
+        mov     [lbl_after_enter], 0
         stdcall [tl_key], tree1
         stdcall [tl_key], tree2
+        cmp     [lbl_after_enter], 0
+        jz      @f
+        jmp     [lbl_after_enter]
+      @@:
         stdcall [edit_box_key], edit_mkd
         stdcall [edit_box_key], edit_volume
         stdcall [edit_box_key], edit_search
@@ -266,13 +310,19 @@ gui: ;//////////////////////////////////////////////////////////////////////////
 
     align 16
     .button:
-        mcall   17
+        mcall   SF_GET_BUTTON
 
         cmp     ah, 3
         jne     @f
         ijmp    eax, interface_addr, interface.server_addr
         jmp     .still
 
+      @@:
+        cmp     ah, 10
+        jne     @f
+        call    show_hide_log
+        jmp     .still
+
       @@:
         cmp     ah, 4
         jne     @f
@@ -327,13 +377,15 @@ gui: ;//////////////////////////////////////////////////////////////////////////
         cmp     byte[esi], 0
         jne     @b
         stdcall [ted_text_add], tedit0, tedit_buffer, ecx, ebx
+        cmp     [show_log],0
+        je      .end_log_2
         stdcall [ted_draw], tedit0
+    .end_log_2:
         ; write to log file
         mov     eax, [esp+36]
         sub     ecx, 2 ; 0a0d is not included
         call    write_to_file
 
-      @@:
         popad
         ret     4
 
@@ -353,13 +405,16 @@ gui: ;//////////////////////////////////////////////////////////////////////////
 ;< none                                                                                           ;;
 ;;================================================================================================;;
 
-        push    edx
-        push    eax
+        cmp     eax, 1
+        jl      data_loop
+        push    edx eax
         ; check if any incomplete entry to be parsed
         cmp     byte[remote_list_buf], 0
         je      .no_backlog
+
         ; find end of remote_list_buf
         mov     edi, remote_list_buf
+        mov     ecx, 1024 ;buffer size
         mov     al, 0
         repne   scasb
         ; copy rest of the incomplete entry to remote_list_buf
@@ -424,6 +479,8 @@ gui: ;//////////////////////////////////////////////////////////////////////////
         mov     byte[edi], 0
 
         ; add node to tree list
+        and dword[tree2.style], not 8
+        stdcall [tl_cur_next], tree2
         cmp     word[node_entry2], 'fi'
         jne     @f
         stdcall [tl_node_add], tree2, 0, node_entry2
@@ -453,9 +510,9 @@ gui: ;//////////////////////////////////////////////////////////////////////////
 
       .store_last_entry:
         ; find index of the last incomplete entry
-        mov     ecx, -1
         mov     eax, [esp]
         lea     edi, [buf_buffer2+eax-2]
+        mov     ecx, eax
         mov     al, 0x0a
         std
         repne   scasb
@@ -470,9 +527,10 @@ gui: ;//////////////////////////////////////////////////////////////////////////
         jne     @b
 
       .done_parsing:
+        stdcall [tl_cur_beg], tree2
+        or dword[tree2.style], 8
         call    .draw ; to update tree list immediately in case of "auto_list"
-        pop     eax
-        pop     edx
+        pop     eax edx
         jmp     data_loop
 
         ; clear tree list and add ".." node before executing "LIST"
@@ -494,7 +552,7 @@ gui: ;//////////////////////////////////////////////////////////////////////////
 ;;================================================================================================;;
 
         ; detect abort
-        mcall   17
+        mcall   SF_GET_BUTTON
         cmp     ah, 10
         je      cmd_abor
 
@@ -578,7 +636,8 @@ fun_on_enter:
     cmp     byte[esi], 0
     jne     @b
     mov     word[edi], 0x000a
-    jmp     cmd_stor
+    mov     [lbl_after_enter], cmd_stor
+    ret
 
 
 ; Function to call when you press [Enter]
@@ -591,7 +650,8 @@ fun_on_enter2:
     cmp     dword[esi], 0x2E2E
     jne     @f
     mov     [auto_list], 1
-    jmp     cmd_cdup
+    mov     [lbl_after_enter], cmd_cdup
+    ret
 
   @@:
     cmp     word[eax], 'fo'
@@ -610,12 +670,14 @@ fun_on_enter2:
                                 ; newline in console code
     cmp     word[eax], 'fo'
     je      @f
-    jmp     cmd_retr
+    mov     [lbl_after_enter], cmd_retr
+    ret
 
   @@:
     stdcall [tl_info_clear], tree2
     mov     [auto_list], 1
-    jmp     cmd_cwd
+    mov     [lbl_after_enter], cmd_cwd
+    ret
 
 
 ;;================================================================================================;;
@@ -641,7 +703,7 @@ populate_local_tree_list: ;/////////////////////////////////////////////////////
     jne     @f
 
     ; removes last file name from filestruct.name
-    mcall   30, 2, filestruct.name,1024 ; get absolute path for cwd
+    mcall   SF_CURRENT_FOLDER, SSF_GET_CF, filestruct.name,1024 ; get absolute path for cwd
     lea     edi, [filestruct.name+eax] ; edi = pointer to the tail of file name
     mov     al, '/'
     mov     ecx, -1
@@ -652,15 +714,15 @@ populate_local_tree_list: ;/////////////////////////////////////////////////////
     mov     ecx, filestruct.name
 
   @@:
-    mcall   30, 1, ; set cwd
-    mcall   30, 2, filestruct.name, 1024 ; get absolute path for cwd
+    mcall   SF_CURRENT_FOLDER, SSF_SET_CF ; set cwd
+    mcall   SF_CURRENT_FOLDER, SSF_GET_CF, filestruct.name, 1024 ; get absolute path for cwd
     ; clear all nodes in tree list
     stdcall [tl_info_clear], tree1
     mov     [filestruct.offset], 0
 
   ; read 32 blocks
   .outer:
-    mcall   70, filestruct
+    mcall   SF_FILE, filestruct
     ;int3
     test    eax, eax
     jz      @f
@@ -746,6 +808,16 @@ EvSize:
     ret
 
 
+;
+show_hide_log:
+    mov     esi, 555
+    xor     [show_log],1
+    jnz     @f
+    sub     esi, 160
+    @@:
+    mcall   SF_CHANGE_WINDOW, -1, -1, -1
+    ret
+
 ;;================================================================================================;;
 filter_remote_list: ;/////////////////////////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
@@ -861,30 +933,133 @@ search: ;///////////////////////////////////////////////////////////////////////
     pop     edi esi edx ecx ebx
     ret
 
+
+align 4
+proc copy_icon uses ebx ecx esi edi, buf_d:dword, buf_s:dword, ind:dword
+;;------------------------------------------------------------------------------------------------;;
+;> buf_d = pointer to destination buffer 24-bit
+;> buf_s = pointer to source buffer 32-bit (with icons)
+;> ind   = icon index
+;;------------------------------------------------------------------------------------------------;;
+;< eax   = pointer to destination buffer + icon size
+;;------------------------------------------------------------------------------------------------;;
+    mov     edi, [buf_d]
+    mov     ecx, (18+ICON_LEFT_B)*ICON_TOP_B*3
+    mov     al, 0xff
+    rep     stosb ; make top border
+    ; copy icon
+    mov     esi, [ind]
+    imul    esi, 18*18*4
+    add     esi, [buf_s]
+    mov     ebx, 18
+  .cycle0:
+    mov     ecx, ICON_LEFT_B*3
+    rep     stosb ; make left border
+    mov     ecx, 18
+  @@:
+    movsw
+    movsb
+    inc     esi ; skip transparent byte
+    loop    @b
+    dec     ebx
+    jnz     .cycle0
+    mov     eax, edi
+    ret
+endp
+
+
+align 4
+proc img_to_gray, buf_rgb:dword, buf_g24:dword, pixels:dword
+;;------------------------------------------------------------------------------------------------;;
+; function for generating gray icons
+;;------------------------------------------------------------------------------------------------;;
+;> buf_rgb - buffer with input 24-bit color image
+;> buf_g24 - buffer with output 24-bit gray image
+;> pixels - number of pixels in the image
+;;------------------------------------------------------------------------------------------------;;
+pushad
+    mov     esi, [buf_rgb]
+    mov     edi, [buf_g24]
+    mov     ecx, [pixels]
+    mov     ebx, 3
+  @@:
+    movzx   eax, byte[esi]
+    movzx   edx, byte[esi+1]
+    add     eax, edx
+    movzx   edx, byte[esi+2]
+    add     eax, edx
+    xor     edx, edx
+    div     ebx
+    mov     ah, al
+    mov     word[edi], ax
+    mov     byte[edi+2], al
+    add     esi, 3
+    add     edi, 3
+    loop    @b
+popad
+    ret
+endp
+
+
+align 4
+proc copy_icon_w uses ecx esi edi, buf_d:dword, buf_s:dword, ind:dword
+;;------------------------------------------------------------------------------------------------;;
+;> buf_d = pointer to destination buffer 32-bit
+;> buf_s = pointer to source buffer 32-bit (with icons)
+;> ind   = icon index
+;;------------------------------------------------------------------------------------------------;;
+;< eax   = pointer to destination buffer + icon size
+;;------------------------------------------------------------------------------------------------;;
+    mov     edi, [buf_d]
+    mov     ecx, 18*18
+    mov     esi, [ind]
+    imul    esi, ecx
+    shl     esi, 2
+    add     esi, [buf_s]
+    rep     movsd
+    mov     eax, edi
+
+    mov     ecx, 18*18
+    mov     edi, [buf_d]
+    mov     esi, [edi] ;copy transparent color
+  .cycle0:
+    cmp     [edi], esi
+    jne     @f
+    mov     dword[edi], BT_COL
+  @@:
+    add     edi, 4
+    loop    .cycle0
+    ret
+endp
+
 ;>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
 ;hed             db 'FTP Client for KolibriOS',0
 str_change      db 'Change',0
 str_disconnect  db 'Disconnect',0
+str_show_log    db 'Show log',0
+str_hide_log    db 'Hide log',0
 str_copy        db 'Copy',0
 str_mkd         db 'MKD',0
 str_dele        db 'DELE',0
 str_rdir        db 'RDIR',0
 str_rmd         db 'RMD',0
 str_abort       db 'Cancel',0
-str_search      db 'Search',0
+;str_search      db 'Search',0
 str_list        db 'LIST',0
 str_null        db 0
 
+str_icon_18 db 'ICONS18',0
+
 ;----------------------
 ; tree list elements
 ;----------------------
-tree1 tree_list 64, 500, tl_list_box_mode, 16, 16, \
-    0xffffff, BT_COL, 0x000000, TLIST1_X, 105, TLIST_SZ-16, 185, 14, 4,\
+tree1 tree_list 64, 500, tl_list_box_mode, 18+ICON_LEFT_B, 18+ICON_TOP_B, \
+    0xffffff, BT_COL, 0x10000000, TLIST1_X, 105, TLIST_SZ-16, 185, 15, 4,\
     0, el_focus, wScr, fun_on_enter
 
-tree2 tree_list 64, 500, tl_list_box_mode, 16, 16, \
-    0xffffff, BT_COL, 0x000000, TLIST2_X, 105, TLIST_SZ-16, 185, 14, 4, \
+tree2 tree_list 64, 500, tl_list_box_mode, 18+ICON_LEFT_B, 18+ICON_TOP_B, \
+    0xffffff, BT_COL, 0x10000000, TLIST2_X, 105, TLIST_SZ-16, 185, 15, 4, \
     0, el_focus, wScr2, fun_on_enter2
 
 ; editbox for mkd
@@ -896,7 +1071,7 @@ edit_volume edit_box TLIST_SZ-60, TLIST1_X, 80, 0xffffff, 0x94AECE, 0, \
     0xAABBCC, 0x10000000, 99, root_dir, mouse_dd, 0
 
 ; editbox for search
-edit_search edit_box TLIST_SZ-60, TLIST2_X, 22, 0xffffff, 0x94AECE, 0, \
+edit_search edit_box TLIST_SZ-30, TLIST2_X, 22, 0xffffff, 0x94AECE, 0, \
     0xAABBCC, 0x10000000, 99, filter,mouse_dd, 0
  
 ; A subsidiary structure for scrolling

programs/network/ftpc/login_gui.inc

@@ -27,7 +27,7 @@ login_gui: ;////////////////////////////////////////////////////////////////////
   .get_username:
         ; in case of error when either login_gui.server_addr or 
         ; login_gui.get_username is called, should resize window
-        mcall   67, WIN_X, WIN_Y, WIN_W, WIN_H ; resize to login gui window size
+        mcall   SF_CHANGE_WINDOW, WIN_X, WIN_Y, WIN_W, WIN_H ; resize to login gui window size
 
   .redraw:
         call    .draw
@@ -44,22 +44,22 @@ login_gui: ;////////////////////////////////////////////////////////////////////
 
   align 4
   .draw:
-        mcall   12, 1
-        mcall   48, 3, sc, 40
+        mcall   SF_REDRAW, SSF_BEGIN_DRAW
+        mcall   SF_STYLE_SETTINGS, SSF_GET_COLORS, sc, 40
         edit_boxes_set_sys_color edit_usr,editboxes_end,sc
         mov     edx, 0x34000000
         or      edx, [sc.work]
-        mcall   0, <WIN_X,WIN_W>, <WIN_Y,WIN_H>, , 0x805080DD, str_title
+        mcall   SF_CREATE_WINDOW, <WIN_X,WIN_W>, <WIN_Y,WIN_H>, , 0x805080DD, str_title
 
 		call    .draw_editboxes
 
         ; draw "connect" button
-        mcall   8, <162,65>, <150,25>, 2, [sc.work_button]
+        mcall   SF_DEFINE_BUTTON, <162,65>, <150,25>, 2, [sc.work_button]
 
         ; draw strings
         mov     ecx, 0x90000000
         or      ecx, [sc.work_text]
-        mcall   4, <3,      8>, , gui_str_usr
+        mcall   SF_DRAW_TEXT, <3,      8>, , gui_str_usr
         mcall    , <3,PAD*1+8>, , gui_str_pass
         mcall    , <3,PAD*2+8>, , gui_str_server
         mcall    , <3,PAD*3+8>, , gui_str_port
@@ -74,12 +74,12 @@ login_gui: ;////////////////////////////////////////////////////////////////////
 		mcall
         mov     [str_error_addr], gui_str_null ; reset error string address
 
-        mcall   12, 2
+        mcall   SF_REDRAW, SSF_END_DRAW
         ret
 
   align 4
   .still:
-        mcall    10     ; wait for event
+        mcall    SF_WAIT_EVENT
         dec      eax
         jz       .redraw
         dec      eax
@@ -96,7 +96,7 @@ login_gui: ;////////////////////////////////////////////////////////////////////
         jmp     .still
 
   .button:
-        mcall   17
+        mcall   SF_GET_BUTTON
 
         dec     ah
         jz      .exit
@@ -107,7 +107,7 @@ login_gui: ;////////////////////////////////////////////////////////////////////
         jmp     .still
 
   .key:
-        mcall   2
+        mcall   SF_GET_KEY
 
         cmp     ah,13
         je      .connect
@@ -124,9 +124,14 @@ login_gui: ;////////////////////////////////////////////////////////////////////
         jmp     .still
 
   .connect:
-		mcall   67, 35, 20, 830, 555 ; resize to main gui window's coordinates
+        mov     esi, 555
+        or      [show_log],0
+        jnz     @f
+        sub     esi, 160
+  @@:
+        mcall   SF_CHANGE_WINDOW, 35, 20, 830 ; resize to main gui window's coordinates
         cmp     [param_server_addr], 0
-		jne     gui.main
+        jne     gui.main
         
         mov     [str_error_addr], gui_str_no_srvr
         jmp     .redraw

programs/network/ftpc/servercommands.inc

@@ -190,10 +190,11 @@ data_loop:
         mov     [filestruct.ptr], buf_buffer2
         mov     [filestruct.size], eax
         push    eax
-        mcall   70, filestruct
+        mcall   SF_FILE, filestruct
         test    eax, eax
         jz      @f
         call    error_fs
+        add     esp, 4 ; fix stack
         jmp     close_datacon
       @@:
         pop     eax
@@ -204,7 +205,7 @@ data_loop:
 
 ; storing, send all data
   .stor:
-        mcall   70, filestruct
+        mcall   SF_FILE, filestruct
         cmp     eax, 6          ; end of file
         je      .last_call
         test    eax, eax        ; error
@@ -244,7 +245,7 @@ data_loop:
         mov     ecx, eax                        ; eax is size of buffer received
         inc     ecx
         add     ecx, [size_fname]               ; added old size to form new required size
-        mcall   68, 20, , [ptr_fname]           ; realloc
+        mcall   SF_SYS_MISC, SSF_MEM_REALLOC, , [ptr_fname]
         test    eax, eax
         je      error_heap
         mov     [ptr_fname], eax                ; eax contains the new block now

programs/network/ftpc/usercommands.inc

@@ -82,13 +82,13 @@ cmd_retr:
         mov     ecx, 256-5
         call    set_filename
 
-        mov     [filestruct.subfn], 2   ; create/rewrite file
+        mov     [filestruct.subfn], SSF_CREATE_FILE ; create/rewrite file
         mov     [filestruct.offset], 0
         mov     [filestruct.offset+4], 0
         mov     [filestruct.size], 0
         mov     [filestruct.ptr], 0
 
-        mcall   70, filestruct
+        mcall   SF_FILE, filestruct
         test    eax, eax
         jz      @f
         call    error_fs
@@ -96,7 +96,7 @@ cmd_retr:
       @@:
 ; Prepare to write to the file
 
-        mov     [filestruct.subfn], 3   ; write to file
+        mov     [filestruct.subfn], SSF_WRITE_FILE
         mov     [operation], OPERATION_RETR
 
 ; Request the file from server
@@ -138,7 +138,7 @@ cmd_stor:
         mov     [operation], OPERATION_STOR
 
         ; get file size
-        mov     [filestruct.subfn], 5
+        mov     [filestruct.subfn], SSF_GET_INFO
         mov     [filestruct.offset], 0
         mov     [filestruct.offset+4], 0
         mov     [filestruct.size], 0
@@ -148,12 +148,12 @@ cmd_stor:
         mov     ecx, 256-5
         call    set_filename
 
-        mcall   70, filestruct
+        mcall   SF_FILE, filestruct
 
         mov     eax, dword[folder_buf+32] ; supports file size upto 4GB
         mov     [file_size], eax
 
-        mov     [filestruct.subfn], 0   ; read file
+        mov     [filestruct.subfn], SSF_READ_FILE
         ; mov     [filestruct.offset], 0
         ; mov     [filestruct.offset+4], 0
         mov     [filestruct.size], BUFFERSIZE
@@ -191,12 +191,12 @@ cmd_lcwd:
         mov     byte[esi-1], 0
 
         ; check whether entered path is valid (folder exists)
-        mov     [filestruct2.subfn], 5
+        mov     [filestruct2.subfn], SSF_GET_INFO
         mov     [filestruct2.offset], 0
         mov     [filestruct2.size], 0
         mov     [filestruct2.ptr], folder_buf
         mov     [filestruct2.name], buf_cmd+5
-        mcall   70, filestruct2
+        mcall   SF_FILE, filestruct2
         test    eax, eax
         jz      @f
         cmp     eax, 2
@@ -205,10 +205,10 @@ cmd_lcwd:
         jmp     wait_for_usercommand
 
   @@:
-        mcall   30, 1, buf_cmd+5              ; set working directory
+        mcall   SF_CURRENT_FOLDER, SSF_SET_CF, buf_cmd+5 ; set working directory
 
   .print:
-        mcall   30, 2, buf_cmd, 256           ; and read it again
+        mcall   SF_CURRENT_FOLDER, SSF_GET_CF, buf_cmd, 256 ; and read it again
         icall   eax, interface_addr, interface.print, str_lcwd, buf_cmd, str_newline
 
         jmp     wait_for_usercommand

programs/other/calcplus/Tupfile.lua

@@ -1,2 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("calcplus.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "calcplus")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
+tup.include(HELPERDIR .. "/use_fasm.lua")
+tup.rule("calcplus.asm", FASM .. " -dlang=" .. tup.getconfig("LANG") .. " %f %o" .. tup.getconfig("KPACK_CMD"), "%B")
+

programs/other/calcplus/build.bat

@@ -1,2 +0,0 @@
-@fasm calcplus.asm calc+
-@pause