update fb2read by akron1, clean skins

git-svn-id: svn://kolibrios.org@8877 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/cmm/lib/clipboard.h

@@ -6,11 +6,6 @@
 #include "../lib/kolibri.h"
 #endif
 
-
-#ifndef INCLUDE_FILESYSTEM_H
-#include "../lib/fs.h"
-#endif
-
 //===================================================//
 //                                                   //
 //       Kolibri Clipboard System Functions          //

skins/_old/Circles/1.Circles/1.Circles.asm

@@ -1,37 +0,0 @@
-include 'skin.inc'
-
-SKIN_PARAMS \
-  height	  = bmp_base.height,\	  ; skin height
-  margins	  = [6:1:43:1],\	  ; margins [left:top:right:bottom]
-  colors active   = [binner=0x7A7A7A:\	  ; border inner color
-		     bouter=0x7A7A7A:\	  ; border outer color
-		     bframe=0x8A8A8A],\   ; border frame color
-  colors inactive = [binner=0x969696:\	  ; border inner color
-		     bouter=0x969696:\	  ; border outer color
-		     bframe=0xA3A3A3],\   ; border frame color
-  dtp		  = 'GREY.DTP'	  ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-25:2][19:19],\		  ; buttons coordinates
-  minimize = [-47:2][19:19]		  ; [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 ;
-;================================;
-
-;

skins/_old/Circles/1.Circles/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("1.Circles.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "1.Circles.skn")

skins/_old/Circles/1.Circles/skin.inc

@@ -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
-}

skins/_old/Nova_skins/Nova_blue/About.txt

@@ -1,12 +0,0 @@
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                      ;;
-;; Specially for KolibriOS.             ;;
-;; Skin created by Rock_maniak_forever. ;;
-;;                                      ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-*****************************************
-* Ïðîëåòàðèè âñåõ ñòðàí, îáúåäèíÿéòåñü! *
-* Proletarian of all countryes, unite!  *
-*****************************************

skins/_old/Nova_skins/Nova_blue/Nova_blue.asm

@@ -1,37 +0,0 @@
-include 'skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\     ; skin height
-  margins         = [19:1:43:1],\         ; margins [left:top:right:bottom]
-  colors active   = [binner=0x9FBCCD:\    ; border inner color
-                     bouter=0x9FBCCD:\    ; border outer color
-                     bframe=0x2E576F],\   ; border frame color
-  colors inactive = [binner=0xB7CDDA:\    ; border inner color
-                     bouter=0xB7CDDA:\    ; border outer color
-                     bframe=0x4D788E],\   ; border frame color
-  dtp             = 'BLUE.DTP'   ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-32:0][26:18],\             ; buttons coordinates
-  minimize = [-49:0][17: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'
-
-;================================;
-; Created by Rock_maniak_forever ;
-;================================;
-
-

skins/_old/Nova_skins/Nova_blue/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("Nova_blue.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Nova_blue.skn")

skins/_old/Nova_skins/Nova_blue/skin.inc

@@ -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
-}

skins/_old/Russia/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("russia.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Russia.skn")

skins/_old/Russia/build.bat

@@ -1,2 +0,0 @@
-@fasm russia.asm russia.skn
-@pause

skins/_old/Russia/russia.asm

@@ -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=0x00081d:\      ; border inner color
-             bouter=0x00081d:\      ; border outer color
-             bframe=0x109420],\   ; border frame color
-  colors inactive = [binner=0x00081d:\      ; border inner color
-             bouter=0x00081d:\      ; border outer color
-             bframe=0x789c80],\   ; border frame color
-  dtp          = 'GREEN.DTP'      ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-24:2][22:20],\          ; buttons coordinates
-  minimize = [-48:2][22: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'         ; 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'

skins/_old/Russia/skin.inc

@@ -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
-}

skins/_old/humanoid_OSX/humanoid_OSX_col/Tupfile.lua

@@ -1,2 +1,2 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "humanoid_OSX_red.skn")
+tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "humanoid_OSX_col.skn")

skins/_old/humanoid_OSX/humanoid_OSX_col/default.asm

@@ -14,8 +14,8 @@ SKIN_PARAMS \
   dtp             = 'default.dtp'          ; dtp colors
 
 SKIN_BUTTONS \
-  close    = [-20:3][16:16],\             ; buttons coordinates
+  close    = [-20:4][16:16],\             ; buttons coordinates
-  minimize = [-40:3][16:16]               ; [left:top][width:height]
+  minimize = [-40:4][16:16]               ; [left:top][width:height]
 
 SKIN_BITMAPS \
   left active   = bmp_left,\              ; skin bitmaps pointers
@@ -28,6 +28,6 @@ SKIN_BITMAPS \
 BITMAP bmp_left ,'left.bmp'               ; skin bitmaps
 BITMAP bmp_oper ,'oper.bmp'
 BITMAP bmp_base ,'base.bmp'
-BITMAP bmp_left1,'left.bmp'
+BITMAP bmp_left1,'left.bmp'               ;the same
 BITMAP bmp_oper1,'oper_1.bmp'
 BITMAP bmp_base1,'base_1.bmp'

