Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 31 → Rev 51

/programs/desktop/trunk/desktop.asm
1,9 → 1,10
;
; UNIFORM WINDOW COLOURS
; UNIFORM WINDOW COLOURS & SKIN
;
; Compile with FASM for Menuet
;
; < russian edition by Ivan Poddubny >
; < skin selection by Mike Semenyako >
;
 
;******************************************************************************
13,7 → 14,7
dd 1 ; header version
dd START ; start address
dd I_END ; file size
dd 20000h ; memory
dd 28000h ; memory
dd 10000h ; stack pointer (0x10000+ - work area for os)
dd 0;,0 ; parameters, reserved
 
22,7 → 23,47
;******************************************************************************
 
 
struct SKIN_HEADER
.ident dd ?
.version dd ?
.params dd ?
.buttons dd ?
.bitmaps dd ?
ends
 
struct SKIN_PARAMS
.skin_height dd ?
.margin.right dw ?
.margin.left dw ?
.margin.bottom dw ?
.margin.top dw ?
.colors.inner dd ?
.colors.outer dd ?
.colors.frame dd ?
.colors_1.inner dd ?
.colors_1.outer dd ?
.colors_1.frame dd ?
.dtp.size dd ?
.dtp.data db 40 dup (?)
ends
 
struct SKIN_BUTTONS
.type dd ?
.pos:
.left dw ?
.top dw ?
.size:
.width dw ?
.height dw ?
ends
 
struct SKIN_BITMAPS
.kind dw ?
.type dw ?
.data dd ?
ends
 
 
START: ; start of execution
 
mov eax,48 ; get current colors
32,14 → 73,14
int 0x40
 
cld
mov esi, default_file
mov esi,default_skn
mov edi, fname
mov ecx, default_file.size
mov ecx,default_skn.size
rep movsb
mov [skin_info.fname],0
mov [skin_info.workarea],0x10000
call load_skin_file
 
mov [read_info.address], color_table
mov [read_info.workarea], 0x10000
mov [read_info.start_block], 0
 
red:
call draw_window ; at first, draw the window
71,6 → 112,25
mov eax,17 ; get id
int 0x40
 
cmp ah,11 ; read string
jne no_string
call read_string
jmp still
no_string:
 
cmp ah,12 ; load file
jne no_load
call load_file
call draw_window
jmp still
no_load:
 
cmp ah,13 ; save file
jne no_save
call save_file
jmp still
no_save:
 
cmp ah,14 ; set 3d buttons
jne no_3d
mov eax,48
91,8 → 151,9
jmp still
no_flat:
 
cmp ah,51 ; apply
cmp ah,16 ; apply
jne no_apply
apply_direct:
mov eax,48
mov ebx,2
mov ecx,color_table
104,6 → 165,22
int 0x40
no_apply:
 
cmp ah,17 ; load skin file
jne no_load_skin
call load_skin_file
call draw_window
jmp still
no_load_skin:
 
cmp ah,18 ; apply skin
jne no_apply_skin
cmp [skin_info.fname],0
je no_apply_skin
mcall 48,8,skin_info
call draw_window
jmp still
no_apply_skin:
 
cmp ah,31
jb no_new_colour
cmp ah,41
124,28 → 201,9
int 0x40
noid1:
 
cmp ah,11 ; read string
jne no_string
call read_string
jmp still
no_string:
 
cmp ah,12 ; load file
jne no_load
call load_file
call draw_window
jmp still
no_load:
 
cmp ah,13 ; save file
jne no_save
call save_file
jmp still
no_save:
 
jmp still
 
 
draw_cursor:
 
pusha
174,9 → 232,9
cmp ebx,32
jbe no_color
 
cmp ebx,280 ; CHANGE COLOR
cmp ebx,266 ; CHANGE COLOR
jb no_color
cmp ebx,280+20*3
cmp ebx,266+20*3
jg no_color
 
cmp ecx,30+128
184,7 → 242,7
cmp ecx,30
jb no_color
 
sub ebx,280
sub ebx,266
mov eax,ebx
cdq
mov ebx,20
212,11 → 270,47
pushad
 
mov [read_info.mode], 0
mov [read_info.start_block],0
mov [read_info.blocks], 1
mov [read_info.address] ,color_table
mov [read_info.workarea] ,0x10000
mcall 58, read_info
 
call draw_colours
popad
ret
 
