WebSVN – Kolibri OS – Path Comparison – / – /skins/ Rev 8887 and /skins/ Rev 8888

Regard whitespace Rev 8887 → Rev 8888

/skins/_old/sea/oper_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/sea/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/sea/left_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/sea/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/sea/base_1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/sea/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/sea/default.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/testtest/inactive/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/testtest/inactive/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/testtest/inactive/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/testtest/dtp.asm
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/skins/_old/testtest/active/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/testtest/active/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/testtest/active/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Cold/colors.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Cold/active/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Cold/active/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Cold/active/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Cold/inactive/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Aqua/inactive/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Aqua/colors.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Aqua/active/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Aqua/active/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/SashSkinPack_1_1/Src/Aqua/active/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Flowers/active/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Flowers/active/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Flowers/active/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Flowers/BLUE.DTP
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Flowers/inactive/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Flowers/inactive/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Flowers/inactive/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/mursky/inactive/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Deleted: svn:mime-type
-image/x-ms-bmp
\ No newline at end of property

/skins/_old/mursky/inactive/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Deleted: svn:mime-type
-image/x-ms-bmp
\ No newline at end of property

/skins/_old/mursky/inactive/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Deleted: svn:mime-type
-image/x-ms-bmp
\ No newline at end of property

/skins/_old/mursky/dtp.asm
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:eol-style
-native
\ No newline at end of property

/skins/_old/mursky/active/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Deleted: svn:mime-type
-image/x-ms-bmp
\ No newline at end of property

/skins/_old/mursky/active/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Deleted: svn:mime-type
-image/x-ms-bmp
\ No newline at end of property

/skins/_old/mursky/active/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Deleted: svn:mime-type
-image/x-ms-bmp
\ No newline at end of property

/skins/_old/mursky/mursky.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Deleted: svn:mime-type
-image/png
\ No newline at end of property

/skins/_old/Leency/Sandwich/left1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Leency/Sandwich/left2.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Leency/Sandwich/default.dtp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Leency/Sandwich/right1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Leency/Sandwich/right2.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Leency/Sandwich/center1.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Leency/Sandwich/center2.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/_old/Leency/scr_all.PNG
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property

/skins/dunkaist/mursky/Tupfile.lua
0,0 → 1,3
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("dtp.asm", 'fasm "%f" "%o" ', "%B")
tup.rule({"mursky.asm", extra_inputs = {"dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "mursky.skn")

 /skins/dunkaist/mursky/dtp.asm
 ,0 → 1,10
+frame               dd 0x95afcf
+grab                dd 0x95afcf
+grab_button         dd 0x95afcf
+grab_button_text    dd 0xffffff
+grab_text           dd 0x333333
+work                dd 0xe2e4e4
+work_button         dd 0xacc4da
+work_button_text    dd 0x001c1e
+work_text           dd 0x333333
+work_graph          dd 0x95afcf
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /skins/dunkaist/mursky/mursky.asm
 ,0 → 1,40
+;;=====================================================================
+;; dunkaist, Mario | 2010
+;;---------------------------------------------------------------------
+include 'skin.inc'
+SKIN_PARAMS \
+    height          =   bmp_base.height,    \   ; skin height
+    margins         =   [5:1:42:1],         \   ; margins [left:top:right:bottom]
+  colors                                    \
+    active          =   [                   \
+    binner          =   0x95afc6:           \   ; border inner color
+    bouter          =   0x607180:           \   ; border outer color
+    bframe          =   0xd3e0eb],          \   ; border frame color
+  colors                                    \
+    inactive        =   [                   \
+    binner          =   0x95afc6:           \   ; border inner color
+    bouter          =   0x7c92a5:           \   ; border outer color
+    bframe          =   0xeaf0f5],          \   ; border frame color
+\
+  dtp               =   'dtp'                   ; dtp colors
+SKIN_BUTTONS \
+    close           =   [-23:2][20:20],     \   ; buttons coordinates
+    minimize        =   [-43:2][20:20]          ; [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'
+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'

 /skins/dunkaist/mursky/skin.inc
 ,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
+}

/skins/dunkaist/mursky/active/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Added: svn:mime-type
+image/x-ms-bmp
\ No newline at end of property

/skins/dunkaist/mursky/active/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Added: svn:mime-type
+image/x-ms-bmp
\ No newline at end of property

/skins/dunkaist/mursky/active/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Added: svn:mime-type
+image/x-ms-bmp
\ No newline at end of property

/skins/dunkaist/mursky/inactive/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Added: svn:mime-type
+image/x-ms-bmp
\ No newline at end of property

/skins/dunkaist/mursky/inactive/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Added: svn:mime-type
+image/x-ms-bmp
\ No newline at end of property

/skins/dunkaist/mursky/inactive/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = image/x-ms-bmp
Property changes:
Added: svn:mime-type
+image/x-ms-bmp
\ No newline at end of property

/skins/dunkaist/mursky/mursky.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes:
Added: svn:mime-type
+image/png
\ No newline at end of property

/skins/dunkaist/testtest/Tupfile.lua
0,0 → 1,3
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("dtp.asm", 'fasm "%f" "%o"', "%B")
tup.rule({"testtest.asm", extra_inputs = {"dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "testtest.skn")

 /skins/dunkaist/testtest/dtp.asm
 ,0 → 1,10
+frame               dd 0x95afcf
+grab                dd 0x95afcf
+grab_button         dd 0x95afcf
+grab_button_text    dd 0xffffff
+grab_text           dd 0x333333
+work                dd 0xe2e4e4
+work_button         dd 0xacc4da
+work_button_text    dd 0x001c1e
+work_text           dd 0x333333
+work_graph          dd 0x95afcf
 Property changes:
 Added: svn:eol-style
 +native
 \ No newline at end of property

 /skins/dunkaist/testtest/testtest.asm
 ,0 → 1,40
+;;=====================================================================
+;; dunkaist, Mario | 2010
+;;---------------------------------------------------------------------
+include 'skin.inc'
+SKIN_PARAMS \
+    height          =   bmp_base.height,    \   ; skin height
+    margins         =   [5:1:1:1],          \   ; margins [left:top:right:bottom]
+  colors                                    \
+    active          =   [                   \
+    binner          =   0xff0000:           \   ; border inner color
+    bouter          =   0xff0000:           \   ; border outer color
+    bframe          =   0x00ff00],          \   ; border frame color
+  colors                                    \
+    inactive        =   [                   \
+    binner          =   0x00ff00:           \   ; border inner color
+    bouter          =   0x00ff00:           \   ; border outer color
+    bframe          =   0xff0000],          \   ; border frame color
+\
+  dtp               =   'dtp'                   ; dtp colors
+SKIN_BUTTONS \
+    close           =   [-23:2][20:107],    \   ; buttons coordinates
+    minimize        =   [-43:2][20:107]         ; [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'
+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'

 /skins/dunkaist/testtest/skin.inc
 ,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
+}

/skins/dunkaist/testtest/active/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/skins/dunkaist/testtest/active/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/skins/dunkaist/testtest/active/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/skins/dunkaist/testtest/inactive/base.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/skins/dunkaist/testtest/inactive/left.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

/skins/dunkaist/testtest/inactive/oper.bmp
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property

 /skins/skinlist.lua
 ,7 → 46,6
 "_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",
 ,9 → 62,6
 "_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",

Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8887 → Rev 8888