WebSVN – Kolibri OS – Diff – /programs/network/htmlv/browser/TWB.h

 int	downloader_id;
-dword j,
+dword
 	buf,
 	filesize,
-	blink = 400;
+	blink;
  int i;
 char download_path[]="/rd/1/.download";
 char search_path[]="http://nigma.ru/index.php?s=";
-char version[]=" Text-based Browser 0.93e";
+char version[]=" Text-based Browser 0.94";
 		//#1
 		if (URL[0] == '#')
+		{
-			copystr(#URL+find_symbol(#URL, '#'), #anchor);
+			strcpy(#anchor, #URL+find_symbol(#URL, '#'));
-			copystr(BrowserHistory.CurrentUrl(), #URL);
-			//copystr(#editURL, #URL + strlen(#URL));
-			//copystr(#URL, #editURL);
+			strcpy(#URL, BrowserHistory.CurrentUrl());
-			za_kadrom=count-max_kolvo_strok;
+			lines_first=lines_all-lines_visible;
 			ShowPage(#URL);
 			return;
+		}
 		//liner.ru#1
 		if (find_symbol(#URL, '#')<>-1)
+		{
-			copystr(#URL+find_symbol(#URL, '#'), #anchor);
+			strcpy(#anchor, #URL+find_symbol(#URL, '#'));
 			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);
-			copystr(BrowserHistory.CurrentUrl(), #URL);
+			strcpy(#URL, BrowserHistory.CurrentUrl());
 			return;
 		}
 		OpenPage();
 		return;
+	}
 				Pause(20);
 				Draw_Window();
 				return;
+			}
-			anchor_line_num=za_kadrom; //âåñ¸ëûé êîñòûëü :Ð
+			anchor_line_num=lines_first; //âåñ¸ëûé êîñòûëü :Ð
 			anchor[0]='|';
 			OpenPage();
 			return;
 		case 014: //Ctrl+N íîâîå îêíî
 		case 020: //Ctrl+T íîâàÿ âêëàäêà
 		case NEWTAB:
 			RunProgram(#program_path, #URL);
 			return;
 		case HOME:
-			copystr("http://kolibri-os.narod.ru", #editURL);
+			strcpy(#editURL, "http://kolibri-os.narod.ru");
 		case GOTOURL:
 		case 0x0D: //enter
-			copystr(#editURL, #URL);
+			strcpy(#URL, #editURL);
 			OpenPage();
 			return;
 		case 173:	//ctrl+enter
 		case SEARCHWEB:
-			copystr(#search_path, #URL);
+			strcpy(#URL, #search_path);
-			copystr(#editURL, #URL + strlen(#URL));
+			strcat(#URL, #editURL);
 			OpenPage();
 			return;
 		case ID1: //ìîòàåì ââåðõ
-			IF(za_kadrom <= 0) return;
+			IF(lines_first <= 0) return;
-			za_kadrom--;
+			lines_first--;
 			break;
 		case ID2: //ìîòàåì âíèç
-			IF(max_kolvo_strok + za_kadrom >= count) return;
+			IF(lines_visible + lines_first >= lines_all) return;
-			za_kadrom++;
+			lines_first++;
 			break;
 		case 183: //PgDown
-			IF(za_kadrom == count - max_kolvo_strok) return;
+			IF(lines_first == lines_all - lines_visible) return;
-			za_kadrom += max_kolvo_strok + 2;
+			lines_first += lines_visible + 2;
-			IF(max_kolvo_strok + za_kadrom > count) za_kadrom = count - max_kolvo_strok;
+			IF(lines_visible + lines_first > lines_all) lines_first = lines_all - lines_visible;
 			BREAK;
 		case 184: //PgUp
-			IF(za_kadrom == 0) RETURN;
+			IF(lines_first == 0) RETURN;
-			za_kadrom -= max_kolvo_strok - 2;
+			lines_first -= lines_visible - 2;
-			IF(za_kadrom < 0) za_kadrom = 0;
+			IF(lines_first < 0) lines_first = 0;
 			BREAK;
 		case 180: //home
-			IF(za_kadrom == 0) RETURN;
+			IF(lines_first == 0) RETURN;
-			za_kadrom = 0;
+			lines_first = 0;
 			BREAK;
 		case 181: //end
-			IF (za_kadrom == count - max_kolvo_strok) RETURN;
+			IF (lines_first == lines_all - lines_visible) RETURN;
-			za_kadrom = count - max_kolvo_strok;
+			lines_first = lines_all - lines_visible;
 			BREAK;
 		default:
 			RETURN;
+	}
 	ParseHTML(buf, filesize);
+}
 void GetNewUrl(){
-	IF (!strcmp(get_URL_part(2),"./")) copystr(#URL+2,#URL); //èãíîðèì :)
+	IF (!strcmp(get_URL_part(2),"./")) strcpy(#URL, #URL+2); //èãíîðèì :)
 	if (URL[0] <> '/')
 	&& (strcmp(get_URL_part(5),"http:")<>0)	&& (strcmp(get_URL_part(5),"mailt")<>0)	&& (strcmp(get_URL_part(5),"ftp:/")<>0)
+	{
-		copystr(BrowserHistory.CurrentUrl(), #editURL); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
+		strcpy(#editURL, BrowserHistory.CurrentUrl()); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
 		_CUT_ST_LEVEL_MARK:
 		if (editURL[find_symbol(#editURL, '/')-2]<>'/')  // åñëè íå http://pagename.ua <-- íàõðåíà ýòà ñòðîêà???
+		{
 			editURL[find_symbol(#editURL, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
 		}
 		IF (!strcmp(get_URL_part(3),"../")) //íà óðîâåíü ââåðõ
+		{
-			copystr(#URL+3,#URL);
+			strcpy(#URL,#URL+3);
 void OpenPage()
+{
 	if (GetProcessSlot(downloader_id)<>0) PutPaletteImage(#toolbar,200,42,0,0,8,#toolbar_pal);
 	KillProcess(downloader_id);
-	copystr(#URL, #editURL);
+	strcpy(#editURL, #URL);
 	BrowserHistory.AddUrl();
-	za_kadrom = count = 0;
 	if (!strcmp(get_URL_part(5),"http:")))
+	{
-		copystr(#version, #header);
 		KillProcess(downloader_id); //óáèâàåì ñòàðûé ïðîöåññ
 		DeleteFile(#download_path);
 		IF (URL[strlen(#URL)-1]=='/') URL[strlen(#URL)-1]='';
 		downloader_id = RunProgram("/sys/network/downloader", #URL);
 		//ýòî ãåíèàëüíî è ýòî ïèçäåö!!!
 		IF (downloader_id<0) RunProgram("@notify", "Error running Downloader. Internet unavilable.");
 		Draw_Window();
 		return;
+	}
-	ReadHtml();
+	lines_first = lines_all = 0;
+	ReadHtml();
 	if (filesize) wintodos(buf);
 	WB1.ShowPage(#URL);
+}
+void TWebBrowser::ParseHTML(dword bword, fsize){
-void TWebBrowser::ParseHTML(dword bword, fsize){
+	word bukva[1];
-	word bukva[1];
+	int j;
+	byte ignor_param = 0;
-	byte ignor_param = 0;
+	char temp[768];
 	char temp[768];
+	stroka = -lines_first;
-	stroka = -za_kadrom;
+	stolbec = 0;
+	for (j = 400; j < blink + 1; j++;) DeleteButton(j);
-	stolbec = 0;
+	blink = 400;
 	FOR(j = 400; j < blink + 1; j++;) DeleteButton(j);
 	b_text = i_text = u_text = s_text = pre_text = blq_text = body_present =
 	li_text = link = ignor_text = text_color_index = text_colors[0] = li_tab = 0; //îáíóëÿåì òåãè
-	link_color = 0x0000FF;
-	bg_color = 0xFFFFFF;
+	link_color = 0x0000FF;
-	blink = 400;
+	bg_color = 0xFFFFFF;
 	line = '';
-	copystr("|", #page_links);
+	strcpy(#page_links,"|");
-	copystr(#version, #header);
+	strcpy(#header,#version);
-	IF(!strcmp(#URL + strlen(#URL) - 4, ".txt"))
+	if (!strcmp(#URL + strlen(#URL) - 4, ".txt"))
+	{
 		DrawBar(left, top, width-15, 15, bg_color); //çàêðàøèâàåì ïåðâóþ ñòðîêó
 		pre_text = 1; //çà÷¸òíîå îòîáðàæåíèå òåêñòà
+	}
-	IF(!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
+	if (!strcmp(#URL + strlen(#URL) - 4, ".mht")) ignor_text = 1;
 	for (bword = buf; buf + fsize > bword; bword++;) {
 	  bukva = ESBYTE[bword];
 	  switch (bukva) {
+			{
 				tab_len=strlen(#line)/8;
 				tab_len=tab_len*8;
 				tab_len=8+tab_len-strlen(#line);
 				for (i=0; i
 				break;
+			}
 		case 0x0d:
 			bukva = ' ';
 			goto DEFAULT_MARK;
 		case '<':
 			bword++; //ïðîìîòàåì ñèìâîë <
-			IF(ESBYTE[bword] == '!') //ôèëüòðàöèÿ âíóòðè , äåðçêî
+			if (ESBYTE[bword] == '!') //ôèëüòðàöèÿ âíóòðè , äåðçêî
 			{
 				bword++;
-				IF(ESBYTE[bword] == '-') {
+				if (ESBYTE[bword] == '-') {
 					HH_: do {
 						bword++;
 						IF(bword >= buf + fsize) break 1;
 					} while (ESBYTE[bword] <>'-');
 					bword++;
-					IF(ESBYTE[bword] <>'-') GOTO HH_;
+					if (ESBYTE[bword] <>'-') goto HH_;
 				}
+			}
-			WHILE (ESBYTE[bword] <>'>') && (bword < buf + fsize) //ïîëó÷àåì òåã è åãî ïàðàìåòðû
+			while (ESBYTE[bword] <>'>') && (bword < buf + fsize) //ïîëó÷àåì òåã è åãî ïàðàìåòðû
 			{
 				bukva = ESBYTE[bword];
-				IF(bukva == '\9') || (bukva == '\x0a') || (bukva == '\x0d') bukva = ' ';
+				if (bukva == '\9') || (bukva == '\x0a') || (bukva == '\x0d') bukva = ' ';
-				IF(!ignor_param) && (bukva <>' ') copystr(#bukva, #tag + strlen(#tag));
+				if (!ignor_param) && (bukva <>' ') strcat(#tag, #bukva);
-				ELSE {
+				else
+				{
 					ignor_param = true;
-					copystr(#bukva, #tagparam + strlen(#tagparam));
+					strcat(#tagparam, #bukva);
 				}
 				bword++;
+			}
 			lowcase(#tag);
 			lowcase(#tagparam);
-			IF (tag[strlen(#tag)-1]=='/') tag[strlen(#tag)-1]=''; //íåáîëüøîé ôèêñ äëÿ ðàáîòû ñ XHTML-òåãàìè òèïà br/
+			if (tag[strlen(#tag)-1]=='/') tag[strlen(#tag)-1]=''; //íåáîëüøîé ôèêñ äëÿ ðàáîòû ñ XHTML-òåãàìè òèïà br/
-			IF(strlen(#tagparam) > 0) && (strlen(#tagparam) < 4000) GetNextParam();
+			if (strlen(#tagparam) > 0) && (strlen(#tagparam) < 4000) GetNextParam();
 			WhatTextStyle(left + 5, stroka * 10 + top + 5, width - 20); //îáðàáîòêà òåãîâ
 			line = tag = parametr = tagparam = ignor_param = 0; //âñ¸ îáíóëÿåì
 			break;
 		case '=': //ïîääåðæêà øàéòàíñêîé êîäèðîâêè ñòðàíèö, ñîõðàí¸ííûõ ÷åðåç ÈÅ7
-			IF(strcmp(#URL + strlen(#URL) - 4, ".mht")<>0) goto DEFAULT_MARK;
+			if (strcmp(#URL + strlen(#URL) - 4, ".mht")<>0) goto DEFAULT_MARK;
 			bword++;
 			bukva=ESBYTE[bword];
-			copystr(#bukva, #temp);
+			strcpy(#temp,#bukva);
 			bword++;
 			bukva=ESBYTE[bword];
-			copystr(#bukva, #temp + strlen(#temp));
+			strcat(#temp,#bukva);
 			bukva=Hex2Symb(#temp);
-			IF (bukva) goto DEFAULT_MARK;
+			if (bukva) goto DEFAULT_MARK;
 			break;
 		case '&': //îáðàáîòêà òåãîâ òèïà
-			IF(ignor_text) break;
+			if (ignor_text) break;
 			bword++;
 			tag='';
-			FOR (j=0;   (ESBYTE[bword] <>';') && (j < 7);     j++; bword++;)
+			for (j=0;  (ESBYTE[bword] <>';') && (j < 7);     j++, bword++;)
 			{
 				bukva = ESBYTE[bword];
-				copystr(#bukva, #tag + strlen(#tag));
+				strcat(#tag, #bukva);
+			}
-			FOR (j=0; unicode_tags[j]!=0; j+=2;)
+			for (j=0; unicode_tags[j]!=0; j+=2;)
+			{
-				IF(!strcmp(#tag, unicode_tags[j]))
+				if (!strcmp(#tag, unicode_tags[j]))
+				{
-					copystr(unicode_tags[j+1], #line + strlen(#line));
+					strcat(#line, unicode_tags[j+1]);
 					break 1;
+				}
 			}
 			rez = StrToInt(#tag + 1) - 1040;
-			IF(tag[1] == '1') && (rez>=0) && (rez<=72) && (strlen(#tag) == 5)
+			if (tag[1] == '1') && (rez>=0) && (rez<=72) && (strlen(#tag) == 5)
+				{
 					bukva = unicode_chars[rez];
 					GOTO DEFAULT_MARK; //îáðàáàòûâàåì áóêâó
+				}
-			//WriteDebug(#tag); //òýã íå íàéäåí - âûâîäèì íà äîñêó îòëàäêè
+			//debug(#tag); //òýã íå íàéäåí - âûâîäèì íà äîñêó îòëàäêè
-			copystr(#tag, #line + strlen(#line)); //âûâîäèì íà ýêðàí íåîáðàáîòàííûé òåã, òàê áðàóçåðû çà÷åì-òî äåëàþò
+			strcat(#line,#tag); //âûâîäèì íà ýêðàí íåîáðàáîòàííûé òåã, òàê áðàóçåðû çà÷åì-òî äåëàþò
 			break;
+		default:
-		default:
+			DEFAULT_MARK:
-			DEFAULT_MARK:
+			IF(ignor_text) break;
-			IF(ignor_text) break;
+			IF(!pre_text) && (bukva == ' ') && (!strcmp(#line + strlen(#line) - 1, " ")) continue;
-			IF(pre_text == 0) && (bukva == ' ') && (strcmp(#line + strlen(#line) - 1, " ") == 0) continue;
+			//
-			//
+			if (stolbec + strlen(#line) >lines_column_max)
-			if (stolbec + strlen(#line) > max_kolvo_stolbcov)
+			{
-			{
+				strcpy(#temp, #line + find_symbol(#line, ' ')); //ïåðåíîñ ïî ñëîâàì
-				copystr(#line + find_symbol(#line, ' '), #temp); //ïåðåíîñ ïî ñëîâàì
+				line[find_symbol(#line, ' ')] = 0x00;
-				line[find_symbol(#line, ' ')] = 0x00;
+			NEXT_MARK:
-				NEXT_MARK: IF(stroka - 1 > max_kolvo_strok) && (za_kadrom <>0) break 1; //óõîäèì...
+				IF(stroka - 1 > lines_visible) && (lines_first <>0) break 1; //óõîäèì...
 				WhatTextStyle(left + 5, stroka * 10 + top + 5, width - 20); //âûâîä ñòðîêè
 				TextGoDown(left + 5, stroka * 10 + top + 5, width - 20); //çàêðàøèâàåì ñëåäóùóþ ñòðîêó
-				copystr(#temp, #line);
+				strcpy(#line, #temp);
+			}
-			IF(pre_text == 0) && (bukva == ' ') && (stolbec == 0) && (strlen(#line) == 0) CONTINUE;
+			if (!pre_text) && (bukva == ' ') && (!stolbec) && (!line) CONTINUE;
-			copystr(#bukva, #line + strlen(#line));
+			strcat(#line, #bukva);
+	  }
+	}
-	if (strcmp(#URL + strlen(#URL) - 4, ".txt")<>0) && (body_present==0)
+	if (strcmp(#URL + strlen(#URL) - 4, ".txt")<>0) && (!body_present)
 		DrawBar(left, top, width-15, 15, bg_color); //çàêðàøèâàåì ïåðâóþ ñòðîêó åñëè êàêîé-òî ðàõèò íå ñîçäàë òåã áîäè
-	if (max_kolvo_strok * 10 + 25 <= height)
+	if (lines_visible * 10 + 25 <= height)
-		DrawBar(left, max_kolvo_strok * 10 + top + 25, width - 15, -max_kolvo_strok * 10 + height - 25, bg_color);
+		DrawBar(left, lines_visible * 10 + top + 25, width - 15, -lines_visible * 10 + height - 25, bg_color);
 	if (stroka * 10 + 15 <= height)
 	IF (kavichki)
+	{
 		i=find_symbol(#tagparam, kavichki);
-		copystr(#tagparam + i, #options);
+		strcpy(#options, #tagparam + i);
+	}
 	ELSE
+	{
 		WHILE((i > 0) && (tagparam[i] <>'=')) i--; //i=find_symbol(#tagparam, '=')+1;
 		i++;
-		copystr(#tagparam + i, #options); //êîïèðóåì îïöèþ
+		strcpy(#options, #tagparam + i); //êîïèðóåì îïöèþ
-		WHILE (options[0] == ' ') copystr(#options + 1, #options);
+		WHILE (options[0] == ' ') strcpy(#options, #options+1);
+	}
 	tagparam[i] = 0x00;
 			tagparam[i + 1] = 0x00;
+		}
+	}
-	copystr(#tagparam + i + 1, #parametr); //êîïèðóåì ïàðàìåòð
+	strcpy(#parametr, #tagparam + i + 1); //êîïèðóåì ïàðàìåòð
 	tagparam[i] = 0x00;
+}
 	dword hr_color;
     dword image=0;
     char temp[4096];
-    int w, h, img_za_kadrom=0;
+    int w, h, img_lines_first=0;
 	//ïðîâåðÿåì òåã îòêðûâàåòñÿ èëè çàêðûâàåòñÿ
 	IF(tag[0] == '/')
+	{
 		rez = 0;
-		copystr(#tag + 1, #tag);
+		strcpy(#tag, #tag+1);
+	}
 	ELSE
 		rez = 1;
 	IF(!chTag("script")) || (!chTag("style")) || (!chTag("binary")) ignor_text = rez;
 	if(!chTag("title")) && (!rez)
+	{
-		copystr(#line, #header);
+		strcpy(#header, #line);
-		copystr(" -", #header + strlen(#header));
+		strcat(#header, " -");
-		copystr(#version, #header + strlen(#header));
+		strcat(#header, #version);
 		if (stroka==0) DrawTitle(#header);
 		return;
+	}
 	IF (ignor_text == 1) return;
 	//
 	//
-	IF(!chTag("q")) copystr("\"", #line + strlen(#line));
+	IF(!chTag("q")) strcat(#line, "\"");
 	//âûâîä íà ýêðàí
-	if (stroka >= 0) && (stroka - 2 < max_kolvo_strok) && (line) && (!anchor)
+	if (stroka >= 0) && (stroka - 2 < lines_visible) && (line) && (!anchor)
+	{
 		WriteText(stolbec * 6 + left1, top1, 0x80, text_colors[text_color_index], #line, 0); //ìîæåò òóò ðèñîâàòü áåëóþ ñòðîêó?
 	if (anchor) && (!strcmp(#parametr, "id=")) //î÷åíü ïëîõî!!! ïîòîìó ÷òî åñëè íå ïîñëåäíèé òåã, ðàáîòàòü íå áóäåò
+	{
 		if (!strcmp(#anchor, #options))
+		{
-			anchor_line_num=za_kadrom+stroka;
+			anchor_line_num=lines_first+stroka;
+		}
+	}
 	if (!chTag("body"))
+		{
 			_A_MARK:
 			if (!strcmp(#parametr, "href="))
+			{
-				if (stroka - 1 > max_kolvo_strok) || (stroka < -2) return;
+				if (stroka - 1 > lines_visible) || (stroka < -2) return;
 				if (link == 1) text_color_index--; //åñëè êàêîé-òî äîëáî¸á íå çàêðûë òýã
 				link = 1;
 				blink++;
 				text_color_index++;
 				text_colors[text_color_index] = link_color;
-				copystr(#options, #page_links + strlen(#page_links));
+				strcat(#page_links, #options);
-				copystr("|", #page_links + strlen(#page_links));
+				strcat(#page_links, "|");
 			}
 			if (anchor) && (!strcmp(#parametr, "name="))
+			{
 				if (!strcmp(#anchor, #options))
+				{
-					anchor_line_num=za_kadrom+stroka;
+					anchor_line_num=lines_first+stroka;
 				}
+			}
 			if (tagparam)
+			{
 				GetNextParam();
 				GOTO _A_MARK;
+	}
 	/////////////////////////
 	if (!chTag("font"))
+	{
-		IF (stroka - 1 > max_kolvo_strok) return;
+		IF (stroka - 1 > lines_visible) return;
 		COL_MARK:
 		if (strcmp(#parametr, "color=") == 0) //&& (parametr[1] == '#')
+		{
 			text_color_index++;
 			text_colors[text_color_index] = GetColor(#options);
+		}
 		IF(!rez) && (text_color_index > 0) text_color_index--;
 		return;
+	}
 	//////////////////////////
-	IF(!chTag("tr")) || (!chTag("br")) {
+	if(!chTag("tr")) || (!chTag("br")) {
 		TextGoDown(left1, top1, width1);
 		return;
+	}
-	IF(!chTag("div")) {
+	if (!chTag("div")) {
 		IF(oldtag[0] <>'h') TextGoDown(left1, top1, width1);
 		return;
+	}
-	IF(!chTag("p")) {
+	if (!chTag("p")) {
 		IF(oldtag[0] == 'h') return;
 		TextGoDown(left1, top1, width1);
 		IF(rez) TextGoDown(left1, top1 + 10, width1);
 		return;
+	}
 	////////////////////////////
-	IF(!chTag("h1")) || (!chTag("h2")) || (!chTag("h3")) || (!chTag("h4")) {
+	if (!chTag("h1")) || (!chTag("h2")) || (!chTag("h3")) || (!chTag("h4")) {
 		TextGoDown(left1, top1, width1);
 		IF(rez) TextGoDown(left1, top1 + 10, width1);
 		b_text = rez;
-		copystr(#tag, #oldtag);
+		strcpy(#oldtag, #tag);
 		return;
 	} ELSE copystr("", #oldtag);
+	else
+		oldtag='';
-	IF(!chTag("b")) || (!chTag("strong")) || (!chTag("big")) {
+	if (!chTag("b")) || (!chTag("strong")) || (!chTag("big")) {
 		b_text = rez;
 		return;
+	}
 	////////////////////////////
-	IF(!chTag("i")) || (!chTag("em")) || (!chTag("subtitle")) {
+	if(!chTag("i")) || (!chTag("em")) || (!chTag("subtitle")) {
 		i_text = rez;
 		return;
+	}
 	////////////////////////////
 	if (!chTag("dt"))
+	{
+	{
 		li_text = rez;
 		IF(rez == 0) return;
 		TextGoDown(left1, top1, width1);
-		IF(stroka > -1) && (stroka - 2 < max_kolvo_strok) DrawBar(li_tab * 5 * 6 + left1 - 5, top1 + 12, 2, 2, 0);
+		IF(stroka > -1) && (stroka - 2 < lines_visible) DrawBar(li_tab * 5 * 6 + left1 - 5, top1 + 12, 2, 2, 0);
 		return;
+	}
 	////////////////////////////
 	IF(!chTag("u")) || (!chTag("ins")) u_text = rez;
 	IF(!chTag("s")) || (!chTag("strike")) || (!chTag("del")) s_text = rez;
 	IF(!chTag("ul")) || (!chTag("ol")) IF(!rez) {
 		//IF (GetFileInfo(#libimg)<>0) return;  //åñëè áèáëèîòåêè íåò
 		IMG_TAG:
 			IF (strcmp(#parametr,"src=")==0)   //íàäî îáúåäèíèòü ñ GetNewUrl()
+	          {
-				copystr(BrowserHistory.CurrentUrl(), #temp); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
+				strcpy(#temp, BrowserHistory.CurrentUrl()); //äîñòà¸ì àäðåñ òåêóùåé ñòðàíèöû
 				temp[find_symbol(#temp, '/')] = 0x00; //îáðåçàåì å¸ óðë äî ïîñëåäíåãî /
-				copystr(#options,#temp+strlen(#temp));
+				strcat(#temp, #options);
 				image=load_image(#temp);
 	                w=DSWORD[image+4];
 	                h=DSWORD[image+8];
+	          }
 				return;
 			if (top1
+			{
-				img_za_kadrom=WB1.top-top1;
+				img_lines_first=WB1.top-top1;
-				h=h-img_za_kadrom;
+				h=h-img_lines_first;
 				top1=WB1.top;
+			}
-			if (top1>WB1.top+WB1.height-h-15) //åñëè ÷àñòü èçîáðàæåíèÿ ñíèçó     IF (stroka - 2 < max_kolvo_strok)
+			if (top1>WB1.top+WB1.height-h-15) //åñëè ÷àñòü èçîáðàæåíèÿ ñíèçó     IF (stroka - 2 < lines_visible)
+			{
 				h=WB1.top+WB1.height-top1-15;
+			}
 			IF (h<=0) return;
-			img_draw stdcall (image,left1-5,top1+10,w, h,0,img_za_kadrom);
+			img_draw stdcall (image,left1-5,top1+10,w, h,0,img_lines_first);
 			DrawBar(left1+w - 5, top1 + 10, width1-w + 5, h, bg_color);
 			IF (link)
+	{
 		META:
 		if (!strcmp(#parametr, "charset=")) || (!strcmp(#parametr, "content=")) || (!strcmp(#parametr, "encoding="))
+		{
-			copystr(#options[find_symbol(#options, '=')],#options); //ïîèñê â content=
+			strcpy(#options, #options[find_symbol(#options, '=')]); //ïîèñê â content=
 			IF (!strcmp(#options,"utf-8")) || (!strcmp(#options,"utf8"))
+			{
 				ReadHtml();
 				utf8rutodos(buf);
+			{
 				ReadHtml();
+			}
+		}
-		IF(tagparam)
+		if (tagparam)
 		{
 			GetNextParam();
 			goto META;
+		}
 		return;
+	}
 	stroka++;
 	IF(blq_text == 1) stolbec = 8;
 	ELSE stolbec = 0;
 	IF(li_text == 1) stolbec = li_tab * 5;
-	IF(stroka >= 0) && (stroka - 2 < max_kolvo_strok)  && (!anchor) DrawBar(left1 - 5, top1 + 10, width1 + 5, 10, bg_color);
+	IF(stroka >= 0) && (stroka - 2 < lines_visible)  && (!anchor) DrawBar(left1 - 5, top1 + 10, width1 + 5, 10, bg_color);
 }
 //ñêðîëë
 void TWebBrowser::DrawScroller() //íå îïòèìàëüíàÿ îòðèñîâêà, íî çàòî â îäíîì ìåñòå
 {
-	scroll1.max_area = count;
+	scroll1.max_area = lines_all;
-	scroll1.cur_area = max_kolvo_strok;
+	scroll1.cur_area = lines_visible;
-	scroll1.position = za_kadrom;
+	scroll1.position = lines_first;
 	scroll1.all_redraw=1;

Subversion Repositories Kolibri OS

(root)/programs/network/htmlv/browser/TWB.h – Rev 2803 → 2810