load_skin_file:
pushad
 
mov [read_info.mode] ,0
mov [read_info.start_block],0
mov [read_info.blocks] ,64
mov [read_info.address] ,0x20000
mov [read_info.workarea] ,0x10000
mcall 58, read_info
 
cmp dword[0x20000+SKIN_HEADER.ident],'SKIN'
jne @f
 
mov esi,fname
mov edi,skin_info.fname
mov ecx,257
rep movsb
 
mov esi,0x20000
mov edi,0x18000
mov ecx,0x8000/4
rep movsd
 
mov ebp,0x18000
mov esi,[ebp+SKIN_HEADER.params]
add esi,ebp
lea esi,[esi+SKIN_PARAMS.dtp.data]
mov edi,color_table
mov ecx,10
rep movsd
@@:
 
popad
ret
 
226,6 → 320,8
 
mov [write_info.mode], 1
mov [write_info.bytes2write], 10*4
mov [write_info.address] ,color_table
mov [write_info.workarea] ,0x10000
mcall 58, write_info
 
popad
238,7 → 334,7
 
mov edi,fname
mov al,'_'
mov ecx,54
mov ecx,87
cld
rep stosb
 
270,13 → 366,13
call print_text
 
inc edi
cmp edi, fname+54
cmp edi, fname+87
jne f11
 
read_done:
 
mov ecx, fname
add ecx, 55
add ecx, 88
sub ecx, edi
mov eax, 0
cld
292,12 → 388,12
print_text:
pushad
 
mpack ebx, 16, 6*54+4
mpack ecx, 234, 10
mpack ebx,15,6*87+4
mpack ecx,(30+18*10+2),11
mcall 13, , , [w_work]
 
mpack ebx, 17, 235
mcall 4, , [w_work_text], fname, 54
mpack ebx,17,(30+18*10+4)
mcall 4,,[w_work_text],fname,87
 
popad
ret
308,13 → 404,13
pusha
 
mov eax,13
mov ebx,280*65536+60
mov ebx,266*65536+60
mov ecx,170*65536+30
mov edx,[color]
int 0x40
 
; mov eax,13
mov ebx,280*65536+60
mov ebx,266*65536+60
mov ecx,200*65536+10
mov edx,[w_work]
int 0x40
322,7 → 418,7
mov eax,47
mov ebx,0+1*256+8*65536
mov ecx,[color]
mov edx,280*65536+201
mov edx,272*65536+201
mov esi,[w_work_text]
int 0x40
 
338,12 → 434,12
mov esi,color_table
 
mov ebx,225*65536+32
mov ecx,37*65536+12
mov ecx,32*65536+12
newcol:
mov eax,13
mov edx,[esi]
int 0x40
add ecx,20*65536
add ecx,18*65536
add esi,4
cmp esi,color_table+4*9
jbe newcol
353,7 → 449,190
ret
 
 
draw_framerect: ; ebx,ecx
push ebx ecx
add bx,[esp+6]
mov cx,[esp+2]
dec ebx
mcall 38
add cx,[esp]
rol ecx,16
add cx,[esp]
sub ecx,0x00010001
mcall
mov ebx,[esp+4]
mov ecx,[esp]
mov bx,[esp+6]
add cx,[esp+2]
dec ecx
mcall
add bx,[esp+4]
rol ebx,16
add bx,[esp+4]
sub ebx,0x00010001
mcall
add esp,8
ret
 
find_bitmap:
mov edi,[ebp+SKIN_HEADER.bitmaps]
add edi,ebp
xor ebx,ebx
.lp1: cmp dword[edi],0
je .lp2
cmp dword[edi+0],eax
jne @f
mov ebx,[edi+SKIN_BITMAPS.data]
add ebx,ebp
mov ecx,[ebx-2]
mov cx,[ebx+4]
add ebx,8
.lp2: ret
@@: add edi,8
jmp .lp1
 
