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

HTMLv files fix

Browse Source 
git-svn-id: svn://kolibrios.org@2416 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2012-02-28 10:49:22 +00:00
parent 0f5cbca619
commit 5ba5037595
3 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/network/htmlv/browser/TWB.h
View File

@ -81,7 +81,8 @@ void TWebBrowser::Scan(dword id) {
if (!strcmp(get_URL_part(5),"http:"))) HttpLoad();
//Lee 21.02 }
ShowPage(#URL);
copystr(#URL, #editURL);
//ShowPage(#URL);
Draw_Window();
return;
}
@ -202,8 +203,6 @@ void GetNewUrl(){
void HttpLoad()
{
za_kadrom = 0;
copystr(#URL, #editURL);
KillProcess(downloader_id); //óáèâàåì ñòàðûé ïðîöåññ
DeleteFile(#download_path);

6
programs/network/htmlv/browser/include/history.h
View File

@ -9,8 +9,8 @@ UrlsHistory BrowserHistory;
void UrlsHistory::GoBack()
{
//WriteDebug(#UrlHistory);
WriteDebug(#UrlHistory);
//find_symbol(#UrlHistory, '|')
j = strlen(#UrlHistory);
WHILE(UrlHistory[j] <>'|') && (j > 0) j--;
@ -20,6 +20,8 @@ void UrlsHistory::GoBack()
j--;
}
UrlHistory[j] = 0x00;
copystr(#URL, #editURL);
WB1.ShowPage(#URL);
}

93
programs/network/htmlv/lib/kolibri.h--
View File

@ -64,25 +64,6 @@ void mouse::get()
vert = EBX;
}
struct proc_info{
dword use_cpu;
word pos_in_stack,num_slot,rezerv1;
char name[11];
char rezerv2;
dword adress,use_memory,ID,left,top,width,height;
word status_slot,rezerv3;
dword work_left,work_top,work_width,work_height;
char status_window;
void GetInfo(dword ECX);
byte reserved[1024-71];
#define SelfInfo -1
};
void GetProcessInfo(dword EBX, ECX)
{
EAX = 9;
$int 0x40
}
struct system_colors{
dword frame,grab,grab_button,grab_button_text,grab_text,work,work_button,work_button_text,work_text,work_graph;
@ -140,16 +121,6 @@ inline fastcall word GetKey(){ //Gluk fix
EAX = EAX >> 8;
}
inline fastcall word GetButtonID(){
EAX = 17;
$int 0x40
EAX = EAX >> 8;
}
inline fastcall ExitProcess(){
EAX = -1; // close this program
$int 0x40
}
inline fastcall Pause(dword EBX)
{ //<2F> ã§ , ¢ á®âëå ¤®«ïå ᥪ㭤ë EBX = value
@ -157,7 +128,53 @@ inline fastcall Pause(dword EBX)
$int 0x40
}
//------------------------------------------------------------------------------
//==================================================================
inline fastcall word GetButtonID(){
EAX = 17;
$int 0x40
EAX = EAX >> 8;
}
struct proc_info{
dword use_cpu;
word pos_in_stack,num_slot,rezerv1;
char name[11];
char rezerv2;
dword adress,use_memory,ID,left,top,width,height;
word status_slot,rezerv3;
dword work_left,work_top,work_width,work_height;
char status_window;
void GetInfo(dword ECX);
byte reserved[1024-71];
#define SelfInfo -1
};
void GetProcessInfo(dword EBX, ECX)
{
EAX = 9;
$int 0x40
}
int GetProcessSlot(ECX) //ECX = process ID
{
EAX = 18;
EBX = 21;
$int 0x40;
}
inline fastcall ExitProcess(){
EAX = -1; // close this program
$int 0x40
}
inline fastcall KillProcess(dword ECX){
$mov eax,18;
$mov ebx,18;
$int 0x40
}
//==================================================================
//eax = ÿçûê ñèñòåìû (1=eng, 2=fi, 3=ger, 4=rus)
inline fastcall int GetSystemLanguage(){
@ -479,24 +496,26 @@ inline fastcall int utf8rutodos(dword ESI) //-
//------------------------------------------------------------------------------
byte WindowRePaint=0;
inline fastcall void WindowRedrawStatus(dword EBX)
{
EAX = 12; // function 12:tell os about windowdraw
$int 0x40
IF (EBX==1) WindowRePaint=1; ELSE WindowRePaint=0;
}
void DefineAndDrawWindow(dword x,y,sizeX,sizeY,byte mainAreaType,dword mainAreaColour,byte headerType,dword headerColour,EDI)
{
EAX = 12; // function 12:tell os about windowdraw
EBX = 1;
$int 0x40
EBX = x << 16 + sizeX;
ECX = y << 16 + sizeY;
EDX = mainAreaType << 24 | mainAreaColour;
ESI = headerType << 24 | headerColour;
$xor eax,eax
$int 0x40
EAX = 12; // function 12:tell os about windowdraw
EBX = 2;
$int 0x40
}
inline fastcall dword CreateThread(dword ECX,EDX)
{
EAX = 51;