diff --git a/skins/LucidChocolate/LucidChocolate.asm b/skins/LucidChocolate/LucidChocolate.asm new file mode 100644 index 0000000000..ea97363a50 --- /dev/null +++ b/skins/LucidChocolate/LucidChocolate.asm @@ -0,0 +1,31 @@ +include 'skin.inc' + +SKIN_PARAMS \ + height = bmp_base.height,\ ; skin height + margins = [5:1:60:1],\ ; margins [left:top:right:bottom] + colors active = [binner=0xf0ebe2:\ ; border inner color + bouter=0x625a4d:\ ; border outer color + bframe=0xf0ebe2],\ ; border frame color + colors inactive = [binner=0xf0ebe2:\ ; border inner color + bouter=0x625a4d:\ ; border outer color + bframe=0xf0ebe2],\ ; border frame color + dtp = 'default.dtp' ; dtp colors + +SKIN_BUTTONS \ + close = [-23:5][15:16],\ ; buttons coordinates + minimize = [-39:5][15:16] ; [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' \ No newline at end of file diff --git a/skins/LucidChocolate/Tupfile.lua b/skins/LucidChocolate/Tupfile.lua new file mode 100644 index 0000000000..3476fbc287 --- /dev/null +++ b/skins/LucidChocolate/Tupfile.lua @@ -0,0 +1,2 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("LucidChocolate.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "LucidChocolate.skn") diff --git a/skins/LucidChocolate/base.bmp b/skins/LucidChocolate/base.bmp new file mode 100644 index 0000000000..7dfb78b01d Binary files /dev/null and b/skins/LucidChocolate/base.bmp differ diff --git a/skins/LucidChocolate/base_1.bmp b/skins/LucidChocolate/base_1.bmp new file mode 100644 index 0000000000..7dfb78b01d Binary files /dev/null and b/skins/LucidChocolate/base_1.bmp differ diff --git a/skins/LucidChocolate/build.bat b/skins/LucidChocolate/build.bat new file mode 100644 index 0000000000..f0abd9e0e8 --- /dev/null +++ b/skins/LucidChocolate/build.bat @@ -0,0 +1,4 @@ +@del default.skn +@fasm default.dtp.asm default.dtp +@fasm LucidChocolate.asm default.skn +@del default.dtp diff --git a/skins/LucidChocolate/default.dtp.asm b/skins/LucidChocolate/default.dtp.asm new file mode 100644 index 0000000000..48729c5d50 --- /dev/null +++ b/skins/LucidChocolate/default.dtp.asm @@ -0,0 +1,11 @@ +;SYSTEM COLORS (.DTP) - COMPILE WITH FASM +frame dd 0x3c3b37 +grab dd 0x5a5954 +grab_button dd 0x625a4d +grab_button_text dd 0xFFFFFF +grab_text dd 0xFFFFFF +work dd 0xf0ebe2 +work_button dd 0xD0C3B2 +work_button_text dd 0x000000 +work_text dd 0x000000 +work_graph dd 0xccbfa9 \ No newline at end of file diff --git a/skins/LucidChocolate/left.bmp b/skins/LucidChocolate/left.bmp new file mode 100644 index 0000000000..811adc4500 Binary files /dev/null and b/skins/LucidChocolate/left.bmp differ diff --git a/skins/LucidChocolate/left_1.bmp b/skins/LucidChocolate/left_1.bmp new file mode 100644 index 0000000000..811adc4500 Binary files /dev/null and b/skins/LucidChocolate/left_1.bmp differ diff --git a/skins/LucidChocolate/oper.bmp b/skins/LucidChocolate/oper.bmp new file mode 100644 index 0000000000..69b672f8d4 Binary files /dev/null and b/skins/LucidChocolate/oper.bmp differ diff --git a/skins/LucidChocolate/oper_1.bmp b/skins/LucidChocolate/oper_1.bmp new file mode 100644 index 0000000000..f4a589c3f3 Binary files /dev/null and b/skins/LucidChocolate/oper_1.bmp differ diff --git a/skins/LucidChocolate/skin.inc b/skins/LucidChocolate/skin.inc new file mode 100644 index 0000000000..81a6bd8f3f --- /dev/null +++ b/skins/LucidChocolate/skin.inc @@ -0,0 +1,239 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; ;; +;; 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/skinlist.lua b/skins/skinlist.lua index f35532bcdf..c61baa0614 100644 --- a/skins/skinlist.lua +++ b/skins/skinlist.lua @@ -11,6 +11,7 @@ skinlist = { "Leency/Workbench/Workbench.skn", "Leency/Yeah/Yeah.skn", "loggy/loggy.skn", +"LucidChocolate/LucidChocolate.skn", "night/night.skn", "Win10/Win10.skn", "_old/5imple Alpha/1.5imple Alpha/1.5imple Alpha.skn",