Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3224 → Rev 3225

/programs/cmm/lib/figures.h
1,25 → 1,27
//#include "strings.h"
 
void DrawRectangle(dword x,y,width,height,color1)
void DrawRectangle(dword x,y,w,h,color1)
{
DrawBar(x,y,width,1,color1);
DrawBar(x,y+height,width,1,color1);
DrawBar(x,y,1,height,color1);
DrawBar(x+width,y,1,height+1,color1);
if (w<=0) || (h<=0) return;
DrawBar(x,y,w,1,color1);
DrawBar(x,y+h,w,1,color1);
DrawBar(x,y,1,h,color1);
DrawBar(x+w,y,1,h+1,color1);
}
 
void DrawRectangle3D(dword x,y,width,height,color1,color2)
void DrawRectangle3D(dword x,y,w,h,color1,color2)
{
DrawBar(x,y,width+1,1,color1);
DrawBar(x,y+1,1,height-1,color1);
DrawBar(x+width,y+1,1,height,color2);
DrawBar(x,y+height,width,1,color2);
if (w<=0) || (h<=0) return;
DrawBar(x,y,w+1,1,color1);
DrawBar(x,y+1,1,h-1,color1);
DrawBar(x+w,y+1,1,h,color2);
DrawBar(x,y+h,w,1,color2);
}
 
void DrawCaptButton(dword x,y,width,height,id,color_b, color_t,text)
void DrawCaptButton(dword x,y,w,h,id,color_b, color_t,text)
{
DefineButton(x,y,width,height,id,color_b);
WriteText(-strlen(text)*6+width/2+x+1,height/2-3+y,0x80,color_t,text);
DefineButton(x,y,w,h,id,color_b);
WriteText(-strlen(text)*6+w/2+x+1,h/2-3+y,0x80,color_t,text);
}
 
void DrawCircle(int x, y, r)
60,16 → 62,21
 
void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent, status_text)
{
int progress_w = progress_percent * st_w / 100 - 3;
int progress_w;
static int fill_old;
if (!progress_percent) {DrawBar(st_x,st_y, st_x + st_y + fill_old + 15,st_h+1, col_fon); return;}
if (progress_percent<=0) {DrawBar(st_x,st_y, st_x + st_w + fill_old + 15,st_h+1, col_fon); fill_old=0; return;}
DrawRectangle(st_x, st_y, st_w,st_h, col_border);
DrawRectangle3D(st_x+1, st_y+1, st_w-2,st_h-2, 0xFFFfff, 0xFFFfff);
if (progress_percent) DrawBar(st_x+2, st_y+2, progress_w, st_h-3, col_fill);
if (progress_percent<100) DrawBar(st_x+2+progress_w, st_y+2, st_w-progress_w-3, st_h-3, 0xFFFfff);
if (progress_percent>0) && (progress_percent<=100)
{
progress_w = st_w - 3 * progress_percent / 100;
DrawBar(st_x+2, st_y+2, progress_w, st_h-3, col_fill);
DrawBar(st_x+2+progress_w, st_y+2, st_w-progress_w-3, st_h-3, 0xFFFfff);
}
if (status_text)
{
DrawBar(st_x+st_w+15, st_h/2-4+st_y, fill_old, 9, col_fon);
/programs/cmm/lib/kolibri.h
465,7 → 465,7
 
void DrawBar(dword x,y,w,h,EDX)
{
if (h<=0) || (h>65000) return; //bad boy :)
if (h<=0) || (h>60000) || (w<=0) || (w>60000) return; //bad boy :)
EAX = 13;
EBX = x<<16+w;
ECX = y<<16+h;
/programs/cmm/lib/list_box.h
0,0 → 1,45
//list_box
 
struct llist
{
int x, y, w, h, min_h;
int line_h;
int count, visible, first, current;
void ClearList();
void SetSizes(int xx, yy, ww, hh, min_hh, line_hh);
int MouseScroll(dword scroll_state);
};
 
 
void llist::ClearList()
{
count = visible = first = current = 0;
}
 
 
void llist::SetSizes(int xx, yy, ww, hh, min_hh, line_hh)
{
x = xx;
y = yy;
w = ww;
h = hh;
min_h = min_hh;
line_h = line_hh;
}
 
 
int llist::MouseScroll(dword scroll_state)
{
if (scroll_state == 65535)
{
if (first == 0) return 0;
if (first > 3) first -= 2; else first=0;
return 1;
}
if (scroll_state == 1)
{
if (visible+first+3 >= count) first = count - visible; else first+=2;
return 1;
}
return 0;
}
/programs/cmm/lib/strings.h
210,11 → 210,11
}
 
 
void strcpyb(dword searchin, copyin, startstr, endstr)
void strcpyb(dword search_in, copyin, startstr, endstr)
{
dword startp, endp;
startp = strstr(searchin, startstr) + strlen(startstr);
endp = strstr(startp, endstr);
startp = strstr(search_in, startstr) + strlen(startstr);
endp = strstri(startp, endstr);
if (startp==endp) return;
do
{