skins/_old/humanoid_OSX/humanoid_OSX_col/default.dtp.asm

@@ -0,0 +1,11 @@
+;SYSTEM COLORS (.DTP) - COMPILE WITH FASM
+unused1          dd 0x586786
+unused2          dd 0xFEFEFE
+work_3d_dark     dd 0xB9B9B9
+work_3d_light    dd 0xE3E3E3
+title_text       dd 0xCBC8C8
+work             dd 0xc8c8c8
+work_button      dd 0xD8D8D8
+work_button_text dd 0x000000
+work_text        dd 0x000000
+work_graph       dd 0x7A7A7A

skins/_old/humanoid_OSX/humanoid_OSX_orange/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "humanoid_OSX_orange.skn")

skins/_old/humanoid_OSX/humanoid_OSX_orange/default.asm

@@ -1,33 +0,0 @@
-;SKIN (.SKN) - COMPILE WITH FASM
-
-include '../skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\     ; skin height
-  margins         = [5:1:45:1],\          ; margins [left:top:right:bottom]
-  colors active   = [binner=0x101010:\    ; border inner color
-                     bouter=0x101010:\    ; border outer color
-                     bframe=0x131313],\   ; border frame color
-  colors inactive = [binner=0x101010:\    ; border inner color
-                     bouter=0x101010:\    ; border outer color
-                     bframe=0x131313],\   ; border frame color
-  dtp             = 'default.dtp'          ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-20:3][16:16],\             ; buttons coordinates
-  minimize = [-40:3][16: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.bmp'
-BITMAP bmp_oper1,'oper_1.bmp'
-BITMAP bmp_base1,'base_1.bmp'

skins/_old/humanoid_OSX/humanoid_OSX_orange/default.dtp.asm

@@ -1,11 +0,0 @@
-;SYSTEM COLORS (.DTP) - COMPILE WITH FASM
-frame            	dd 0x131313
-grab             	dd 0x3E3E3E
-grab_button      	dd 0x904e2b
-grab_button_text 	dd 0x341e0e
-grab_text        	dd 0xaa552f
-work             	dd 0xc8c8c8
-work_button      	dd 0xc8c8c8
-work_button_text 	dd 0x000000
-work_text        	dd 0x000000
-work_graph       	dd 0x868686

skins/_old/humanoid_OSX/humanoid_OSX_red/default.dtp.asm

@@ -1,11 +0,0 @@
-;SYSTEM COLORS (.DTP) - COMPILE WITH FASM
-frame            	dd 0x131313
-grab             	dd 0x3E3E3E
-grab_button      	dd 0x982423
-grab_button_text 	dd 0x370f0b
-grab_text        	dd 0xb42528
-work             	dd 0xc8c8c8
-work_button      	dd 0xc8c8c8
-work_button_text 	dd 0x000000
-work_text        	dd 0x000000
-work_graph       	dd 0x868686

skins/_old/humanoid_OSX/humanoid_OSX_red/skn_build.bat

@@ -1,4 +0,0 @@
-fasm default.dtp.asm default.dtp
-fasm default.asm default.skn
-kpack default.skn default.skn
-pause

skins/_old/humanoid_OSX/humanoid_OSX_yellow/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "humanoid_OSX_yellow.skn")

skins/_old/humanoid_OSX/humanoid_OSX_yellow/default.asm

@@ -1,33 +0,0 @@
-;SKIN (.SKN) - COMPILE WITH FASM
-
-include '../skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\     ; skin height
-  margins         = [5:1:45:1],\          ; margins [left:top:right:bottom]
-  colors active   = [binner=0x101010:\    ; border inner color
-                     bouter=0x101010:\    ; border outer color
-                     bframe=0x131313],\   ; border frame color
-  colors inactive = [binner=0x101010:\    ; border inner color
-                     bouter=0x101010:\    ; border outer color
-                     bframe=0x131313],\   ; border frame color
-  dtp             = 'default.dtp'          ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-20:3][16:16],\             ; buttons coordinates
-  minimize = [-40:3][16: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.bmp'
-BITMAP bmp_oper1,'oper_1.bmp'
-BITMAP bmp_base1,'base_1.bmp'

skins/_old/humanoid_OSX/humanoid_OSX_yellow/default.dtp.asm

@@ -1,11 +0,0 @@
-;SYSTEM COLORS (.DTP) - COMPILE WITH FASM
-frame            	dd 0x131313
-grab             	dd 0x3E3E3E
-grab_button      	dd 0x8e822c
-grab_button_text 	dd 0x33310e
-grab_text        	dd 0xa89631
-work             	dd 0xc8c8c8
-work_button      	dd 0xc8c8c8
-work_button_text 	dd 0x000000
-work_text        	dd 0x000000
-work_graph       	dd 0x868686

skins/_old/humanoid_OSX/humanoid_OSX_yellow/skn_build.bat

@@ -1,4 +0,0 @@
-fasm default.dtp.asm default.dtp
-fasm default.asm default.skn
-kpack default.skn default.skn
-pause

skins/_old/vista/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "vista.skn")

