Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7048 → Rev 7049

/programs/cmm/Calypte/Calypte.c
1,13 → 1,12
//Calypte 0.35 - Leency
//Calypte 0.15 - Punk Joker
 
#define MEMSIZE 1024*100
#define MEMSIZE 1024*200
 
#ifndef AUTOBUILD
#include "lang.h--"
#endif
 
 
//===================================================//
// //
// LIB //
19,20 → 18,16
#include "../lib/gui.h"
#include "../lib/list_box.h"
#include "../lib/menu.h"
//#include "../lib/collection.h"
#include "../lib/collection.h"
 
 
#include "../lib/obj/iconv.h"
#include "../lib/obj/box_lib.h"
#include "../lib/obj/libio_lib.h" //TO CHECK: why opendial is a peace of shit!
#include "../lib/obj/libio.h"
#include "../lib/obj/proc_lib.h"
//#include "../lib/obj/libini.h"
 
#include "../lib/patterns/simple_open_dialog.h"
 
 
char default_dir[] = "/rd/1";
od_filter filter2 = { "TXT",0};
 
//===================================================//
// //
// DATA //
39,6 → 34,9
// //
//===================================================//
 
char default_dir[] = "/rd/1";
od_filter filter2 = { 8, "TXT\0\0" };
 
/*========= MENU ==========*/
?define MENU1 "File"
?define MENU2 "Encoding"
89,7 → 87,7
int menu_reopen_x = NULL;
/*======== MENU END ==========*/
 
#define TITLE "Calypte v0.3"
#define TITLE "Calypte v0.37"
char win_title[4096] = TITLE;
 
#define TOPPANELH 23
107,12 → 105,11
 
dword bufpointer;
dword bufsize;
dword draw_sruct;
 
scroll_bar scroll_v = { SCROLL_SIZE,200,398,44,0,2,115,15,0,0xeeeeee,0xBBBbbb,0xeeeeee,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
scroll_bar scroll_h = { SCROLL_SIZE,200,398,44,0,2,115,15,0,0xeeeeee,0xBBBbbb,0xeeeeee,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1};
 
//collection s;
collection s;
 
//===================================================//
// //
120,22 → 117,27
// //
//===================================================//
 
void InitDlls()
void main()
{
int id;
 
load_dll(boxlib, #box_lib_init, 0);
load_dll(libio, #libio_init, 1);
//load_dll(libini, #lib_init, 1);
load_dll(iconv_lib, #iconv_open, 0);
load_dll(Proc_lib, #OpenDialog_init,0);
OpenDialog_init stdcall (#o_dialog);
}
 
void main()
if (param)
{
int id;
draw_window();
OpenFile(#param);
Prepare();
DrawText();
}
 
InitDlls();
SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
loop()
{
switch(WaitEvent())
171,25 → 173,7
break;
case evReDraw:
if (menu.list.cur_y) {
if (menu.list.cur_y == FILE_SUBMENU_ID_OPEN) EventOpenFile();
if (menu.list.cur_y == FILE_SUBMENU_ID_CLOSE) EventCloseFile();
if (menu.list.cur_y == FILE_SUBMENU_ID_PROPERTIES) EventShowFileProperties();
if (menu.list.cur_y == FILE_SUBMENU_ID_EXIT) ExitProcess();
 
if (menu.list.cur_y > MENU_ID_ENCODING) && (menu.list.cur_y < MENU_ID_ENCODING + 10)
EventChangeEncoding(menu.list.cur_y - MENU_ID_ENCODING);
 
if (menu.list.cur_y == FILE_SUBMENU_ID_TINYPAD) ReopenFileIn("/sys/tinypad");
if (menu.list.cur_y == FILE_SUBMENU_ID_TEXTEDIT) ReopenFileIn("/sys/develop/t_edit");
if (menu.list.cur_y == FILE_SUBMENU_ID_TEXTREAD) ReopenFileIn("/sys/txtread");
if (menu.list.cur_y == FILE_SUBMENU_ID_WEBVIEW) ReopenFileIn("/sys/network/webview");
if (menu.list.cur_y == FILE_SUBMENU_ID_FB2READ) ReopenFileIn("/sys/fb2read");
if (menu.list.cur_y == FILE_SUBMENU_ID_HEXVIEW) ReopenFileIn("/sys/develop/heed");
 
menu.list.cur_y = 0;
};
if (menu.list.cur_y) EventMenuClick();
draw_window();
break;
}
196,55 → 180,6
}
}
 
void ReopenFileIn(dword _app)
{
RunProgram(_app, #param);
}
 
void EventShowMenu(dword _menu_item_x, _menu_list, _id, _selected)
{
menu.selected = _selected;
menu.show(
Form.left+5 + _menu_item_x,
Form.top+skin_height + TOPPANELH,
140,
_menu_list,
_id);
}
 
void EventOpenFile()
{
OpenDialog_start stdcall (#o_dialog);
if (!o_dialog.status) return;
OpenFile(#openfile_path);
Prepare();
draw_window();
}
 
void EventCloseFile()
{
if (!bufpointer) return;
strcpy(#win_title, TITLE);
FreeBuf();
draw_window();
}
 
void EventShowFileProperties()
{
char ss_param[4096];
if (!bufpointer) return;
sprintf(#ss_param, "-p %s", #param);
RunProgram("/sys/File managers/Eolite", #ss_param);
}
 
void EventChangeEncoding(dword id)
{
encoding = id;
OpenFile(#openfile_path);
Prepare();
draw_window();
}
 
int DrawMenuButton(dword x,y,id,text)
{
int textlen = strlen(text)*8;
257,7 → 192,7
void draw_window()
{
system.color.get();
DefineAndDrawWindow(GetScreenWidth()-WIN_W/2,GetScreenHeight()-WIN_H/2,WIN_W,WIN_H,0x73,0xFFFFFF,#win_title,0);
DefineAndDrawWindow(screen.width-WIN_W/2,screen.height-WIN_H/2,WIN_W,WIN_H,0x73,0xFFFFFF,#win_title,0);
GetProcessInfo(#Form, SelfInfo);
DrawBar(0, 0, Form.cwidth, TOPPANELH-1, system.color.work);
DrawBar(0, TOPPANELH-1, Form.cwidth, 1, system.color.work_dark);
298,23 → 233,12
if (ReadFile(0, bufsize, bufpointer, #param) != 0) {
bufpointer = 0;
notify("'Error opening file'-E");
return;
}
}
if (encoding!=CH_CP866) ChangeCharset(charsets[encoding], "CP866", bufpointer);
}
 
void FreeBuf()
{
int i;
if (!bufpointer) return;
for (i=0; i<rows.count; i++)
{
mem_Free(DSDWORD[i*4+draw_sruct]);
}
draw_sruct = mem_Free(draw_sruct);
bufpointer = mem_Free(bufpointer);
}
 
enum {
PARSE_CALCULATE_ROWS_COUNT,
PARSE_DRAW_PREPARE,
342,20 → 266,12
}
if (len_str<=rows.column_max)
{
if (mode==PARSE_DRAW_PREPARE)
{
ESDWORD[sub_pos*4+draw_sruct] = mem_Alloc(len_str+1);
strlcpy(DSDWORD[sub_pos*4+draw_sruct], bufpointer+pos, len_str); //-1 to do not show \n symbol
}
if (mode==PARSE_DRAW_PREPARE) s.addn(bufpointer+pos, len_str);
pos += len_str+1;
}
else
{
if (mode==PARSE_DRAW_PREPARE)
{
ESDWORD[sub_pos*4+draw_sruct] = mem_Alloc(len_str+1);
strlcpy(DSDWORD[sub_pos*4+draw_sruct], bufpointer+pos, rows.column_max);
}
if (mode==PARSE_DRAW_PREPARE) s.addn(bufpointer+pos, rows.column_max);
pos += rows.column_max;
}
sub_pos++;
366,10 → 282,7
if (mode == PARSE_CALCULATE_ROWS_COUNT)
{
rows.count = sub_pos;
draw_sruct = mem_Free(draw_sruct);
draw_sruct = mem_Alloc(rows.count*4);
Parse(PARSE_DRAW_PREPARE);
 
}
}
 
392,7 → 305,7
if (bufpointer) for (i=0; i<top; i++)
{
DrawBar(0, i*rows.item_h+TOPPANELH, rows.w, rows.item_h, 0xFFFFFF);
WriteText(2, i*rows.item_h+TOPPANELH, 0x90, 0x000000, DSDWORD[i+rows.first*4+draw_sruct]);
WriteText(2, i*rows.item_h+TOPPANELH, 0x90, 0x000000, s.get(i+rows.first));
}
DrawBar(0, i*rows.item_h+rows.y, rows.w, -i*rows.item_h + rows.h, 0xFFFfff);
DrawVerticalScroll();
410,4 → 323,84
scrollbar_v_draw(#scroll_v);
}
 
//===================================================//
// //
// EVENTS //
// //
//===================================================//
 
void EventMenuClick()
{
switch(menu.list.cur_y)
{
//File
case FILE_SUBMENU_ID_OPEN: EventOpenFile(); break;
case FILE_SUBMENU_ID_CLOSE: EventCloseFile(); break;
case FILE_SUBMENU_ID_PROPERTIES: EventShowFileProperties(); break;
case FILE_SUBMENU_ID_EXIT: ExitProcess(); break;
//Encoding
case MENU_ID_ENCODING...MENU_ID_ENCODING+9: EventChangeEncoding(menu.list.cur_y-MENU_ID_ENCODING); break;
//Reopen
case FILE_SUBMENU_ID_TINYPAD: EventOpenFileInAnotherProgram("/sys/tinypad"); break;
case FILE_SUBMENU_ID_TEXTEDIT: EventOpenFileInAnotherProgram("/sys/develop/t_edit"); break;
case FILE_SUBMENU_ID_TEXTREAD: EventOpenFileInAnotherProgram("/sys/txtread"); break;
case FILE_SUBMENU_ID_WEBVIEW: EventOpenFileInAnotherProgram("/sys/network/webview"); break;
case FILE_SUBMENU_ID_FB2READ: EventOpenFileInAnotherProgram("/sys/fb2read"); break;
case FILE_SUBMENU_ID_HEXVIEW: EventOpenFileInAnotherProgram("/sys/develop/heed"); break;
}
menu.list.cur_y = 0;
}
 
void EventShowMenu(dword _menu_item_x, _menu_list, _id, _selected)
{
menu.selected = _selected;
menu.show(
Form.left+5 + _menu_item_x,
Form.top+skin_height + TOPPANELH,
140,
_menu_list,
_id);
}
 
void EventOpenFile()
{
OpenDialog_start stdcall (#o_dialog);
if (!o_dialog.status) return;
OpenFile(#openfile_path);
Prepare();
draw_window();
}
 
void EventCloseFile()
{
if (!bufpointer) return;
s.drop();
bufpointer = mem_Free(bufpointer);
strcpy(#win_title, TITLE);
draw_window();
}
 
void EventShowFileProperties()
{
char ss_param[4096];
if (!bufpointer) return;
sprintf(#ss_param, "-p %s", #param);
RunProgram("/sys/File managers/Eolite", #ss_param);
}
 
void EventChangeEncoding(dword id)
{
encoding = id;
OpenFile(#openfile_path);
Prepare();
draw_window();
}
 
void EventOpenFileInAnotherProgram(dword _app)
{
RunProgram(_app, #param);
}
 
 
 
stop:
/programs/cmm/browser/WebView.c
19,8 → 19,8
 
//*.obj libraries
#include "..\lib\obj\box_lib.h"
#include "..\lib\obj\libio_lib.h"
#include "..\lib\obj\libimg_lib.h"
#include "..\lib\obj\libio.h"
#include "..\lib\obj\libimg.h"
#include "..\lib\obj\http.h"
#include "..\lib\obj\iconv.h"
//useful patterns
/programs/cmm/drvinst/drvinst.c
13,7 → 13,7
#include "../lib/gui.h"
#include "../lib/list_box.h"
#include "../lib/obj/box_lib.h"
#include "../lib/obj/libio_lib.h"
#include "../lib/obj/libio.h"
#include "../lib/obj/libini.h"
#include "../lib/collection.h"
#include "../lib/io.h"
/programs/cmm/lib/collection.h
13,8 → 13,9
int realloc_size, count;
dword data_start;
dword data_size;
dword element_offset[4090];
dword element_offset[4000];
int add();
int addn();
dword get();
void drop();
void increase_data_size();
34,15 → 35,19
}
 
int collection::add(dword in) {
if (count >= 4090) return 0;
if (element_offset[count]+strlen(in)+2 > data_size) {
return addn(in, strlen(in));
}
 
int collection::addn(dword in, len) {
if (count >= 4000) return 0;
if (element_offset[count]+len+2 > data_size) {
increase_data_size();
add(in);
return;
addn(in, len);
return 1;
}
strcpy(data_start+element_offset[count], in);
strncpy(data_start+element_offset[count], in, len);
count++;
element_offset[count] = element_offset[count-1] + strlen(in) + 1;
element_offset[count] = element_offset[count-1] + len + 1;
return 1;
}
 
/programs/cmm/lib/obj/libimg_lib.h
File deleted
\ No newline at end of file
/programs/cmm/lib/obj/libio_lib.h
File deleted
\ No newline at end of file
/programs/cmm/lib/obj/libimg.h
0,0 → 1,136
//Asper
#ifndef INCLUDE_LIBIMG_H
#define INCLUDE_LIBIMG_H
 
#ifndef INCLUDE_KOLIBRI_H
#include "../lib/kolibri.h"
#endif
 
#ifndef INCLUDE_MEM_H
#include "../lib/mem.h"
#endif
 
#ifndef INCLUDE_DLL_H
#include "../lib/dll.h"
#endif
 
#ifndef INCLUDE_LIBIO_H
#include "../lib/obj/libio.h"
#endif
 
:byte init_imglib_check;
 
//library
dword libimg = #alibimg;
char alibimg[21] = "/sys/lib/libimg.obj\0";
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;
//dword img_flip = #aimg_flip;
//dword img_rotate = #aimg_rotate;
$DD 2 dup 0
 
//import libimg , \
char alibimg_init[9] = "lib_init\0";
char aimg_is_img[11] = "img_is_img\0";
char aimg_to_rgb2[12] = "img_to_rgb2\0";
char aimg_decode[11] = "img_decode\0";
char aimg_destroy[12] = "img_destroy\0";
char aimg_draw[9] = "img_draw\0";
//char aimg_flip[9] = "img_flip\0";
//char aimg_rotate[11] = "img_rotate\0 ";
 
 
 
dword load_image(dword filename)
{
//align 4
dword img_data=0;
dword img_data_len=0;
dword fh=0;
dword image=0;
 
byte tmp_buf[40];
$and img_data, 0
//$mov eax, filename
//$push eax
//invoke file.open, eax, O_READ
file_open stdcall (filename, O_READ);
$or eax, eax
$jnz loc05
$stc
return 0;
@loc05:
$mov fh, eax
//invoke file.size
file_size stdcall (filename);
$mov img_data_len, ebx
//stdcall mem.Alloc, ebx
mem_Alloc(EBX);
$test eax, eax
$jz error_close
$mov img_data, eax
//invoke file.read, [fh], eax, [img_data_len]
file_read stdcall (fh, EAX, img_data_len);
$cmp eax, -1
$jz error_close
$cmp eax, img_data_len
$jnz error_close
//invoke file.close, [fh]
file_close stdcall (fh);
$inc eax
$jz error_
//; img.decode checks for img.is_img
//; //invoke img.is_img, [img_data], [img_data_len]
//; $or eax, eax
//; $jz exit
//invoke img.decode, [img_data], [img_data_len], 0
EAX=img_data;
img_decode stdcall (EAX, img_data_len,0);
$or eax, eax
$jz error_
$cmp image, 0
$pushf
$mov image, eax
//call init_frame
$popf
//call update_image_sizes
mem_Free(img_data);//free_img_data(img_data);
$clc
return image;
 
@error_free:
//invoke img.destroy, [image]
img_destroy stdcall (image);
$jmp error_
 
@error_pop:
$pop eax
$jmp error_
@error_close:
//invoke file.close, [fh]
file_close stdcall (fh);
@error_:
mem_Free(img_data);
$stc
return 0;
}
 
void DrawLibImage(dword image_pointer,x,y,w,h,offx,offy) {
img_draw stdcall (
image_pointer,
x,
y,
w,
h,
offx,
offy
);
}
 
#endif
/programs/cmm/lib/obj/libio.h
0,0 → 1,46
//Asper
#ifndef INCLUDE_LIBIO_H
#define INCLUDE_LIBIO_H
 
#ifndef INCLUDE_KOLIBRI_H
#include "../lib/kolibri.h"
#endif
 
#ifndef INCLUDE_DLL_H
#include "../lib/dll.h"
#endif
 
//library
dword libio = #alibio;
char alibio[21] = "/sys/lib/libio.obj\0"; //"libio.obj\0";
 
dword libio_init = #alibio_init;
dword file_size = #afile_size;
dword file_open = #afile_open;
dword file_read = #afile_read;
dword file_close = #afile_close;
$DD 2 dup 0
 
 
//import libio , \
char alibio_init[9] = "lib_init\0";
char afile_size[11] = "file_size\0";
char afile_open[12] = "file_open\0";
char afile_read[11] = "file_read\0";
char afile_close[12] = "file_close\0";
 
//align 4
//dword fh=0;
 
#define O_BINARY 0
#define O_READ 1
#define O_WRITE 2
#define O_CREATE 4
#define O_SHARE 8
#define O_TEXT 16
 
#define SEEK_SET 0
#define SEEK_CUR 1
#define SEEK_END 2
 
#endif
/programs/cmm/lib/patterns/libimg_load_skin.h
2,7 → 2,7
#define INCLUDE_LIBIMG_LOAD_SKIN_H
 
#ifndef INCLUDE_LIBIMG_H
#include "../lib/obj/libimg_lib.h"
#include "../lib/obj/libimg.h"
#endif
 
:struct libimg_image {
/programs/cmm/lib/patterns/simple_open_dialog.h
1,16 → 1,18
struct od_filter
{
dword size;
byte end;
dword size; //size = len(#ext) + sizeof(dword)
char ext[16];
};
 
 
proc_info pr_inf;
char communication_area_name[] = "FFFFFFFF_open_dialog";
char opendir_path[4096];
char opendir_path[3072];
char open_dialog_path[] = "/rd/1/File managers/opendial";
char openfile_path[4096];
char filename_area[256];
char filename_area[1024];
 
 
opendialog o_dialog = {
0,
#pr_inf,
/programs/cmm/lib/strings.h
233,6 → 233,18
return 0;
}
 
:void strncpy(dword dst, src, len)
{
while (len)
{
ESBYTE[dst] = ESBYTE[src];
dst++;
src++;
len--;
}
ESBYTE[dst]=0;
}
 
/*
inline fastcall void strtrim( ESI)
{
889,6 → 901,15
return 0;
}
 
replace_char(dword in_str, char from_char, to_char, int length) {
int i;
for (i=0; i<length; i++) {
if (ESBYTE[in_str+i] == from_char) ESBYTE[in_str+i] = to_char;
}
ESBYTE[in_str+length]=0;
}
 
 
#define strnmov strmovn
#define stricmp strcmpi
#define strcmpn strncmp
/programs/cmm/liza/liza.c
16,8 → 16,8
//*.obj libraries
#include "../lib/obj/box_lib.h"
#include "../lib/obj/network.h"
#include "../lib/obj/libio_lib.h"
#include "../lib/obj/libimg_lib.h"
#include "../lib/obj/libio.h"
#include "../lib/obj/libimg.h"
#include "../lib/obj/netcode.h"
#include "../lib/obj/iconv.h"
//patternts
/programs/cmm/mblocks/mblocks.c
8,8 → 8,8
#include "..\lib\gui.h"
#include "..\lib\random.h"
 
#include "..\lib\obj\libio_lib.h"
#include "..\lib\obj\libimg_lib.h"
#include "..\lib\obj\libio.h"
#include "..\lib\obj\libimg.h"
#include "..\lib\patterns\libimg_load_skin.h"
 
proc_info Form;
/programs/cmm/mousecfg/mousecfg.c
9,7 → 9,7
#include "..\lib\mem.h"
#include "..\lib\file_system.h"
#include "..\lib\gui.h"
#include "..\lib\obj\libio_lib.h"
#include "..\lib\obj\libio.h"
#include "..\lib\obj\box_lib.h"
#include "..\lib\obj\libini.h"
#include "..\lib\patterns\restart_process.h"
/programs/cmm/panels_cfg/panels_cfg.c
10,7 → 10,7
#include "..\lib\dll.h"
#include "..\lib\gui.h"
 
#include "..\lib\obj\libio_lib.h"
#include "..\lib\obj\libio.h"
#include "..\lib\obj\libini.h"
#include "..\lib\obj\box_lib.h"
 
/programs/cmm/pixie/pixie.c
14,8 → 14,8
#include "..\lib\gui.h"
 
#include "..\lib\obj\box_lib.h"
#include "..\lib\obj\libio_lib.h"
#include "..\lib\obj\libimg_lib.h"
#include "..\lib\obj\libio.h"
#include "..\lib\obj\libimg.h"
#include "..\lib\obj\libini.h"
 
#include "..\lib\patterns\libimg_load_skin.h"
/programs/cmm/pixie2/pixie.c
15,8 → 15,8
#include "../lib/gui.h"
 
#include "../lib/obj/box_lib.h"
#include "../lib/obj/libio_lib.h"
#include "../lib/obj/libimg_lib.h"
#include "../lib/obj/libio.h"
#include "../lib/obj/libimg.h"
#include "../lib/obj/libini.h"
 
#include "../lib/patterns/libimg_load_skin.h"
/programs/cmm/software_widget/software_widget.c
8,8 → 8,8
#include "..\lib\io.h"
#include "..\lib\gui.h"
 
#include "..\lib\obj\libio_lib.h"
#include "..\lib\obj\libimg_lib.h"
#include "..\lib\obj\libio.h"
#include "..\lib\obj\libimg.h"
#include "..\lib\obj\libini.h"
#include "..\lib\kfont.h"
#include "..\lib\list_box.h"
/programs/cmm/the_bus/the_bus.c
15,8 → 15,8
#include "..\lib\kolibri.h"
#include "..\lib\random.h"
 
#include "..\lib\obj\libio_lib.h"
#include "..\lib\obj\libimg_lib.h"
#include "..\lib\obj\libio.h"
#include "..\lib\obj\libimg.h"
#include "..\lib\patterns\libimg_load_skin.h"
 
libimg_image menu;
/programs/cmm/tmpdisk/tmpdisk.c
5,7 → 5,7
#include "..\lib\file_system.h"
 
#include "..\lib\dll.h"
#include "..\lib\obj\libio_lib.h"
#include "..\lib\obj\libio.h"
#include "..\lib\obj\libini.h"
 
#ifndef AUTOBUILD