Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7147 → Rev 7148

/programs/cmm/backgen/compile_en.bat
File deleted
\ No newline at end of file
/programs/cmm/backgen/colors_mas.h
File deleted
/programs/cmm/backgen/Tupfile.lua
File deleted
/programs/cmm/backgen/backgen.c
File deleted
\ No newline at end of file
/programs/cmm/iconedit/Tupfile.lua
0,0 → 1,6
if tup.getconfig("NO_CMM") ~= "" then return end
if tup.getconfig("LANG") == "ru"
then C_LANG = "LANG_RUS"
else C_LANG = "LANG_ENG" -- this includes default case without config
end
tup.rule("iconedit.c", "c-- /D=AUTOBUILD /D=$(C_LANG) %f" .. tup.getconfig("KPACK_CMD"), "iconedit.com")
/programs/cmm/iconedit/colors_mas.h
0,0 → 1,139
struct _colors
{
int x,y,w,h;
unsigned rows, columns;
unsigned cell_size;
dword mas[MAX_COLORS*MAX_COLORS];
dword image;
void set_default_values();
void set_color();
dword get_color();
dword get_image();
void draw_cell();
void draw_all_cells();
void move();
} colors;
 
void _colors::set_default_values()
{
int i;
 
columns = MAX_COLORS;
rows = MAX_COLORS;
cell_size = 5;
w = columns * cell_size;
h = rows * cell_size;
 
for (i = 0; i < columns*rows; i++) mas[i]=0xBFCAD2;
}
 
void _colors::set_color(int _r, _c, _color)
{
mas[MAX_COLORS*_r + _c] = _color;
}
 
dword _colors::get_color(int _r, _c)
{
return mas[MAX_COLORS*_r + _c];
}
 
dword _colors::get_image()
{
int r=0, c=0;
dword i;
 
free(image);
i = image = malloc(rows*columns*3);
 
for (r = 0; r < rows; r++)
{
for (c = 0; c < columns; c++)
{
rgb.DwordToRgb(get_color(r,c));
ESBYTE[i] = rgb.b;
ESBYTE[i+1] = rgb.g;
ESBYTE[i+2] = rgb.r;
i += 3;
}
}
return image;
}
 
void _colors::draw_cell(int _x, _y, _color)
{
//DrawRectangle(_x, _y, cell_size, cell_size, system.color.work_graph);
//DrawBar(_x+1, _y+1, cell_size-1, cell_size-1, _color);
DrawBar(_x, _y, cell_size, cell_size, _color);
}
 
void _colors::draw_all_cells()
{
int r, c, i;
for (i=300; i<MAX_COLORS*MAX_COLORS+300; i++) DeleteButton(i);
for (r = 0; r < rows; r++)
{
for (c = 0; c < columns; c++)
{
draw_cell(c*cell_size + x, r*cell_size + y, get_color(r, c));
//DefineHiddenButton(c*cell_size + x, r*cell_size + y, cell_size, cell_size, r*columns+c+300+BT_NOFRAME);
}
}
}
 
enum {
DIRECTION_LEFT,
DIRECTION_RIGHT,
DIRECTION_UP,
DIRECTION_DOWN
};
void _colors::move(int direction)
{
int r, c;
dword first_element_data;
 
if (direction == DIRECTION_LEFT)
{
for (r = 0; r < rows; r++)
{
first_element_data = get_color(r, 0);
for (c = 0; c < columns-1; c++) set_color(r, c, get_color(r, c+1));
set_color(r, columns-1, first_element_data);
}
}
if (direction == DIRECTION_RIGHT)
{
for (r = 0; r < rows; r++)
{
first_element_data = get_color(r, columns-1);
for (c = columns-1; c > 0; c--) set_color(r, c, get_color(r, c-1));
set_color(r, 0, first_element_data);
}
}
if (direction == DIRECTION_UP)
{
for (c = 0; c < columns; c++)
{
first_element_data = get_color(0, c);
for (r = 0; r < rows-1; r++) set_color(r, c, get_color(r+1, c));
set_color(rows-1, c, first_element_data);
}
}
if (direction == DIRECTION_DOWN)
{
for (c = 0; c < columns; c++)
{
first_element_data = get_color(rows-1, c);
for (r = rows-1; r > 0; r--) set_color(r, c, get_color(r-1, c));
set_color(0, c, first_element_data);
}
}
 
draw_all_cells();
}
 
 
 
 
 
 
 
/programs/cmm/iconedit/compile_en.bat
0,0 → 1,5
@del *.
@c-- iconedit.c
@rename *.com *.
@del warning.txt
@pause
/programs/cmm/iconedit/iconedit.c
0,0 → 1,272
/*
* BACKGEN - Background generator
* Author: Leency
* Licence: GPL v2
*/
 
#define MEMSIZE 4096*40
 
#include "../lib/gui.h"
#include "../lib/obj/libimg.h"
#include "../lib/patterns/rgb.h"
#include "../lib/patterns/libimg_load_skin.h"
 
//===================================================//
// //
// DATA //
// //
//===================================================//
 
