From 014a5bcd7063a1bbc7fb117cce4cbc6d669c347c Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Tue, 12 Jun 2012 22:13:05 +0000
Subject: [PATCH] HTMLv 0.9b, preparation

git-svn-id: svn://kolibrios.org@2763 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/network/htmlv/browser/HTMLv.c-- |  3 +--
 programs/network/htmlv/browser/TWB.h     | 11 ++---------
 programs/network/htmlv/lib/kolibri.h--   |  8 ++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/programs/network/htmlv/browser/HTMLv.c-- b/programs/network/htmlv/browser/HTMLv.c--
index 4ba61e2e3f..5be162ec61 100644
--- a/programs/network/htmlv/browser/HTMLv.c--
+++ b/programs/network/htmlv/browser/HTMLv.c--
@@ -63,7 +63,6 @@ void main()
 	{
 		WaitEventTimeout(1);
 		switch(EAX & 0xFF)
-		//switch(WaitEvent())
 		{
 			CASE evMouse:
 				edit_box_mouse stdcall (#edit1);
@@ -147,7 +146,7 @@ void Draw_Window()
 	DefineAndDrawWindow(215,100,640,480,0x73,0x00E4DFE1,0,0,0);
 	
 	GetProcessInfo(#Form, SelfInfo);
-	IF (Form.status_window==4) //если свернуто в заголовок, ничего не рисуем
+	IF (Form.status_window>2) //если свернуто в заголовок, ничего не рисуем
 	{
 		DrawTitle(#header);
 		return;
diff --git a/programs/network/htmlv/browser/TWB.h b/programs/network/htmlv/browser/TWB.h
index 51f3abaef3..4b4a080aee 100644
--- a/programs/network/htmlv/browser/TWB.h
+++ b/programs/network/htmlv/browser/TWB.h
@@ -13,7 +13,7 @@ dword j,
 char download_path[]="/rd/1/.download";
 //char search_path[]="http://nova.rambler.ru/search?words=";
 char search_path[]="http://nigma.ru/index.php?s=";
-char version[]=" Text-based Browser 0.9";
+char version[]=" Text-based Browser 0.9b";
 
 
 struct TWebBrowser {
@@ -69,12 +69,10 @@ void TWebBrowser::Scan(dword id) {
 			ShowPage(#URL);
 			return;
 		}
-		
 		URL[find_symbol(#URL, '#')-1] = 0x00; //заглушка, лучше, чем ничего (хабр, например, будет работать)  //это не совсем правильно - в едитурл должно оставаться
 
 		GetNewUrl();
 
-		//полоса, белая рисуется снизу
 		if (!strcmp(#URL + strlen(#URL) - 4, ".gif")) || (!strcmp(#URL + strlen(#URL) - 4, ".png")) || (!strcmp(#URL + strlen(#URL) - 4, ".jpg"))
 		{
 			RunProgram("/sys/media/kiv", #URL);
@@ -82,12 +80,7 @@ void TWebBrowser::Scan(dword id) {
 			return;
 		}
 
-		copystr(#URL, #editURL);
-		za_kadrom = count = 0;
-		
-		if (!strcmp(get_URL_part(5),"http:")) HttpLoad();
-		
-		ShowPage(#URL);
+		OpenPage();
 		return;
 	}
 	
diff --git a/programs/network/htmlv/lib/kolibri.h-- b/programs/network/htmlv/lib/kolibri.h--
index 3c80586e58..35f02d7135 100644
--- a/programs/network/htmlv/lib/kolibri.h--
+++ b/programs/network/htmlv/lib/kolibri.h--
@@ -163,6 +163,14 @@ int GetProcessSlot(ECX) //ECX = process ID
 	$int 0x40;	
 }
 
+inline fastcall int ActiveProcess()
+{
+	EAX = 18;
+	EBX = 7;
+	$int 0x40
+}
+
+
 inline fastcall ExitProcess(){
  EAX = -1;              // close this program
  $int 0x40