Post-SVN clean up (#244)

- Move source code from `trunk` into program root directory.
- Fix build and ASM files.
- Translated a few RU comments to en_US.
- Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.

(Work towards #75, point 3)

Reviewed-on: KolibriOS/kolibrios#244
Reviewed-by: Gleb Zaharov <risdeveau@codrs.ru>
Reviewed-by: Burer <burer@kolibrios.org>
Co-authored-by: Andrew <dent.ace@gmail.com>
Co-committed-by: Andrew <dent.ace@gmail.com>

data/Tupfile.lua

@@ -195,8 +195,8 @@ extra_files = {
  {"kolibrios/develop/utils/SPEDump", SRC_PROGS .. "/develop/SPEDump/SPEDump.kex"},
  {"kolibrios/emul/", "common/emul/*"},
  {"kolibrios/emul/dosbox/", "common/emul/DosBox/*"},
- {"kolibrios/emul/e80/readme.txt", SRC_PROGS .. "/emulator/e80/trunk/readme.txt"},
- {"kolibrios/emul/e80/keyboard.png", SRC_PROGS .. "/emulator/e80/trunk/keyboard.png"},
+ {"kolibrios/emul/e80/readme.txt", SRC_PROGS .. "/emulator/e80/readme.txt"},
+ {"kolibrios/emul/e80/keyboard.png", SRC_PROGS .. "/emulator/e80/keyboard.png"},
  {"kolibrios/emul/fceu/fceu", SRC_PROGS .. "/emulator/fceu/fceu"},
  {"kolibrios/emul/fceu/FCEU ReadMe.txt", SRC_PROGS .. "/emulator/fceu/FCEU ReadMe.txt"},
  {"kolibrios/emul/chip8/chip8", VAR_PROGS .. "/emulator/chip8/chip8"},
@@ -284,7 +284,7 @@ extra_files = {
  {"kolibrios/netsurf/res/", "common/network/netsurf/res/*"},
  {"kolibrios/res/skins/", "../skins/authors.txt"},
  {"kolibrios/res/templates/", "common/templates/*"},
- {"kolibrios/res/templates/", SRC_PROGS .. "/emulator/e80/trunk/games/*"},
+ {"kolibrios/res/templates/", SRC_PROGS .. "/emulator/e80/games/*"},
  {"kolibrios/res/templates/NES/", "common/templates/NES/*"},
  {"kolibrios/res/wallpapers/", "common/wallpapers/*"},
  {"kolibrios/res/system/", build_type .. "/settings/kolibri.lbl"},
@@ -409,7 +409,7 @@ tup.append_table(img_files, {
  {"HACONFIG", VAR_PROGS .. "/other/ha/HACONFIG"},
  {"ACLOCK", VAR_PROGS .. "/demos/aclock/aclock"},
  {"APM", VAR_PROGS .. "/system/apm/apm"},
- {"CALC", VAR_PROGS .. "/other/calc/trunk/calc"},
+ {"CALC", VAR_PROGS .. "/other/calc/calc"},
  {"CALCPLUS", VAR_PROGS .. "/other/calcplus/calcplus"},
  {"CALENDAR", VAR_PROGS .. "/system/calendar/trunk/calendar"},
  {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"},
@@ -435,7 +435,7 @@ tup.append_table(img_files, {
  {"MYKEY", VAR_PROGS .. "/system/MyKey/trunk/MyKey"},
  {"PCIDEV", VAR_PROGS .. "/testing/pcidev/trunk/PCIDEV"},
  {"RDSAVE", VAR_PROGS .. "/system/rdsave/trunk/rdsave"},
- {"RTFREAD", VAR_PROGS .. "/other/rtfread/trunk/rtfread"},
+ {"RTFREAD", VAR_PROGS .. "/other/rtfread/rtfread"},
  {"SEARCHAP", VAR_PROGS .. "/system/searchap/searchap"},
  {"SCRSHOOT", VAR_PROGS .. "/media/scrshoot/scrshoot"},
  {"SETUP", VAR_PROGS .. "/system/setup/trunk/setup"},
@@ -523,10 +523,10 @@ tup.append_table(img_files, {
  {"LIB/RASTERWORKS.OBJ", VAR_PROGS .. "/develop/libraries/fontRasterWorks_unicode/RasterWorks.obj"},
  {"LIB/SORT.OBJ", VAR_PROGS .. "/develop/libraries/sorter/sort.obj"},
  {"LIB/TINYGL.OBJ", VAR_PROGS .. "/develop/libraries/TinyGL/asm_fork/tinygl.obj"},
- {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/trunk/animage"},
+ {"MEDIA/ANIMAGE", VAR_PROGS .. "/media/animage/animage"},
  {"MEDIA/FILLSCR", VAR_PROGS .. "/media/FillScr/fillscr"},
- {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/trunk/kiv"},
- {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/trunk/listplay"},
+ {"MEDIA/KIV", VAR_PROGS .. "/media/kiv/kiv"},
+ {"MEDIA/LISTPLAY", VAR_PROGS .. "/media/listplay/listplay"},
  {"MEDIA/MIDAMP", VAR_PROGS .. "/media/midamp/trunk/midamp"},
  {"MEDIA/MP3INFO", VAR_PROGS .. "/media/mp3info/mp3info"},
  {"MEDIA/PALITRA", VAR_PROGS .. "/media/palitra/trunk/palitra"},
@@ -641,7 +641,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
 }) end
 
 if build_type == "ru_RU" then tup.append_table(extra_files, {
- {"kolibrios/utils/period", VAR_PROGS .. "/other/period/trunk/period"},
+ {"kolibrios/utils/period", VAR_PROGS .. "/other/period/period"},
  {"kolibrios/games/Dungeons/Dungeons", VAR_PROGS .. "/games/Dungeons/Dungeons"},
 }) end
 
@@ -752,7 +752,7 @@ tup.append_table(img_files, {
 tup.append_table(extra_files, {
 -- {"kolibrios/3D/cubeline", VAR_PROGS .. "/demos/cubeline/trunk/cubeline"},
  {"kolibrios/3D/gears", VAR_PROGS .. "/demos/gears/gears"},
- {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/trunk/e80"},
+ {"kolibrios/emul/e80/e80", VAR_PROGS .. "/emulator/e80/e80"},
  {"kolibrios/emul/uarm/", VAR_CONTRIB .. "/other/uarm/uARM"},
  {"kolibrios/games/2048", VAR_PROGS .. "/games/2048/2048"},
  {"kolibrios/games/checkers", VAR_PROGS .. "/games/checkers/checkers"},

programs/build_all.bat

@@ -13,12 +13,12 @@ rem
    set __value=
    set __res=
    shift
-   
+
   :__allowed
    set __values=%1 %__values%
    shift
    if not "%1"=="" goto __allowed
-   
+
    set /P __res=">
   :Check_Value
    for %%a in (%__values%) do if %%a==%__res% set __value=%__res%
@@ -59,7 +59,7 @@ echo *
 fasm system\calendar\trunk\calendar.asm %BIN%\calendar
 fasm system\board\trunk\board.asm %BIN%\develop\board
 fasm system\commouse\trunk\commouse.asm %BIN%\commouse
-fasm system\cpu\trunk\cpu.asm %BIN%\cpu 
+fasm system\cpu\trunk\cpu.asm %BIN%\cpu
 fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid
 fasm system\skincfg\trunk\skincfg.asm %BIN%\skincfg
 fasm system\docpack\trunk\docpack.asm %BIN%\docpack
@@ -154,16 +154,16 @@ echo *
 echo Building other
 echo *
 rem fasm other\archer\trunk\@rcher.asm %BIN%\@rcher
-fasm other\calc\trunk\calc.asm %BIN%\calc
+fasm other\calc\calc.asm %BIN%\calc
 fasm other\mhc\trunk\mhc.asm %BIN%\mhc
-fasm other\period\trunk\period.asm %BIN%\period
-fasm other\rtfread\trunk\rtfread.asm %BIN%\rtfread
+fasm other\period\period.asm %BIN%\period
+fasm other\rtfread\rtfread.asm %BIN%\rtfread
 
 echo *
 echo Building media
 echo *
 rem media\ac97snd\trunk\ac97snd.asm ac97snd
-fasm media\animage\trunk\animage.asm %BIN%\animage
+fasm media\animage\animage.asm %BIN%\animage
 fasm media\cdp\trunk\cdp.asm %BIN%\cdp
 fasm media\gifview\trunk\gifview.asm %BIN%\gifview
 fasm media\iconedit\trunk\iconedit.asm %BIN%\iconedit
@@ -231,9 +231,9 @@ echo *
 echo Building depend application for fdd's nightbuild
 echo *
 echo __nightbuild fix yes >> config.inc
-fasm media\kiv\trunk\kiv.asm %BIN%\nightbuild\kiv
+fasm media\kiv\kiv.asm %BIN%\nightbuild\kiv
 fasm media\scrshoot\scrshoot.asm %BIN%\nightbuild\scrshoot
-fasm media\animage\trunk\animage.asm %BIN%\nightbuild\animage
+fasm media\animage\animage.asm %BIN%\nightbuild\animage
 fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp
 fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed
 fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad
@@ -242,27 +242,27 @@ fasm system\hdd_info\trunk\hdd_info.asm %BIN%\nightbuild\hdd_info
 fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb
 fasm system\rdsave\trunk\rdsave.asm %BIN%\nightbuild\rdsave
 fasm other\kpack\trunk\kpack.asm %BIN%\nightbuild\kpack
-fasm other\rtfread\trunk\rtfread.asm %BIN%\nightbuild\rtfread
+fasm other\rtfread\rtfread.asm %BIN%\nightbuild\rtfread
 ;restore
 echo __CPU_type fix %res% > config.inc
 erase lang.inc
 
 echo *
-echo Finished building 
+echo Finished building
 echo *
 
 
 kpack /nologo 2> nul
 if "%errorlevel%"=="9009" (
 echo   *** NOTICE ***
-echo If you want to pack all applications you may 
+echo If you want to pack all applications you may
 echo place "kpack" in accessible directory.
 echo You can download that tool from http://diamondz.land.ru/
 goto END
 )
 
 echo Kpack KolibriOS apps?
-echo     
+echo
 
 set /P res=[y/n]?
 
@@ -273,7 +273,7 @@ echo Compressing system
 echo *
 kpack %BIN%\calendar
 kpack %BIN%\develop\board
-kpack %BIN%\cpu 
+kpack %BIN%\cpu
 kpack %BIN%\cpuid
 kpack %BIN%\skincfg
 kpack %BIN%\docpack

programs/emulator/PrMK/Tupfile.lua

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

programs/emulator/e80/Tupfile.lua

@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" or tup.getconfig("NO_GCC") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_gcc.lua")
 INCLUDES = INCLUDES .. "-I" .. tup.getvariantdir()
 LDFLAGS = LDFLAGS .. " -T kolibri.ld"

programs/emulator/e80/utils/keyZXtst/keyZXtst.asm

@@ -1,176 +1,177 @@
-; Text CodePage = cp1251
-
-; <--- include all MeOS stuff --->
-
-include "../../../../../macros.inc"
-
-
-; <--- start of MenuetOS application --->
-MEOS_APP_START
-
-include  "key_read.inc"
-
-; <--- start of code --->
-CODE
-
-   mov	eax,48			    ; get system colors
-   mov	ebx,3
-   mov	ecx,sc
-   mov	edx,sizeof.system_colors
-   mcall
-
-	 xor	  ecx, ecx
-	 inc ecx
-	 mcall 66,1		       ; єёЄрэютър Ёхцшьр ттюфр ёърэъюфют
-
-
-
-  redraw:				 ; redraw event handler
-   call    draw_window		  ; at first create and draw the window
-
-  wait_event:			   ; main cycle
-
-      mcall   10		   ; юцшфрЄ№ ёюс√Єшх
-
-;    mcall    23, 2                  ; трЁшрэЄ яюёЄю ээ√щ юяЁюё
-;    or      eax, eax
-;    jz     key.1
-
-    dec   eax			 ;   if event = 1
-    jz	    redraw		 ;   jump to redraw handler
-    dec   eax			 ;   else if event = 2
-    jz	    key 		   ;   jump to key handler
-
-
-  button:			  ; button event handler
-    mov     al, 17		 ;   get button identifier
-    mcall
-
-    cmp     ah, 1
-    jne     wait_event	      ;   return if button id != 1
-
-    or	    eax, -1		  ;   exit application
-    mcall
-
-  key:				    ; key event handler
-		     ;   get key code
-    call      load_keys
-				       ; яЁхюсЁрчютрэшх
-.1:
-    mov     ah, 0xfe
-    mov     edx, txt_data.fe
-    call     load_ports
-
-    mov     ah, 0xfd
-    mov     edx, txt_data.fd
-    call     load_ports
-
-    mov     ah, 0xfb
-    mov     edx, txt_data.fb
-    call     load_ports
-
-    mov     ah, 0xf7
-    mov     edx, txt_data.f7
-    call     load_ports
-
-    mov     ah, 0xef
-    mov     edx, txt_data.ef
-    call     load_ports
-
-    mov     ah, 0xdf
-    mov     edx, txt_data.df
-    call     load_ports
-
-    mov     ah, 0xbf
-    mov     edx, txt_data.bf
-    call     load_ports
-
-    mov     ah, 0x7f
-    mov     edx, txt_data.7f
-    call     load_ports
-
-    mov     ah, 0x00
-    mov     edx, txt_data.00
-    call     load_ports
-
-
-
-    jmp     redraw
-
-  draw_window:
-    mov     eax, 12		   ; start drawing
-    mov     ebx, 1
-    mcall
-
-    xor       eax, eax			    ; create and draw the window
-    mov     ebx, 40*65536+560 ; (window_cx)*65536+(window_sx)
-    mov     ecx, 40*65536+240  ; (window_cy)*65536+(window_sy)
-    mov     edx, [sc.work]		; work area color 
-    or	       edx, 0x33000000	      ; & window type 3
-    mov     edi, title			  ; window title
-    int        0x40
-
-    mov     ecx, [sc.work_text]
-    or	       ecx, 0x80000000
-    mov     edx, txt_data
-    mcall   4, 10*65536+40
-    mov     edx, txt_data.2s
-    mcall   4, 10*65536+60
-    mov     edx, txt_data.3s
-    mcall   4, 10*65536+80
-
-
-    mov     eax, 12		   ; finish drawing
-    mov     ebx, 2
-    mcall
-
-  ret
-
-
-load_ports:			 ; тїюф  ah - ёЄрЁ°шщ срщЄ яюЁЄр
-					  ;           edx - рфЁхё ЄхъёЄр
-     mov     al, 0xFE
-     call      load_port_FE
-
-rept  8
-{
-     mov     bl, '1'
-     shl      al,1
-     jc   @f
-     mov     bl, '0'
-@@:
-     mov     byte [edx], bl
-     inc      edx
-}
-
-  ret
-
-
-
-
-; <--- initialised data --->
-DATA
-
-
-title db 'Key ZX-Spectrum TEST',0
-
-txt_data   db '#FE: '
-.fe db '********   #FD: '
-.fd db '********   #FB: '
-.fb db '********   #F7: '
-.f7 db '********   ', 0
-.2s db '#EF: '
-.ef db '********   #DF: '
-.df db '********   #BF: '
-.bf db '********   #7F: '
-.7f db '********   ', 0
-.3s db '#00: '
-.00 db '********   ', 0
-
-
-; <--- uninitialised data --->
-UDATA
-sc   system_colors
-
-MEOS_APP_END
-; <--- end of MenuetOS application --->
+; SPDX-License-Identifier: NOASSERTION
+;
+
+; <--- include all MeOS stuff --->
+
+include "../../../../macros.inc"
+
+
+; <--- start of MenuetOS application --->
+MEOS_APP_START
+
+include  "key_read.inc"
+
+; <--- start of code --->
+CODE
+
+   mov	eax,48			    ; get system colors
+   mov	ebx,3
+   mov	ecx,sc
+   mov	edx,sizeof.system_colors
+   mcall
+
+	 xor	  ecx, ecx
+	 inc ecx
+	 mcall 66,1		       ; setting scancode input mode
+
+
+
+  redraw:				 ; redraw event handler
+   call    draw_window		  ; at first create and draw the window
+
+  wait_event:			   ; main cycle
+
+      mcall   10		   ; expect an event
+
+;    mcall    23, 2                  ; option constant poll
+;    or      eax, eax
+;    jz     key.1
+
+    dec   eax			 ;   if event = 1
+    jz	    redraw		 ;   jump to redraw handler
+    dec   eax			 ;   else if event = 2
+    jz	    key 		   ;   jump to key handler
+
+
+  button:			  ; button event handler
+    mov     al, 17		 ;   get button identifier
+    mcall
+
+    cmp     ah, 1
+    jne     wait_event	      ;   return if button id != 1
+
+    or	    eax, -1		  ;   exit application
+    mcall
+
+  key:				    ; key event handler
+		     ;   get key code
+    call      load_keys
+				       ; transformation
+.1:
+    mov     ah, 0xfe
+    mov     edx, txt_data.fe
+    call     load_ports
+
+    mov     ah, 0xfd
+    mov     edx, txt_data.fd
+    call     load_ports
+
+    mov     ah, 0xfb
+    mov     edx, txt_data.fb
+    call     load_ports
+
+    mov     ah, 0xf7
+    mov     edx, txt_data.f7
+    call     load_ports
+
+    mov     ah, 0xef
+    mov     edx, txt_data.ef
+    call     load_ports
+
+    mov     ah, 0xdf
+    mov     edx, txt_data.df
+    call     load_ports
+
+    mov     ah, 0xbf
+    mov     edx, txt_data.bf
+    call     load_ports
+
+    mov     ah, 0x7f
+    mov     edx, txt_data.7f
+    call     load_ports
+
+    mov     ah, 0x00
+    mov     edx, txt_data.00
+    call     load_ports
+
+
+
+    jmp     redraw
+
+  draw_window:
+    mov     eax, 12		   ; start drawing
+    mov     ebx, 1
+    mcall
+
+    xor       eax, eax			    ; create and draw the window
+    mov     ebx, 40*65536+560 ; (window_cx)*65536+(window_sx)
+    mov     ecx, 40*65536+240  ; (window_cy)*65536+(window_sy)
+    mov     edx, [sc.work]		; work area color
+    or	       edx, 0x33000000	      ; & window type 3
+    mov     edi, title			  ; window title
+    int        0x40
+
+    mov     ecx, [sc.work_text]
+    or	       ecx, 0x80000000
+    mov     edx, txt_data
+    mcall   4, 10*65536+40
+    mov     edx, txt_data.2s
+    mcall   4, 10*65536+60
+    mov     edx, txt_data.3s
+    mcall   4, 10*65536+80
+
+
+    mov     eax, 12		   ; finish drawing
+    mov     ebx, 2
+    mcall
+
+  ret
+
+
+load_ports:			 ; input ah - port high byte
+					  ;           edx - text address
+     mov     al, 0xFE
+     call      load_port_FE
+
+rept  8
+{
+     mov     bl, '1'
+     shl      al,1
+     jc   @f
+     mov     bl, '0'
+@@:
+     mov     byte [edx], bl
+     inc      edx
+}
+
+  ret
+
+
+
+
+; <--- initialised data --->
+DATA
+
+
+title db 'Key ZX-Spectrum TEST',0
+
+txt_data   db '#FE: '
+.fe db '********   #FD: '
+.fd db '********   #FB: '
+.fb db '********   #F7: '
+.f7 db '********   ', 0
+.2s db '#EF: '
+.ef db '********   #DF: '
+.df db '********   #BF: '
+.bf db '********   #7F: '
+.7f db '********   ', 0
+.3s db '#00: '
+.00 db '********   ', 0
+
+
+; <--- uninitialised data --->
+UDATA
+sc   system_colors
+
+MEOS_APP_END
+; <--- end of MenuetOS application --->

programs/media/animage/animage.asm

@@ -1,376 +1,378 @@
-;*******************************************************
-;**************GRAPHICS EDITOR ANIMAGE *****************
-;*******************************************************
-; version: 1.52
-; last update:  23.11.2016
-; changes:      Can save *.png files
-; autors:       IgorA
-;--------------------------------------------------------
-; version: 1.51
-; last update:  23.03.2016
-; changes:      Use library 'kmenu.obj', update GUI
-; autors:       IgorA, Veliant, Leency
-;--------------------------------------------------------
-; version: 1.4
-; last update:  12.03.2016
-; changes:      Use library 'libimg.obj'
-; autors:       IgorA
-;--------------------------------------------------------
-; version: 1.3
-; last update:  05.10.2010
-; written by:   Marat Zakiyanov aka Mario79, aka Mario
-; changes:      Fixed window flicker when redrawing,
-;               Fixed memory leak for stack
-;--------------------------------------------------------
-; version: 1.2
-; last update:  30.09.2010
-; written by:   Marat Zakiyanov aka Mario79, aka Mario
-; changes:      Program used function 68 instead 64 is now,
-;               select path with OpenDialog
-;--------------------------------------------------------
-; version: 1.1
-; last update:  09.12.2006
-; autors:
-; programming by andrew_programmer
-; design by golus
-
-use32
-org     0
-        db 'MENUET01'
-        dd 1, START, IM_END, I_END
-        dd stacktop, file_path, cur_dir_path
-
-include '../../../config.inc' ;for nightbuild
-include '../../../macros.inc'
-include '../../../proc32.inc'
-include '../../../KOSfuncs.inc'
-include '../../../load_lib.mac'
-include '../../../dll.inc'
-include '../../../develop/libraries/libs-dev/libio/libio.inc'
-include '../../../develop/libraries/libs-dev/libimg/libimg.inc'
-;include '../../../debug.inc'
-
-@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-
-;---------------------------------------------------------
-; *** константы для интерфейса ***
-; *** constants for interface  ***
-
-; корректировки на скин
-ci_offs_skin_w equ  5 ;корректировка на ширину рамки скина
-ci_offs_skin_h equ 24 ;корректировка на высоту скина
-
-; главное окно
-ci_wnd_min_siz_x equ 585 ;minimum size x
-ci_wnd_min_siz_y equ 400 ;minimum size y
-
-; панель инструментов
-ci_panel_x_pos equ  0 ;коорд. x для панели
-ci_panel_y_pos equ 20 ;коорд. y для панели
-ci_panel_but_y1 equ ci_panel_y_pos +5 ;коорд. y для 1-го ряда кнопок
-ci_panel_but_y2 equ ci_panel_y_pos+30 ;коорд. y для 2-го ряда кнопок
-ci_palete_y_pos equ ci_panel_y_pos+51 ;коорд. y для палитры цветов
-ci_panel_zoom_x equ 178 ;коорд. x для кнопок панели масштаба
-
-; окно редактора
-ci_edit_wnd_x_pos  equ  0 ;коорд. x для окна редактора
-ci_edit_wnd_y_pos  equ 71 ;коорд. y для окна редактора
-ci_edit_wnd_border equ  3 ;рамка вокруг окна редактора
-
-; скроллинги
-ci_scroll_dim equ 22 ;размеры скроллингов
-ci_scrollh_coord_x_min equ (ci_edit_wnd_x_pos+3) ;минимальная позиция ползунка
-        ;горизонтального скроллинга
-ci_scrollv_coord_y_min equ (ci_edit_wnd_y_pos+3) ;минимальная позиция ползунка
-        ;вертикального скроллинга
-;---------------------------------------------------------
-
-include 'bmplib.inc'
-include 'dialog2.inc'
-include 'design.inc'
-include 'graphlib.inc'
-
-include 'cursors.inc'
-include 'memory.inc'
-include 'load_from_parameters.inc'
-
-START:
-        mcall SF_SYS_MISC,SSF_HEAP_INIT
-        mcall SF_STYLE_SETTINGS, SSF_GET_COLORS, syscolors, syscolors_end-syscolors
-        
-load_libraries l_libs_start,end_l_libs
-
-        cmp     eax,-1
-        jz      close
-
-        mcall SF_SET_EVENTS_MASK,0x80000067 ; 1100111b
-;---------------------------------------------------------
-;-----------------------init data-------------------------
-;---------------------------------------------------------
-include 'init_data.inc'
-
-;----------------------------------------------------------
-;--------get memory and draw window of program-------------
-;----------------------------------------------------------
-        call GetMemory
-        mov     [Current_instrument],10 ;pencil
-        call TakeButtonInstruments  ;set startup instrument
-        call cleare_work_arrea
-        call load_icons
-        call init_main_menu
-
-;load cursors
-        mov     eax,CursorsID
-        call load_cursors
-
-;---------------------------------------------------------
-;---------check loading of file from parameters-----------
-;---------------------------------------------------------
-        mov     eax,file_path
-        cmp [eax],byte 0
-        jz @f
-        call load_picture
-        call MovePictureToWorkScreen
-@@:
-
-;---------------------------------------------------------------------
-        mov     edi,filename_area
-        mov     esi,path4+5
-        call    copy_str_1
-
-        mov     edi,file_path
-        cmp     [edi],byte 0
-        jne     @f
-        mov     esi,path4
-        call    copy_str_1
-@@:
-;OpenDialog     initialisation
-        stdcall [OpenDialog_Init], OpenDialog_data
-        stdcall [ColorDialog_Init], ColorDialog_data
-;---------------------------------------------------------------------
-
-align 4
-red:
-        call drawwin
-;----------------------------------------------------------
-;---------------------main loop----------------------------
-;----------------------------------------------------------
-align 4
-still:
-        mcall SF_WAIT_EVENT
-
-        cmp     eax,1
-        je      red
-
-        cmp     eax,2
-        je      keys
-
-        cmp     eax,3
-        je      buttons
-
-        cmp     eax,6
-        je      mouse
-
-        jmp     still
-        
-;---------------------------------------------------------------------
-copy_str_1:
-        xor     eax,eax
-        cld
-@@:
-        lodsb
-        stosb
-        test    eax,eax
-        jnz     @b
-        ret
-;---------------------------------------------------------------------
-include 'events.inc'
-include 'events_of_window.inc'
-include 'events_of_keys.inc'
-include 'events_of_buttons.inc'
-include 'events_of_mouse.inc'
-include 'panel_engen.inc'
-include 'screen.inc'
-include 'menu_instruments.inc'
-include 'icons_instruments.inc'
-include 'icons.inc'
-include 'sprites.inc'
-include 'string.inc'
-include 'palette.inc'
-include 'files.inc'
-include 'time.inc'
-include 'menu.inc'
-;-----------------------------------------------------------
-;------------variables and data of program------------------
-;-----------------------------------------------------------
-;sound_havent_memory db 150,64,0
-
-include 'lib_data.inc'
-include 'panel_data.inc'
-include 'brushes.inc'
-include 'spray.inc'
-include 'width_lines.inc'
-;----------------------------------------------------------
-;-------------------icon's picture-------------------------
-;----------------------------------------------------------
-align 4
-panel_picture:
-file 'panel_buttons.png'
-.end:
-align 4
-panel_zoom:
-file 'panel_zoom.png'
-.end:
-;****************cursors******************
-brush_cursor:
-file 'cursors/brush.cur'
-flood_fill_cursor:
-file 'cursors/flood_fill.cur'
-lastik_cursor:
-file 'cursors/lastik.cur'
-other_cursor:
-file 'cursors/other.cur'
-pencil_cursor:
-file 'cursors/pencil.cur'
-pipette_cursor:
-file 'cursors/pipette.cur'
-spray_cursor:
-file 'cursors/spray.cur'
-zoom_cursor:
-file 'cursors/zoom.cur'
-;----------------------------------------------------------
-align 4
-IM_END:
-;-----------------------------------------------------------
-;------------variables and data of program------------------
-;-----------------------------------------------------------
-time                    rd 1
-PosX                    rd 1 ;scroll x file position
-PosY                    rd 1 ;scroll y file position
-PointerToIcons          rd 1
-ScreenPointer           rd 1
-PointerToPicture        rd 1
-PointerToCopyPicture    rd 1
-PointerToCopyPicture2   rd 1
-PointerToEditBufer      rd 1
-PointerToSpriteBufer    rd 1
-PointerToPalette        rd 1 ;указатель на пилитру (нужен для сохранения в *.bmp)
-Color                   rd 1
-SColor                  rd 1
-Number_Brush            rd 1
-Brush_SizeX             rd 1
-Brush_SizeY             rd 1
-Current_instrument      rd 1
-Last_instrument         rd 1
-OldX                    rd 1
-OldY                    rd 1
-
-MouseX                  rd 1
-MouseY                  rd 1
-MouseBut                        rd 1 ;события от кнопок мыши
-Window_SizeX            rd 1
-Window_SizeY            rd 1
-Window_CordinatX        rd 1
-Window_CordinatY        rd 1
-Picture_SizeX           rd 1
-Picture_SizeY           rd 1
-ScreenX                 rd 1 ;координата x курсора с учетом масштаба
-ScreenY                 rd 1 ;координата y курсора с учетом масштаба
-WorkScreen_SizeX        rd 1 ;ширина рабочего экрана
-WorkScreen_SizeY        rd 1 ;высота рабочего экрана
-MaxWorkScreen_SizeX     rd 1
-MaxWorkScreen_SizeY     rd 1
-k                       rd 1 ;масштаб
-
-ReserveArray            rd 1 ;указатель на память используемую при рисовании фигур
-        ;для сохранения участков фона под фигурами, а также для заливки
-CounterX                rd 1 ;число пикселей изображения по ширине, которые попадают
-        ;в экран рабочей области, с учетом текущего масштаба
-CounterY                rd 1
-OffsetYPicture          rd 1 ;сдвиг по оси y в буфере изображения при рисовании
-        ;следующей линии изображения
-OffsetYWorkScreen       rd 1 ;сдвиг по оси y в буфере рабочей области при
-        ;рисовании следующей линии пикселей. Чем больше масштаб, тем ниже
-        ;нужно опускаться по рабочей области.
-OffsetYBigPixel         rd 1 ;сдвиг по оси y для рисования пикселей на большом
-        ;масштабе. Рисуется 1-я полоса пикселя, а потом нужно перейти вниз и
-        ;влево для рисования следующей полосы.
-
-Icon_X                  rd 1
-Icon_Y                  rd 1
-counter                 rd 1
-counter2                rd 1
-number_panel            rd 1
-number_menu             rd 1
-
-Scroll1CoordinatX       rd 1 ;scroll x screen position
-Scroll1CoordinatY       rd 1 ;scroll y screen position
-Scroll1MaxSizeX         rd 1
-Scroll1MaxSizeY         rd 1
-Scroll1SizeX            rd 1 ;scroll polzunok size
-Scroll1FreeX            rd 1
-
-Scroll2CoordinatX       rd 1
-Scroll2CoordinatY       rd 1
-Scroll2MaxSizeX         rd 1
-Scroll2MaxSizeY         rd 1
-Scroll2SizeY            rd 1
-Scroll2FreeY            rd 1
-
-x                       rd 1
-y                       rd 1
-
-Radius                  rd 1
-Dx_                     rd 1
-Dy_                     rd 1
-line_width              rd 1
-a_ellips                rd 1
-b_ellips                rd 1
-
-used_OldX               rd 1 ;for draw hard contour
-used_OldY               rd 1
-paste_img_w rd 1 ;ширина вставляемого изображения
-paste_img_h rd 1 ;высота вставляемого изображения
-crossing_old_x          rd 1 ;начальная коорд. x области копирования
-crossing_old_y          rd 1 ;начальная коорд. y области копирования
-rectangular_shade_x     rd 1 ;конечная коорд. x области копирования
-rectangular_shade_y     rd 1 ;конечная коорд. y области копирования
-crossing                rd 1 ;0 - выделения нет, 1 - идет процес выделения,
-        ;2 - выделение завершено, 3 - область выделения перемещается
-number_undo             rd 1
-SpriteSizeX             rd 1 ;???
-SpriteSizeY             rd 1 ;???
-SpriteCoordinatX        rd 1
-SpriteCoordinatY        rd 1
-SpriteOldCoordinatX     rd 1
-SpriteOldCoordinatY     rd 1
-
-CursorsID       rd 10
-
-Activate_instrument     rb 1 ;если равно 0 - то копирование текущего буфера
-        ;для его редактирования, если 1 - текущий буфер не копируется
-save_flag               rb 1
-exit_from_work_arrea    rb 1
-lastik_is_active        rb 1
-instrument_used         rb 1
-DrawSprite_flag         rb 1
-Paste_flag              rb 1
-;---------------------------------------------------------------------
-IncludeUGlobals
-;---------------------------------------------------------------------
-align 4
-file_path rb 4096
-filename_area rb 256
-temp_dir_pach rb 4096
-library_path rb 4096
-cur_dir_path rb 4096
-procinfo: rb 1024
-align 4
-syscolors rb 192
-syscolors_end:
-;---------------------------------------------------------------------
-align 4
-        rb 4096
-stacktop:
-;---------------------------------------------------------------------
-I_END:
+; SPDX-License-Identifier: NOASSERTION
+;
+
+;*******************************************************
+;**************GRAPHICS EDITOR ANIMAGE *****************
+;*******************************************************
+; version: 1.52
+; last update:  23.11.2016
+; changes:      Can save *.png files
+; author:       IgorA
+;--------------------------------------------------------
+; version: 1.51
+; last update:  23.03.2016
+; changes:      Use library 'kmenu.obj', update GUI
+; authors:      IgorA, Veliant, Leency
+;--------------------------------------------------------
+; version: 1.4
+; last update:  12.03.2016
+; changes:      Use library 'libimg.obj'
+; author:       IgorA
+;--------------------------------------------------------
+; version: 1.3
+; last update:  05.10.2010
+; written by:   Marat Zakiyanov aka Mario79, aka Mario
+; changes:      Fixed window flicker when redrawing,
+;               Fixed memory leak for stack
+;--------------------------------------------------------
+; version: 1.2
+; last update:  30.09.2010
+; written by:   Marat Zakiyanov aka Mario79, aka Mario
+; changes:      Program used function 68 instead 64 is now,
+;               select path with OpenDialog
+;--------------------------------------------------------
+; version: 1.1
+; last update:  09.12.2006
+; authors:
+; programming by andrew_programmer
+; design by golus
+
+use32
+org     0
+        db 'MENUET01'
+        dd 1, START, IM_END, I_END
+        dd stacktop, file_path, cur_dir_path
+
+include '../../config.inc' ;for nightbuild
+include '../../macros.inc'
+include '../../proc32.inc'
+include '../../KOSfuncs.inc'
+include '../../load_lib.mac'
+include '../../dll.inc'
+include '../../develop/libraries/libs-dev/libio/libio.inc'
+include '../../develop/libraries/libs-dev/libimg/libimg.inc'
+;include '../../debug.inc'
+
+@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
+
+;---------------------------------------------------------
+; *** constants for interface  ***
+
+; skin adjustments
+ci_offs_skin_w equ  5 ;adjustment to the width of the skin frame
+ci_offs_skin_h equ 24 ;skin height adjustment
+
+; main window
+ci_wnd_min_siz_x equ 585 ;minimum size x
+ci_wnd_min_siz_y equ 400 ;minimum size y
+
+; toolbar
+ci_panel_x_pos equ  0 ;coord. x for panel
+ci_panel_y_pos equ 20 ;coord. y for panel
+ci_panel_but_y1 equ ci_panel_y_pos +5 ;y coordinate for 1st row of buttons
+ci_panel_but_y2 equ ci_panel_y_pos+30 ;y coordinate for 2nd row of buttons
+ci_palete_y_pos equ ci_panel_y_pos+51 ;y coordinate for color palette
+ci_panel_zoom_x equ 178 ;x coordinate for zoom bar buttons
+
+; editor window
+ci_edit_wnd_x_pos  equ  0 ;x coordinate for editor window
+ci_edit_wnd_y_pos  equ 71 ;y coordinate for editor window
+ci_edit_wnd_border equ  3 ;frame around the editor window
+
+; scrolling
+ci_scroll_dim equ 22 ;scroll sizes
+ci_scrollh_coord_x_min equ (ci_edit_wnd_x_pos+3) ;x minimum slider position
+        ;horizontal scrolling
+ci_scrollv_coord_y_min equ (ci_edit_wnd_y_pos+3) ;y minimum slider position
+        ;vertical scrolling
+;---------------------------------------------------------
+
+include 'bmplib.inc'
+include 'dialog2.inc'
+include 'design.inc'
+include 'graphlib.inc'
+
+include 'cursors.inc'
+include 'memory.inc'
+include 'load_from_parameters.inc'
+
+START:
+        mcall SF_SYS_MISC,SSF_HEAP_INIT
+        mcall SF_STYLE_SETTINGS, SSF_GET_COLORS, syscolors, syscolors_end-syscolors
+
+load_libraries l_libs_start,end_l_libs
+
+        cmp     eax,-1
+        jz      close
+
+        mcall SF_SET_EVENTS_MASK,0x80000067 ; 1100111b
+;---------------------------------------------------------
+;-----------------------init data-------------------------
+;---------------------------------------------------------
+include 'init_data.inc'
+
+;----------------------------------------------------------
+;--------get memory and draw window of program-------------
+;----------------------------------------------------------
+        call GetMemory
+        mov     [Current_instrument],10 ;pencil
+        call TakeButtonInstruments  ;set startup instrument
+        call cleare_work_arrea
+        call load_icons
+        call init_main_menu
+
+;load cursors
+        mov     eax,CursorsID
+        call load_cursors
+
+;---------------------------------------------------------
+;---------check loading of file from parameters-----------
+;---------------------------------------------------------
+        mov     eax,file_path
+        cmp [eax],byte 0
+        jz @f
+        call load_picture
+        call MovePictureToWorkScreen
+@@:
+
+;---------------------------------------------------------------------
+        mov     edi,filename_area
+        mov     esi,path4+5
+        call    copy_str_1
+
+        mov     edi,file_path
+        cmp     [edi],byte 0
+        jne     @f
+        mov     esi,path4
+        call    copy_str_1
+@@:
+;OpenDialog     initialisation
+        stdcall [OpenDialog_Init], OpenDialog_data
+        stdcall [ColorDialog_Init], ColorDialog_data
+;---------------------------------------------------------------------
+
+align 4
+red:
+        call drawwin
+;----------------------------------------------------------
+;---------------------main loop----------------------------
+;----------------------------------------------------------
+align 4
+still:
+        mcall SF_WAIT_EVENT
+
+        cmp     eax,1
+        je      red
+
+        cmp     eax,2
+        je      keys
+
+        cmp     eax,3
+        je      buttons
+
+        cmp     eax,6
+        je      mouse
+
+        jmp     still
+
+;---------------------------------------------------------------------
+copy_str_1:
+        xor     eax,eax
+        cld
+@@:
+        lodsb
+        stosb
+        test    eax,eax
+        jnz     @b
+        ret
+;---------------------------------------------------------------------
+include 'events.inc'
+include 'events_of_window.inc'
+include 'events_of_keys.inc'
+include 'events_of_buttons.inc'
+include 'events_of_mouse.inc'
+include 'panel_engen.inc'
+include 'screen.inc'
+include 'menu_instruments.inc'
+include 'icons_instruments.inc'
+include 'icons.inc'
+include 'sprites.inc'
+include 'string.inc'
+include 'palette.inc'
+include 'files.inc'
+include 'time.inc'
+include 'menu.inc'
+;-----------------------------------------------------------
+;------------variables and data of program------------------
+;-----------------------------------------------------------
+;sound_havent_memory db 150,64,0
+
+include 'lib_data.inc'
+include 'panel_data.inc'
+include 'brushes.inc'
+include 'spray.inc'
+include 'width_lines.inc'
+;----------------------------------------------------------
+;-------------------icon's picture-------------------------
+;----------------------------------------------------------
+align 4
+panel_picture:
+file 'panel_buttons.png'
+.end:
+align 4
+panel_zoom:
+file 'panel_zoom.png'
+.end:
+;****************cursors******************
+brush_cursor:
+file 'cursors/brush.cur'
+flood_fill_cursor:
+file 'cursors/flood_fill.cur'
+lastik_cursor:
+file 'cursors/lastik.cur'
+other_cursor:
+file 'cursors/other.cur'
+pencil_cursor:
+file 'cursors/pencil.cur'
+pipette_cursor:
+file 'cursors/pipette.cur'
+spray_cursor:
+file 'cursors/spray.cur'
+zoom_cursor:
+file 'cursors/zoom.cur'
+;----------------------------------------------------------
+align 4
+IM_END:
+;-----------------------------------------------------------
+;------------variables and data of program------------------
+;-----------------------------------------------------------
+time                    rd 1
+PosX                    rd 1 ;scroll x file position
+PosY                    rd 1 ;scroll y file position
+PointerToIcons          rd 1
+ScreenPointer           rd 1
+PointerToPicture        rd 1
+PointerToCopyPicture    rd 1
+PointerToCopyPicture2   rd 1
+PointerToEditBufer      rd 1
+PointerToSpriteBufer    rd 1
+PointerToPalette        rd 1 ;pointer to the file (needed for saving in *.bmp)
+Color                   rd 1
+SColor                  rd 1
+Number_Brush            rd 1
+Brush_SizeX             rd 1
+Brush_SizeY             rd 1
+Current_instrument      rd 1
+Last_instrument         rd 1
+OldX                    rd 1
+OldY                    rd 1
+
+MouseX                  rd 1
+MouseY                  rd 1
+MouseBut                rd 1 ;mouse button events
+Window_SizeX            rd 1
+Window_SizeY            rd 1
+Window_CordinatX        rd 1
+Window_CordinatY        rd 1
+Picture_SizeX           rd 1
+Picture_SizeY           rd 1
+ScreenX                 rd 1 ;x coordinate of the cursor accounting for the scale
+ScreenY                 rd 1 ;y coordinate of the cursor accounting for the scale
+WorkScreen_SizeX        rd 1 ;width of the working screen
+WorkScreen_SizeY        rd 1 ;height of the working screen
+MaxWorkScreen_SizeX     rd 1
+MaxWorkScreen_SizeY     rd 1
+k                       rd 1 ;scale
+
+ReserveArray            rd 1 ;pointer to memory used when drawing figures
+        ;to save background areas under figures, as well as for filling
+CounterX                rd 1 ;number of image pixels by width that fall
+        ;within the workspace screen, given the current zoom level
+CounterY                rd 1
+OffsetYPicture          rd 1 ;y-shift in image buffer when drawing
+        ;next line of image
+OffsetYWorkScreen       rd 1 ;y-shift in the workspace buffer when
+        ;drawing the next line of pixels. The larger the scale, the lower
+        ;you need to go down the workspace.
+OffsetYBigPixel         rd 1 ;shift along the y-axis to draw pixels on a large
+        ;scale. The 1st strip of the pixel is drawn, and then you need to move down and
+        ;left to draw the next strip.
+
+Icon_X                  rd 1
+Icon_Y                  rd 1
+counter                 rd 1
+counter2                rd 1
+number_panel            rd 1
+number_menu             rd 1
+
+Scroll1CoordinatX       rd 1 ;scroll x screen position
+Scroll1CoordinatY       rd 1 ;scroll y screen position
+Scroll1MaxSizeX         rd 1
+Scroll1MaxSizeY         rd 1
+Scroll1SizeX            rd 1 ;scroll polzunok size
+Scroll1FreeX            rd 1
+
+Scroll2CoordinatX       rd 1
+Scroll2CoordinatY       rd 1
+Scroll2MaxSizeX         rd 1
+Scroll2MaxSizeY         rd 1
+Scroll2SizeY            rd 1
+Scroll2FreeY            rd 1
+
+x                       rd 1
+y                       rd 1
+
+Radius                  rd 1
+Dx_                     rd 1
+Dy_                     rd 1
+line_width              rd 1
+a_ellips                rd 1
+b_ellips                rd 1
+
+used_OldX               rd 1 ;for draw hard contour
+used_OldY               rd 1
+paste_img_w rd 1 ;width of the inserted image
+paste_img_h rd 1 ;height of the inserted image
+crossing_old_x          rd 1 ;initial x-coord of copy area
+crossing_old_y          rd 1 ;initial y-coord of copy area
+rectangular_shade_x     rd 1 ;end x-coord of copy area
+rectangular_shade_y     rd 1 ;end y-coord of copy area
+crossing                rd 1 ;0 - no selection, 1 - selection in progress,
+        ;2 - selection complete, 3 - selection area moving
+number_undo             rd 1
+SpriteSizeX             rd 1 ;???
+SpriteSizeY             rd 1 ;???
+SpriteCoordinatX        rd 1
+SpriteCoordinatY        rd 1
+SpriteOldCoordinatX     rd 1
+SpriteOldCoordinatY     rd 1
+
+CursorsID       rd 10
+
+Activate_instrument     rb 1 ;if equal to 0 - then copy the current buffer
+        ;for editing it, if 1 - the current buffer is not copied
+save_flag               rb 1
+exit_from_work_arrea    rb 1
+lastik_is_active        rb 1
+instrument_used         rb 1
+DrawSprite_flag         rb 1
+Paste_flag              rb 1
+;---------------------------------------------------------------------
+IncludeUGlobals
+;---------------------------------------------------------------------
+align 4
+file_path rb 4096
+filename_area rb 256
+temp_dir_pach rb 4096
+library_path rb 4096
+cur_dir_path rb 4096
+procinfo: rb 1024
+align 4
+syscolors rb 192
+syscolors_end:
+;---------------------------------------------------------------------
+align 4
+        rb 4096
+stacktop:
+;---------------------------------------------------------------------
+I_END: