diff --git a/programs/demos/life/trunk/macros.inc b/programs/demos/life/trunk/macros.inc index a04ab1d2e7..1b9cf4cf34 100644 --- a/programs/demos/life/trunk/macros.inc +++ b/programs/demos/life/trunk/macros.inc @@ -230,8 +230,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/develop/SPForth/MACROS.INC b/programs/develop/SPForth/MACROS.INC index 7de7b6f831..71c03027f0 100644 --- a/programs/develop/SPForth/MACROS.INC +++ b/programs/develop/SPForth/MACROS.INC @@ -227,8 +227,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/develop/fast_call_test/macros.inc b/programs/develop/fast_call_test/macros.inc index e0d44ffc57..9b0258970e 100644 --- a/programs/develop/fast_call_test/macros.inc +++ b/programs/develop/fast_call_test/macros.inc @@ -255,8 +255,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/develop/ktcc/trunk/libc/start/macros.inc b/programs/develop/ktcc/trunk/libc/start/macros.inc index ecf51616f1..6b5bc9a6ba 100644 --- a/programs/develop/ktcc/trunk/libc/start/macros.inc +++ b/programs/develop/ktcc/trunk/libc/start/macros.inc @@ -301,8 +301,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/develop/scc/MACROS.INC b/programs/develop/scc/MACROS.INC index cd445840ed..9dc5f24e35 100644 --- a/programs/develop/scc/MACROS.INC +++ b/programs/develop/scc/MACROS.INC @@ -231,8 +231,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/develop/sdk/trunk/pixlib/demo1.asm b/programs/develop/sdk/trunk/pixlib/demo1.asm index 508fe9c470..e47f646ae1 100644 --- a/programs/develop/sdk/trunk/pixlib/demo1.asm +++ b/programs/develop/sdk/trunk/pixlib/demo1.asm @@ -5,8 +5,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/develop/sdk/trunk/pixlib/demo2.asm b/programs/develop/sdk/trunk/pixlib/demo2.asm index e8064d6f44..b161235f17 100644 --- a/programs/develop/sdk/trunk/pixlib/demo2.asm +++ b/programs/develop/sdk/trunk/pixlib/demo2.asm @@ -5,8 +5,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/develop/sdk/trunk/pixlib/demo3.asm b/programs/develop/sdk/trunk/pixlib/demo3.asm index 801c289d5d..0db263e142 100644 --- a/programs/develop/sdk/trunk/pixlib/demo3.asm +++ b/programs/develop/sdk/trunk/pixlib/demo3.asm @@ -5,8 +5,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/develop/tinypy/tinypy/fasm_modules/macros.inc b/programs/develop/tinypy/tinypy/fasm_modules/macros.inc index 2f3f66a41d..9d8a3fb396 100644 --- a/programs/develop/tinypy/tinypy/fasm_modules/macros.inc +++ b/programs/develop/tinypy/tinypy/fasm_modules/macros.inc @@ -1,47 +1,47 @@ @^ fix macro comment { ^@ fix } -; ------------------------- -macro library [lname,fname] -{ - forward - dd __#lname#_library_table__,__#lname#_library_name__ - common - dd 0 - forward - align 4 - __#lname#_library_name__ db fname,0 -} - -macro import lname,[name,sname] -{ - common - align 4 - __#lname#_library_table__: - forward - if used name - name dd __#name#_import_name__ - end if - common - dd 0 - forward - if used name - align 4 - __#name#_import_name__ db sname,0 - end if -} - -macro export [name,sname] -{ - forward - dd __#name#_export_name__,name - common - dd 0 - forward - align 4 - __#name#_export_name__ db sname,0 -} -; ------------------------- +; ------------------------- +macro library [lname,fname] +{ + forward + dd __#lname#_library_table__,__#lname#_library_name__ + common + dd 0 + forward + align 4 + __#lname#_library_name__ db fname,0 +} + +macro import lname,[name,sname] +{ + common + align 4 + __#lname#_library_table__: + forward + if used name + name dd __#name#_import_name__ + end if + common + dd 0 + forward + if used name + align 4 + __#name#_import_name__ db sname,0 + end if +} + +macro export [name,sname] +{ + forward + dd __#name#_export_name__,name + common + dd 0 + forward + align 4 + __#name#_export_name__ db sname,0 +} +; ------------------------- macro m2m dest,src { push src @@ -473,8 +473,8 @@ ends struct system_colors frame dd ? grab dd ? - grab_button dd ? - grab_button_text dd ? + work_3d_dark dd ? + work_3d_light dd ? grab_text dd ? work dd ? work_button dd ? @@ -525,4 +525,4 @@ EVM_EXIT = 1000b EVM_BACKGROUND = 10000b EVM_MOUSE = 100000b EVM_IPC = 1000000b -EVM_STACK = 10000000b +EVM_STACK = 10000000b diff --git a/programs/emulator/PrMK/trunk/macros.inc b/programs/emulator/PrMK/trunk/macros.inc index 2a485f55bb..bad2eb2283 100644 --- a/programs/emulator/PrMK/trunk/macros.inc +++ b/programs/emulator/PrMK/trunk/macros.inc @@ -464,8 +464,8 @@ ends struct system_colors frame dd ? grab dd ? - grab_button dd ? - grab_button_text dd ? + work_3d_dark dd ? + work_3d_light dd ? grab_text dd ? work dd ? work_button dd ? diff --git a/programs/fs/fspeed/udata.inc b/programs/fs/fspeed/udata.inc index 684f0ead58..6d5f5ec29e 100644 --- a/programs/fs/fspeed/udata.inc +++ b/programs/fs/fspeed/udata.inc @@ -28,8 +28,8 @@ align 4 app_colours: w_frame dd ? w_grab dd ? -w_grab_button dd ? -w_grab_button_text dd ? +w_work_3d_dark dd ? +w_work_3d_light dd ? w_grab_text dd ? w_work dd ? w_work_button dd ? diff --git a/programs/fs/opendial/opendial.asm b/programs/fs/opendial/opendial.asm index 7881ce3c93..3b6333dd29 100644 --- a/programs/fs/opendial/opendial.asm +++ b/programs/fs/opendial/opendial.asm @@ -3209,8 +3209,8 @@ app_colours: w_frame rd 1 w_grab rd 1 -w_grab_button rd 1 -w_grab_button_text rd 1 +w_work_3d_dark rd 1 +w_work_3d_light rd 1 w_grab_text rd 1 w_work rd 1 w_work_button rd 1 diff --git a/programs/games/bnc/trunk/macros.inc b/programs/games/bnc/trunk/macros.inc index 50d2745750..33b942bf02 100644 --- a/programs/games/bnc/trunk/macros.inc +++ b/programs/games/bnc/trunk/macros.inc @@ -233,8 +233,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/games/flood-it/trunk/lib/kolibri.h b/programs/games/flood-it/trunk/lib/kolibri.h index 495e164baa..f0b05f9e51 100644 --- a/programs/games/flood-it/trunk/lib/kolibri.h +++ b/programs/games/flood-it/trunk/lib/kolibri.h @@ -47,7 +47,7 @@ inline fastcall void GetProcessInfo(dword EBX, ECX) } struct system_colors{ - dword frame,grab,grab_button,grab_button_text,grab_text,work,work_button,work_button_text,work_text,work_graph; + dword frame,grab,work_3d_dark,work_3d_light,grab_text,work,work_button,work_button_text,work_text,work_graph; void get(); }; diff --git a/programs/games/megamaze/trunk/macros.inc b/programs/games/megamaze/trunk/macros.inc index 7de7b6f831..71c03027f0 100644 --- a/programs/games/megamaze/trunk/macros.inc +++ b/programs/games/megamaze/trunk/macros.inc @@ -227,8 +227,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/games/rsquare/trunk/MACROS.INC b/programs/games/rsquare/trunk/MACROS.INC index 14185dbfce..0b11cc026b 100644 --- a/programs/games/rsquare/trunk/MACROS.INC +++ b/programs/games/rsquare/trunk/MACROS.INC @@ -232,8 +232,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/games/soko/trunk/MACROS.INC b/programs/games/soko/trunk/MACROS.INC index 4cb0765ce7..3abd50eedd 100644 --- a/programs/games/soko/trunk/MACROS.INC +++ b/programs/games/soko/trunk/MACROS.INC @@ -152,8 +152,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/games/sq_game/trunk/MACROS.INC b/programs/games/sq_game/trunk/MACROS.INC index 14185dbfce..0b11cc026b 100644 --- a/programs/games/sq_game/trunk/MACROS.INC +++ b/programs/games/sq_game/trunk/MACROS.INC @@ -232,8 +232,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/macros.inc b/programs/macros.inc index b1651feb4a..a4ea029a58 100644 --- a/programs/macros.inc +++ b/programs/macros.inc @@ -467,11 +467,11 @@ struct process_information ends struct system_colors - frame dd ? - grab dd ? - grab_button dd ? - grab_button_text dd ? - grab_text dd ? + frame dd ? ;nonset1 + grab dd ? ;nonset2 + work_3d_dark dd ? + work_3d_light dd ? + grab_text dd ? ;nonset3 work dd ? work_button dd ? work_button_text dd ? diff --git a/programs/media/scrshoot/scrshoot.mac b/programs/media/scrshoot/scrshoot.mac index be43dbc99e..f5c5e52d91 100644 --- a/programs/media/scrshoot/scrshoot.mac +++ b/programs/media/scrshoot/scrshoot.mac @@ -224,8 +224,8 @@ struc sys_color_table { .frames: dd ? ;+0 .grab: dd ? ;+4 -.grab_button: dd ? ;+8 -.grab_button_text: dd ? ;+12 +.work_3d_dark: dd ? ;+8 +.work_3d_light: dd ? ;+12 .grab_text: dd ? ;+16 .work: dd ? ;+20 .work_button: dd ?;+24 diff --git a/programs/other/Timer/Timer.asm b/programs/other/Timer/Timer.asm index bf526f90f2..1961d0cef2 100644 --- a/programs/other/Timer/Timer.asm +++ b/programs/other/Timer/Timer.asm @@ -59,8 +59,8 @@ window: sc: .frames dd 0 .grab dd 0 -.grab_button dd 0 -.grab_button_text dd 0 +.work_3d_dark dd 0 +.work_3d_light dd 0 .grab_text dd 0 .work dd 0 .work_button dd 0 diff --git a/programs/system/RunOD/RunOD.asm b/programs/system/RunOD/RunOD.asm index 82aaeb2584..26855343b5 100644 --- a/programs/system/RunOD/RunOD.asm +++ b/programs/system/RunOD/RunOD.asm @@ -635,8 +635,8 @@ edit_box_set_text dd 0 sc: .frames dd 0 .grab dd 0 -.grab_button dd 0 -.grab_button_text dd 0 +.work_3d_dark dd 0 +.work_3d_light dd 0 .grab_text dd 0 .work dd 0 .work_button dd 0 diff --git a/programs/system/cd_tray/MACROS.INC b/programs/system/cd_tray/MACROS.INC index cd445840ed..9dc5f24e35 100644 --- a/programs/system/cd_tray/MACROS.INC +++ b/programs/system/cd_tray/MACROS.INC @@ -231,8 +231,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/system/launch/trunk/macros.inc b/programs/system/launch/trunk/macros.inc index 154a07b060..3716a1fc8c 100755 --- a/programs/system/launch/trunk/macros.inc +++ b/programs/system/launch/trunk/macros.inc @@ -468,8 +468,8 @@ ends struct system_colors frame dd ? grab dd ? - grab_button dd ? - grab_button_text dd ? + work_3d_dark dd ? + work_3d_light dd ? grab_text dd ? work dd ? work_button dd ? diff --git a/programs/system/pcidev/branches/new_api/macros.inc b/programs/system/pcidev/branches/new_api/macros.inc index 1ad6ebdfb0..790819c3af 100644 --- a/programs/system/pcidev/branches/new_api/macros.inc +++ b/programs/system/pcidev/branches/new_api/macros.inc @@ -296,8 +296,8 @@ struc system_colors { .frame dd ? .grab dd ? - .grab_button dd ? - .grab_button_text dd ? + .work_3d_dark dd ? + .work_3d_light dd ? .grab_text dd ? .work dd ? .work_button dd ? diff --git a/programs/system/skincfg/trunk/udata.inc b/programs/system/skincfg/trunk/udata.inc index 51f74fb69b..ac97847455 100644 --- a/programs/system/skincfg/trunk/udata.inc +++ b/programs/system/skincfg/trunk/udata.inc @@ -33,8 +33,8 @@ app_colours: w_frame dd ? w_grab dd ? -w_grab_button dd ? -w_grab_button_text dd ? +w_work_3d_dark dd ? +w_work_3d_light dd ? w_grab_text dd ? w_work dd ? w_work_button dd ?