From 8f354bd99d9401d6d2c094235fad6a2daf247de1 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sat, 15 Dec 2012 15:56:24 +0000
Subject: [PATCH] cmm: update libs, fixed itoa

git-svn-id: svn://kolibrios.org@3114 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/lib/figures.h       | 20 ++++++++++++++++++++
 programs/cmm/lib/kolibri.h       |  7 +++++++
 programs/cmm/lib/strings.h       |  7 +++++--
 programs/cmm/tmpdisk/t_console.c |  4 +---
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/programs/cmm/lib/figures.h b/programs/cmm/lib/figures.h
index e27a0f6462..f52538e27b 100644
--- a/programs/cmm/lib/figures.h
+++ b/programs/cmm/lib/figures.h
@@ -56,4 +56,24 @@ void CheckBox(dword x,y,w,h, bt_id, text, graph_color, text_color, is_checked)
 		DrawRectangle3D(x+1, y+1, w-2, h-2, 0xDDDddd, 0xffffff);
 		DrawBar(x+2, y+2, w-3, h-3, 0xffffff);
 	} 
+}
+
+void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent, status_text)
+{
+	int progress_w = progress_percent * st_w / 100 - 3;
+	static int fill_old;
+	    
+	if (!progress_percent) {DrawBar(st_x,st_y, st_x + st_y + fill_old + 15,st_h+1, col_fon);  return;}
+	
+	DrawRectangle(st_x, st_y, st_w,st_h, col_border);
+	DrawRectangle3D(st_x+1, st_y+1, st_w-2,st_h-2, 0xFFFfff, 0xFFFfff);
+	if (progress_percent) DrawBar(st_x+2, st_y+2, progress_w, st_h-3, col_fill);
+	if (progress_percent<100) DrawBar(st_x+2+progress_w, st_y+2, st_w-progress_w-3, st_h-3, 0xFFFfff);
+	
+	if (status_text)
+	{
+		DrawBar(st_x+st_w+15, st_h/2-4+st_y, fill_old, 9, col_fon);
+		WriteText(st_x+st_w+15, st_h/2-4+st_y, 0x80, col_text, status_text);
+		fill_old = strlen(status_text) * 6;
+	}
 }
\ No newline at end of file
diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h
index b8dda73c0f..cc899122ef 100644
--- a/programs/cmm/lib/kolibri.h
+++ b/programs/cmm/lib/kolibri.h
@@ -219,6 +219,13 @@ inline fastcall int GetActiveProcess()
 	$int 0x40
 }
 
+inline fastcall void ActivateWindow( ECX)
+{
+	EAX = 18;
+	EBX = 3;
+	$int 0x40
+}
+
 inline fastcall int CreateThread( ECX,EDX)
 {
 	$mov eax,51
diff --git a/programs/cmm/lib/strings.h b/programs/cmm/lib/strings.h
index 9f8632eb06..abae7916b5 100644
--- a/programs/cmm/lib/strings.h
+++ b/programs/cmm/lib/strings.h
@@ -114,6 +114,8 @@ inline fastcall strcat( EDI, ESI)
 dword itoa( ESI)
 {
 	unsigned char buffer[11];
+	$pusha
+
 	EDI = #buffer;
 	ECX = 10;
 	if (ESI < 0)
@@ -139,8 +141,9 @@ F3:
 	
 	$mov     al, '\0'
 	$stosb
-	 
-     return #buffer;
+	
+	$popa 
+    return #buffer;
 } 
 
 
diff --git a/programs/cmm/tmpdisk/t_console.c b/programs/cmm/tmpdisk/t_console.c
index 5c0e839e9b..590ffe2a84 100644
--- a/programs/cmm/tmpdisk/t_console.c
+++ b/programs/cmm/tmpdisk/t_console.c
@@ -58,9 +58,7 @@ void Console_Work()
 				add_disk.DiskSize = GetFreeRAM() / 5;
 				debug("disk size is not specified");
 				strcpy(#size_t, "10% from free RAM will be used, new DiskSize: ");
-				driver_rezult=itoa(add_disk.DiskSize/2048);
-				strcat(#size_t, driver_rezult);
-				//strcat(#size_t, itoa(add_disk.DiskSize/2048));
+				strcat(#size_t, itoa(add_disk.DiskSize/2048));
 				strcat(#size_t, " MB");
 				debug(#size_t);
 			}