KolibriOS/kolibrios
13
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Eolite 2.16.1: small fix in encodings, small optimizations

Browse Source 
git-svn-id: svn://kolibrios.org@4428 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2014-01-07 01:04:38 +00:00
parent 95ffbe2056
commit 7cff165859
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/cmm/eolite/Eolite.c
View File

@ -80,8 +80,8 @@
enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
#define TITLE "Eolite File Manager v2.16" #define TITLE "Eolite File Manager v2.16.1"
#define ABOUT_TITLE "Eolite v2.16" #define ABOUT_TITLE "Eolite v2.16.1"
dword col_padding, col_selec, col_lpanel; dword col_padding, col_selec, col_lpanel;
int toolbar_buttons_x[7]={9,46,85,134,167,203}; int toolbar_buttons_x[7]={9,46,85,134,167,203};

33
programs/cmm/eolite/include/copy.h
View File

@ -1,36 +1,25 @@
//Leency 2008-2013 //Leency 2008-2014
byte copy_to[4096];
byte copy_from[4096], copy_to[4096], cut_active=0; byte cut_active=0;
enum {NOCUT, CUT, COPY_PASTE_END}; enum {NOCUT, CUT, COPY_PASTE_END};
struct buffer_data
{
dword size;
dword type;
dword encoding;
byte buffer_data[4096];
};
buffer_data buf_data;
Clipboard clipboard; Clipboard clipboard;
#define WIN_W 300
#define WIN_H 50
void Copy(dword pcth, char cut) void Copy(dword pcth, char cut)
{ {
strcpy(#copy_from, pcth); clipboard.data.size = sizeof(buffer_data);
buf_data.size = sizeof(buffer_data); clipboard.data.type = 0;
buf_data.type = 0; clipboard.data.encoding = 1;
buf_data.encoding = 866; strcpy(#clipboard.data.buffer_data, pcth);
strcpy(#buf_data.buffer_data, pcth); clipboard.SetSlotData(sizeof(buffer_data), #clipboard.data);
clipboard.SetSlotData(sizeof(buffer_data), #buf_data);
cut_active = cut; cut_active = cut;
} }
void copyf_Draw_Progress(dword filename) { void copyf_Draw_Progress(dword filename) {
#define WIN_W 300
#define WIN_H 50
DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_W,GetSkinHeight()+WIN_H-1,0x34,sc.work,T_PASTE_WINDOW); DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_W,GetSkinHeight()+WIN_H-1,0x34,sc.work,T_PASTE_WINDOW);
WriteText(5,8, 0x80, sc.work_text, T_PASTE_WINDOW_TEXT); WriteText(5,8, 0x80, sc.work_text, T_PASTE_WINDOW_TEXT);
DrawBar(5, 26, WIN_W-10, 10, sc.work); DrawBar(5, 26, WIN_W-10, 10, sc.work);
@ -46,6 +35,7 @@ void copyf_Draw_Progress(dword filename) {
void Paste() void Paste()
{ {
char copy_rezult; char copy_rezult;
byte copy_from[4096];
strcpy(#copy_from, clipboard.GetSlotData(clipboard.GetSlotCount()-1)+12); strcpy(#copy_from, clipboard.GetSlotData(clipboard.GetSlotCount()-1)+12);
@ -71,7 +61,6 @@ void Paste()
{ {
strcpy(#file_path, #copy_from); strcpy(#file_path, #copy_from);
Del_File(true); Del_File(true);
copy_from=NULL;
cut_active=false; cut_active=false;
} }
action_buf = COPY_PASTE_END; action_buf = COPY_PASTE_END;

10
programs/cmm/lib/clipboard.h
View File

@ -1,4 +1,14 @@
struct buffer_data
{
dword size;
dword type;
dword encoding;
byte buffer_data[4096];
};
struct Clipboard { struct Clipboard {
buffer_data data;
dword GetSlotCount(); dword GetSlotCount();
dword GetSlotData( ECX); dword GetSlotData( ECX);
dword SetSlotData( EDX, ESI); dword SetSlotData( EDX, ESI);