skins/_old/vista/default.asm

@@ -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=0x00081D:\                      ; border inner color
-                     bouter=0x00081D:\                      ; border outer color
-                     bframe=0x2D2F2B],\                     ; border frame color
-  colors inactive = [binner=0x00081D:\                      ; border inner color
-                     bouter=0x00081D:\                      ; border outer color
-                     bframe=0x72757A],\                     ; border frame color
-  dtp             = 'default.dtp'                           ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-47:3][41:17],\                               ; buttons coordinates
-  minimize = [-71:3][23: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 ,'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'

skins/_old/vista/skin.inc

@@ -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
-}

skins/_old/winflat/Tupfile.lua

@@ -1,2 +0,0 @@
-if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "winflat.skn")

skins/_old/winflat/default.asm

@@ -1,31 +0,0 @@
-include 'skin.inc'
-
-SKIN_PARAMS \
-  height          = bmp_base.height,\                       ; skin height
-  margins         = [8:1:43:1],\                            ; margins [left:top:right:bottom]
-  colors active   = [binner=0x004080:\                      ; border inner color
-                     bouter=0x004080:\                      ; border outer color
-                     bframe=0xD8D5CE],\                     ; border frame color
-  colors inactive = [binner=0x195999:\                      ; border inner color
-                     bouter=0x195999:\                      ; border outer color
-                     bframe=0xF1EEE7],\                     ; border frame color
-  dtp             = 'Mistificator.DTP'                      ; dtp colors
-
-SKIN_BUTTONS \
-  close    = [-20:6][16:14],\                               ; buttons coordinates
-  minimize = [-40:6][16: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 ,'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'

skins/_old/winflat/skin.inc

@@ -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
-}

skins/skinlist.lua

@@ -31,7 +31,6 @@ skinlist = {
 "_old/Black_lace/2.Black_lace/2.Black_lace.skn",
 "_old/Blended/Blended.skn",
 "_old/cherry/cherry.skn",
-"_old/Circles/1.Circles/1.Circles.skn",
 "_old/CodeOpusC/Opus_A/Opus_A.skn",
 "_old/CodeOpusC/Opus_B/Opus_B.skn",
 "_old/CodeOpusC/Opus_D/Opus_D.skn",
@@ -55,9 +54,7 @@ skinlist = {
 "_old/humanoid_OSX/humanoid_OSX_blue/humanoid_OSX_blue.skn",
 "_old/humanoid_OSX/Humanoid_OSX_dark_night/Humanoid_OSX_dark_night.skn",
 "_old/humanoid_OSX/humanoid_OSX_green/humanoid_OSX_green.skn",
-"_old/humanoid_OSX/humanoid_OSX_orange/humanoid_OSX_orange.skn",
+"_old/humanoid_OSX/humanoid_OSX_col/humanoid_OSX_col.skn",
-"_old/humanoid_OSX/humanoid_OSX_red/humanoid_OSX_red.skn",
-"_old/humanoid_OSX/humanoid_OSX_yellow/humanoid_OSX_yellow.skn",
 "_old/khrome2/khrome2.skn",
 "_old/Leency/Sandwich/Sandwich.skn",
 "_old/lightskin/lightskin.skn",
@@ -79,12 +76,10 @@ skinlist = {
 "_old/neutral/neutral_green/neutral_green.skn",
 "_old/neutral/neutral_lilac/neutral_lilac.skn",
 "_old/nix/nix_small/nix_small.skn",
-"_old/Nova_skins/Nova_blue/Nova_blue.skn",
 "_old/OpusOs_Blue/OpusOs_Blue.skn",
 "_old/Organics/Organics.skn",
 "_old/plum/plum.skn",
 "_old/RoboTech/BRoboTech/BRoboTech.skn",
-"_old/Russia/Russia.skn",
 "_old/Sad_grey/Sad_grey.skn",
 "_old/SashSkinPack_1_1/Src/Aqua/Aqua.skn",
 "_old/SashSkinPack_1_1/Src/Cold/Cold.skn",
@@ -108,13 +103,11 @@ skinlist = {
 "_old/testtest/testtest.skn",
 "_old/USSR/USSR.skn",
 "_old/USSR_2/1.USSR_2/1.USSR_2.skn",
-"_old/vista/vista.skn",
 "_old/WIN311/WIN311.skn",
 "_old/win8/win8.skn",
 "_old/WindowsXP/WinXP Classic blue/WinXP Classic blue.skn",
 "_old/WindowsXP/WinXP Standard blue/WinXP Standard blue.skn",
 "_old/WindowsXP/WinXP Standard olive_green/WinXP Standard olive_green.skn",
 "_old/WindowsXP/WinXP Standard silver/WinXP Standard silver.skn",
-"_old/winflat/winflat.skn",
 "_old/zRiver/zRiver1/zRiver1.skn",
 }