programs: Fix post-SVN tidying
- Fix include paths after moving files up a level, from old SVN trunk subdirs. e.g. `include '../../macros.inc’`. - Add SPDX placeholder. - Translated a few RU comments to en_US. - Note: Line endings standardised from `CRLF` > `LF`, so best to view diffs with whitespace changes hidden.
This commit is contained in:
@@ -1,3 +1,6 @@
|
|||||||
|
; SPDX-License-Identifier: NOASSERTION
|
||||||
|
;
|
||||||
|
|
||||||
;; Calculator for MenuetOS (c) Ville Turjanmaa
|
;; Calculator for MenuetOS (c) Ville Turjanmaa
|
||||||
;;
|
;;
|
||||||
;; Compile with FASM
|
;; Compile with FASM
|
||||||
@@ -31,9 +34,9 @@ use32
|
|||||||
dd E_END ; esp
|
dd E_END ; esp
|
||||||
dd 0x0,0x0 ; I_Param , I_Icon
|
dd 0x0,0x0 ; I_Param , I_Icon
|
||||||
|
|
||||||
include '../../../macros.inc'
|
include '../../macros.inc'
|
||||||
include '../../../gui_patterns.inc'
|
include '../../gui_patterns.inc'
|
||||||
include '../../../KOSfuncs.inc'
|
include '../../KOSfuncs.inc'
|
||||||
|
|
||||||
hotkeys_count equ 26
|
hotkeys_count equ 26
|
||||||
asci: db 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 43, 61, 13, 45, 42, 47, 44, 46, 27, 182, \
|
asci: db 49, 50, 51, 52, 53, 54, 55, 56, 57, 48, 43, 61, 13, 45, 42, 47, 44, 46, 27, 182, \
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -1,3 +1,6 @@
|
|||||||
|
; SPDX-License-Identifier: NOASSERTION
|
||||||
|
;
|
||||||
|
|
||||||
; RTF READER FOR KOLIBRI >= 0.7.7.0
|
; RTF READER FOR KOLIBRI >= 0.7.7.0
|
||||||
; Written in pure assembler by Ivushkin Andrey aka Willow
|
; Written in pure assembler by Ivushkin Andrey aka Willow
|
||||||
; Menu_bar and scroll_bar from box_lib provided by dunkaist
|
; Menu_bar and scroll_bar from box_lib provided by dunkaist
|
||||||
@@ -57,15 +60,15 @@ AR_OFFSET equ 10
|
|||||||
dd fname_buf ; <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC>
|
dd fname_buf ; <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><>ࠬ<EFBFBD><E0A0AC>
|
||||||
dd cur_dir_path ; <20><><EFBFBD><EFBFBD> <20> <20>ணࠬ<E0AEA3><E0A0AC>
|
dd cur_dir_path ; <20><><EFBFBD><EFBFBD> <20> <20>ணࠬ<E0AEA3><E0A0AC>
|
||||||
|
|
||||||
include '../../../config.inc' ;for nightbuild
|
include '../../config.inc' ;for nightbuild
|
||||||
include '../../../macros.inc' ; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ᥬ<EFBFBD><E1A5AC><EFBFBD><EFBFBD>騪<EFBFBD><E9A8AA>!
|
include '../../macros.inc' ; Macros facilitate the life of assemblers!
|
||||||
include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
|
include '../../develop/libraries/box_lib/trunk/box_lib.mac'
|
||||||
include '../../../KOSfuncs.inc'
|
include '../../KOSfuncs.inc'
|
||||||
include '../../../load_lib.mac'
|
include '../../load_lib.mac'
|
||||||
|
|
||||||
@use_library
|
@use_library
|
||||||
|
|
||||||
; include '../../../debug.inc'
|
; include '../../debug.inc'
|
||||||
|
|
||||||
TOP=TOP+4
|
TOP=TOP+4
|
||||||
include 'bgifont.inc'
|
include 'bgifont.inc'
|
||||||
@@ -242,10 +245,10 @@ key: ;
|
|||||||
.home:
|
.home:
|
||||||
cmp ah,180 ; Home
|
cmp ah,180 ; Home
|
||||||
je top_red
|
je top_red
|
||||||
|
|
||||||
cmp dword[is_scroll_bar_needed], 0
|
cmp dword[is_scroll_bar_needed], 0
|
||||||
je still
|
je still
|
||||||
|
|
||||||
mov ebx,dword[prcinfo+46]
|
mov ebx,dword[prcinfo+46]
|
||||||
sub ebx,TOP+15
|
sub ebx,TOP+15
|
||||||
cmp ah,183 ;PgDn
|
cmp ah,183 ;PgDn
|
||||||
@@ -254,7 +257,7 @@ key: ;
|
|||||||
|
|
||||||
cmp dword[is_scroll_bar_needed], 0
|
cmp dword[is_scroll_bar_needed], 0
|
||||||
je still
|
je still
|
||||||
|
|
||||||
mov eax, [scroll_bar_data_vertical.position]
|
mov eax, [scroll_bar_data_vertical.position]
|
||||||
add eax, AR_OFFSET*7
|
add eax, AR_OFFSET*7
|
||||||
mov ebx, [scroll_bar_data_vertical.max_area]
|
mov ebx, [scroll_bar_data_vertical.max_area]
|
||||||
@@ -273,7 +276,7 @@ key: ;
|
|||||||
|
|
||||||
cmp dword[is_scroll_bar_needed], 0
|
cmp dword[is_scroll_bar_needed], 0
|
||||||
je still
|
je still
|
||||||
|
|
||||||
mov eax, [scroll_bar_data_vertical.position]
|
mov eax, [scroll_bar_data_vertical.position]
|
||||||
add eax, AR_OFFSET
|
add eax, AR_OFFSET
|
||||||
mov ebx, [scroll_bar_data_vertical.max_area]
|
mov ebx, [scroll_bar_data_vertical.max_area]
|
||||||
@@ -299,7 +302,7 @@ key: ;
|
|||||||
|
|
||||||
cmp dword[is_scroll_bar_needed], 0
|
cmp dword[is_scroll_bar_needed], 0
|
||||||
je still
|
je still
|
||||||
|
|
||||||
cmp dword[scroll_bar_data_vertical.position], AR_OFFSET*7
|
cmp dword[scroll_bar_data_vertical.position], AR_OFFSET*7
|
||||||
sub dword[scroll_bar_data_vertical.position], AR_OFFSET*7
|
sub dword[scroll_bar_data_vertical.position], AR_OFFSET*7
|
||||||
jg @f
|
jg @f
|
||||||
@@ -314,7 +317,7 @@ key: ;
|
|||||||
|
|
||||||
cmp dword[is_scroll_bar_needed], 0
|
cmp dword[is_scroll_bar_needed], 0
|
||||||
je still
|
je still
|
||||||
|
|
||||||
cmp dword[scroll_bar_data_vertical.position], AR_OFFSET
|
cmp dword[scroll_bar_data_vertical.position], AR_OFFSET
|
||||||
sub dword[scroll_bar_data_vertical.position], AR_OFFSET
|
sub dword[scroll_bar_data_vertical.position], AR_OFFSET
|
||||||
jg @f
|
jg @f
|
||||||
@@ -337,7 +340,7 @@ key: ;
|
|||||||
|
|
||||||
cmp dword[is_scroll_bar_needed], 0
|
cmp dword[is_scroll_bar_needed], 0
|
||||||
je still
|
je still
|
||||||
|
|
||||||
mov eax, [scroll_bar_data_vertical.max_area]
|
mov eax, [scroll_bar_data_vertical.max_area]
|
||||||
sub eax, [scroll_bar_data_vertical.cur_area]
|
sub eax, [scroll_bar_data_vertical.cur_area]
|
||||||
mov dword[scroll_bar_data_vertical.position], eax
|
mov dword[scroll_bar_data_vertical.position], eax
|
||||||
@@ -350,7 +353,7 @@ key: ;
|
|||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
;OpenDialog_start:
|
;OpenDialog_start:
|
||||||
; copy_path open_dialog_name,path,library_path,0
|
; copy_path open_dialog_name,path,library_path,0
|
||||||
|
|
||||||
push dword OpenDialog_data
|
push dword OpenDialog_data
|
||||||
call [OpenDialog_Start]
|
call [OpenDialog_Start]
|
||||||
|
|
||||||
@@ -366,14 +369,14 @@ key: ;
|
|||||||
cmp ah, 1 ; <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> 1,
|
cmp ah, 1 ; <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> 1,
|
||||||
je .exit
|
je .exit
|
||||||
jmp still
|
jmp still
|
||||||
|
|
||||||
.exit:
|
.exit:
|
||||||
mcall -1 ; <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC>
|
mcall -1 ; <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC>
|
||||||
|
|
||||||
|
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
;--- MOUSE EVENT PROCESSING ----------------------------------------
|
;--- MOUSE EVENT PROCESSING ----------------------------------------
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
mouse:
|
mouse:
|
||||||
mcall 37,7
|
mcall 37,7
|
||||||
test eax, eax
|
test eax, eax
|
||||||
@@ -454,9 +457,9 @@ mouse:
|
|||||||
|
|
||||||
push dword scroll_bar_data_vertical
|
push dword scroll_bar_data_vertical
|
||||||
call [scrollbar_ver_mouse]
|
call [scrollbar_ver_mouse]
|
||||||
|
|
||||||
call Set_position
|
call Set_position
|
||||||
|
|
||||||
mov eax,scroll_bar_data_vertical.redraw
|
mov eax,scroll_bar_data_vertical.redraw
|
||||||
xor ebx,ebx
|
xor ebx,ebx
|
||||||
cmp [eax],ebx
|
cmp [eax],ebx
|
||||||
@@ -482,7 +485,7 @@ draw_window:
|
|||||||
@@:
|
@@:
|
||||||
mov edx, -1
|
mov edx, -1
|
||||||
mov esi, -1
|
mov esi, -1
|
||||||
|
|
||||||
mov eax, [procinfo2.box.width]
|
mov eax, [procinfo2.box.width]
|
||||||
cmp eax, [window_width]
|
cmp eax, [window_width]
|
||||||
je @f
|
je @f
|
||||||
@@ -526,11 +529,11 @@ draw_window:
|
|||||||
sub ebx, SCROLL_WIDTH_SIZE
|
sub ebx, SCROLL_WIDTH_SIZE
|
||||||
dec ebx
|
dec ebx
|
||||||
@@:
|
@@:
|
||||||
|
|
||||||
mov ecx, 19*65536-23
|
mov ecx, 19*65536-23
|
||||||
add ecx, [procinfo2.box.height]
|
add ecx, [procinfo2.box.height]
|
||||||
sub ecx, [skin_height]
|
sub ecx, [skin_height]
|
||||||
|
|
||||||
mov eax, 13
|
mov eax, 13
|
||||||
mov edx, 0xf0f0f0
|
mov edx, 0xf0f0f0
|
||||||
int 0x40
|
int 0x40
|
||||||
@@ -544,13 +547,13 @@ draw_window:
|
|||||||
; draw for Vertical ScrollBar
|
; draw for Vertical ScrollBar
|
||||||
push dword scroll_bar_data_vertical
|
push dword scroll_bar_data_vertical
|
||||||
call [scrollbar_ver_draw]
|
call [scrollbar_ver_draw]
|
||||||
; reset all_redraw flag
|
; reset all_redraw flag
|
||||||
xor eax,eax
|
xor eax,eax
|
||||||
mov [scroll_bar_data_vertical.all_redraw],eax
|
mov [scroll_bar_data_vertical.all_redraw],eax
|
||||||
@@:
|
@@:
|
||||||
;---------------------------------------------
|
;---------------------------------------------
|
||||||
;po-moumu eto govno mamonta
|
;po-moumu eto govno mamonta
|
||||||
|
|
||||||
;mcall 47,0x30000,isymImplemented,<114,8>, 0x10DDEEFF
|
;mcall 47,0x30000,isymImplemented,<114,8>, 0x10DDEEFF
|
||||||
;add edx,36 shl 16
|
;add edx,36 shl 16
|
||||||
;mcall ,,isymMax
|
;mcall ,,isymMax
|
||||||
@@ -585,18 +588,18 @@ draw_window:
|
|||||||
;---------------------------------------------
|
;---------------------------------------------
|
||||||
; draw for Menu 1
|
; draw for Menu 1
|
||||||
push dword menu_data_1
|
push dword menu_data_1
|
||||||
call [menu_bar_draw]
|
call [menu_bar_draw]
|
||||||
; draw for Menu 2
|
; draw for Menu 2
|
||||||
push dword menu_data_2
|
push dword menu_data_2
|
||||||
call [menu_bar_draw]
|
call [menu_bar_draw]
|
||||||
; draw for Menu 3
|
; draw for Menu 3
|
||||||
push dword menu_data_3
|
push dword menu_data_3
|
||||||
call [menu_bar_draw]
|
call [menu_bar_draw]
|
||||||
;---------------------------------------------
|
;---------------------------------------------
|
||||||
|
|
||||||
sub dword[prcinfo+42],2*LMARGIN+SCROLL_WIDTH_SIZE
|
sub dword[prcinfo+42],2*LMARGIN+SCROLL_WIDTH_SIZE
|
||||||
sub dword[prcinfo+46],CHARH+25
|
sub dword[prcinfo+46],CHARH+25
|
||||||
|
|
||||||
if GUTTER eq 1
|
if GUTTER eq 1
|
||||||
mov ebx,LMARGIN shl 16+20
|
mov ebx,LMARGIN shl 16+20
|
||||||
mov ecx,20
|
mov ecx,20
|
||||||
@@ -676,7 +679,7 @@ call Set_position
|
|||||||
; draw for Vertical ScrollBar
|
; draw for Vertical ScrollBar
|
||||||
push dword scroll_bar_data_vertical
|
push dword scroll_bar_data_vertical
|
||||||
call [scrollbar_ver_draw]
|
call [scrollbar_ver_draw]
|
||||||
; reset all_redraw flag
|
; reset all_redraw flag
|
||||||
xor eax,eax
|
xor eax,eax
|
||||||
mov [scroll_bar_data_vertical.all_redraw],eax
|
mov [scroll_bar_data_vertical.all_redraw],eax
|
||||||
@@:
|
@@:
|
||||||
@@ -712,10 +715,10 @@ Set_position:
|
|||||||
mov ebx, [scroll_bar_data_vertical.max_area]
|
mov ebx, [scroll_bar_data_vertical.max_area]
|
||||||
sub ebx, [scroll_bar_data_vertical.cur_area]
|
sub ebx, [scroll_bar_data_vertical.cur_area]
|
||||||
div ebx
|
div ebx
|
||||||
|
|
||||||
mov dword[top], TOP
|
mov dword[top], TOP
|
||||||
sub dword[top], eax
|
sub dword[top], eax
|
||||||
|
|
||||||
.quit:
|
.quit:
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
@@ -728,7 +731,7 @@ Set_scroll_position:
|
|||||||
mov eax, dword[procinfo2+0x42]
|
mov eax, dword[procinfo2+0x42]
|
||||||
sub eax, 17
|
sub eax, 17
|
||||||
mov word[scroll_bar_data_vertical.size_y], ax
|
mov word[scroll_bar_data_vertical.size_y], ax
|
||||||
|
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
|
|
||||||
@@ -1049,7 +1052,7 @@ litt_end:
|
|||||||
help_file:
|
help_file:
|
||||||
file 'reader.rtf'
|
file 'reader.rtf'
|
||||||
help_end:
|
help_end:
|
||||||
|
|
||||||
I_END0:
|
I_END0:
|
||||||
fname_buf:
|
fname_buf:
|
||||||
rb 1024+16
|
rb 1024+16
|
||||||
|
Reference in New Issue
Block a user