From b6b76291218c1442a06e796803bb5e7febef1556 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 26 Dec 2021 18:21:03 +0000
Subject: [PATCH] bunch of fixes

git-svn-id: svn://kolibrios.org@9481 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/common/drivers/drvinf.ini                |   5 +-
 programs/cmm/appearance/appearance.c          |   4 +-
 programs/cmm/lib/patterns/toolbar_button.h    |  52 +++++++++++-------
 programs/cmm/quark/quark.c                    |   6 +-
 skins/Leency/Shkvorka/Tupfile.lua             |   4 +-
 skins/Leency/Shkvorka/build.bat               |   2 +-
 .../{default.dtp.asm => colors.dtp.asm}       |   2 +-
 skins/Leency/Shkvorka/default.asm             |   2 +-
 skins/Leency/Shkvorka/default.dtp             | Bin 40 -> 0 bytes
 9 files changed, 43 insertions(+), 34 deletions(-)
 rename skins/Leency/Shkvorka/{default.dtp.asm => colors.dtp.asm} (82%)
 delete mode 100644 skins/Leency/Shkvorka/default.dtp

diff --git a/data/common/drivers/drvinf.ini b/data/common/drivers/drvinf.ini
index f411d7b6a9..32cbdf1795 100644
--- a/data/common/drivers/drvinf.ini
+++ b/data/common/drivers/drvinf.ini
@@ -33,7 +33,6 @@ install=/kolibrios/drivers/acpi/install.kex
 [Audio AMD Geode]
 ver=rc3
 icon=64
-description_ru=Драйвер звука для AMD Geode CS5536.
-description_en=AMD Geode CS5536 audio driver.
-readme=/kolibrios/drivers/geode/readme.txt
+description_ru=Драйвер звука для звуковых чипов AMD Geode CS5536.
+description_en=AMD Geode CS5536 audio driver. 
 install=/kolibrios/drivers/geode/geode
