Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2152 → Rev 2153

/programs/network/htmlv/browser/HTMLv.c--
3,7 → 3,6
//Asper, Lrz, Nable, lev.
 
#include "../lib/kolibri.h--"
#include "../lib/memory.h--"
#include "../lib/file_system.h--"
#include "include/some_code.h--"
#include "img/toolbar_icons.c--"
39,10 → 38,14
 
void main()
{
mouse m; dword btn; byte key;
mouse m;
int btn;
byte key;
IF (param) copystr(#param,#URL);
BrowserHistory.AddUrl();
copystr(#URL,#editURL);
//Asper [
mem_Init();
$or eax, eax
/programs/network/htmlv/browser/History.txt
1,5 → 1,8
04.09.11 -- v0.68 -- 11.1 Êá
- óñòðàí¸í âûëåò ïðîãðàììû ïðè íåïðàâèëüíîì ïàðàìåòðå color òåãà <font> - àëñî èíîãäà äåéñòâèòåëüíî ïîëåçíî ÷èòàòü ìàíû.
- óñòðàí¸í âûëåò ïðîãðàììû ïðè íåïðàâèëüíîì ïàðàìåòðå color òåãà <font> - àëñî
èíîãäà äåéñòâèòåëüíî ïîëåçíî ÷èòàòü ìàíû;
- memory.h-- óäàë¸í êàê ñòàðûé äóáëèêàò, âñå ôóíêöèè ðàáîòû ñ ïàìÿòüþ îòíûíå
èñïîëüçóþò mem.h--, íàïèñàííûé Asper'îì.
 
20.08.11 -- v0.67 -- 11.1 Êá
- áîëåå àäåêâàòíàÿ ïðîêðóòêà èçîáðàæåíèé;
/programs/network/htmlv/browser/TWB.h--
173,10 → 173,12
 
 
 
void ReadHtml(byte DO_LOAD) {
IF(buf) free(buf);
buf = malloc(1048576);
void ReadHtml(byte DO_LOAD)
{
mem_Free(buf);
 
buf = mem_Alloc(1048576);
 
IF (!strcmp(get_URL_part(5),"http:")))
{
IF (DO_LOAD) && (!WindowRePaint)
193,8 → 195,38
filesize = EBX;
}
 
/*void ReadHtml(byte DO_LOAD)
{
char FileAdress[4096];
 
IF (!strcmp(get_URL_part(5),"http:"))
{
IF (DO_LOAD) //&& (!WindowRePaint)
{
DeleteFile(#download_path);
IF (URL[strlen(#URL)-1]=='/') URL[strlen(#URL)-1]='';
RunProgram("/sys/network/downloader", #URL);
RETURN;
}
copystr(#download_path, #FileAdress);
//ReadFile(0, 1048576, buf, #download_path);
}
ELSE copystr(#URL, #FileAdress);//ReadFile(0, 1048576, buf, #URL);
 
mem_Free(buf);
file_size stdcall (#FileAdress);
$mov filesize, ebx
buf = mem_Alloc(filesize);
WriteDebug(IntToStr(filesize));
//$mov buf, eax
//buf = malloc(1048576);
 
//filesize = EBX;
}*/
 
 
 
 
void TWebBrowser::Load(dword adress) {
IF (URL[0] == '#') { //ìû íå óìååì ïåðåõîäèòü ïî ññûëêå âíóòðè äîêóìåíòà. Ïîêà ÷òî...
copystr(#editURL, #URL);
/programs/network/htmlv/browser/include/some_code.h--
49,7 → 49,8
i, skin_width,
shift=-2;
 
italic_buf = malloc(w*h*3);
italic_buf = mem_Alloc(w*h*3);
skin_width = GetSkinWidth();
 
CopyScreen(italic_buf, w * 65536 + h, x + Form.left + 2 * 65536 + y + Form.top + skin_width);
58,5 → 59,5
FOR (i=0;i*tile_height<h;i++){
PutImage(w*3*tile_height*i+italic_buf,w,tile_height,x+shift-i+1,i*tile_height+y);
}
free(italic_buf);
mem_Free(italic_buf);
}
/programs/network/htmlv/lib/mem.h--
62,3 → 62,34
$pop ebx
$pop eax
}
 
//stdcall dword ??
inline fastcall mem_Move( EDI, ESI, ECX)
{
asm {
mov eax, ecx
cmp edi, esi
jg l1
je l2
sar ecx, 2
js l2
rep movsd
mov ecx, eax
and ecx, 3
rep movsb
jmp short l2
l1: lea esi, dsdword[ esi+ecx-4]
lea edi, dsdword[ edi+ecx-4]
sar ecx, 2
js l2
std
rep movsd
mov ecx, eax
and ecx, 3
add esi, 3
add edi, 3
rep movsb
cld
l2:
}
}