draw_skin:
mcall 13,<345,206>,<20,191>,0x00FFFFFF
mov ebp,0x18000
mov edi,[ebp+SKIN_HEADER.params]
add edi,ebp
mpack ebx,345+45,150
mpack ecx,20+10,140
mov edx,[edi+SKIN_PARAMS.colors_1.outer]
call draw_framerect
mpack ebx,345+45+4,150-8
mpack ecx,20+10+4,140-8
mov edx,[edi+SKIN_PARAMS.colors_1.inner]
call draw_framerect
mcall 13,<345+45+1,148>,<20+10+1,3>,[edi+SKIN_PARAMS.colors_1.frame]
add ecx,135*65536
mcall
mcall ,<345+45+1,3>,<20+10+1,138>
add ebx,145*65536
mcall
mcall ,<345+45+5,140>,<20+10+5,130>,dword[edi+SKIN_PARAMS.dtp.data+system_colors.work]
 
mov eax,0x00000001 ; left, inactive
call find_bitmap
mcall 7,,,<345+45,20+10>
 
pushd [ebx-8]
mov eax,0x00000003 ; base, inactive
call find_bitmap
pop edx
mov esi,345+45+150-1
sub esi,edx
shl edx,16
add edx,(345+45)*65536+20+10
mcall 7
@@: rol edx,16
add dx,[ebx-8]
cmp dx,si
ja @f
rol edx,16
mcall 7
jmp @b
@@:
 
mov eax,0x00000002 ; oper, inactive
call find_bitmap
mov edx,ecx
shr edx,16
neg edx
shl edx,16
add edx,(345+45+150)*65536+20+10
mcall 7
 
mov ebp,0x18000
mov edi,[ebp+SKIN_HEADER.params]
add edi,ebp
mov eax,dword[edi+SKIN_PARAMS.margin.left-2]
mov ax,word[edi+SKIN_PARAMS.skin_height]
sub ax,[edi+SKIN_PARAMS.margin.bottom]
shr ax,1
add ax,[edi+SKIN_PARAMS.margin.top]
add ax,-4
push eax
lea ebx,[eax+(345+45)*65536+20+10]
mcall 4,,dword[edi+SKIN_PARAMS.dtp.data+system_colors.grab_text],test_text,test_text.size
 
;---------------------------------------------------------
 
mov edi,[ebp+SKIN_HEADER.params]
add edi,ebp
mpack ebx,345+10,150
mpack ecx,20+40,140
mov edx,[edi+SKIN_PARAMS.colors.outer]
call draw_framerect
mpack ebx,345+10+4,150-8
mpack ecx,20+40+4,140-8
mov edx,[edi+SKIN_PARAMS.colors.inner]
call draw_framerect
mcall 13,<345+10+1,148>,<20+40+1,3>,[edi+SKIN_PARAMS.colors.frame]
add ecx,135*65536
mcall
mcall ,<345+10+1,3>,<20+40+1,138>
add ebx,145*65536
mcall
mcall ,<345+10+5,140>,<20+40+5,130>,dword[edi+SKIN_PARAMS.dtp.data+system_colors.work]
 
mov eax,0x00010001 ; left, inactive
call find_bitmap
mcall 7,,,<345+10,20+40>
 
pushd [ebx-8]
mov eax,0x00010003 ; base, inactive
call find_bitmap
pop edx
mov esi,345+10+150-1
sub esi,edx
shl edx,16
add edx,(345+10)*65536+20+40
mcall 7
@@: rol edx,16
add dx,[ebx-8]
cmp dx,si
ja @f
rol edx,16
mcall 7
jmp @b
@@:
 
mov eax,0x00010002 ; oper, inactive
call find_bitmap
mov edx,ecx
shr edx,16
neg edx
shl edx,16
add edx,(345+10+150)*65536+20+40
mcall 7
 
mov ebp,0x18000
mov edi,[ebp+SKIN_HEADER.params]
add edi,ebp
pop eax
lea ebx,[eax+(345+10)*65536+20+40]
mcall 4,,dword[edi+SKIN_PARAMS.dtp.data+system_colors.grab_text],test_text,test_text.size
 
;----------------------------------------------------------------------
 
mov edi,[ebp+SKIN_HEADER.buttons]
add edi,ebp
.lp1: cmp dword[edi],0
je .lp2
mov ebx,dword[edi+SKIN_BUTTONS.left-2]
mov bx,[edi+SKIN_BUTTONS.width]
mov ecx,dword[edi+SKIN_BUTTONS.top-2]
mov cx,[edi+SKIN_BUTTONS.height]
add ebx,(345+10+150)*65536
add ecx,(20+40)*65536
dec ebx
dec ecx
mcall 8,,,0x40000000
add edi,12
jmp .lp1
.lp2: ret
 