\ No newline at end of file
diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c
index 45f1e33f3a..f993044f3f 100644
--- a/programs/cmm/appearance/appearance.c
+++ b/programs/cmm/appearance/appearance.c
@@ -117,8 +117,8 @@ void main()
 			if (! edit_cmm.flags & ed_focus) && (! edit_st.flags & ed_focus)
 			for (i=select_list.cur_y+1; i<select_list.count; i++)
 			{
-				id = ESBYTE[list.get(i)];
-				if (id==ESBYTE[EAX]) || (id==key_ascii-32)
+				id = list.get(i) + strrchr(list.get(i), '/');
+				if (ESBYTE[id]==key_ascii) || (ESBYTE[id]==key_ascii-32)
 				{
 					select_list.cur_y = i - 1;
 					select_list.KeyDown();
diff --git a/programs/cmm/lib/patterns/toolbar_button.h b/programs/cmm/lib/patterns/toolbar_button.h
index 2bfc86e7d6..b753bb0331 100644
--- a/programs/cmm/lib/patterns/toolbar_button.h
+++ b/programs/cmm/lib/patterns/toolbar_button.h
@@ -1,36 +1,46 @@
+inline fastcall replace_2cols(EDI, EDX, ESI, ECX, EBX, EAX) 
+{
+    EDX += EDI; //imgsrc + imgsize;
+    WHILE (EDI < EDX) {
+        IF (DSDWORD[EDI]==ESI) DSDWORD[EDI] = ECX;
+        ELSE IF (DSDWORD[EDI]==EBX) DSDWORD[EDI] = EAX;
+        EDI += 4;
+    }
+}
 
 :unsigned int DrawTopPanelButton(dword _button_id, _x, _y, signed int _icon_n, bool pressed)
 {
 	#define TSZE 25
-	static libimg_image top_icons;
-	static dword semi_white=0, bg_col_light, bg_col_dark;
-	int i;
-	if (!semi_white) {
-		top_icons.load("/sys/icons16.png");
-
-		semi_white = MixColors(sc.work, 0xFFFfff, skin_is_dark()*90 + 96);
-		bg_col_dark = MixColors(sc.work, sc.work_graph, 90);
-		bg_col_light = MixColors(semi_white, 0xFFFfff, skin_is_dark()*90 + 10);
-
-		top_icons.replace_color(0xffFFFfff, semi_white);
-		top_icons.replace_color(0xffCACBD6, MixColors(semi_white, 0, 220));
+	static dword lightest, i16_mem, old_work_light;
+	dword i16_size;
+	if (!lightest) || (old_work_light != sc.work_light) {
+		old_work_light = sc.work_light;
+		lightest = MixColors(sc.work_light, 0xFFFfff, skin_is_dark()*155 + 20);
+		if (ESI = memopen("ICONS18", NULL, SHM_READ)) {
+			i16_size = EDX;
+			i16_mem = malloc(i16_size);
+			memmov(i16_mem, ESI, i16_size);
+			replace_2cols(i16_mem, i16_size, 0xffFFFfff, sc.work_light, 0xffCACBD6, sc.work_dark);			
+		}
 	}
-
-	DrawWideRectangle(_x+1, _y+1, TSZE, TSZE, 5, semi_white);
-
+	DrawWideRectangle(_x+1, _y+1, TSZE, TSZE, 5, sc.work_light);
 	DefineHiddenButton(_x, _y, TSZE+1, TSZE+1, _button_id);
 	if (_icon_n==-1) {
-		DrawBar(_x+6, _y+5, 16, 16, semi_white);
-		for (i=0; i<=2; i++) DrawBar(_x+6, i*5+_y+7, 15, 3, sc.work_graph);
+		DrawBar(_x+6, _y+5, 16, 16, sc.work_light);
+		DrawBar(_x+6, _y+7, 15, 3, sc.work_graph);
+		$add ecx,5*65536
+		$int 64
+		$add ecx,5*65536
+		$int 64
 	} else {
-		i = TSZE - top_icons.w / 2; //icon pos
-		img_draw stdcall(top_icons.image, _x+i+2, _y+i+1+pressed, top_icons.w, top_icons.w, 0, _icon_n*top_icons.w);
+		if (i16_mem) PutPaletteImage(18*18*4*_icon_n + i16_mem, 
+			18, 18, TSZE/2-9+2+_x, TSZE/2-9+1+_y+pressed, 32, 0);
 	}
 
 	if (!pressed) {
-		DrawOvalBorder(_x, _y, TSZE, TSZE, bg_col_light, bg_col_dark, semi_white, sc.work);
+		DrawOvalBorder(_x, _y, TSZE, TSZE, lightest, sc.work_graph, sc.work_light, sc.work);
 	} else {
-		DrawOvalBorder(_x, _y, TSZE, TSZE, sc.work_graph, bg_col_light, semi_white, sc.work);
+		DrawOvalBorder(_x, _y, TSZE, TSZE, sc.work_graph, sc.work_light, sc.work_dark, sc.work);
 		PutShadow(_x+1, _y+1, TSZE, TSZE, true, 2);
 	}
 
diff --git a/programs/cmm/quark/quark.c b/programs/cmm/quark/quark.c
index 185f115613..b445040198 100644
--- a/programs/cmm/quark/quark.c
+++ b/programs/cmm/quark/quark.c
@@ -29,7 +29,6 @@
 
 #include "../lib/obj/box_lib.h"
 #include "../lib/obj/libini.h"
-#include "../lib/obj/libimg.h"
 #include "../lib/obj/iconv.h"
 #include "../lib/obj/proc_lib.h"
 
@@ -104,7 +103,6 @@ EVENTS key;
 void InitDlls()
 {
 	load_dll(boxlib,    #box_lib_init,   0);
-	load_dll(libimg,    #libimg_init,    1);
 	load_dll(libini,    #lib_init,       1);
 	load_dll(iconv_lib, #iconv_open,     0);
 	load_dll(Proc_lib,  #OpenDialog_init,0);
@@ -619,8 +617,8 @@ int TopBarBt(dword _event, _hotkey, char image_id, int x, pressed) {
 
 void DrawToolbar()
 {
-	#define GAP_S 26+5
-	#define GAP_B 26+18
+	#define GAP_S 26+7
+	#define GAP_B 26+19
 	incn x;
 	bool thema = false;
 	bool reopa = false;
diff --git a/skins/Leency/Shkvorka/Tupfile.lua b/skins/Leency/Shkvorka/Tupfile.lua
index 2da4aebce1..5fbcabf215 100644
--- a/skins/Leency/Shkvorka/Tupfile.lua
+++ b/skins/Leency/Shkvorka/Tupfile.lua
@@ -1,2 +1,4 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("default.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Shkvorka.skn")
+tup.rule("colors.dtp.asm", 'fasm "%f" "%o"', "colors.dtp")
+tup.rule({"default.asm", extra_inputs = {"colors.dtp"}}, 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "Shkvorka.skn")
+
diff --git a/skins/Leency/Shkvorka/build.bat b/skins/Leency/Shkvorka/build.bat
index 4da7975657..ab23f71755 100644
--- a/skins/Leency/Shkvorka/build.bat
+++ b/skins/Leency/Shkvorka/build.bat
@@ -1,4 +1,4 @@
-@fasm default.dtp.asm default.dtp
+@fasm colors.dtp.asm colors.dtp
 @fasm default.asm default.skn
 @kpack default.skn
 @pause
\ No newline at end of file
diff --git a/skins/Leency/Shkvorka/default.dtp.asm b/skins/Leency/Shkvorka/colors.dtp.asm
similarity index 82%
rename from skins/Leency/Shkvorka/default.dtp.asm
rename to skins/Leency/Shkvorka/colors.dtp.asm
index cbc5b1f23f..69cdec49be 100644
--- a/skins/Leency/Shkvorka/default.dtp.asm
+++ b/skins/Leency/Shkvorka/colors.dtp.asm
@@ -3,7 +3,7 @@ struc system_colors
   .taskbar          dd 0x586786
   .taskbar_text     dd 0xFEFEFE
   .work_dark        dd 0xC5BDB9
-  .work_light       dd 0xECE9E5
+  .work_light       dd 0xF2EFEC
   .window_title     dd 0x333333
   .work             dd 0xDDD7CF
   .work_button      dd 0x7887A6
diff --git a/skins/Leency/Shkvorka/default.asm b/skins/Leency/Shkvorka/default.asm
index 38ab178246..09f8085136 100644
--- a/skins/Leency/Shkvorka/default.asm
+++ b/skins/Leency/Shkvorka/default.asm
@@ -9,7 +9,7 @@ SKIN_PARAMS \
   colors inactive = [binner=0xDDD7CF:\    ; border inner
                      bouter=0x646464:\    ; border outer
                      bframe=0xDDD7CF],\   ; border middle
-  dtp             = 'default.dtp'          ; dtp colors
+  dtp             = 'colors.dtp'          ; dtp colors
 
 SKIN_BUTTONS \
   close    = [-31:1][27:18],\             ; buttons coordinates
diff --git a/skins/Leency/Shkvorka/default.dtp b/skins/Leency/Shkvorka/default.dtp
deleted file mode 100644
index 9847d3899183d0a5f1653a77c9af043b45bd3bef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 40
scmZomk6`%s?;pd?y+;|IzI?-AY;4SM{`y^pW$hJUaRwl$tE*!G0Hie%Y5)KL