From 72b2ccfd17aa87615d9aa85169597aaecfe05bd6 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Mon, 27 Jan 2014 01:17:07 +0000
Subject: [PATCH] HTMLv: fixes

git-svn-id: svn://kolibrios.org@4533 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/TWB/TWB.c          |  2 +-
 programs/cmm/browser/HTMLv.c    | 17 ++++++-----------
 programs/cmm/browser/menu_rmb.h |  4 ++--
 programs/cmm/lib/list_box.h     |  1 +
 4 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/programs/cmm/TWB/TWB.c b/programs/cmm/TWB/TWB.c
index a4fb18f938..b5d1091abd 100644
--- a/programs/cmm/TWB/TWB.c
+++ b/programs/cmm/TWB/TWB.c
@@ -474,7 +474,7 @@ void TWebBrowser::WhatTextStyle(int left1, top1, width1) {
 		TextGoDown(left1, top1, width1);
 		return;
 	}
-	if (isTag("div")) {
+	if (isTag("div")) || (isTag("header")) || (isTag("footer")) {
 		IF(oldtag[0] <>'h') TextGoDown(left1, top1, width1);
 		return;
 	}
diff --git a/programs/cmm/browser/HTMLv.c b/programs/cmm/browser/HTMLv.c
index 896f991dd5..a49de4dc04 100644
--- a/programs/cmm/browser/HTMLv.c
+++ b/programs/cmm/browser/HTMLv.c
@@ -79,16 +79,6 @@ void main()
 		switch(EAX & 0xFF)
 		{
 			CASE evMouse:
-				/*
-				//not work well, so we are use custom way of processing scroll
-				scrollbar_v_mouse (#scroll_wv);
-				if (WB1.list.first <> scroll_wv.position)
-				{
-					WB1.list.first = scroll_wv.position;
-					WB1.ParseHTML(buf, filesize);
-				};
-				*/
-				
 				if (!CheckActiveProcess(Form.ID)) break;
 
 				edit_box_mouse stdcall (#address_box);
@@ -241,7 +231,12 @@ void Scan(int id)
 			WB1.ParseHTML(buf);
 			return;
 
-		case 002: //free img cache
+		case 005: //Win encoding
+			WB1.ReadHtml(_WIN);
+			WB1.ParseHTML(buf);
+			return;
+
+		case 009: //free img cache
 			ImgCache.Free();
 			notify(IMAGES_CACHE_CLEARED);
 			WB1.ParseHTML(buf);
diff --git a/programs/cmm/browser/menu_rmb.h b/programs/cmm/browser/menu_rmb.h
index cf6e2da3b1..16fe4f52a1 100644
--- a/programs/cmm/browser/menu_rmb.h
+++ b/programs/cmm/browser/menu_rmb.h
@@ -1,7 +1,7 @@
 //Leency - 2012-2013
 
 char *ITEMS_LIST[]={
-"WIN                  F5",54,
+"WIN              Ctrl+E",05,
 "DOS              Ctrl+D",04,
 "KOI              Ctrl+K",11,
 "UTF              Ctrl+U",21,
@@ -10,7 +10,7 @@ char *ITEMS_LIST[]={
 "Очистить кэш картинок"  ,02,
 #else
 "View source          F3",52,
-"Free image cache"       ,02,
+"Free image cache"       ,09,
 #endif
 0}; 
 
diff --git a/programs/cmm/lib/list_box.h b/programs/cmm/lib/list_box.h
index 69eb5cdf39..f74284e7c1 100644
--- a/programs/cmm/lib/list_box.h
+++ b/programs/cmm/lib/list_box.h
@@ -41,6 +41,7 @@ void llist::SetSizes(int xx, yy, ww, hh, min_hh, line_hh)
 
 int llist::MouseScroll(dword scroll_state)
 {
+	if (count<=visible) return 0;
 	if (scroll_state == 65535)
 	{
 		if (first == 0) return 0;