From 4dd5556f1ddd22b487c76adf5ce888888d309399 Mon Sep 17 00:00:00 2001 From: ConLenov Date: Mon, 4 Mar 2024 08:20:33 +0000 Subject: [PATCH] Add Yaru skin from ConLenov git-svn-id: svn://kolibrios.org@9982 a494cfbc-eb01-0410-851d-a64ba20cac60 --- skins/ConLenov/Yaru/Tupfile.lua | 3 + skins/ConLenov/Yaru/Yaru.asm | 31 ++++ skins/ConLenov/Yaru/base.bmp | Bin 0 -> 150 bytes skins/ConLenov/Yaru/base_1.bmp | Bin 0 -> 150 bytes skins/ConLenov/Yaru/build.bat | 4 + skins/ConLenov/Yaru/default.dtp.asm | 14 ++ skins/ConLenov/Yaru/left.bmp | Bin 0 -> 438 bytes skins/ConLenov/Yaru/left_1.bmp | Bin 0 -> 438 bytes skins/ConLenov/Yaru/oper.bmp | Bin 0 -> 4374 bytes skins/ConLenov/Yaru/oper_1.bmp | Bin 0 -> 4374 bytes skins/ConLenov/Yaru/skin.inc | 239 ++++++++++++++++++++++++++++ 11 files changed, 291 insertions(+) create mode 100644 skins/ConLenov/Yaru/Tupfile.lua create mode 100644 skins/ConLenov/Yaru/Yaru.asm create mode 100644 skins/ConLenov/Yaru/base.bmp create mode 100644 skins/ConLenov/Yaru/base_1.bmp create mode 100644 skins/ConLenov/Yaru/build.bat create mode 100644 skins/ConLenov/Yaru/default.dtp.asm create mode 100644 skins/ConLenov/Yaru/left.bmp create mode 100644 skins/ConLenov/Yaru/left_1.bmp create mode 100644 skins/ConLenov/Yaru/oper.bmp create mode 100644 skins/ConLenov/Yaru/oper_1.bmp create mode 100644 skins/ConLenov/Yaru/skin.inc diff --git a/skins/ConLenov/Yaru/Tupfile.lua b/skins/ConLenov/Yaru/Tupfile.lua new file mode 100644 index 0000000000..4045c2f496 --- /dev/null +++ b/skins/ConLenov/Yaru/Tupfile.lua @@ -0,0 +1,3 @@ +if tup.getconfig("NO_FASM") ~= "" then return end +tup.rule("default.dtp.asm", 'fasm "%f" "%o"', "default.dtp") +tup.rule({"Yaru.asm", extra_inputs = {"default.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Yaru.skn") diff --git a/skins/ConLenov/Yaru/Yaru.asm b/skins/ConLenov/Yaru/Yaru.asm new file mode 100644 index 0000000000..7841fac033 --- /dev/null +++ b/skins/ConLenov/Yaru/Yaru.asm @@ -0,0 +1,31 @@ +include '../../skin.inc' + +SKIN_PARAMS \ + height = bmp_base.height,\ ; skin height + margins = [6:1:43:1],\ ; margins [left:top:right:bottom] + colors active = [binner=0xFAFAFA:\ ; border inner color + bouter=0x232323:\ ; border outer color + bframe=0xFAFAFA],\ ; border frame color + colors inactive = [binner=0xFAFAFA:\ ; border inner color + bouter=0x222222:\ ; border outer color + bframe=0xFAFAFA],\ ; border frame color + dtp = 'default.dtp' ; dtp colors + +SKIN_BUTTONS \ + close = [-22:5][14:14],\ ; buttons coordinates + minimize = [-49:5][14:14] ; [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/ConLenov/Yaru/base.bmp b/skins/ConLenov/Yaru/base.bmp new file mode 100644 index 0000000000000000000000000000000000000000..dd101798481aa301cbb379521c1a163cee58af2a GIT binary patch literal 150 zcmZ?royGtGWyECIxfV3L91fdB);5k3e83WI^tPy@=!$_55TLko?%nLhC~ z8qQ>dvyN4Yn(G23|8q(Km(|=?YTFbLG-Lq7S;rz;#e26x$V)V&82m`vCKr#(2g=Pl z=22))MdNDOmf~{uK)D%f2%|dtg}#9)R%Z{0n}KNidLlgi2%;w12 literal 0 HcmV?d00001 diff --git a/skins/ConLenov/Yaru/oper_1.bmp b/skins/ConLenov/Yaru/oper_1.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ec0f6d6768c35e29eabe677e08421d2c0fc7b272 GIT binary patch literal 4374 zcmeH|O>ToQ5QW_fMCqo=x~rU^D-v3ihyX=YqC}zjA<&zpSLs1|6Z(oJ%Y`A8v*=(c zBikAeX7urF#$J4PD;j&iI7N5RC+IiLD8$!Th|iJi2sd_bp*fCgSA)iO0fY9+{6Aa9 zuCwn4Y5IEju_DXXK@k1<;f&17rJv_-?;R`4@;o^gGk`m=zXDVx<>aeb}Qdl|iX;B=zz=*IguU4UAZgJ|Az+OSs literal 0 HcmV?d00001 diff --git a/skins/ConLenov/Yaru/skin.inc b/skins/ConLenov/Yaru/skin.inc new file mode 100644 index 0000000000..81a6bd8f3f --- /dev/null +++ b/skins/ConLenov/Yaru/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 +}