sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

HTMLv: httplib integration from hidnplayr step #3, uses native_http checkbox (non-stable, off by default)

Browse Source 
git-svn-id: svn://kolibrios.org@4554 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2014-02-02 19:20:59 +00:00
parent 7441360013
commit 3416e337d4
2 changed files with 88 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
programs/cmm/TWB/TWB.c
View File

@ -141,30 +141,61 @@ void TWebBrowser::GetNewUrl(){
} }
void TWebBrowser::ReadHtml(byte encoding) void TWebBrowser::ReadHtml(byte encoding)
{ {
if (!strncmp(#URL,"http:",5)) if (native_http)
file_size stdcall (#download_path); {
if (strncmp(#URL,"http:",5)) {
file_size stdcall (#URL);
bufsize = EBX;
}
if (!bufsize) return;
if (strncmp(#URL,"http:",5)) {
mem_Free(bufpointer);
bufpointer = mem_Alloc(bufsize);
}
if (strncmp(#URL,"http:",5)) ReadFile(0, bufsize, bufpointer, #URL);
cur_encoding = encoding;
if (encoding==_WIN) wintodos(bufpointer);
if (encoding==_UTF) utf8rutodos(bufpointer);
if (encoding==_KOI) koitodos(bufpointer);
}
else else
file_size stdcall (#URL); {
if (!strncmp(#URL,"http:",5))
bufsize = EBX; file_size stdcall (#download_path);
if (!bufsize) return; else
file_size stdcall (#URL);
mem_Free(bufpointer);
bufpointer = mem_Alloc(bufsize); bufsize = EBX;
if (!strncmp(#URL,"http:",5)) if (!bufsize) return;
ReadFile(0, bufsize, bufpointer, #download_path);
else mem_Free(bufpointer);
ReadFile(0, bufsize, bufpointer, #URL); bufpointer = mem_Alloc(bufsize);
if (!strncmp(#URL,"http:",5))
cur_encoding = encoding; ReadFile(0, bufsize, bufpointer, #download_path);
if (encoding==_WIN) wintodos(bufpointer); else
if (encoding==_UTF) utf8rutodos(bufpointer); ReadFile(0, bufsize, bufpointer, #URL);
if (encoding==_KOI) koitodos(bufpointer);
cur_encoding = encoding;
if (encoding==_WIN) wintodos(bufpointer);
if (encoding==_UTF) utf8rutodos(bufpointer);
if (encoding==_KOI) koitodos(bufpointer);
}
} }
/*
void TWebBrowser::ReadHtml(byte encoding)
{
}
*/
void TWebBrowser::Parse(dword bufpos, in_filesize){ void TWebBrowser::Parse(dword bufpos, in_filesize){
word bukva[2]; word bukva[2];

55
programs/cmm/browser/HTMLv.c
View File

@ -43,6 +43,8 @@
unsigned char page_not_found[] = FROM "html\page_not_found_en.htm"; unsigned char page_not_found[] = FROM "html\page_not_found_en.htm";
#endif #endif
byte native_http=0;
proc_info Form; proc_info Form;
#define WIN_W 640 #define WIN_W 640
#define WIN_H 480 #define WIN_H 480
@ -171,27 +173,26 @@ void main()
break; break;
case evNetwork: case evNetwork:
return;
http_get stdcall (#search_path, 0);
http_transfer = EAX;
IF (http_transfer < 0) notify("Error from HTTP lib");
if (http_transfer > 0) { if (http_transfer > 0) {
http_process stdcall (http_transfer); http_process stdcall (http_transfer);
$push EAX $push EAX
ESI = http_transfer; ESI = http_transfer;
bufpointer = ESI.http_msg.content_ptr; bufpointer = ESI.http_msg.content_ptr;
debug(bufpointer); bufsize = ESI.http_msg.content_received;
//bufsize = ESI.http_msg.content_received;
bufsize = strlen(bufpointer)-2;
debugi(bufsize);
WB1.Parse(bufpointer, bufsize); WB1.Parse(bufpointer, bufsize);
$pop EAX $pop EAX
if (EAX == 0) { if (EAX == 0) {
// Loading the page is complete, free resources
http_free stdcall (http_transfer); http_free stdcall (http_transfer);
http_transfer=0; http_transfer=0;
Draw_Window(); // stop button => refresh button
} else {
// We are still loading the page, this means that because of crappy memory manager,
// the address of the HTTP data may change.
// Because this would result in pagefault when redrawing window while loading, we disable this possibility.
bufsize = 0;
} }
pause(10);
} }
default: default:
if (downloader_id<>0) if (downloader_id<>0)
@ -231,7 +232,7 @@ void Draw_Window()
if (Form.width<280) MoveSize(OLD,OLD,280,OLD); if (Form.width<280) MoveSize(OLD,OLD,280,OLD);
PutPaletteImage(#toolbar,200,42,0,0,8,#toolbar_pal); PutPaletteImage(#toolbar,200,42,0,0,8,#toolbar_pal);
if (GetProcessSlot(downloader_id)<>0) _PutImage(88,10, 24,24, #stop_btn); if (GetProcessSlot(downloader_id)<>0) || (http_transfer > 0) _PutImage(88,10, 24,24, #stop_btn);
DrawBar(200,0,Form.cwidth-200,43,0xE4DFE1); DrawBar(200,0,Form.cwidth-200,43,0xE4DFE1);
DrawBar(0,42,Form.cwidth,1,0xE2DBDC); DrawBar(0,42,Form.cwidth,1,0xE2DBDC);
@ -305,6 +306,17 @@ void Scan(int id)
return; return;
case REFRESH: case REFRESH:
if (http_transfer<>0)
{
EAX = http_transfer;
EAX = EAX.http_msg.content_ptr; // get pointer to data
$push EAX // save it on the stack
http_free stdcall (http_transfer); // abort connection
$pop EAX
mem_Free(EAX); // free data
http_transfer=0;
bufsize = 0;
}
if (GetProcessSlot(downloader_id)<>0) if (GetProcessSlot(downloader_id)<>0)
{ {
KillProcess(downloader_id); KillProcess(downloader_id);
@ -444,10 +456,19 @@ void OpenPage()
pre_text =0; pre_text =0;
if (!strncmp(#URL,"http:",5)) if (!strncmp(#URL,"http:",5))
{ {
KillProcess(downloader_id); if (native_http)
DeleteFile(#download_path); {
downloader_id = RunProgram("/sys/network/downloader", #URL); http_get stdcall (#URL, 0);
IF (downloader_id<0) notify("Error running Downloader. Internet unavilable."); http_transfer = EAX;
IF (http_transfer < 0) notify("Error from HTTP lib");
}
else
{
KillProcess(downloader_id);
DeleteFile(#download_path);
downloader_id = RunProgram("/sys/network/downloader", #URL);
IF (downloader_id<0) notify("Error running Downloader. Internet unavilable.");
}
Draw_Window(); Draw_Window();
return; return;
} }