#define T_TITLE "Icon Editor 0.01"
 
#define MAX_COLORS 32
#define TOOLBAR_H 24+8
#define PALLETE_SIZE 116
 
rect preview = { 10, TOOLBAR_H+10, 200, 200 };
rect right_bar = { 230, TOOLBAR_H+10, 280, 320 };
 
dword active_color = 0xFFFfff;
 
enum {
BTN_NEW = 40,
BTN_OPEN,
BTN_SAVE,
BTN_MOVE_LEFT,
BTN_MOVE_RIGHT,
BTN_MOVE_UP,
BTN_MOVE_DOWN,
BTN_FLIP_HOR,
BTN_FLIP_VER,
BTN_ROTATE_LEFT,
BTN_ROTATE_RIGHT,
 
BTN_PICK,
 
BTN_PALETTE_COLOR_MAS = 100,
 
};
 
proc_info Form;
 
bool pick_active = false;
 
dword default_colors[] = {
0x330000,0x331900,0x333300,0x193300,0x003300,0x003319,0x003333,0x001933,0x000033,0x190033,0x330033,0x330019,0x000000,
0x660000,0x663300,0x666600,0x336600,0x006600,0x006633,0x006666,0x003366,0x000066,0x330066,0x660066,0x660033,0x202020,
0x990000,0x994C00,0x999900,0x4C9900,0x009900,0x00994C,0x009999,0x004C99,0x000099,0x4C0099,0x990099,0x99004C,0x404040,
0xCC0000,0xCC6600,0xCCCC00,0x66CC00,0x00CC00,0x00CC66,0x00CCCC,0x0066CC,0x0000CC,0x6600CC,0xCC00CC,0xCC0066,0x606060,
0xFF0000,0xFF8000,0xFFFF00,0x80FF00,0x00FF00,0x00FF80,0x00FFFF,0x0080FF,0x0000FF,0x7F00FF,0xFF00FF,0xFF007F,0x808080,
0xFF3333,0xFF9933,0xFFFF33,0x99FF33,0x33FF33,0x33FF99,0x33FFFF,0x3399FF,0x3333FF,0x9933FF,0xFF33FF,0xFF3399,0xA0A0A0,
0xFF6666,0xFFB266,0xFFFF66,0xB2FF66,0x66FF66,0x66FFB2,0x66FFFF,0x66B2FF,0x6666FF,0xB266FF,0xFF66FF,0xFF66B2,0xC0C0C0,
0xFF9999,0xFFCC99,0xFFFF99,0xCCFF99,0x99FF99,0x99FFCC,0x99FFFF,0x99CCFF,0x9999FF,0xCC99FF,0xFF99FF,0xFF99CC,0xE0E0E0,
0xFFCCCC,0xFFE5CC,0xFFFFCC,0xE5FFCC,0xCCFFCC,0xCCFFE5,0xCCFFFF,0xCCE5FF,0xCCCCFF,0xE5CCFF,0xFFCCFF,0xFFCCE5,0xFFFFFF
};
 
 
//===================================================//
// //
// CODE //
// //
//===================================================//
 
#include "colors_mas.h"
 
void main()
{
word btn;
 
load_dll(libio, #libio_init, 1);
load_dll(libimg, #libimg_init, 1);
Libimg_LoadImage(#skin, "/sys/icons16.png");
 
colors.set_default_values();
 
SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
 
loop() switch(WaitEvent())
{
case evMouse:
mouse.get();
if (pick_active) EventPickColor();
else {
if (mouse.lkm)
&& (mouse.x>colors.x) && (mouse.y>colors.y)
&& (mouse.y<colors.y+colors.h) && (mouse.x<colors.x+colors.w)
{
colors.set_color(mouse.y-colors.y/colors.cell_size,
mouse.x-colors.x/colors.cell_size, active_color);
DrawColorsField();
}
}
break;
 
case evButton:
btn = GetButtonID();
switch(btn)
{
case BTN_MOVE_LEFT:
colors.move(DIRECTION_LEFT);
break;
case BTN_MOVE_RIGHT:
colors.move(DIRECTION_RIGHT);
break;
case BTN_MOVE_UP:
colors.move(DIRECTION_UP);
break;
case BTN_MOVE_DOWN:
colors.move(DIRECTION_DOWN);
break;
case CLOSE_BTN:
ExitProcess();
case BTN_PICK:
EventPickActivate();
break;
}
if (btn >= BTN_PALETTE_COLOR_MAS) && (btn < BTN_PALETTE_COLOR_MAS+PALLETE_SIZE)
{
active_color = default_colors[btn-BTN_PALETTE_COLOR_MAS];
DrawActiveColor(NULL);
}
if (btn >= 300)
{
btn-=300;
debugval("\n\nid",btn);
colors.set_color(btn/colors.columns, btn%colors.columns, active_color);
DrawColorsField();
}
break;
case evKey:
GetKeys();
if (key_scancode == SCAN_CODE_ESC) ExitProcess();
if (key_scancode == SCAN_CODE_KEY_I) EventPickActivate();
break;
case evReDraw:
draw_window();
break;
}
}
 
void DrawToolbarButton(dword _id, _x, _icon_n)
{
DrawWideRectangle(_x, 4, 24, 24, 4, 0xFFFfff);
DefineHiddenButton(_x, 4, 23, 23, _id);
img_draw stdcall(skin.image, _x+4, 8, 16, 16, 0, _icon_n*16);
}
 
void DrawStatusBar()
{
sprintf(#param,"Canvas: %ix%i", colors.rows, colors.columns);
WriteText(10, Form.cheight-40, 0x90, system.color.work_text, #param);
}
 
void draw_window()
{
#define TB_ICON_PADDING 26
incn tx;
system.color.get();
DefineAndDrawWindow(215, 100, right_bar.x+right_bar.w+9,
right_bar.y+right_bar.h+skin_height+5,
0x34, system.color.work, T_TITLE,0
);
GetProcessInfo(#Form, SelfInfo);
 
tx.n = preview.x - TB_ICON_PADDING;
DrawToolbarButton(BTN_NEW, tx.inc(TB_ICON_PADDING), 2); //not implemented
DrawToolbarButton(BTN_OPEN, tx.inc(TB_ICON_PADDING), 0); //not implemented
DrawToolbarButton(BTN_SAVE, tx.inc(TB_ICON_PADDING), 5); //not implemented
DrawToolbarButton(BTN_MOVE_LEFT, tx.inc(TB_ICON_PADDING+8), 30);
DrawToolbarButton(BTN_MOVE_RIGHT, tx.inc(TB_ICON_PADDING), 31);
DrawToolbarButton(BTN_MOVE_UP, tx.inc(TB_ICON_PADDING), 32);
DrawToolbarButton(BTN_MOVE_DOWN, tx.inc(TB_ICON_PADDING), 33);
DrawToolbarButton(BTN_FLIP_HOR, tx.inc(TB_ICON_PADDING+8), 34); //not implemented
DrawToolbarButton(BTN_FLIP_VER, tx.inc(TB_ICON_PADDING), 35); //not implemented
DrawToolbarButton(BTN_ROTATE_LEFT, tx.inc(TB_ICON_PADDING), 36); //not implemented
DrawToolbarButton(BTN_ROTATE_RIGHT, tx.inc(TB_ICON_PADDING), 37); //not implemented
 
DrawToolbarButton(BTN_PICK, tx.inc(TB_ICON_PADDING+8), 38);
 
DrawBar(0, TOOLBAR_H-1, Form.cwidth, 1, system.color.work_dark);
DrawBar(0, TOOLBAR_H, Form.cwidth, 1, system.color.work_light);
 
DrawColorsField();
 
DrawRightBar();
DrawStatusBar();
}
 
void DrawColorsField()
{
 
colors.x = -colors.cell_size*colors.columns+preview.w/2 + preview.x;
colors.y = -colors.cell_size*colors.rows+preview.h/2 + preview.y;
colors.draw_all_cells();
 
DrawRectangle(preview.x, preview.y, preview.w, preview.h, system.color.work_graph);
DrawWideRectangle(preview.x+1, preview.y+1, preview.w-1, preview.h-1,
colors.x-preview.x, 0xC0C0C0);
}
 
void DrawRightBar()
{
int i;
incn y;
DrawDefaultColors(right_bar.x, right_bar.y);
 
DrawActiveColor(Form.cheight-40);
}
 
void DrawActiveColor(dword iny)
{
static dword outy;
if (iny != NULL) outy = iny;
DrawBar(right_bar.x, outy, 20, 20, active_color);
sprintf(#param, "%A", active_color);
EDI = system.color.work;
WriteText(right_bar.x + 30, outy + 3, 0xD0, system.color.work_text, #param+4);
}
 
void DrawDefaultColors(dword _x, _y)
{
int r, c, i;
int cellw = 20;
 
i = 0;
for (r = 0; r < 9; r++)
{
for (c = 0; c < 13; c++)
{
DrawBar(c*cellw + _x, r*cellw + _y, cellw, cellw, default_colors[PALLETE_SIZE-i]);
DefineHiddenButton(c*cellw + _x, r*cellw + _y, cellw-1, cellw-1, BTN_PALETTE_COLOR_MAS+PALLETE_SIZE-i);
i++;
}
}
DrawRectangle(_x-1, _y-1, c*cellw+1, r*cellw+1, system.color.work_light);
DrawRectangle(_x-2, _y-2, c*cellw+3, r*cellw+3, system.color.work_dark);
}
 
 
//===================================================//
// //
// EVENTS //
// //
//===================================================//
 
void EventPickActivate()
{
SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE);
pick_active = true;
}
 
void EventPickColor()
{
active_color = GetPixelColorFromScreen(mouse.x + Form.left + 5, mouse.y + Form.top + skin_height);
DrawActiveColor(NULL);
if (mouse.down) && (mouse.key&MOUSE_LEFT) {
pick_active = false;
SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
}
}