Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4485 → Rev 4486

/programs/cmm/TWB/TWB.c
17,7 → 17,6
char header[2048];
 
 
 
char download_path[]="/rd/1/.download";
 
struct TWebBrowser {
32,6 → 31,7
void DrawScroller();
void TextGoDown();
};
 
TWebBrowser WB1;
 
byte rez, b_text, i_text, u_text, s_text, pre_text, blq_text, li_text, li_tab,
593,12 → 593,12
}
if (strcmp(#parametr, "color=") == 0) hr_color = GetColor(#options); else hr_color = 0x999999;
TextGoDown(left1, top1, width1);
DrawBuf.DrawBar(5, WB1.list.line_h/2, WB1.list.w-10, 1, hr_color);
TextGoDown(left1, top1+WB1.list.line_h, width1);
DrawBuf.DrawBar(5, list.line_h/2, list.w-10, 1, hr_color);
TextGoDown(left1, top1+list.line_h, width1);
}
if (!chTag("img"))
{
Images( left1, top1, width1);
ImgCache1.Images( left1, top1, width1);
return;
}
if (!chTag("meta")) || (!chTag("?xml"))
624,8 → 624,8
scroll_wv.position = list.first;
 
scroll_wv.all_redraw=1;
scroll_wv.start_x = WB1.list.x + WB1.list.w;
scroll_wv.size_y=WB1.list.h;
scroll_wv.start_x = list.x + list.w;
scroll_wv.size_y=list.h;
 
scrollbar_v_draw(#scroll_wv);
}
633,12 → 633,12
 
void TWebBrowser::TextGoDown(int left1, top1, width1)
{
if (!stroka) DrawBar(WB1.list.x, WB1.list.y, WB1.list.w, 5, bg_color); //çàêðàøèâàåì ôîí íàä ïåðâîé ñòðîêîé
if (top1>=WB1.list.y) && ( top1 < WB1.list.h+WB1.list.y-10) && (!anchor)
if (!stroka) DrawBar(list.x, list.y, list.w, 5, bg_color); //çàêðàøèâàåì ôîí íàä ïåðâîé ñòðîêîé
if (top1>=list.y) && ( top1 < list.h+list.y-10) && (!anchor)
{
if (text_align == ALIGN_CENTER) DrawBuf.AlignCenter(left1,top1,WB1.list.w,WB1.list.line_h,stolbec * 6);
if (text_align == ALIGN_RIGHT) DrawBuf.AlignRight(left1,top1,WB1.list.w,WB1.list.line_h,stolbec * 6);
PutPaletteImage(buf_data+8, WB1.list.w, WB1.list.line_h, left1-5, top1, 32,0);
if (text_align == ALIGN_CENTER) DrawBuf.AlignCenter(left1,top1,list.w,list.line_h,stolbec * 6);
if (text_align == ALIGN_RIGHT) DrawBuf.AlignRight(left1,top1,list.w,list.line_h,stolbec * 6);
PutPaletteImage(buf_data+8, list.w, list.line_h, left1-5, top1, 32,0);
DrawBuf.Fill(bg_color);
}
stroka++;
/programs/cmm/TWB/img_cache.h
3,31 → 3,38
dword *image;
char path[4096];
};
 
s_image pics[100]; //pics = mem_Alloc( 100*sizeof(s_image) );
int num_of_pics;
 
int GetOrSetPicNum(dword i_path)
struct ImgCache {
int pics_count;
void Free();
int GetImage();
void Images();
} ImgCache1;
 
void ImgCache::Free()
{
int i;
for (i=0; i<num_of_pics; i++)
for ( ; pics_count>0; pics_count--)
{
if (!strcmp(#pics[i].path, i_path)) return i;
if (pics[pics_count].image) img_destroy stdcall (pics[pics_count].image);
pics[pics_count].path = NULL;
}
num_of_pics++;
return num_of_pics;
}
 
void FreeImgCache()
int ImgCache::GetImage(dword i_path)
{
for ( ; num_of_pics>0; num_of_pics--)
{
if (pics[num_of_pics].image) img_destroy stdcall (pics[num_of_pics].image);
pics[num_of_pics].path = NULL;
int i;
for (i=0; i<pics_count; i++) if (!strcmp(#pics[i].path, i_path)) return i; //image exists
// Load image and add it to Cache
pics_count++;
pics[pics_count].image = load_image(i_path);
strcpy(#pics[pics_count].path, i_path);
return pics_count;
}
}
 
 
void Images(int left1, top1, width1)
void ImgCache::Images(int left1, top1, width1)
{
dword image;
char img_path[4096], alt[4096];
49,14 → 56,9
img_path[strrchr(#img_path, '/')] = '\0';
strcat(#img_path, #options);
}
cur_pic=GetOrSetPicNum(#img_path);
if (!pics[cur_pic].path)
{
pics[cur_pic].image=load_image(#img_path);
strcpy(#pics[cur_pic].path, #img_path);
cur_pic = GetImage(#img_path);
}
}
}
if (!strcmp(#parametr,"alt="))
{
strcpy(#alt, "[");