From 5ba50375957aff287faebe283f9786dfbbf2f89e Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Tue, 28 Feb 2012 10:49:22 +0000
Subject: [PATCH] HTMLv files fix

git-svn-id: svn://kolibrios.org@2416 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/network/htmlv/browser/TWB.h          |  5 +-
 .../network/htmlv/browser/include/history.h   |  6 +-
 programs/network/htmlv/lib/kolibri.h--        | 95 +++++++++++--------
 3 files changed, 63 insertions(+), 43 deletions(-)

diff --git a/programs/network/htmlv/browser/TWB.h b/programs/network/htmlv/browser/TWB.h
index 229d30fae7..9900513f40 100644
--- a/programs/network/htmlv/browser/TWB.h
+++ b/programs/network/htmlv/browser/TWB.h
@@ -81,7 +81,8 @@ void TWebBrowser::Scan(dword id) {
 		if (!strcmp(get_URL_part(5),"http:"))) HttpLoad();
 		//Lee 21.02 }
 		
-		ShowPage(#URL);
+		copystr(#URL, #editURL);
+		//ShowPage(#URL);
 		Draw_Window();
 		return;
 	}
@@ -202,8 +203,6 @@ void GetNewUrl(){
 void HttpLoad()
 {
 	za_kadrom = 0;
-	copystr(#URL, #editURL);
-
 	
 	KillProcess(downloader_id); //убиваем старый процесс
 	DeleteFile(#download_path);
diff --git a/programs/network/htmlv/browser/include/history.h b/programs/network/htmlv/browser/include/history.h
index 70264fa194..51b05e1b27 100644
--- a/programs/network/htmlv/browser/include/history.h
+++ b/programs/network/htmlv/browser/include/history.h
@@ -9,8 +9,8 @@ UrlsHistory BrowserHistory;
 
 void UrlsHistory::GoBack()
 {
-	//WriteDebug(#UrlHistory);
-	
+	WriteDebug(#UrlHistory);
+	//find_symbol(#UrlHistory, '|')
 	
 	j = strlen(#UrlHistory);
 	WHILE(UrlHistory[j] <>'|') && (j > 0) j--;
@@ -20,6 +20,8 @@ void UrlsHistory::GoBack()
 		j--;
 	}
 	UrlHistory[j] = 0x00;
+	
+	copystr(#URL, #editURL);
 	WB1.ShowPage(#URL);
 }
 
diff --git a/programs/network/htmlv/lib/kolibri.h-- b/programs/network/htmlv/lib/kolibri.h--
index 55e4607141..d8a2620cba 100644
--- a/programs/network/htmlv/lib/kolibri.h--
+++ b/programs/network/htmlv/lib/kolibri.h--
@@ -64,25 +64,6 @@ void mouse::get()
 	vert = EBX;
 }
 
-struct proc_info{
-	dword	use_cpu;
-	word	pos_in_stack,num_slot,rezerv1;
-	char	name[11];
-	char	rezerv2;
-	dword	adress,use_memory,ID,left,top,width,height;
-	word	status_slot,rezerv3;
-	dword	work_left,work_top,work_width,work_height;
-	char	status_window;
-	void	GetInfo(dword ECX);
-	byte    reserved[1024-71];
-#define SelfInfo -1
-};
-
-void GetProcessInfo(dword EBX, ECX)
-{
-	EAX = 9;
-	$int  0x40
-}
 
 struct system_colors{
 	dword frame,grab,grab_button,grab_button_text,grab_text,work,work_button,work_button_text,work_text,work_graph;
@@ -140,16 +121,6 @@ inline fastcall word GetKey(){ //Gluk fix
 		EAX = EAX >> 8;		 
 }
 
-inline fastcall word GetButtonID(){
- EAX = 17;
- $int  0x40
- EAX = EAX >> 8;
-}
-
-inline fastcall ExitProcess(){
- EAX = -1;              // close this program
- $int 0x40
-}
 
 inline fastcall Pause(dword EBX)
 {					//Џ г§ , ў б®вле ¤®«пе ᥪ㭤л EBX = value
@@ -157,7 +128,53 @@ inline fastcall Pause(dword EBX)
 	$int 0x40
 }
 
-//------------------------------------------------------------------------------
+//==================================================================
+
+inline fastcall word GetButtonID(){
+ EAX = 17;
+ $int  0x40
+ EAX = EAX >> 8;
+}
+
+struct proc_info{
+	dword	use_cpu;
+	word	pos_in_stack,num_slot,rezerv1;
+	char	name[11];
+	char	rezerv2;
+	dword	adress,use_memory,ID,left,top,width,height;
+	word	status_slot,rezerv3;
+	dword	work_left,work_top,work_width,work_height;
+	char	status_window;
+	void	GetInfo(dword ECX);
+	byte    reserved[1024-71];
+#define SelfInfo -1
+};
+
+void GetProcessInfo(dword EBX, ECX)
+{
+	EAX = 9;
+	$int  0x40
+}
+
+int GetProcessSlot(ECX) //ECX = process ID
+{
+	EAX = 18;
+	EBX = 21;
+	$int 0x40;	
+}
+
+inline fastcall ExitProcess(){
+ EAX = -1;              // close this program
+ $int 0x40
+}
+
+inline fastcall KillProcess(dword ECX){
+	$mov eax,18;
+	$mov ebx,18;
+	$int 0x40
+}
+
+//==================================================================
 
 //eax = язык системы (1=eng, 2=fi, 3=ger, 4=rus)
 inline fastcall int GetSystemLanguage(){
@@ -479,23 +496,25 @@ inline fastcall int utf8rutodos(dword ESI) //-
 
 //------------------------------------------------------------------------------
 
-byte WindowRePaint=0;
-inline fastcall void WindowRedrawStatus(dword EBX)
-{
-	EAX = 12;              // function 12:tell os about windowdraw
-	$int 0x40
-	IF (EBX==1) WindowRePaint=1; ELSE WindowRePaint=0;
-}
 
 void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType,dword mainAreaColour,byte headerType,dword headerColour,EDI)
 {
+	EAX = 12;              // function 12:tell os about windowdraw
+	EBX = 1;
+	$int 0x40
+	
 	EBX = x << 16 + sizeX;
 	ECX = y << 16 + sizeY;
 	EDX = mainAreaType << 24 | mainAreaColour;
 	ESI = headerType << 24 | headerColour;
 	$xor eax,eax
 	$int 0x40
-}   
+
+	EAX = 12;              // function 12:tell os about windowdraw
+	EBX = 2;
+	$int 0x40
+}
+
 
 inline fastcall dword CreateThread(dword ECX,EDX)
 {