@RESHARE: add into IMG, and to autorun, fix memory leak

QUARK: move to ISO SYSMON: use @reshare Various small updates and fixes git-svn-id: svn://kolibrios.org@9428 a494cfbc-eb01-0410-851d-a64ba20cac60
2021-12-16 19:08:12 +00:00 · 2021-12-16 19:08:12 +00:00 · af05642a48
commit af05642a48
parent 3ba48914da
9 changed files with 61 additions and 54 deletions
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@ -651,13 +651,13 @@ end -- tup.getconfig('NO_JWASM') ~= 'full'
 -- Programs that require C-- to compile.
 if tup.getconfig('NO_CMM') ~= 'full' then
 tup.append_table(img_files, {
+ {"@RESHARE", PROGS .. "/cmm/misc/reshare.com"},
 {"APP_PLUS", PROGS .. "/cmm/app_plus/app_plus.com"},
 {"EASYSHOT", PROGS .. "/cmm/misc/easyshot.com"},
 {"MOUSECFG", PROGS .. "/cmm/mousecfg/mousecfg.com"},
 {"BARSCFG", PROGS .. "/cmm/barscfg/barscfg.com"},
 {"SYSPANEL", PROGS .. "/cmm/misc/software_widget.com"},
 {"SYSMON", PROGS .. "/cmm/sysmon/sysmon.com"},
- {"QUARK", PROGS .. "/cmm/quark/quark.com"},
 {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"},
 {"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"},
 {"DEVELOP/MENU", PROGS .. "/cmm/menu/menu.com"},
@ -686,6 +686,7 @@ tup.append_table(extra_files, {
 {"kolibrios/utils/dicty.kex", PROGS .. "/cmm/dicty/dicty.com"},
 {"kolibrios/utils/notes", PROGS .. "/cmm/notes/notes.com"},
 {"kolibrios/utils/osupdate", PROGS .. "/cmm/misc/osupdate.com"},
+ {"kolibrios/utils/quark", PROGS .. "/cmm/quark/quark.com"},
 })
 end -- tup.getconfig('NO_CMM') ~= 'full'

--- a/data/common/settings/AUTORUN.DAT
+++ b/data/common/settings/AUTORUN.DAT
@ -10,13 +10,14 @@
 /SYS/LOADDRV            RDC  0	# videodriver for RDC M2010/M2012
 /SYS/@TASKBAR           ""   0	# Start taskbar
 /SYS/ESKIN              ""   0	# Set style
-/SYS/@ICON		""	0	# Multithread icon
-/SYS/NETWORK/NETCFG	A	0	#
-/SYS/NETWORK/@ZEROCONF	""	0	# Network configuration
-/SYS/@VOLUME		""	0	# Start volume daemon
-/SYS/@SS		ASSM	0	# Screensaver
+/SYS/@ICON              ""   0	# Multithread desktop icons
+/SYS/TMPDISK            A0   0	# Add virtual RAM disk /tmp0/1
+/SYS/@RESHARE           ""   0	# Shared resources
 /SYS/@DOCKY             ""   0	# Start docky
-/SYS/TMPDISK		A0	-1	# Add virtual RAM disk /tmp0/1
-/SYS/SEARCHAP		""	-1	# Search and mount additional system directory
+/SYS/NETWORK/NETCFG     A    0	# Init network driver
+/SYS/NETWORK/@ZEROCONF  ""   0	# Network configuration
+/SYS/@SS                ASSM 0	# Screensaver
+/SYS/@VOLUME            ""   0	# Start volume daemon
+/SYS/SEARCHAP           ""   0	# Search and mount additional system directory
 /SYS/@HOTANGLES         ""   0	# Start Hot Angles
 ### Hello, ASM World! ###
--- a/data/common/settings/assoc.ini
+++ b/data/common/settings/assoc.ini
@ -1,22 +1,20 @@
-[Quark]
-exec=/sys/QUARK
-icon=85
-next=$TinyPad
-
 [CodeEdit]
 exec=/sys/develop/cedit
 icon=58
 next=$TinyPad

-[TinyPad]
-exec=/sys/tinypad
-icon=9
-next=$TextEditor
+[HexEditor]
+exec=/sys/develop/heed
+icon=22

 [Run]
 exec=/sys/run
 icon=55

+[KPack]
+exec=/sys/kpack
+icon=99
+
 [FB2Read]
 exec=/sys/fb2read
 icon=44
@ -26,16 +24,16 @@ exec=/sys/network/webview
 icon=31
 next=$TinyPad

-[zSea]
-exec=/kolibrios/media/zsea/zsea
-icon=46
-next=$KIV
-
 [KIV]
 exec=/sys/media/kiv
 icon=70
 next=$Animage

+[zSea]
+exec=/kolibrios/media/zsea/zsea
+icon=46
+next=$KIV
+
 [Animage]
 exec=/sys/media/animage
 icon=15
@ -57,14 +55,6 @@ icon=40
 exec=/sys/media/ac97snd
 icon=64

-[HexEditor]
-exec=/sys/develop/heed
-icon=22
-
-[KPack]
-exec=/sys/kpack
-icon=99
-
 [Unz]
 exec=/sys/unz
 icon=89
@ -82,6 +72,15 @@ exec=/kolibrios/utils/t_edit
 icon=9
 next=$CodeEdit

+[Quark]
+exec=/kolibrios/utils/quark
+icon=85
+next=$TinyPad
+
+[TinyPad]
+exec=/sys/tinypad
+icon=9
+next=$TextEditor

 [Assoc]
 /=/sys/file managers/eolite
--- a/programs/cmm/misc/build.bat
+++ b/programs/cmm/misc/build.bat
@ -9,6 +9,7 @@ move *.com bin
 cd bin
 forfiles /S /M *.com /C "cmd /c rename @file @fname"
 rename software_widget syspanel
+rename reshare @reshare
 cd ..

 del warning.txt
--- a/programs/cmm/misc/reshare.c
+++ b/programs/cmm/misc/reshare.c
@ -1,4 +1,4 @@
-#define MEMSIZE 1024*50
+#define MEMSIZE 1024*20
 #define ENTRY_POINT #main

 #include "../lib/fs.h"
@ -25,12 +25,12 @@ void main()
 	icons16.load("/sys/icons16.png"); size16 = icons16.h * 18 * 4;

 	shared_i32 = memopen("ICONS32", size32, SHM_CREATE+SHM_WRITE);
-	debugval("@reshare shared_i32", shared_i32);
 	memmov(shared_i32, icons32.imgsrc, size32);
+	img_destroy stdcall(icons32.image);

 	shared_i16 = memopen("ICONS18", size16, SHM_CREATE + SHM_WRITE);
 	memmov(shared_i16, icons16.imgsrc, size16);
-	debugval("@reshare shared_i32", shared_i16);
+	img_destroy stdcall(icons16.image);

 	shared_i16w = memopen("ICONS18W", size16, SHM_CREATE + SHM_WRITE);

@ -40,10 +40,9 @@ UPDATE_ICONS18WORK:
 	$pop eax
 	IF (sc.work != EAX) {
 		icons16w.load("/sys/icons16.png");
-		//icons16w.replace_color(0xffFFFfff, sc.work);
-		//icons16w.replace_color(0xffCACBD6, MixColors(sc.work, 0, 200));	
 		icons16w.replace_2colors(0xffFFFfff, sc.work, 0xffCACBD6, MixColors(sc.work, 0, 200));
 		memmov(shared_i16w, icons16w.imgsrc, size16);
+		img_destroy stdcall(icons16w.image);
 	}

 	loop() IF(WaitEvent()==evDesktop) GOTO UPDATE_ICONS18WORK;
--- a/programs/cmm/sysmon/compile_en.bat
+++ b/programs/cmm/sysmon/compile_en.bat
@ -1,5 +1,5 @@
-@del /D=LANG_ENG sysmon
-@c-- sysmon.c
+@del sysmon
+@c-- /D=LANG_RUS sysmon.c
@rename sysmon.com sysmon
@del warning.txt
@pause
--- a/programs/cmm/sysmon/compile_ru.bat
+++ b/programs/cmm/sysmon/compile_ru.bat
@ -1,5 +1,5 @@
-@del /D=LANG_RUS sysmon
-@c-- sysmon.c
+@del sysmon
+@c-- /D=LANG_RUS sysmon.c
@rename sysmon.com sysmon
@del warning.txt
@pause
--- a/programs/cmm/sysmon/sysmon.c
+++ b/programs/cmm/sysmon/sysmon.c
@ -1,10 +1,11 @@
 /*
 * System Monitor
- * version 1.36
+ * version 1.37
 * Author: Leency
 */

 #define MEMSIZE 4096*30
+#define NO_DLL_INIT

 //===================================================//
 //                                                   //
@ -16,7 +17,6 @@
 #include "../lib/fs.h"
 #include "../lib/list_box.h"

-#include "../lib/obj/libimg.h"
 #include "../lib/obj/box_lib.h"

 #include "../lib/patterns/select_list.h"
@ -78,6 +78,8 @@ int proc_list[256];

 checkbox show_system = { T_SHOW_SYSTEM, false };

+char* shared_icons_16;
+
 sensor cpu;
 sensor ram;
 sensor rd;
@ -95,7 +97,6 @@ int right_w;

 void load_lib()
 {
-	load_dll(libimg, #libimg_init,1);
 	load_dll(boxlib, #box_lib_init,0);
 }

@ -103,6 +104,7 @@ void main()
 {
 	int btn;
 	load_lib();
+	shared_icons_16 = memopen("ICONS18W", NULL, SHM_READ);
 	@SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
 	loop() switch(@WaitEventTimeout(50))
 	{
@ -295,8 +297,12 @@ void MonitorTmp()

 void DrawIconWithText(dword _x, _y, _icon, _title)
 {
-	int size = DrawIcon16(_x, _y, sc.work, _icon);
-	WriteTextWithBg(_x+ICONGAP, _y + size - 16, 0xD0, sc.work_text, _title, sc.work);
+	if (shared_icons_16) {
+		PutPaletteImage(18*18*4*_icon + shared_icons_16, 18, 18,_x, _y, 32, 0);
+	} else {
+		_x -= ICONGAP;
+	}
+	WriteTextWithBg(_x+ICONGAP, _y + 2, 0xD0, sc.work_text, _title, sc.work);
 }

 dword GetCpuLoad(dword max_h)
--- a/programs/cmm/template/t.c
+++ b/programs/cmm/template/t.c
@ -1,4 +1,4 @@
-#define MEMSIZE 4096*40
+#define MEMSIZE 1024*50

 #include "../lib/gui.h"
 #include "../lib/fs.h"