; *********************************************
; ******* WINDOW DEFINITIONS AND DRAW ********
; *********************************************
380,8 → 659,8
 
; DRAW WINDOW
mov eax,0 ; function 0 : define and draw window
mov ebx,110*65536+360 ; [x start] *65536 + [x size]
mov ecx,50*65536+300 ; [y start] *65536 + [y size]
mov ebx,110*65536+555 ; [x start] *65536 + [x size]
mov ecx,50*65536+255 ; [y start] *65536 + [y size]
mov edx,[w_work] ; color of work area RRGGBB,8->color
or edx,0x02000000
mov esi,[w_grab] ; color of grab bar RRGGBB,8->color gl
401,60 → 680,81
int 0x40
; CLOSE BUTTON
mov eax,8 ; function 8 : define and draw button
mov ebx,(360-19)*65536+12 ; [x start] *65536 + [x size]
mov ebx,(555-19)*65536+12 ; [x start] *65536 + [x size]
mov ecx,4*65536+12 ; [y start] *65536 + [y size]
mov edx,1 ; button id
mov esi,[w_grab_button] ; button color RRGGBB
int 0x40
 
if lang eq ru
load_w = (5*2+6*9)
save_w = (5*2+6*9)
flat_w = (5*2+6*7)
apply_w = (5*2+6*9)
else
load_w = (5*2+6*6)
save_w = (5*2+6*6)
flat_w = (5*2+6*4)
apply_w = (5*2+6*7)
end if
 
; mov eax,8 ; FILENAME BUTTON
mov ebx,280*65536+60
mov ecx,250*65536+14
mov edx,11
mov esi,[w_work_button]
mov ebx,5*65536+545
mov ecx,212*65536+10
mov edx,0x4000000B
int 0x40
 
; mov eax,8 ; SAVE BUTTON
mov ebx,280*65536+29
mov ecx,270*65536+14
; mov eax,8 ; LOAD BUTTON
mov ebx,15*65536+load_w
mov ecx,(30+18*11)*65536+14
mov edx,12
mov esi,[w_work_button]
int 0x40
 
; mov eax,8 ; LOAD BUTTON
add ebx,30*65536
; mov eax,8 ; SAVE BUTTON
add ebx,(load_w+2)*65536-load_w+save_w
inc edx
int 0x40
 
; mov eax,8 ; 3D
mov ebx,15*65536+35
mov ecx,275*65536+14
mov ebx,(340-t1.size*6-13)*65536+(5*2+6*4)
inc edx
int 0x40
; mov eax,8 ; FLAT
if lang eq ru
add ebx,40*65536+7
else
add ebx,40*65536
end if
add ebx,(5*2+6*4+2)*65536-(5*2+6*4)+flat_w
inc edx
int 0x40
 
; mov eax,8 ; APPLY BUTTON
add ebx,(flat_w+6+2)*65536-flat_w+apply_w
inc edx
int 0x40
 
; mov eax,8 ; LOAD SKIN BUTTON
mov ebx,(336+(555-335)/2-t2.size*6/2)*65536+load_w
inc edx
int 0x40
 
; mov eax,8 ; APPLY SKIN BUTTON
add ebx,(load_w+6+2)*65536-load_w+apply_w
inc edx
int 0x40
 
mov eax, 4
mov ebx, 281*65536+254
mov ebx, (339-t1.size*6-12)*65536+(30+18*11+4)
mov ecx, [w_work_button_text]
mov edx, t1
mov esi, t1.size
int 0x40
 
; mov eax, 4
mov ebx, 277*65536+274
mov ebx,(336+(555-335)/2-t2.size*6/2)*65536+(30+18*11+4)
mov edx, t2
mov esi, t2.size
int 0x40
 
 
mov eax,38 ; R G B COLOR GLIDES
mov ebx,280*65536+300 ;295
mov ebx,266*65536+285
mov ecx,30*65536+30
mov edx,0xff0000
.newl:
476,22 → 776,17
 
mov edx,31 ; BUTTON ROW
mov ebx,15*65536+200
mov ecx,35*65536+14
mov ecx,30*65536+14
mov esi,[w_work_button]
newb:
mov eax,8
int 0x40
add ecx,20*65536
add ecx,18*65536
inc edx
cmp edx,40
jbe newb
 
; mov eax,8 ; APPLY BUTTON
add ecx,20*65536
mov edx,51
int 0x40
 
mov ebx,20*65536+39 ; ROW OF TEXTS
mov ebx,15*65536+34 ; ROW OF TEXTS
mov ecx,[w_work_button_text]
mov edx,text
mov esi,32
498,7 → 793,7
newline:
mov eax,4
int 0x40
add ebx,20
add ebx,18
add edx,32
cmp [edx],byte 'x'
jne newline
505,8 → 800,26
 
call draw_colours
 
mcall 13,<5,546>,<212,11>,[w_work]
mcall 13,<337,7>,<2,250>,[w_frame]
shr edx,1
and edx,0x007F7F7F
mcall 38,<336,336>,<20,250>
add ebx,0x00080008
mcall
sub ebx,0x00040004
mcall ,,<0,255>
mcall ,<5,550>,<211,211>
add ecx,0x000C000C
mcall
 
call print_text
 
cmp dword[0x18000+SKIN_HEADER.ident],'SKIN'
jne @f
call draw_skin
@@:
 
mov eax,12 ; function 12:tell os about windowdraw
mov ebx,2 ; 2, end of draw
int 0x40
528,8 → 841,7
ru, ' ’…Š‘’ ‚ €Ž—…‰ Ž‹€‘’ˆ ',\
ru, ' ƒ€”ˆŠ€ ‚ €Ž—…‰ Ž‹€‘’ˆ ',\
ru, ' ',\
ru, ' ˆŒ…ˆ’œ ',\
ru, ' 3D ‹Ž‘Š ',\
ru, ' ‡€ƒ“‡ˆ’œ ‘Ž•€ˆ’œ ',\
ru, 'x',\
en, ' WINDOW FRAME ',\
en, ' WINDOW GRAB BAR ',\
542,26 → 854,28
en, ' WINDOW WORK AREA TEXT ',\
en, ' WINDOW WORK AREA GRAPH ',\
en, ' ',\
en, ' APPLY CHANGES ',\
en, ' 3D FLAT ',\
en, ' LOAD SAVE ',\
en, 'x'
 
 
lsz t1,\
ru, ' 3D ‹Ž‘Šˆ… ˆŒ…ˆ’œ ',\
en, ' 3D FLAT APPLY '
 
lsz t2,\
ru, ' ‡€ƒ ‘Ž• ',\
en, ' LOAD SAVE '
ru, ' ‡€ƒ“‡ˆ’œ ˆŒ…ˆ’œ ',\
en, ' LOAD APPLY ',\
 
lsz t1,\
ru, ' ”€‰‹ ',\
en, ' FILENAME '
lsz test_text,\
ru, '‡ £®«®¢®ª',\
en, 'Caption'
 
lsz labelt,\
ru, '€‘’Ž‰Š€ –‚…’Ž‚',\
en, 'DESKTOP COLOURS - DEFINE COLOR AND CLICK ON TARGET'
 
sz default_skn, '/RD/1/DEFAULT.SKN',0
 
sz default_file, '/RD/1/DEFAULT.DTP'
 
color dd 0
 
I_END:
583,6 → 897,14
.workarea dd ?
end virtual
 
skin_info:
.mode dd ?
.start_block dd ?
.blocks dd ?
.address dd ?
.workarea dd ?
.fname rb 256+1
 
app_colours:
 
w_frame dd ?
/programs/desktop/trunk/macros.inc
197,17 → 197,30
}
 
 
macro struct name
; structure definition helper
macro struct name, [arg]
{
common
name@struct equ name
struc name arg {
}
 
macro struct_helper name
{
match xname,name
\{
virtual at 0
name name
sizeof.#name = $ - name
xname xname
sizeof.#xname = $ - xname
name equ sizeof.#xname
end virtual
\}
}
 
ends fix } struct_helper name@struct
 
; structures used in MeOS
struc process_information
{
struct process_information
.cpu_usage dd ? ; +0
.window_stack_position dw ? ; +4
.window_stack_value dw ? ; +6
222,11 → 235,9
.y_size dd ? ; +46
.slot_state dw ? ; +50
rb (1024-52)
}
struct process_information
ends
 
struc system_colors
{
struct system_colors
.frame dd ?
.grab dd ?
.grab_button dd ?
237,8 → 248,7
.work_button_text dd ?
.work_text dd ?
.work_graph dd ?
}
struct system_colors
ends
 
 
; constants