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

@@ -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,7 +242,7 @@ 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

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,8 +1,9 @@
-; Text CodePage = cp1251
+; SPDX-License-Identifier: NOASSERTION
+;
 
 ; <--- include all MeOS stuff --->
 
-include "../../../../../macros.inc"
+include "../../../../macros.inc"
 
 
 ; <--- start of MenuetOS application --->
@@ -21,7 +22,7 @@ CODE
 
 	 xor	  ecx, ecx
 	 inc ecx
-	 mcall 66,1		       ; єёЄрэютър Ёхцшьр ттюфр ёърэъюфют
+	 mcall 66,1		       ; setting scancode input mode
 
 
 
@@ -30,9 +31,9 @@ CODE
 
   wait_event:			   ; main cycle
 
-      mcall   10		   ; юцшфрЄ№ ёюс√Єшх
+      mcall   10		   ; expect an event
 
-;    mcall    23, 2                  ; трЁшрэЄ яюёЄю ээ√щ юяЁюё
+;    mcall    23, 2                  ; option constant poll
 ;    or      eax, eax
 ;    jz     key.1
 
@@ -55,7 +56,7 @@ CODE
   key:				    ; key event handler
 		     ;   get key code
     call      load_keys
-				       ; яЁхюсЁрчютрэшх
+				       ; transformation
 .1:
     mov     ah, 0xfe
     mov     edx, txt_data.fe
@@ -127,8 +128,8 @@ CODE
   ret
 
 
-load_ports:			 ; тїюф  ah - ёЄрЁ°шщ срщЄ яюЁЄр
-					  ;           edx - рфЁхё ЄхъёЄр
+load_ports:			 ; input ah - port high byte
+					  ;           edx - text address
      mov     al, 0xFE
      call      load_port_FE
 

programs/media/animage/animage.asm

@@ -1,20 +1,23 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ;*******************************************************
 ;**************GRAPHICS EDITOR ANIMAGE *****************
 ;*******************************************************
 ; version: 1.52
 ; last update:  23.11.2016
 ; changes:      Can save *.png files
-; autors:       IgorA
+; author:       IgorA
 ;--------------------------------------------------------
 ; version: 1.51
 ; last update:  23.03.2016
 ; changes:      Use library 'kmenu.obj', update GUI
-; autors:       IgorA, Veliant, Leency
+; authors:      IgorA, Veliant, Leency
 ;--------------------------------------------------------
 ; version: 1.4
 ; last update:  12.03.2016
 ; changes:      Use library 'libimg.obj'
-; autors:       IgorA
+; author:       IgorA
 ;--------------------------------------------------------
 ; version: 1.3
 ; last update:  05.10.2010
@@ -30,7 +33,7 @@
 ;--------------------------------------------------------
 ; version: 1.1
 ; last update:  09.12.2006
-; autors:
+; authors:
 ; programming by andrew_programmer
 ; design by golus
 
@@ -40,49 +43,48 @@ org     0
         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'
+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 ;корректировка на высоту скина
+; 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
 
-; панель инструментов
-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 для кнопок панели масштаба
+; 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
 
-; окно редактора
-ci_edit_wnd_x_pos  equ  0 ;коорд. x для окна редактора
-ci_edit_wnd_y_pos  equ 71 ;коорд. y для окна редактора
-ci_edit_wnd_border equ  3 ;рамка вокруг окна редактора
+; 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
 
-; скроллинги
-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) ;минимальная позиция ползунка
-        ;вертикального скроллинга
+; 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'
@@ -254,7 +256,7 @@ PointerToCopyPicture    rd 1
 PointerToCopyPicture2   rd 1
 PointerToEditBufer      rd 1
 PointerToSpriteBufer    rd 1
-PointerToPalette        rd 1 ;указатель на пилитру (нужен для сохранения в *.bmp)
+PointerToPalette        rd 1 ;pointer to the file (needed for saving in *.bmp)
 Color                   rd 1
 SColor                  rd 1
 Number_Brush            rd 1
@@ -267,34 +269,34 @@ OldY                    rd 1
 
 MouseX                  rd 1
 MouseY                  rd 1
-MouseBut                        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 курсора с учетом масштаба
-ScreenY                 rd 1 ;координата y курсора с учетом масштаба
-WorkScreen_SizeX        rd 1 ;ширина рабочего экрана
-WorkScreen_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 ;масштаб
+k                       rd 1 ;scale
 
-ReserveArray            rd 1 ;указатель на память используемую при рисовании фигур
-        ;для сохранения участков фона под фигурами, а также для заливки
-CounterX                rd 1 ;число пикселей изображения по ширине, которые попадают
-        ;в экран рабочей области, с учетом текущего масштаба
+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 в буфере изображения при рисовании
-        ;следующей линии изображения
-OffsetYWorkScreen       rd 1 ;сдвиг по оси y в буфере рабочей области при
-        ;рисовании следующей линии пикселей. Чем больше масштаб, тем ниже
-        ;нужно опускаться по рабочей области.
-OffsetYBigPixel         rd 1 ;сдвиг по оси y для рисования пикселей на большом
-        ;масштабе. Рисуется 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
@@ -329,14 +331,14 @@ 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 - область выделения перемещается
+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 ;???
@@ -347,8 +349,8 @@ SpriteOldCoordinatY     rd 1
 
 CursorsID       rd 10
 
-Activate_instrument     rb 1 ;если равно 0 - то копирование текущего буфера
-        ;для его редактирования, если 1 - текущий буфер не копируется
+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