KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

Charsets Checker 0.3.2
Some checks failed
Build system / Check kernel codestyle (pull_request) Successful in 49s
Details
Build system / Build (pull_request) Failing after 2m16s
Details

Browse Source 
- Renamed to Charsets Viewer/Charsets
- Fixed rolled-up bug
- Tweaked UI a little bit
- Renamed files in autobuild
This commit is contained in:
Taldariner
2025-03-07 10:01:27 +02:00
parent d7e16ca0d1
commit a930f8fd8f
4 changed files with 91 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/Tupfile.lua
View File

@@ -465,7 +465,7 @@ tup.append_table(img_files, {
{"DEMOS/ZEROLINE", VAR_PROGS .. "/demos/zeroline/trunk/zeroline"},
{"DEVELOP/BOARD", VAR_PROGS .. "/system/board/trunk/board"},
{"DEVELOP/CEDIT", SRC_PROGS .. "/develop/cedit/CEDIT"},
{"DEVELOP/CHARSETS", VAR_PROGS .. "/other/charset_checker/charchck"},
{"DEVELOP/CHARSETS", VAR_PROGS .. "/other/charsets/charsets"},
{"DEVELOP/COBJ", VAR_PROGS .. "/develop/cObj/trunk/cObj"},
{"DEVELOP/ENTROPYV", VAR_PROGS .. "/develop/entropyview/entropyview"},
{"DEVELOP/FASM", VAR_PROGS .. "/develop/fasm/1.73/fasm"},

2
programs/other/charset_checker/Tupfile.lua
View File

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

2
programs/other/charsets/Tupfile.lua Normal file
View File

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

103
programs/other/charset_checker/charset_checker.asm → programs/other/charsets/charsets.asm
View File

@@ -41,7 +41,7 @@ red: ; Redraw event handler
key: ; Keypress event handler
mov eax, 2 ; The key is returned in ah. The key must be
mcall ; read and cleared from the system queue.
cmp eax, 1 ; Just read the key, ignore it and jump to event_wait.
cmp eax, 1 ; Just read the key, ignore it and jump to event_wait.
je event_wait
mov cl, [reading]
cmp cl, 0x00
@@ -126,7 +126,7 @@ button: ; Buttonpress event handler
cmp ah, 0x0F
jne .button_10
mov [page], 0x00
call logic_update
call logic_update
call draw_update
jmp event_wait
@@ -136,7 +136,7 @@ button: ; Buttonpress event handler
mov ch, [page]
dec ch
mov [page], ch
call logic_update
call logic_update
call draw_update
jmp event_wait
@@ -146,7 +146,7 @@ button: ; Buttonpress event handler
mov ch, [page]
inc ch
mov [page], ch
call logic_update
call logic_update
call draw_update
jmp event_wait
@@ -170,7 +170,8 @@ draw_window:
mcall 48, 3, window_colors, 40
mcall , 4
push eax
add eax, 3
mov [win_head], eax
mov eax, 0
mov ebx, 100 * 65536 + 685
@@ -180,15 +181,24 @@ draw_window:
mov edi, title
mcall
pop esi
add esi, 495
mcall 67, -1, -1, -1,
; Don't draw rolled up or rolled down window
mcall 9, proc_info, -1
mov eax, [proc_info + 70]
mov [win_stat], eax
test [win_stat], 100b
jnz .draw_end
; Draw all app content
add [win_head], 492
call draw_base
call draw_update
call draw_toggle
mcall 12, 2
.draw_end:
mov esi, [win_head]
mcall 67, -1, -1, -1,
mcall 12, 2
ret
@@ -399,9 +409,21 @@ draw_update:
mov al, 0x01
mov ecx, eax
push ecx
mcall 13, 65536 * 34 + 384, , [window_colors.work_button]
add ecx, 65536 * 23
mov eax, 13
mov ebx, 65536 * 34 + 384
mov edx, [window_colors.work_button]
;skip lines aligned to table borders
cmp ecx, 65536 * 34 + 65536
jle .hl_next_hr
mcall
.hl_next_hr:
add ecx, 65536 * 23
cmp ecx, 65536 * 417
jge .hl_end_hr
mcall
.hl_end_hr:
mov al, [char]
and al, 0x0F
@@ -411,15 +433,28 @@ draw_update:
shl eax, 16
mov al, 0x01
mov ebx, eax
mcall 13, , 65536 * 34 + 384, [window_colors.work_button]
add ebx, 65536 * 23
mov eax, 13
mov ecx, 65536 * 34 + 384
mov edx, [window_colors.work_button]
;skip lines aligned to table borders
cmp ebx, 65536 * 34 + 65536
jle .hl_next_vr
mcall
.hl_next_vr:
add ebx, 65536 * 23
cmp ebx, 65536 * 417
jge .hl_end_vr
mcall
.hl_end_vr:
pop ecx
add ecx, 23
sub ebx, 65535 * 23
mcall
; redraw active symbol
shr ecx, 16
mov bx, cx
add ebx, 65536 * 8 + 5
@@ -574,7 +609,7 @@ logic_utf16to8:
; ================================================================
title db "Charset Checker 0.3.1", 0
title db "Charsets Viewer 0.3.2", 0
lb_cp6x9 db "CP866 6x9 ", 0
lb_cp8x16 db "CP866 8x16 ", 0
@@ -609,7 +644,11 @@ char_ascii dw 0x0000, 0
char_scan dw 0x0000, 0
char_utf dd 0x00000000, 0
window_colors system_colors
win_stat rd 1
win_head rd 1
window_colors system_colors
proc_info process_information
; ================================================================
@@ -619,3 +658,37 @@ I_END:
STACKTOP:
MEM:
; Development history
;
; 22.10.2024 - 0.1.0
; - First version, display of charpages in all KOS charsets
;
; 23.10.2024 - 0.2.0
; - Fixed UTF-8 display by Doczom
; - Interface adaptation for skins
; - Reduced redraw
; - Refactored code
;
; 27.10.2024 - 0.2.5
; - Fixed version in app header
; - Tweaked UI colors
; - Something else???
;
; 17.01.2025 - 0.3.0
; - Added button to reset charpage to 00
; - Functionality to pick and preview single character
; - Functionality to input characters from keyboard
; - Display of ASCII and SCAN codes of characters in dec and hex format
; - Tweaked UI colors
;
; 17.01.2025 - 0.3.1
; - Small UI fixes
; - Code refactoring
; - Reformatted sources, fixed indentation
; and removed non-Unicode characters
;
; 07.03.2025 - 0.3.2
; - Renamed to Charsets Viewer/Charsets
; - Symbol highlight UI tweaks
; - Fixed rolled up bug