forked from KolibriOS/kolibrios
*kernel - fixes in 15.2 by Mario79 and 67 by mike.dld
updated sysfunc.txt
*programs
new icons and logo for CPUID and ICON
added new version of @ICON and ICONMNGR
fixes in iconedit and calendar from DedOK
new algoritm of fill background in pic4
all apps (fasm-writen only) rewriten to use common macros.inc for easy recompile in fastcall mode (there is a bug in https; run need rewrite to use common macros.inc)
small fixes in build_all.bat script
git-svn-id: svn://kolibrios.org@485 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
heavyiron
@@ -11,49 +11,42 @@
|
||||
dd 0x01 ; header version
|
||||
dd START ; start of code
|
||||
dd I_END ; size of image
|
||||
dd 0x2000 ; memory for app
|
||||
dd 0x1000 ; esp
|
||||
dd 0x2000 ; memory for app
|
||||
dd 0x2000 ; esp
|
||||
dd 0x0 , 0x0 ; I_Param , I_Icon
|
||||
|
||||
include 'lang.inc'
|
||||
include 'macros.inc'
|
||||
include '..\..\..\..\macros.inc'
|
||||
|
||||
|
||||
START: ; start of execution
|
||||
|
||||
red: ; redraw
|
||||
call draw_window ; at first, draw the window
|
||||
|
||||
still:
|
||||
|
||||
mov eax,10 ; wait here for event
|
||||
int 0x40
|
||||
mcall
|
||||
|
||||
cmp eax,1 ; redraw request ?
|
||||
dec eax ; redraw request ?
|
||||
je red
|
||||
cmp eax,2 ; key in buffer ?
|
||||
je key
|
||||
cmp eax,3 ; button in buffer ?
|
||||
je button
|
||||
|
||||
jmp still
|
||||
|
||||
red: ; redraw
|
||||
call draw_window
|
||||
jmp still
|
||||
dec eax ; key in buffer ?
|
||||
jne button
|
||||
|
||||
key: ; key
|
||||
mov eax,2 ; just read it and ignore
|
||||
int 0x40
|
||||
mcall
|
||||
jmp still
|
||||
|
||||
button: ; button
|
||||
mov eax,17 ; get id
|
||||
int 0x40
|
||||
mcall
|
||||
|
||||
cmp ah,1 ; button id=1 ?
|
||||
jne noclose
|
||||
mov eax,-1 ; close this program (thread)
|
||||
int 0x40
|
||||
or eax,-1 ; close this program (thread)
|
||||
mcall
|
||||
noclose:
|
||||
|
||||
cmp ah,2
|
||||
@@ -67,7 +60,7 @@ still:
|
||||
mov ebx,1
|
||||
mov ecx,START
|
||||
mov edx,[thread_stack]
|
||||
int 0x40
|
||||
mcall
|
||||
|
||||
jmp still
|
||||
|
||||
@@ -75,6 +68,7 @@ still:
|
||||
|
||||
jmp still
|
||||
|
||||
|
||||
thread_stack dd 0x1000
|
||||
|
||||
|
||||
@@ -87,10 +81,10 @@ draw_window:
|
||||
|
||||
mov eax,12 ; function 12:tell os about windowdraw
|
||||
mov ebx,1 ; 1, start of draw
|
||||
int 0x40
|
||||
mcall
|
||||
|
||||
; DRAW WINDOW
|
||||
mov eax,0 ; function 0 : define and draw window
|
||||
xor eax,eax ; function 0 : define and draw window
|
||||
mov ebx,10*65536+290 ; [x start] *65536 + [x size]
|
||||
mov ecx,10*65536+130 ; [y start] *65536 + [y size]
|
||||
mov esi,[thread_stack]
|
||||
@@ -99,33 +93,25 @@ draw_window:
|
||||
shl esi,16
|
||||
add ebx,esi
|
||||
add ecx,esi
|
||||
mov edx,0x03ffffff ; color of work area RRGGBB,8->color gl
|
||||
mov esi,0x808899ff ; color of grab bar RRGGBB,8->color gl
|
||||
mov edi,0x008899ff ; color of frames RRGGBB
|
||||
int 0x40
|
||||
|
||||
; WINDOW LABEL
|
||||
mov eax,4 ; function 4 : write text to window
|
||||
mov ebx,8*65536+8 ; [x start] *65536 + [y start]
|
||||
mov ecx,0x10ddeeff ; color of text RRGGBB
|
||||
mov edx,labelt ; pointer to text beginning
|
||||
mov esi,labellen-labelt ; text length
|
||||
int 0x40
|
||||
mov edx,0x33ffffff ; color of work area RRGGBB,8->color gl
|
||||
mov edi,title ; WINDOW LABEL
|
||||
mcall
|
||||
|
||||
|
||||
mov eax,8 ; NEW THREAD BUTTON
|
||||
mov ebx,25*65536+128
|
||||
mov ecx,88*65536+20
|
||||
mov ebx,20*65536+128
|
||||
mov ecx,63*65536+20
|
||||
mov edx,2
|
||||
mov esi,0x90b0d0 ;0x5577cc
|
||||
int 0x40
|
||||
mcall
|
||||
|
||||
mov ebx,25*65536+35 ; draw info text with function 4
|
||||
mov eax,4
|
||||
mov ebx,20*65536+10 ; draw info text with function 4
|
||||
mov ecx,0x224466
|
||||
mov edx,text
|
||||
mov esi,40
|
||||
newline:
|
||||
mov eax,4
|
||||
int 0x40
|
||||
mcall
|
||||
add ebx,10
|
||||
add edx,40
|
||||
cmp [edx],byte 'x'
|
||||
@@ -134,7 +120,7 @@ draw_window:
|
||||
|
||||
mov eax,12 ; function 12:tell os about windowdraw
|
||||
mov ebx,2 ; 2, end of draw
|
||||
int 0x40
|
||||
mcall
|
||||
|
||||
ret
|
||||
|
||||
@@ -143,19 +129,17 @@ draw_window:
|
||||
|
||||
if lang eq ru
|
||||
text:
|
||||
db '�’€ ��Žƒ�€ŒŒ€ ‘Ž‡„€…’ �Ž’ŽŠˆ, ‡€�“‘Š€Ÿ '
|
||||
db 'Ž„ˆ� ˆ ’Ž’ †… ŠŽ„ Œ�ŽƒŽ �€‡. �€Œ �“†�Ž '
|
||||
db '’Ž‹œŠŽ �Ž‡€�Ž’ˆ’œ‘Ÿ Ž� Ž’„…‹œ�ŽŒ ‘’�Š… '
|
||||
db '„‹Ÿ Š€†„ŽƒŽ �Ž’ŽŠ€. '
|
||||
db '�€ŒŸ’œ „‹Ÿ ‚‘…• �Ž’ŽŠŽ‚ Ž�™€Ÿ. '
|
||||
db '�â ¯à®£à ¬¬ ᮧ¤ ¥â ¯®â®ª¨, § ¯ã᪠ï '
|
||||
db '®¤¨ ¨ â®â ¦¥ ª®¤ ¬®£® à §. � ¬ 㦮 '
|
||||
db '⮫쪮 ¯®§ ¡®â¨âìáï ®¡ ®â¤¥«ì®¬ áâíª¥ '
|
||||
db '¤«ï ª ¦¤®£® ¯®â®ª . '
|
||||
db '� ¬ïâì ¤«ï ¢á¥å ¯®â®ª®¢ ®¡é ï. '
|
||||
db ' '
|
||||
db ' ‘Ž‡„€’œ �Ž‚›‰ �Ž’ŽŠ '
|
||||
|
||||
db 'x' ; <- END MARKER, DONT DELETE
|
||||
|
||||
labelt:
|
||||
db '��ˆŒ…� ˆ‘�Ž‹œ‡Ž‚€�ˆŸ 51®© ”“�Š–ˆˆ'
|
||||
labellen:
|
||||
title db '�ਬ¥à ¨á¯®«ì§®¢ ¨ï ¯®â®ª®¢',0
|
||||
|
||||
else
|
||||
text:
|
||||
db 'THIS EXAMPLE CREATES THREADS BY RUNNING '
|
||||
@@ -165,11 +149,9 @@ else
|
||||
db ' '
|
||||
db ' '
|
||||
db ' CREATE NEW THREAD '
|
||||
|
||||
db 'x' ; <- END MARKER, DONT DELETE
|
||||
|
||||
labelt:
|
||||
db 'THREAD EXAMPLE'
|
||||
labellen:
|
||||
title db 'THREAD EXAMPLE',0
|
||||
|
||||
end if
|
||||
I_END:
|
||||
|
||||
Reference in New Issue
Block a user