From 27bb99473f28414db0842eb9fcc8d4d9323d1dfe Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 26 Dec 2015 04:01:56 +0000 Subject: [PATCH] Shkvorka2, use global me_skin.inc git-svn-id: svn://kolibrios.org@6007 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/_old/Leency/AreaO/build.bat | 4 +- skins/_old/Leency/AreaO/default.asm | 2 +- skins/_old/Leency/AreaSq/build.bat | 4 +- skins/_old/Leency/AreaSq/default.asm | 2 +- skins/_old/Leency/AreaSq/me_skin.inc | 235 --------------------- skins/_old/Leency/L-Junior/DEFAULT.ASM | 2 +- skins/_old/Leency/L-Junior/ME_SKIN.INC | 235 --------------------- skins/_old/Leency/L-Junior/build.bat | 4 +- skins/_old/Leency/Latte/build.bat | 4 +- skins/_old/Leency/Latte/default.asm | 2 +- skins/_old/Leency/Latte/me_skin.inc | 235 --------------------- skins/_old/Leency/Luna/build.bat | 4 +- skins/_old/Leency/Luna/default.asm | 2 +- skins/_old/Leency/Luna/me_skin.inc | 235 --------------------- skins/_old/Leency/Octo/build.bat | 4 +- skins/_old/Leency/Octo/default.asm | 2 +- skins/_old/Leency/Octo/me_skin.inc | 235 --------------------- skins/_old/Leency/Octo_flat/default.asm | 2 +- skins/_old/Leency/Octo_flat/me_skin.inc | 235 --------------------- skins/_old/Leency/OpusN/OpusN.asm | 2 +- skins/_old/Leency/OpusN/my_skin.inc | 235 --------------------- skins/_old/Leency/Sandwich/build.bat | 4 +- skins/_old/Leency/Sandwich/default.asm | 2 +- skins/_old/Leency/Sandwich/me_skin.inc | 235 --------------------- skins/_old/Leency/Shkvorka/build.bat | 1 + skins/_old/Leency/Shkvorka/center1.bmp | Bin 142 -> 150 bytes skins/_old/Leency/Shkvorka/center2.bmp | Bin 142 -> 150 bytes skins/_old/Leency/Shkvorka/default.asm | 20 +- skins/_old/Leency/Shkvorka/default.dtp | Bin 40 -> 40 bytes skins/_old/Leency/Shkvorka/default.dtp.asm | 10 +- skins/_old/Leency/Shkvorka/default.skn | Bin 0 -> 1039 bytes skins/_old/Leency/Shkvorka/left1.bmp | Bin 142 -> 150 bytes skins/_old/Leency/Shkvorka/left2.bmp | Bin 142 -> 150 bytes skins/_old/Leency/Shkvorka/me_skin.inc | 235 --------------------- skins/_old/Leency/Shkvorka/right1.bmp | Bin 4014 -> 4374 bytes skins/_old/Leency/Shkvorka/right2.bmp | Bin 4014 -> 4374 bytes skins/_old/Leency/Yeah/build.bat | 4 +- skins/_old/Leency/Yeah/default.asm | 2 +- skins/_old/Leency/Yeah/me_skin.inc | 235 --------------------- skins/_old/Leency/{AreaO => }/me_skin.inc | 0 40 files changed, 42 insertions(+), 2391 deletions(-) delete mode 100644 skins/_old/Leency/AreaSq/me_skin.inc delete mode 100644 skins/_old/Leency/L-Junior/ME_SKIN.INC delete mode 100644 skins/_old/Leency/Latte/me_skin.inc delete mode 100644 skins/_old/Leency/Luna/me_skin.inc delete mode 100644 skins/_old/Leency/Octo/me_skin.inc delete mode 100644 skins/_old/Leency/Octo_flat/me_skin.inc delete mode 100644 skins/_old/Leency/OpusN/my_skin.inc delete mode 100644 skins/_old/Leency/Sandwich/me_skin.inc create mode 100644 skins/_old/Leency/Shkvorka/default.skn delete mode 100644 skins/_old/Leency/Shkvorka/me_skin.inc delete mode 100644 skins/_old/Leency/Yeah/me_skin.inc rename skins/_old/Leency/{AreaO => }/me_skin.inc (100%) diff --git a/skins/_old/Leency/AreaO/build.bat b/skins/_old/Leency/AreaO/build.bat index b014dacfba..32faafdd9c 100644 --- a/skins/_old/Leency/AreaO/build.bat +++ b/skins/_old/Leency/AreaO/build.bat @@ -1,4 +1,4 @@ del default.skn -..\fasm default.asm default.skn -..\kpack default.skn +fasm default.asm default.skn +kpack default.skn pause \ No newline at end of file diff --git a/skins/_old/Leency/AreaO/default.asm b/skins/_old/Leency/AreaO/default.asm index cb7005d145..d134c2a62b 100644 --- a/skins/_old/Leency/AreaO/default.asm +++ b/skins/_old/Leency/AreaO/default.asm @@ -1,4 +1,4 @@ -include 'me_skin.inc' +include '../me_skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height diff --git a/skins/_old/Leency/AreaSq/build.bat b/skins/_old/Leency/AreaSq/build.bat index b014dacfba..32faafdd9c 100644 --- a/skins/_old/Leency/AreaSq/build.bat +++ b/skins/_old/Leency/AreaSq/build.bat @@ -1,4 +1,4 @@ del default.skn -..\fasm default.asm default.skn -..\kpack default.skn +fasm default.asm default.skn +kpack default.skn pause \ No newline at end of file diff --git a/skins/_old/Leency/AreaSq/default.asm b/skins/_old/Leency/AreaSq/default.asm index 80241e521b..05245f9669 100644 --- a/skins/_old/Leency/AreaSq/default.asm +++ b/skins/_old/Leency/AreaSq/default.asm @@ -1,4 +1,4 @@ -include 'me_skin.inc' +include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height diff --git a/skins/_old/Leency/AreaSq/me_skin.inc b/skins/_old/Leency/AreaSq/me_skin.inc deleted file mode 100644 index ccbb3c191c..0000000000 --- a/skins/_old/Leency/AreaSq/me_skin.inc +++ /dev/null @@ -1,235 +0,0 @@ -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - file _fname - load w dword from _bmp.i.biWidth - load h dword from _bmp.i.biHeight - end virtual - align 4 - label _name - .width = w - .height = h - dd w,h - a=54+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - virtual at 0 - file _fname - load r from a+0 - load g from a+1 - load b from a+2 - end virtual - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp,_dtp_sz - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - virtual at 0 - file _dtp - _dtp_sz = $ - end virtual - dd _dtp_sz - file _dtp -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/L-Junior/DEFAULT.ASM b/skins/_old/Leency/L-Junior/DEFAULT.ASM index ac9d23294f..50cb0a0d8b 100644 --- a/skins/_old/Leency/L-Junior/DEFAULT.ASM +++ b/skins/_old/Leency/L-Junior/DEFAULT.ASM @@ -1,4 +1,4 @@ -include 'ME_SKIN.INC' +include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height diff --git a/skins/_old/Leency/L-Junior/ME_SKIN.INC b/skins/_old/Leency/L-Junior/ME_SKIN.INC deleted file mode 100644 index 752c8f07d3..0000000000 --- a/skins/_old/Leency/L-Junior/ME_SKIN.INC +++ /dev/null @@ -1,235 +0,0 @@ -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - file _fname - load w dword from _bmp.i.biWidth - load h dword from _bmp.i.biHeight - end virtual - align 4 - label _name - .width = w - .height = h - dd w,h - a=54+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - virtual at 0 - file _fname - load r from a+0 - load g from a+1 - load b from a+2 - end virtual - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp,_dtp_sz - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - virtual at 0 - file _dtp - _dtp_sz = $ - end virtual - dd _dtp_sz - file _dtp -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/L-Junior/build.bat b/skins/_old/Leency/L-Junior/build.bat index 2f6751da01..2131bf7f71 100644 --- a/skins/_old/Leency/L-Junior/build.bat +++ b/skins/_old/Leency/L-Junior/build.bat @@ -1,3 +1,3 @@ -..\fasm default.asm default.skn -..\kpack default.skn +fasm default.asm default.skn +kpack default.skn pause \ No newline at end of file diff --git a/skins/_old/Leency/Latte/build.bat b/skins/_old/Leency/Latte/build.bat index 6780f9a852..26a1daf097 100644 --- a/skins/_old/Leency/Latte/build.bat +++ b/skins/_old/Leency/Latte/build.bat @@ -1,3 +1,3 @@ -..\fasm default.asm Latte.skn -..\kpack Latte.skn +fasm default.asm Latte.skn +kpack Latte.skn pause \ No newline at end of file diff --git a/skins/_old/Leency/Latte/default.asm b/skins/_old/Leency/Latte/default.asm index 8667162ab9..4088272b65 100644 --- a/skins/_old/Leency/Latte/default.asm +++ b/skins/_old/Leency/Latte/default.asm @@ -1,4 +1,4 @@ -include 'me_skin.inc' +include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height diff --git a/skins/_old/Leency/Latte/me_skin.inc b/skins/_old/Leency/Latte/me_skin.inc deleted file mode 100644 index ccbb3c191c..0000000000 --- a/skins/_old/Leency/Latte/me_skin.inc +++ /dev/null @@ -1,235 +0,0 @@ -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - file _fname - load w dword from _bmp.i.biWidth - load h dword from _bmp.i.biHeight - end virtual - align 4 - label _name - .width = w - .height = h - dd w,h - a=54+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - virtual at 0 - file _fname - load r from a+0 - load g from a+1 - load b from a+2 - end virtual - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp,_dtp_sz - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - virtual at 0 - file _dtp - _dtp_sz = $ - end virtual - dd _dtp_sz - file _dtp -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/Luna/build.bat b/skins/_old/Leency/Luna/build.bat index 2f6751da01..2131bf7f71 100644 --- a/skins/_old/Leency/Luna/build.bat +++ b/skins/_old/Leency/Luna/build.bat @@ -1,3 +1,3 @@ -..\fasm default.asm default.skn -..\kpack default.skn +fasm default.asm default.skn +kpack default.skn pause \ No newline at end of file diff --git a/skins/_old/Leency/Luna/default.asm b/skins/_old/Leency/Luna/default.asm index a955919406..4ae3ab214d 100644 --- a/skins/_old/Leency/Luna/default.asm +++ b/skins/_old/Leency/Luna/default.asm @@ -1,4 +1,4 @@ -include 'me_skin.inc' +include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height diff --git a/skins/_old/Leency/Luna/me_skin.inc b/skins/_old/Leency/Luna/me_skin.inc deleted file mode 100644 index ccbb3c191c..0000000000 --- a/skins/_old/Leency/Luna/me_skin.inc +++ /dev/null @@ -1,235 +0,0 @@ -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - file _fname - load w dword from _bmp.i.biWidth - load h dword from _bmp.i.biHeight - end virtual - align 4 - label _name - .width = w - .height = h - dd w,h - a=54+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - virtual at 0 - file _fname - load r from a+0 - load g from a+1 - load b from a+2 - end virtual - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp,_dtp_sz - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - virtual at 0 - file _dtp - _dtp_sz = $ - end virtual - dd _dtp_sz - file _dtp -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/Octo/build.bat b/skins/_old/Leency/Octo/build.bat index 2f6751da01..2131bf7f71 100644 --- a/skins/_old/Leency/Octo/build.bat +++ b/skins/_old/Leency/Octo/build.bat @@ -1,3 +1,3 @@ -..\fasm default.asm default.skn -..\kpack default.skn +fasm default.asm default.skn +kpack default.skn pause \ No newline at end of file diff --git a/skins/_old/Leency/Octo/default.asm b/skins/_old/Leency/Octo/default.asm index ebbc65dfa2..56e060b188 100644 --- a/skins/_old/Leency/Octo/default.asm +++ b/skins/_old/Leency/Octo/default.asm @@ -1,4 +1,4 @@ -include 'me_skin.inc' +include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height diff --git a/skins/_old/Leency/Octo/me_skin.inc b/skins/_old/Leency/Octo/me_skin.inc deleted file mode 100644 index ccbb3c191c..0000000000 --- a/skins/_old/Leency/Octo/me_skin.inc +++ /dev/null @@ -1,235 +0,0 @@ -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - file _fname - load w dword from _bmp.i.biWidth - load h dword from _bmp.i.biHeight - end virtual - align 4 - label _name - .width = w - .height = h - dd w,h - a=54+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - virtual at 0 - file _fname - load r from a+0 - load g from a+1 - load b from a+2 - end virtual - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp,_dtp_sz - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - virtual at 0 - file _dtp - _dtp_sz = $ - end virtual - dd _dtp_sz - file _dtp -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/Octo_flat/default.asm b/skins/_old/Leency/Octo_flat/default.asm index ce07ed2cf6..af0d150ae8 100644 --- a/skins/_old/Leency/Octo_flat/default.asm +++ b/skins/_old/Leency/Octo_flat/default.asm @@ -1,4 +1,4 @@ -include 'me_skin.inc' +include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height diff --git a/skins/_old/Leency/Octo_flat/me_skin.inc b/skins/_old/Leency/Octo_flat/me_skin.inc deleted file mode 100644 index ccbb3c191c..0000000000 --- a/skins/_old/Leency/Octo_flat/me_skin.inc +++ /dev/null @@ -1,235 +0,0 @@ -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - file _fname - load w dword from _bmp.i.biWidth - load h dword from _bmp.i.biHeight - end virtual - align 4 - label _name - .width = w - .height = h - dd w,h - a=54+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - virtual at 0 - file _fname - load r from a+0 - load g from a+1 - load b from a+2 - end virtual - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp,_dtp_sz - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - virtual at 0 - file _dtp - _dtp_sz = $ - end virtual - dd _dtp_sz - file _dtp -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/OpusN/OpusN.asm b/skins/_old/Leency/OpusN/OpusN.asm index 6cc546f291..12b328b062 100644 --- a/skins/_old/Leency/OpusN/OpusN.asm +++ b/skins/_old/Leency/OpusN/OpusN.asm @@ -1,4 +1,4 @@ -include 'my_skin.inc' +include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_base.height,\ ; skin height diff --git a/skins/_old/Leency/OpusN/my_skin.inc b/skins/_old/Leency/OpusN/my_skin.inc deleted file mode 100644 index ccbb3c191c..0000000000 --- a/skins/_old/Leency/OpusN/my_skin.inc +++ /dev/null @@ -1,235 +0,0 @@ -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - file _fname - load w dword from _bmp.i.biWidth - load h dword from _bmp.i.biHeight - end virtual - align 4 - label _name - .width = w - .height = h - dd w,h - a=54+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - virtual at 0 - file _fname - load r from a+0 - load g from a+1 - load b from a+2 - end virtual - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp,_dtp_sz - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - virtual at 0 - file _dtp - _dtp_sz = $ - end virtual - dd _dtp_sz - file _dtp -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/Sandwich/build.bat b/skins/_old/Leency/Sandwich/build.bat index 2f6751da01..2131bf7f71 100644 --- a/skins/_old/Leency/Sandwich/build.bat +++ b/skins/_old/Leency/Sandwich/build.bat @@ -1,3 +1,3 @@ -..\fasm default.asm default.skn -..\kpack default.skn +fasm default.asm default.skn +kpack default.skn pause \ No newline at end of file diff --git a/skins/_old/Leency/Sandwich/default.asm b/skins/_old/Leency/Sandwich/default.asm index e84bbe2cea..2cd55874de 100644 --- a/skins/_old/Leency/Sandwich/default.asm +++ b/skins/_old/Leency/Sandwich/default.asm @@ -1,4 +1,4 @@ -include 'me_skin.inc' +include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height diff --git a/skins/_old/Leency/Sandwich/me_skin.inc b/skins/_old/Leency/Sandwich/me_skin.inc deleted file mode 100644 index ccbb3c191c..0000000000 --- a/skins/_old/Leency/Sandwich/me_skin.inc +++ /dev/null @@ -1,235 +0,0 @@ -;============================================================================ -; This file should be used to generate skins of new standard -;============================================================================ -; skin file structure: -;---------------------------------------------------------------------------- -; header: -; dd 'SKIN' -; dd = version (1 for now) -; dd @ params -; dd @ buttons -; dd @ bitmaps -; ... -;---------------------------------------------------------------------------- -; NOTE: order of sections listed below is insignificant -; since they're identified by pointer in above header -;---------------------------------------------------------------------------- -; ... -; params: -; dd = skin height -; dw = right margin -; dw = left margin -; dw = bottom margin -; dw = top margin -; dd = inner line color -; dd = outer line color -; dd = frame color -; dd = dtp file size -; ?? = dtp file itself -; ... -;---------------------------------------------------------------------------- -; ... -; buttons: -; dd = button type (1 = close, 2 = minimize) -; dw = left button coord (could be negative) -; dw = top button coord (could be negative) -; dw = button width -; dw = button height -; ... etc for all buttons -; dd = 0 (end of buttons list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmaps: -; dw = bitmap kind (1 = left, 2 = oper, 3 = base) -; dw = bitmap type (1 = active, 0 = inactive) -; dd @ bitmap -; ... etc for all bitmaps -; dd 0 (end of bitmaps list) -; ... -;---------------------------------------------------------------------------- -; ... -; bitmap: -; dd = bitmap width -; dd = bitmap height -; ?? = raw bitmap data -; ... etc for all bitmaps -; ... -;============================================================================ - -dd 'SKIN',1,__params__,__buttons__,__bitmaps__ - -struc BITMAPFILEHEADER { - .bfType dw ? ; WORD - .bfSize dd ? ; DWORD - .bfReserved1 dw ? ; WORD - .bfReserved2 dw ? ; WORD - .bfOffBits dd ? ; DWORD -} - -struc BITMAPINFOHEADER { - .biSize dd ? ; DWORD - .biWidth dd ? ; LONG - .biHeight dd ? ; LONG - .biPlanes dw ? ; WORD - .biBitCount dw ? ; WORD - .biCompression dd ? ; DWORD - .biSizeImage dd ? ; DWORD - .biXPelsPerMeter dd ? ; LONG - .biYPelsPerMeter dd ? ; LONG - .biClrUsed dd ? ; DWORD - .biClrImportant dd ? ; DWORD -} - -struc _bmp { - .h BITMAPFILEHEADER - .i BITMAPINFOHEADER -} -virtual at 0 - _bmp _bmp -end virtual - -macro BITMAP _name*,_fname* -{ - local w,h,a,r,g,b - virtual at 0 - file _fname - load w dword from _bmp.i.biWidth - load h dword from _bmp.i.biHeight - end virtual - align 4 - label _name - .width = w - .height = h - dd w,h - a=54+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - virtual at 0 - file _fname - load r from a+0 - load g from a+1 - load b from a+2 - end virtual - db r,g,b - a=a+3 - end repeat - a=a-w*3*2-(w mod 4) - end repeat -} - -macro define_colors name,[col,val] -{ - common - local a,b,c - forward - match =binner,col \{ a = val \} - match =bouter,col \{ b = val \} - match =bframe,col \{ c = val \} - common - name equ a,b,c -} - -macro SKIN_PARAMS [a] -{ - common - local _height,_margins,_colors,_colors_1,_dtp,_dtp_sz - __params__: - forward - match qq == ww,a - \{ - match =height,qq \\{ _height = ww \\} - match =margins,qq \\{ - match [q1:q2:q3:q4],ww - \\\{ - _margins equ q3,q1,q4,q2 - \\\} - \\} - match =colors =active,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =colors =inactive,qq - \\{ - match [q10==q11:q20==q21:q30==q31],ww - \\\{ - define_colors _colors_1,q10,q11,q20,q21,q30,q31 - \\\} - \\} - match =dtp,qq \\{ _dtp equ ww \\} - \} - common - dd _height - dw _margins - dd _colors,_colors_1 - virtual at 0 - file _dtp - _dtp_sz = $ - end virtual - dd _dtp_sz - file _dtp -} - -macro SKIN_BUTTONS [a] -{ - common - local btn - __buttons__: - forward - match qq == ww,a - \{ - btn = 0 - match =close,qq \\{ btn = 1 \\} - match =minimize,qq \\{ btn = 2 \\} - match [q1:q2][q3:q4],ww - \\{ - if btn <> 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/Shkvorka/build.bat b/skins/_old/Leency/Shkvorka/build.bat index 2131bf7f71..8c6c14bc00 100644 --- a/skins/_old/Leency/Shkvorka/build.bat +++ b/skins/_old/Leency/Shkvorka/build.bat @@ -1,3 +1,4 @@ +fasm default.dtp.asm default.dtp fasm default.asm default.skn kpack default.skn pause \ No newline at end of file diff --git a/skins/_old/Leency/Shkvorka/center1.bmp b/skins/_old/Leency/Shkvorka/center1.bmp index 137aa32e4dec5585dbd029abbab97e0ea3b54748..3acbc90ac8e9d5ae8a7033849d3614ca979688c6 100644 GIT binary patch literal 150 zcmY+#!3hH)6olbP7bzhXq=3Drhdo$?m82p?L=X`{LgS;^yyQEXV0E7ynOkR;q~j+ OaQyDwJBE^y5(WV3OFz;8 literal 142 zcmZ?r?PGudGa#h_#Ed{J2Bsx|Bm+YPm_#KWK77bPE`Iv-DZ{g8&lq05e97?o^=pPV QZ{9Hc|Noz%q@;ua06|qdivR!s diff --git a/skins/_old/Leency/Shkvorka/default.asm b/skins/_old/Leency/Shkvorka/default.asm index 6cd77089f9..d7355c292a 100644 --- a/skins/_old/Leency/Shkvorka/default.asm +++ b/skins/_old/Leency/Shkvorka/default.asm @@ -1,19 +1,19 @@ -include 'me_skin.inc' +include '..\me_skin.inc' SKIN_PARAMS \ height = bmp_center1.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xE1E1E1:\ ; border inner color - bouter=0x646464:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - colors inactive = [binner=0xE1E1E1:\ ; border inner color - bouter=0x747474:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color + margins = [6:5:43:3],\ ; margins [left:top:right:bottom] + colors active = [binner=0xE4DFE1:\ ; border inner + bouter=0x646464:\ ; border outer + bframe=0xE4DFE1],\ ; border middle + colors inactive = [binner=0xE4DFE1:\ ; border inner + bouter=0x646464:\ ; border outer + bframe=0xE4DFE1],\ ; border middle dtp = 'default.dtp' ; dtp colors SKIN_BUTTONS \ - close = [-31:1][27:17],\ ; buttons coordinates - minimize = [-58:1][27:17] ; [left:top][width:height] + close = [-31:1][27:18],\ ; buttons coordinates + minimize = [-58:1][27:18] ; [left:top][width:height] SKIN_BITMAPS \ left active = bmp_left1,\ ; skin bitmaps pointers diff --git a/skins/_old/Leency/Shkvorka/default.dtp b/skins/_old/Leency/Shkvorka/default.dtp index b73d804cf8bab0a3d37977de6f984a83c77db318..2a67758b538e95d4ca6fc423df6b4378892ddcb8 100644 GIT binary patch literal 40 icmYdENnt<+#>U1B5AQ!=c=_@rgNus`SgNkBjsXCp>j`TB literal 40 pcmca|)gEG2@liBwzoEnr4?uD22ywIRAspndfp6Q&{)=?B8a{9vQu10d0zIW>lQ_MAm znONUD5kM80%{UzpL?3Dxd$&h)K{Fg~>{=$VrH9DB>IGpS5NSa49px#A*$vH2qD8i1 zg`zdTm&OwN=ns*PoRQ1O39_5DmWMZ@GZK@zhJM>jjSCG;R;O=0El2#?DOiL}IpWqH zdx1RgDA>jK&l`9%QnAl`Yu^r`63W)9JZk+Ll?o7e{=~2$!Dvr(t8FvuG&*(OX-|h|j@>ar}?P2dqOm2cOe}A;Y{asEc)F7m$V3UiX8`?--j+ZQP{B z^xvADQX4#IDTwk)ilTVSKfcY|A2P0}n}rZ}5K zq{S0#XO|YXL3zHsW^-&ssS-rg5-_ekRa;fi{CWk*k&2&D)ox>FExa4G-noXY4uWe7 zA$lWRDZ~vd)Ic8!c!DS4%@Rpwt1Mh9CI~+}9Wgoh6ZZgqM~gqLW?+jW(i^dNV;$?HqR^KhHP6A z<{#Nun*TaqP(EA*OBd0L>xtCU5La9t;Y5DEK{cDq4*yk87^Ewm&?H{K&A2U#!UmnT z?yv;m6}0p7T(To#*ELz04)ga?a_Cv=uIkDDZVt!^0nVmr#-!o 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/Shkvorka/right1.bmp b/skins/_old/Leency/Shkvorka/right1.bmp index 0348384d7cfa2c27894e10fad0482dc843941c3b..90d16741145507a7fdad8ad308dfe0f50472e621 100644 GIT binary patch literal 4374 zcmdUw&1zFo5Xb8q=tg`5pTLzMxc3R%X4NQef{046)YcHI4Sv+7SYnEHQ3P8-5K63A zgGh*4O;XKwn(EnMdFr~XN1IyOsa-FwNq_t5_ zr*mcbc_b2%_L4cBP6HeYy;@s)y}lkkxUH^+NIP~VW0P%?XLR%&%p#I!G8r07w?EsY zXf#UN8DGIWUbMwXC7d66(wSqi*rrXQbkfe=sZ34OY%x*^=ck_VbGaOSPNh;`6@9a$ zcsx$pfWJ0QEOu+6j_F&j)Ob!F2O1=#qcRBi`FtK`rg{)yrBeB+h{Hkg z!o0Zf!xR9p33u`0g%l>V;!nEEe`ki1VL&=_p-@m6D1>SEdcCIy0&YNbnyP2tp;x3{=EY#kf~jRnpCQqiYqc7E zuGi}p@J#>YfXr%{!VITOFMWnqm>CaS^pBX~l<9@J(P+S|X&Q&NNJj3(a{Jj*%N8S* eaLV-Jce`DfS?yA%(;;o>WyeMnP9ek}M*RUj7f_V| literal 4014 zcmdUwO=}ZD7{}u$@Fso)KY=Gf@a`w@no}cq2_jO0Z>b?xTYPPbWlhl>ifCI9ym+uE zG!zf5^bi`9P@5OiY<81|M1sU$^OSMfo%GTXyMO+>JoC)#Gr!EvY%W}Ub22j2S?*`J z&T*aMIuSX|JrcQg&_8S(+)80nG#U*Xaw)vb&1SRH>Fgd?*|yziG}L}zodM40^YM6` z_;@N7i!CiKS1J|329gy9c;(}#)z!6)jZGt_?5*)_LoQNhZ0s_-z{|`Og+f6s{t*L; zQ*h>CZ8BLmVoFiaaU36Wxm-RXs(M_QtxSFDuC4X`$L&`La!sE%S@$T`|| z2I+@R?3r{reLf(Py5ajdVP1OOemrRhJ)NrG87~b6gD-1sq5Ztlph=Rh;CM2W8pRA= zP<&ys+3cl&NCpQ>hM&(AOf)m?Xg!fA0W8=OY_7LSY6p`%gqhc^6`yp@tXF)}wId~| znCG54TF*YR@z?czY(yX#?O>9JFxL%9F~68~u$B31nsd)=eDnI&w_;D231~{*_lPuu z%-wF6SII=|LnHDr&p&s(wlemE)b{t{FMzqLfFxZ4=^alj%&zP13uRGlEG5h6e&b4jSmA7RaWSL4?dHDJhw}ka68) zA12O?Z_jfwKYaLb@_w$3{7;`g1xo$+@dHSH{rYusBe&b+qulY#&z?P-+|Rp_`Q^)( MKzjS;dpsAI0I-mZZ2$lO delta 97 zcmbQHv`*g4$#)$;0~nYANev*j0b(&AW@L~6k_-$LP 0 - dd btn - dw q1,q2,q3,q4 - end if - \\} - \} - common - dd 0 -} - -macro SKIN_BITMAPS [a] -{ - common - local bmp - __bitmaps__: - forward - match qq == ww,a - \{ - bmp=-1 - match qqq =active,qq \\{ bmp = 1 \\} - match qqq =inactive,qq \\{ bmp = 0 \\} - match =left qqq,qq - \\{ - if bmp >= 0 - dw 1,bmp - dd ww - end if - \\} - match =oper qqq,qq - \\{ - if bmp >= 0 - dw 2,bmp - dd ww - end if - \\} - match =base qqq,qq - \\{ - if bmp >= 0 - dw 3,bmp - dd ww - end if - \\} - \} - common - dd 0 -} \ No newline at end of file diff --git a/skins/_old/Leency/AreaO/me_skin.inc b/skins/_old/Leency/me_skin.inc similarity index 100% rename from skins/_old/Leency/AreaO/me_skin.inc rename to skins/_old/Leency/me_skin.inc