Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6786 → Rev 6791

/programs/cmm/lib/clipboard.h
32,9 → 32,9
}
 
#define SLOT_DATA_TYPE_TEXT 0
#define SLOT_DATA_TYPE_IMAGE 1
#define SLOT_DATA_TYPE_RAW 2
#define SLOT_DATA_TYPE_RESERVED 3
#define SLOT_DATA_TYPE_TEXT_WITH_BLOCK_SELECTION 1
#define SLOT_DATA_TYPE_IMAGE 2
#define SLOT_DATA_TYPE_RAW 3
dword Clipboard::GetSlotData( ECX) //ECX = slot number
{
dword result;
/programs/cmm/lib/keyboard.h
38,6 → 38,11
#define SCAN_CODE_PGDN 081
#define SCAN_CODE_PGUP 073
 
#define SCAN_CODE_KEY_C 046
#define SCAN_CODE_KEY_M 050
#define SCAN_CODE_KEY_O 024
#define SCAN_CODE_KEY_P 025
 
#define KEY_LSHIFT 00000000001b
#define KEY_RSHIFT 00000000010b
#define KEY_LCTRL 00000000100b
/programs/cmm/lib/kolibri.h
58,8 → 58,6
#define EVENT_MASK_NETWORK 010000000b
#define EVENT_MASK_DEBUG 100000000b
 
//ARGS FUNCTION
#define END_ARGS 0xFF00FF
//-------------------------------------------------------------------------
 
#include "../lib/system.h"
364,6 → 362,18
$int 0x40;
}
 
// @EDX is a procewss id, -1 for self
// @ESI is a new LayerBehaviour
// @RETURN: EAX, 0 is fail, 1 is success
#define WINDOW_LAYER_ALWAYS_ON_TOP 1
inline fastcall dword SetWindowLayerBehaviour(EDX, ESI)
{
EAX = 18;
EBX = 25;
ECX = 2;
$int 64
}
 
:void WriteTextB(dword x,y,byte fontType, dword color, str_offset)
{
EAX = 4;
414,11 → 424,11
$int 0x40;
}
 
:dword GetPixelColor(dword x, x_size, y)
:dword GetPixelColorFromScreen(dword _x, _y)
{
$mov eax, 35
EBX= y*x_size+x;
$int 0x40
EAX = 35;
EBX = _y * screen.width + _x;
$int 64
}
 
:void _PutImage(dword x,y, w,h, data_offset)
490,6 → 500,37
$int 0x40
}
 
void DefineDragableWindow(dword _x, _y, _w, _h)
{
DefineAndDrawWindow(_x, _y, _w, _h, 0x41,0x000000,NULL,0b);
}
 
:void EventDragWindow()
{
dword tmp_x,tmp_y;
dword z1,z2;
tmp_x = mouse.x;
tmp_y = mouse.y;
do {
mouse.get();
if (tmp_x!=mouse.x) || (tmp_y!=mouse.y)
{
z1 = Form.left + mouse.x - tmp_x;
z2 = Form.top + mouse.y - tmp_y;
if(z1<=10) || (z1>20000) z1=0; else if(z1>screen.width-Form.width-10)z1=screen.width-Form.width;
if(z2<=10) || (z2>20000) z2=0; else if(z2>screen.height-Form.height-10)z2=screen.height-Form.height;
MoveSize(z1 , z2, OLD, OLD);
draw_window();
}
pause(1);
} while (mouse.lkm);
}
 
:void DefineHiddenButton(dword _x, _y, _w, _h, _id)
{
DefineButton(_x, _y, _w, _h, _id + BT_HIDE, 0);
}
 
inline fastcall void DeleteButton( EDX)
{
EAX = 8;
/programs/cmm/lib/strings.h
794,6 → 794,7
 
inline cdecl int sprintf(dword buf, format,...)
{
#define END_ARGS 0xFF00FF //ARGS FUNCTION
byte s;
char X[10];
dword ret, tmp, l;