system/zkey: Post-SVN clean up

- Move source code from `trunk` into program root directory.
- Update build files and ASM include paths.
This commit is contained in:
2025-05-20 20:45:49 +01:00
committed by Andrew
parent da4a5717d2
commit 8cd163f8dd
6 changed files with 17 additions and 14 deletions

View File

@@ -446,7 +446,7 @@ tup.append_table(img_files, {
{"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"}, {"TINFO", VAR_PROGS .. "/system/tinfo/tinfo"},
{"TIMER", VAR_PROGS .. "/other/Timer/Timer"}, {"TIMER", VAR_PROGS .. "/other/Timer/Timer"},
{"UNZ", VAR_PROGS .. "/fs/unz/unz"}, {"UNZ", VAR_PROGS .. "/fs/unz/unz"},
{"ZKEY", VAR_PROGS .. "/system/zkey/trunk/ZKEY"}, {"ZKEY", VAR_PROGS .. "/system/zkey/ZKEY"},
{"3D/3DWAV", VAR_PROGS .. "/demos/3dwav/trunk/3dwav"}, {"3D/3DWAV", VAR_PROGS .. "/demos/3dwav/trunk/3dwav"},
{"3D/CROWNSCR", VAR_PROGS .. "/demos/crownscr/trunk/crownscr"}, {"3D/CROWNSCR", VAR_PROGS .. "/demos/crownscr/trunk/crownscr"},
{"3D/3DCUBE2", VAR_PROGS .. "/demos/3dcube2/trunk/3DCUBE2"}, {"3D/3DCUBE2", VAR_PROGS .. "/demos/3dcube2/trunk/3DCUBE2"},

View File

@@ -81,7 +81,7 @@ fasm system\skinsel\skinsel.asm %BIN%\skinsel
fasm system\ss\trunk\@ss.asm %BIN%\@ss fasm system\ss\trunk\@ss.asm %BIN%\@ss
fasm system\vrr\trunk\vrr.asm %BIN%\vrr fasm system\vrr\trunk\vrr.asm %BIN%\vrr
fasm system\vrr_m\trunk\vrr_m.asm %BIN%\vrr_m fasm system\vrr_m\trunk\vrr_m.asm %BIN%\vrr_m
fasm system\zkey\trunk\zkey.asm %BIN%\zkey fasm system\zkey\zkey.asm %BIN%\zkey
echo * echo *
echo Building develop echo Building develop

View File

@@ -1,4 +1,4 @@
include '../../../proc32.inc' include '../../proc32.inc'
macro start_draw_window x,y,xsize,ysize,areacolor,caption macro start_draw_window x,y,xsize,ysize,areacolor,caption
{ {
@@ -125,4 +125,3 @@ macro putpixel x,y,color
mov edx, color mov edx, color
int 0x40 int 0x40
} }

View File

@@ -1,4 +1,9 @@
; SPDX-License-Identifier: NOASSERTION
; ;
; Text encoded with Code Page 866 - Cyrillic
; ZKEY. Version 0.51. ; ZKEY. Version 0.51.
; Virtual keyboard for KolibriOS. ; Virtual keyboard for KolibriOS.
; ;
@@ -20,7 +25,7 @@ use32
dd 0 dd 0
dd 0 dd 0
include '../../../macros.inc' include '../../macros.inc'
include "ASPAPI.INC" include "ASPAPI.INC"
N_KEYCOLOR equ 0x00677889 ; Normal button color N_KEYCOLOR equ 0x00677889 ; Normal button color
@@ -168,19 +173,19 @@ draw_window:
mul byte [keyboard_mode] mul byte [keyboard_mode]
add eax, SwitchText add eax, SwitchText
stdcall draw_button, 513,28,46,20,106,0x00700000,eax,6,TEXTCOLOR ; Scan/ASCII switch stdcall draw_button, 513,28,46,20,106,0x00700000,eax,6,TEXTCOLOR ; Scan/ASCII switch
xor al, al xor al, al
xchg al, [red_type] xchg al, [red_type]
test al, 2 test al, 2
jnz .skip_end_draw_window ; if we draw switch button without redraw window then end_draw_window not need jnz .skip_end_draw_window ; if we draw switch button without redraw window then end_draw_window not need
@@: @@:
.draw_indicators_area: .draw_indicators_area:
call lights_on call lights_on
end_draw_window end_draw_window
.skip_end_draw_window: .skip_end_draw_window:
ret ret
get_zkey_window_slot_number: get_zkey_window_slot_number:
@@ -197,14 +202,14 @@ still:
call get_receiver_window_slot_number call get_receiver_window_slot_number
call get_receiver_window_keyboard_mode ; return in ecx keyboard_mode for set_keyboard_mode call get_receiver_window_keyboard_mode ; return in ecx keyboard_mode for set_keyboard_mode
call set_keyboard_mode call set_keyboard_mode
; delete_switch_button ; delete_switch_button
mov eax, 8 mov eax, 8
mov edx, BT_DEL + 0x00700000 mov edx, BT_DEL + 0x00700000
int 0x40 int 0x40
mov byte [red_type], 2 mov byte [red_type], 2
call draw_window.draw_switch_button call draw_window.draw_switch_button
mov eax, 10 ; Wait for an event in the queue. mov eax, 10 ; Wait for an event in the queue.
int 0x40 int 0x40
@@ -486,4 +491,3 @@ PROCINFO_BUFF process_information
rb 4096 rb 4096
STACKTOP: STACKTOP:
MEM: MEM: