Spaceraven/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Fix macro name - rename sys_colors to sys_colors_new to avoid collisions

Browse Source 
git-svn-id: svn://kolibrios.org@4817 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Yogev Ezra 2014-04-10 16:43:59 +00:00
parent b22512a865
commit 6e6d77845e
2 changed files with 311 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
programs/develop/asciivju/trunk/asciivju.asm
View File

@ -62,7 +62,7 @@ button:
redraw: redraw:
mcall 9, proc_info, -1 mcall 9, proc_info, -1
mcall 48, 3, sc, 40 mcall 48, 3, sys_colors, 40
mcall 12, 1 mcall 12, 1
@ -70,9 +70,9 @@ redraw:
mov ecx, 300*0x10000+184 mov ecx, 300*0x10000+184
add ecx, eax add ecx, eax
mov edx, 0x34000000 mov edx, 0x34000000
or edx, [sc.work] or edx, [sys_colors.work]
mov esi, 0x80000000 mov esi, 0x80000000
or esi, [sc.grab_text] or esi, [sys_colors.grab_text]
mcall 0, <300,315>, , , , window_title mcall 0, <300,315>, , , , window_title
test [proc_info.wnd_state], 0x04 test [proc_info.wnd_state], 0x04
jnz @f jnz @f
@ -198,7 +198,7 @@ proc draw_button
mcall 8, , , mcall 8, , ,
and edx, 0x7FFFFFFF and edx, 0x7FFFFFFF
or edx, 0x20000000 or edx, 0x20000000
mcall , , , , [sc.work_button] mcall , , , , [sys_colors.work_button]
test edi, edi ; is focused? test edi, edi ; is focused?
jz .symbol ; draw only character, not selection square jz .symbol ; draw only character, not selection square
@ -242,7 +242,7 @@ proc draw_button
shl ebx, 16 shl ebx, 16
add ebx, [button_y] add ebx, [button_y]
add ebx, 5 add ebx, 5
mcall 4, , [sc.work_button_text], symbol_current, 1 mcall 4, , [sys_colors.work_button_text], symbol_current, 1
ret ret
endp endp
@ -252,14 +252,14 @@ proc draw_page_switcher _blinking
mcall 8, , , 0x8000FFAA mcall 8, , , 0x8000FFAA
mov esi, [sc.work_button] mov esi, [sys_colors.work_button]
cmp [_blinking], 1 ; blinking? cmp [_blinking], 1 ; blinking?
jne @f jne @f
mov esi, PAGE_SWITCHER_BLINK_COLOR mov esi, PAGE_SWITCHER_BLINK_COLOR
@@: mcall , <2,60>, <157,19>, 0x2000FFAA @@: mcall , <2,60>, <157,19>, 0x2000FFAA
mov ecx, 0x80000000 mov ecx, 0x80000000
or ecx, [sc.work_button_text] or ecx, [sys_colors.work_button_text]
mov edx, string_000_127 mov edx, string_000_127
cmp [symbol_start], 0 ; first page? cmp [symbol_start], 0 ; first page?
je @f je @f
@ -272,13 +272,13 @@ endp
proc draw_codes proc draw_codes
mov ecx, 0x80000000 mov ecx, 0x80000000
or ecx, [sc.work_text] or ecx, [sys_colors.work_text]
mcall 4, <80,164>, , string_ASCII_CODE mcall 4, <80,164>, , string_ASCII_CODE
mcall , <180,164>, , string_ASCII_HEX_CODE mcall , <180,164>, , string_ASCII_HEX_CODE
movzx ecx, [symbol_focused] movzx ecx, [symbol_focused]
mov esi, 0x40000000 mov esi, 0x40000000
or esi, [sc.work_text] or esi, [sys_colors.work_text]
mcall 47, 0x00030000, , <152,164>, , [sc.work] mcall 47, 0x00030000, , <152,164>, , [sys_colors.work]
mcall , 0x00020100, , <276,164>, mcall , 0x00020100, , <276,164>,
ret ret
@ -305,6 +305,6 @@ symbol_unfocused db 0
symbol_focused db 0 symbol_focused db 0
i_end: i_end:
proc_info process_information proc_info process_information
sc system_colors sys_colors system_colors
rb 0x400 ;stack rb 0x400 ;stack
e_end: e_end:

2
programs/macros.inc
View File

@ -507,7 +507,7 @@ struct system_colors
work_graph dd ? work_graph dd ?
ends ends
struct sys_colors struct sys_colors_new
menu_body dd ? menu_body dd ?
3d_face dd ? 3d_face dd ?
3d_dark dd ? 3d_dark dd ?