Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8395 → Rev 8396

/programs/cmm/lib/draw_buf.h
44,10 → 44,9
 
void DrawBufer::Fill(dword start_pointer, i_fill_color)
{
dword i;
dword max_i = bufw * bufh * 4 + buf_data + 8;
dword max_i = bufw * bufh * 4 - start_pointer/4;
fill_color = i_fill_color;
@MEMSETD(buf_data+start_pointer+8, max_i-buf_data-start_pointer-8/4, fill_color);
@MEMSETD(buf_data+start_pointer+8, max_i, fill_color);
}
 
void DrawBufer::DrawBar(dword x, y, w, h, color)
122,47 → 121,11
}
}
 
/*
void DrawBufer::Zoom2x(int zoom)
void DrawBufer::Show(dword _y_offset, _h)
{
int i, s;
dword point_x, max_i, zline_w, s_inc;
 
point_x = 0;
max_i = bufw * bufh * 4 + buf_data+8;
s_inc = zoom * 4;
zline_w = zbufw * 4;
 
for (i=buf_data+8, s=zbuf_data+8; i<max_i; i+=4, s+= s_inc) {
ESDWORD[s] = ESDWORD[i];
ESDWORD[s+4] = ESDWORD[i];
ESDWORD[s+zline_w] = ESDWORD[i];
ESDWORD[s+zline_w+4] = ESDWORD[i];
if (zoom==3)
{
ESDWORD[s+8] = ESDWORD[i];
ESDWORD[zline_w+s+8] = ESDWORD[i];
ESDWORD[zline_w*2+s] = ESDWORD[i];
ESDWORD[zline_w*2+s+4] = ESDWORD[i];
ESDWORD[zline_w*2+s+8] = ESDWORD[i];
PutPaletteImage(_y_offset * bufw * 4 + buf_data+8, bufw, _h, bufx, bufy, 32, 0);
}
 
point_x++;
if (point_x >= bufw)
{
s += zoom - 1 * zline_w;
point_x = 0;
}
}
}
*/
 
 
void DrawBufer::Show(dword _y_offset)
{
PutPaletteImage(_y_offset * bufw * 4 + buf_data+8, bufw, bufh, bufx, bufy, 32, 0);
}
 
void DrawBufer::IncreaseBufSize()
{
static dword alloc_counter;
/programs/cmm/lib/kolibri.h
120,6 → 120,16
$shr eax,8
}
 
inline fastcall int GetKernelRev()
{
char buf[16];
EAX = 18;
EBX = 13;
ECX = #buf;
$int 0x40
EAX = ESDWORD[#buf+5];
}
 
inline fastcall dword GetFreeRAM()
{
$mov eax, 18
/programs/cmm/lib/obj/libimg.h
19,8 → 19,6
char alibimg[] = "/sys/lib/libimg.obj";
dword libimg_init = #alibimg_init;
dword img_is_img = #aimg_is_img;
dword img_to_rgb2 = #aimg_to_rgb2;
dword img_decode = #aimg_decode;
dword img_destroy = #aimg_destroy;
dword img_draw = #aimg_draw;
28,15 → 26,18
dword img_encode = #aimg_encode;
dword img_convert = #aimg_convert;
dword img_from_file = #aimg_from_file;
 
dword img_blend = #aimg_blend;
//dword img_resize = #aimg_resize;
//dword img_is_img = #aimg_is_img;
//dword img_to_rgb2 = #aimg_to_rgb2;
//dword img_scale = #aimg_scale;
//dword img_flip = #aimg_flip;
//dword img_rotate = #aimg_rotate;
 
$DD 2 dup 0
 
//import libimg , \
//import
char alibimg_init[] = "lib_init";
char aimg_is_img[] = "img_is_img";
char aimg_to_rgb2[] = "img_to_rgb2";
char aimg_decode[] = "img_decode";
char aimg_destroy[] = "img_destroy";
char aimg_draw[] = "img_draw";
44,11 → 45,14
char aimg_encode[] = "img_encode";
char aimg_convert[] = "img_convert";
char aimg_from_file[] = "img_from_file";
char aimg_blend[] = "img_blend";
//char aimg_resize[] = "img_resize";
//char aimg_is_img[] = "img_is_img";
//char aimg_to_rgb2[] = "img_to_rgb2";
//char aimg_scale[] = "img_scale";
//char aimg_flip[] = "img_flip";
//char aimg_rotate[] = "img_rotate ";
 
//invoke img.scale, ebx, 0, 0, [ebx + Image.Width], [ebx + Image.Height], 0, LIBIMG_SCALE_TYPE_STRETCH, LIBIMG_SCALE_ALG_BILINEAR, edx, ecx
 
#define LIBIMG_FORMAT_BMP 1
#define LIBIMG_FORMAT_ICO 2
#define LIBIMG_FORMAT_CUR 3
104,16 → 108,16
{
$push edi
EDI = image;
checksum = DSWORD[EDI];
//checksum = ESDWORD[EDI];
w = ESDWORD[EDI+4];
h = ESDWORD[EDI+8];
next = ESDWORD[EDI+12];
previous = ESDWORD[EDI+16];
//next = ESDWORD[EDI+12];
//previous = ESDWORD[EDI+16];
imgsrc = ESDWORD[EDI+24];
palette = ESDWORD[EDI+28];
extended = ESDWORD[EDI+32];
flags = ESDWORD[EDI+36];
delay = ESDWORD[EDI+40];
//palette = ESDWORD[EDI+28];
//extended = ESDWORD[EDI+32];
//flags = ESDWORD[EDI+36];
//delay = ESDWORD[EDI+40];
$pop edi
}