diff --git a/skins/_old/Flowers/BLUE.DTP b/skins/_old/Flowers/BLUE.DTP deleted file mode 100644 index b4bbc6d722..0000000000 Binary files a/skins/_old/Flowers/BLUE.DTP and /dev/null differ diff --git a/skins/_old/Flowers/Flowers.asm b/skins/_old/Flowers/Flowers.asm deleted file mode 100644 index 75c7945063..0000000000 --- a/skins/_old/Flowers/Flowers.asm +++ /dev/null @@ -1,38 +0,0 @@ - -; -- ONLY FOR GIRLS -- - -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [6:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x0077AA:\ ; border inner color - bouter=0x0077AA:\ ; border outer color - bframe=0x039BDB],\ ; border frame color - colors inactive = [binner=0x0077AA:\ ; border inner color - bouter=0x0077AA:\ ; border outer color - bframe=0x039BDB],\ ; border frame color - dtp = 'BLUE.DTP' ; dtp colors - -SKIN_BUTTONS \ - close = [-29:1][21:22],\ ; buttons coordinates - minimize = [-51:1][21:22] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' - -;================================; -; Created by Rock_maniak_forever ; -;================================; diff --git a/skins/_old/Flowers/Tupfile.lua b/skins/_old/Flowers/Tupfile.lua deleted file mode 100644 index 55d96bd14a..0000000000 --- a/skins/_old/Flowers/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Flowers.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Flowers.skn") diff --git a/skins/_old/Flowers/active/base.bmp b/skins/_old/Flowers/active/base.bmp deleted file mode 100644 index 0f888b7a2a..0000000000 Binary files a/skins/_old/Flowers/active/base.bmp and /dev/null differ diff --git a/skins/_old/Flowers/active/left.bmp b/skins/_old/Flowers/active/left.bmp deleted file mode 100644 index c7a33d9393..0000000000 Binary files a/skins/_old/Flowers/active/left.bmp and /dev/null differ diff --git a/skins/_old/Flowers/active/oper.bmp b/skins/_old/Flowers/active/oper.bmp deleted file mode 100644 index 2c611e5c71..0000000000 Binary files a/skins/_old/Flowers/active/oper.bmp and /dev/null differ diff --git a/skins/_old/Flowers/inactive/base.bmp b/skins/_old/Flowers/inactive/base.bmp deleted file mode 100644 index 98787fbf00..0000000000 Binary files a/skins/_old/Flowers/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/Flowers/inactive/left.bmp b/skins/_old/Flowers/inactive/left.bmp deleted file mode 100644 index aae863a62f..0000000000 Binary files a/skins/_old/Flowers/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/Flowers/inactive/oper.bmp b/skins/_old/Flowers/inactive/oper.bmp deleted file mode 100644 index b800fa7278..0000000000 Binary files a/skins/_old/Flowers/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/Leency/Sandwich/Tupfile.lua b/skins/_old/Leency/Sandwich/Tupfile.lua deleted file mode 100644 index e2ffd8cdcb..0000000000 --- a/skins/_old/Leency/Sandwich/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Sandwich.skn") diff --git a/skins/_old/Leency/Sandwich/build.bat b/skins/_old/Leency/Sandwich/build.bat deleted file mode 100644 index 2131bf7f71..0000000000 --- a/skins/_old/Leency/Sandwich/build.bat +++ /dev/null @@ -1,3 +0,0 @@ -fasm default.asm default.skn -kpack default.skn -pause \ No newline at end of file diff --git a/skins/_old/Leency/Sandwich/center1.bmp b/skins/_old/Leency/Sandwich/center1.bmp deleted file mode 100644 index 67e4f35f24..0000000000 Binary files a/skins/_old/Leency/Sandwich/center1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Sandwich/center2.bmp b/skins/_old/Leency/Sandwich/center2.bmp deleted file mode 100644 index 67e4f35f24..0000000000 Binary files a/skins/_old/Leency/Sandwich/center2.bmp and /dev/null differ diff --git a/skins/_old/Leency/Sandwich/default.asm b/skins/_old/Leency/Sandwich/default.asm deleted file mode 100644 index fa50622d9d..0000000000 --- a/skins/_old/Leency/Sandwich/default.asm +++ /dev/null @@ -1,31 +0,0 @@ -include '..\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=0x3E3635:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - colors inactive = [binner=0xE1E1E1:\ ; border inner color - bouter=0x3E3635:\ ; border outer color - bframe=0xE1E1E1],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-18:4][13:14],\ ; buttons coordinates - minimize = [-36:4][13:14] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left1,\ ; skin bitmaps pointers - left inactive = bmp_left2,\ - oper active = bmp_right1,\ - oper inactive = bmp_right2,\ - base active = bmp_center1,\ - base inactive = bmp_center2 - -BITMAP bmp_left1, 'left1.bmp' ; skin bitmaps -BITMAP bmp_left2, 'left2.bmp' -BITMAP bmp_right1, 'right1.bmp' -BITMAP bmp_right2, 'right2.bmp' -BITMAP bmp_center1,'center1.bmp' -BITMAP bmp_center2,'center2.bmp' diff --git a/skins/_old/Leency/Sandwich/default.dtp b/skins/_old/Leency/Sandwich/default.dtp deleted file mode 100644 index 9e19447b76..0000000000 Binary files a/skins/_old/Leency/Sandwich/default.dtp and /dev/null differ diff --git a/skins/_old/Leency/Sandwich/default.dtp.asm b/skins/_old/Leency/Sandwich/default.dtp.asm deleted file mode 100644 index a182bb44b3..0000000000 --- a/skins/_old/Leency/Sandwich/default.dtp.asm +++ /dev/null @@ -1,14 +0,0 @@ -struc system_colors - { - .frame dd 0x000000 - .grab dd 0x006393 - .grab_button dd 0xB1B1B1 - .grab_button_text dd 0x000000 - .grab_text dd 0xFFFFFF - .work dd 0xE8E8E8 - .work_button dd 0xB1B1B1 - .work_button_text dd 0x000000 - .work_text dd 0x000000 - .work_graph dd 0x000000 - } -struct system_colors \ No newline at end of file diff --git a/skins/_old/Leency/Sandwich/left1.bmp b/skins/_old/Leency/Sandwich/left1.bmp deleted file mode 100644 index a9c38fee44..0000000000 Binary files a/skins/_old/Leency/Sandwich/left1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Sandwich/left2.bmp b/skins/_old/Leency/Sandwich/left2.bmp deleted file mode 100644 index a9c38fee44..0000000000 Binary files a/skins/_old/Leency/Sandwich/left2.bmp and /dev/null differ diff --git a/skins/_old/Leency/Sandwich/right1.bmp b/skins/_old/Leency/Sandwich/right1.bmp deleted file mode 100644 index 294b94c567..0000000000 Binary files a/skins/_old/Leency/Sandwich/right1.bmp and /dev/null differ diff --git a/skins/_old/Leency/Sandwich/right2.bmp b/skins/_old/Leency/Sandwich/right2.bmp deleted file mode 100644 index 996a2a57a4..0000000000 Binary files a/skins/_old/Leency/Sandwich/right2.bmp and /dev/null differ diff --git a/skins/_old/Leency/scr_all.PNG b/skins/_old/Leency/scr_all.PNG deleted file mode 100644 index 5e41e9cff5..0000000000 Binary files a/skins/_old/Leency/scr_all.PNG and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/Aqua.asm b/skins/_old/SashSkinPack_1_1/Src/Aqua/Aqua.asm deleted file mode 100644 index 67023f97ea..0000000000 --- a/skins/_old/SashSkinPack_1_1/Src/Aqua/Aqua.asm +++ /dev/null @@ -1,31 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0x49b2d5:\ ; border inner color - bouter=0x4fc0e5:\ ; border outer color - bframe=0x2cb9e9],\ ; border frame color - colors inactive = [binner=0x47899f:\ ; border inner color - bouter=0x47899f:\ ; border outer color - bframe=0x47899f],\ ; border frame color - dtp = 'colors.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:0][21:22],\ ; buttons coordinates - minimize = [-42:0][21:22] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/Tupfile.lua b/skins/_old/SashSkinPack_1_1/Src/Aqua/Tupfile.lua deleted file mode 100644 index a03203fdb3..0000000000 --- a/skins/_old/SashSkinPack_1_1/Src/Aqua/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Aqua.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Aqua.skn") diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/active/base.bmp b/skins/_old/SashSkinPack_1_1/Src/Aqua/active/base.bmp deleted file mode 100644 index 4d27547927..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Aqua/active/base.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/active/left.bmp b/skins/_old/SashSkinPack_1_1/Src/Aqua/active/left.bmp deleted file mode 100644 index fd23fd77fe..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Aqua/active/left.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/active/oper.bmp b/skins/_old/SashSkinPack_1_1/Src/Aqua/active/oper.bmp deleted file mode 100644 index 75ca57784e..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Aqua/active/oper.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/colors.dtp b/skins/_old/SashSkinPack_1_1/Src/Aqua/colors.dtp deleted file mode 100644 index cc04bd7a14..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Aqua/colors.dtp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/base.bmp b/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/base.bmp deleted file mode 100644 index 55fb4e2d7c..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/left.bmp b/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/left.bmp deleted file mode 100644 index ca236029c4..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/oper.bmp b/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/oper.bmp deleted file mode 100644 index 126f17afad..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Aqua/skin.inc b/skins/_old/SashSkinPack_1_1/Src/Aqua/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/SashSkinPack_1_1/Src/Aqua/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; 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 equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - 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 - __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 - dd @f - $ - 4 - 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 -} diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/Cold.asm b/skins/_old/SashSkinPack_1_1/Src/Cold/Cold.asm deleted file mode 100644 index 9d7079926f..0000000000 --- a/skins/_old/SashSkinPack_1_1/Src/Cold/Cold.asm +++ /dev/null @@ -1,31 +0,0 @@ -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:43:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xa9b2b4:\ ; border inner color - bouter=0x909698:\ ; border outer color - bframe=0xa9b2b4],\ ; border frame color - colors inactive = [binner=0xa9b2b4:\ ; border inner color - bouter=0x909698:\ ; border outer color - bframe=0xa9b2b4],\ ; border frame color - dtp = 'colors.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-21:4][16:16],\ ; buttons coordinates - minimize = [-41:4][16:18] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'active/left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'active/oper.bmp' -BITMAP bmp_base ,'active/base.bmp' -BITMAP bmp_left1,'inactive/left.bmp' -BITMAP bmp_oper1,'inactive/oper.bmp' -BITMAP bmp_base1,'inactive/base.bmp' diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/Tupfile.lua b/skins/_old/SashSkinPack_1_1/Src/Cold/Tupfile.lua deleted file mode 100644 index 49b05f9554..0000000000 --- a/skins/_old/SashSkinPack_1_1/Src/Cold/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("Cold.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Cold.skn") diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/active/base.bmp b/skins/_old/SashSkinPack_1_1/Src/Cold/active/base.bmp deleted file mode 100644 index b634b9f0c5..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Cold/active/base.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/active/left.bmp b/skins/_old/SashSkinPack_1_1/Src/Cold/active/left.bmp deleted file mode 100644 index 358047c6ba..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Cold/active/left.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/active/oper.bmp b/skins/_old/SashSkinPack_1_1/Src/Cold/active/oper.bmp deleted file mode 100644 index 588167933d..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Cold/active/oper.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/colors.dtp b/skins/_old/SashSkinPack_1_1/Src/Cold/colors.dtp deleted file mode 100644 index ce0d83d2f7..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Cold/colors.dtp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/base.bmp b/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/base.bmp deleted file mode 100644 index c48976ca0f..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/base.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/left.bmp b/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/left.bmp deleted file mode 100644 index af0d8cb9e2..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/left.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/oper.bmp b/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/oper.bmp deleted file mode 100644 index e4ff59075a..0000000000 Binary files a/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/oper.bmp and /dev/null differ diff --git a/skins/_old/SashSkinPack_1_1/Src/Cold/skin.inc b/skins/_old/SashSkinPack_1_1/Src/Cold/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/SashSkinPack_1_1/Src/Cold/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; 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 equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - 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 - __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 - dd @f - $ - 4 - 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 -} diff --git a/skins/_old/mursky/skin.inc b/skins/_old/mursky/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/mursky/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; 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 equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - 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 - __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 - dd @f - $ - 4 - 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 -} diff --git a/skins/_old/sea/Tupfile.lua b/skins/_old/sea/Tupfile.lua deleted file mode 100644 index 2750ed97ce..0000000000 --- a/skins/_old/sea/Tupfile.lua +++ /dev/null @@ -1,2 +0,0 @@ -if tup.getconfig("NO_FASM") ~= "" then return end -tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "sea.skn") diff --git a/skins/_old/sea/base.bmp b/skins/_old/sea/base.bmp deleted file mode 100644 index b2b3715002..0000000000 Binary files a/skins/_old/sea/base.bmp and /dev/null differ diff --git a/skins/_old/sea/base_1.bmp b/skins/_old/sea/base_1.bmp deleted file mode 100644 index b2b3715002..0000000000 Binary files a/skins/_old/sea/base_1.bmp and /dev/null differ diff --git a/skins/_old/sea/default.asm b/skins/_old/sea/default.asm deleted file mode 100644 index 0bbf6a1cd8..0000000000 --- a/skins/_old/sea/default.asm +++ /dev/null @@ -1,33 +0,0 @@ -;SKIN (.SKN) - COMPILE WITH FASM - -include 'skin.inc' - -SKIN_PARAMS \ - height = bmp_base.height,\ ; skin height - margins = [5:1:66:1],\ ; margins [left:top:right:bottom] - colors active = [binner=0xD1D1D1:\ ; border inner color - bouter=0x22a68c:\ ; border outer color - bframe=0xf3f3f3],\ ; border frame color - colors inactive = [binner=0xD1D1D1:\ ; border inner color - bouter=0x22a68c:\ ; border outer color - bframe=0xf3f3f3],\ ; border frame color - dtp = 'default.dtp' ; dtp colors - -SKIN_BUTTONS \ - close = [-32:3][28:17],\ ; buttons coordinates - minimize = [-61:3][28:17] ; [left:top][width:height] - -SKIN_BITMAPS \ - left active = bmp_left,\ ; skin bitmaps pointers - left inactive = bmp_left1,\ - oper active = bmp_oper,\ - oper inactive = bmp_oper1,\ - base active = bmp_base,\ - base inactive = bmp_base1 - -BITMAP bmp_left ,'left.bmp' ; skin bitmaps -BITMAP bmp_oper ,'oper.bmp' -BITMAP bmp_base ,'base.bmp' -BITMAP bmp_left1,'left_1.bmp' -BITMAP bmp_oper1,'oper_1.bmp' -BITMAP bmp_base1,'base_1.bmp' diff --git a/skins/_old/sea/default.dtp b/skins/_old/sea/default.dtp deleted file mode 100644 index 769a41a18c..0000000000 Binary files a/skins/_old/sea/default.dtp and /dev/null differ diff --git a/skins/_old/sea/default.dtp.asm b/skins/_old/sea/default.dtp.asm deleted file mode 100644 index 2c9757c657..0000000000 --- a/skins/_old/sea/default.dtp.asm +++ /dev/null @@ -1,11 +0,0 @@ -;SYSTEM COLORS (.DTP) - COMPILE WITH FASM -frame dd 0x22a68c -grab dd 0x56d6c2 -grab_button dd 0x4ea39d -grab_button_text dd 0xffffff -grab_text dd 0xffffff -work dd 0xf3f3f3 -work_button dd 0xd8d8d8 -work_button_text dd 0x000000 -work_text dd 0x000000 -work_graph dd 0xD1D1D1 \ No newline at end of file diff --git a/skins/_old/sea/dtp_build.bat b/skins/_old/sea/dtp_build.bat deleted file mode 100644 index 2fddee0e38..0000000000 --- a/skins/_old/sea/dtp_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.dtp.asm default.dtp -pause \ No newline at end of file diff --git a/skins/_old/sea/left.bmp b/skins/_old/sea/left.bmp deleted file mode 100644 index 6bd322bf69..0000000000 Binary files a/skins/_old/sea/left.bmp and /dev/null differ diff --git a/skins/_old/sea/left_1.bmp b/skins/_old/sea/left_1.bmp deleted file mode 100644 index 6bd322bf69..0000000000 Binary files a/skins/_old/sea/left_1.bmp and /dev/null differ diff --git a/skins/_old/sea/oper.bmp b/skins/_old/sea/oper.bmp deleted file mode 100644 index 216593e514..0000000000 Binary files a/skins/_old/sea/oper.bmp and /dev/null differ diff --git a/skins/_old/sea/oper_1.bmp b/skins/_old/sea/oper_1.bmp deleted file mode 100644 index b560529d48..0000000000 Binary files a/skins/_old/sea/oper_1.bmp and /dev/null differ diff --git a/skins/_old/sea/pack_build.bat b/skins/_old/sea/pack_build.bat deleted file mode 100644 index 7e7d474b2c..0000000000 --- a/skins/_old/sea/pack_build.bat +++ /dev/null @@ -1 +0,0 @@ -kpack default.skn default.pack.skn diff --git a/skins/_old/sea/skin.inc b/skins/_old/sea/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/sea/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; 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 equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - 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 - __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 - dd @f - $ - 4 - 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 -} diff --git a/skins/_old/sea/skn_build.bat b/skins/_old/sea/skn_build.bat deleted file mode 100644 index 2828114c6b..0000000000 --- a/skins/_old/sea/skn_build.bat +++ /dev/null @@ -1,2 +0,0 @@ -fasm default.asm default.skn -pause \ No newline at end of file diff --git a/skins/_old/testtest/skin.inc b/skins/_old/testtest/skin.inc deleted file mode 100644 index 81a6bd8f3f..0000000000 --- a/skins/_old/testtest/skin.inc +++ /dev/null @@ -1,239 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;; -;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;; -;; Distributed under terms of the GNU General Public License ;; -;; ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;============================================================================ -; 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 equ _#_name - _file:: - file _fname - end virtual - load w dword from _file:_bmp.i.biWidth - load h dword from _file:_bmp.i.biHeight - load hsize dword from _file:_bmp.h.bfOffBits - align 4 - label _name - .width = w - .height = h - dd w,h - a=hsize+(w*3+(w mod 4))*(h-1) - size = $ - repeat h - repeat w - load r from _file:a+0 - load g from _file:a+1 - load b from _file:a+2 - 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 - __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 - dd @f - $ - 4 - 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 -} diff --git a/skins/_old/mursky/Tupfile.lua b/skins/dunkaist/mursky/Tupfile.lua similarity index 100% rename from skins/_old/mursky/Tupfile.lua rename to skins/dunkaist/mursky/Tupfile.lua diff --git a/skins/_old/mursky/active/base.bmp b/skins/dunkaist/mursky/active/base.bmp similarity index 100% rename from skins/_old/mursky/active/base.bmp rename to skins/dunkaist/mursky/active/base.bmp diff --git a/skins/_old/mursky/active/left.bmp b/skins/dunkaist/mursky/active/left.bmp similarity index 100% rename from skins/_old/mursky/active/left.bmp rename to skins/dunkaist/mursky/active/left.bmp diff --git a/skins/_old/mursky/active/oper.bmp b/skins/dunkaist/mursky/active/oper.bmp similarity index 100% rename from skins/_old/mursky/active/oper.bmp rename to skins/dunkaist/mursky/active/oper.bmp diff --git a/skins/_old/mursky/dtp.asm b/skins/dunkaist/mursky/dtp.asm similarity index 100% rename from skins/_old/mursky/dtp.asm rename to skins/dunkaist/mursky/dtp.asm diff --git a/skins/_old/mursky/inactive/base.bmp b/skins/dunkaist/mursky/inactive/base.bmp similarity index 100% rename from skins/_old/mursky/inactive/base.bmp rename to skins/dunkaist/mursky/inactive/base.bmp diff --git a/skins/_old/mursky/inactive/left.bmp b/skins/dunkaist/mursky/inactive/left.bmp similarity index 100% rename from skins/_old/mursky/inactive/left.bmp rename to skins/dunkaist/mursky/inactive/left.bmp diff --git a/skins/_old/mursky/inactive/oper.bmp b/skins/dunkaist/mursky/inactive/oper.bmp similarity index 100% rename from skins/_old/mursky/inactive/oper.bmp rename to skins/dunkaist/mursky/inactive/oper.bmp diff --git a/skins/_old/mursky/mursky.asm b/skins/dunkaist/mursky/mursky.asm similarity index 100% rename from skins/_old/mursky/mursky.asm rename to skins/dunkaist/mursky/mursky.asm diff --git a/skins/_old/mursky/mursky.png b/skins/dunkaist/mursky/mursky.png similarity index 100% rename from skins/_old/mursky/mursky.png rename to skins/dunkaist/mursky/mursky.png diff --git a/skins/_old/Flowers/skin.inc b/skins/dunkaist/mursky/skin.inc similarity index 100% rename from skins/_old/Flowers/skin.inc rename to skins/dunkaist/mursky/skin.inc diff --git a/skins/_old/testtest/Tupfile.lua b/skins/dunkaist/testtest/Tupfile.lua similarity index 100% rename from skins/_old/testtest/Tupfile.lua rename to skins/dunkaist/testtest/Tupfile.lua diff --git a/skins/_old/testtest/active/base.bmp b/skins/dunkaist/testtest/active/base.bmp similarity index 100% rename from skins/_old/testtest/active/base.bmp rename to skins/dunkaist/testtest/active/base.bmp diff --git a/skins/_old/testtest/active/left.bmp b/skins/dunkaist/testtest/active/left.bmp similarity index 100% rename from skins/_old/testtest/active/left.bmp rename to skins/dunkaist/testtest/active/left.bmp diff --git a/skins/_old/testtest/active/oper.bmp b/skins/dunkaist/testtest/active/oper.bmp similarity index 100% rename from skins/_old/testtest/active/oper.bmp rename to skins/dunkaist/testtest/active/oper.bmp diff --git a/skins/_old/testtest/dtp.asm b/skins/dunkaist/testtest/dtp.asm similarity index 100% rename from skins/_old/testtest/dtp.asm rename to skins/dunkaist/testtest/dtp.asm diff --git a/skins/_old/testtest/inactive/base.bmp b/skins/dunkaist/testtest/inactive/base.bmp similarity index 100% rename from skins/_old/testtest/inactive/base.bmp rename to skins/dunkaist/testtest/inactive/base.bmp diff --git a/skins/_old/testtest/inactive/left.bmp b/skins/dunkaist/testtest/inactive/left.bmp similarity index 100% rename from skins/_old/testtest/inactive/left.bmp rename to skins/dunkaist/testtest/inactive/left.bmp diff --git a/skins/_old/testtest/inactive/oper.bmp b/skins/dunkaist/testtest/inactive/oper.bmp similarity index 100% rename from skins/_old/testtest/inactive/oper.bmp rename to skins/dunkaist/testtest/inactive/oper.bmp diff --git a/skins/_old/Leency/skin.inc b/skins/dunkaist/testtest/skin.inc similarity index 100% rename from skins/_old/Leency/skin.inc rename to skins/dunkaist/testtest/skin.inc diff --git a/skins/_old/testtest/testtest.asm b/skins/dunkaist/testtest/testtest.asm similarity index 100% rename from skins/_old/testtest/testtest.asm rename to skins/dunkaist/testtest/testtest.asm diff --git a/skins/skinlist.lua b/skins/skinlist.lua index 102a300f2c..7dfeb158ea 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -46,7 +46,6 @@ skinlist = { "_old/humanoid_OSX/humanoid_OSX_green/humanoid_OSX_green.skn", "_old/humanoid_OSX/humanoid_OSX_col/humanoid_OSX_col.skn", "_old/khrome2/khrome2.skn", -"_old/Leency/Sandwich/Sandwich.skn", "_old/lightskin/lightskin.skn", "_old/macos_l/macos_l.skn", "_old/mage-scroll/mage-scroll.skn", @@ -63,9 +62,6 @@ skinlist = { "_old/OpusOs_Blue/OpusOs_Blue.skn", "_old/RoboTech/BRoboTech/BRoboTech.skn", "_old/Sad_grey/Sad_grey.skn", -"_old/SashSkinPack_1_1/Src/Aqua/Aqua.skn", -"_old/SashSkinPack_1_1/Src/Cold/Cold.skn", -"_old/sea/sea.skn", "_old/Simple_gray/Simple_gray.skn", "_old/skin_feol/skin_feol.skn", "_old/skin_feol_new/skin_feol_new.skn",