WebSVN – Kolibri OS – Diff – /programs/cmm/eolite/Eolite.c

 #include "..\lib\copyf.h"
 //images
 #include "imgs\toolbar.txt"
 #include "imgs\left_p.txt"
-//for OpenDir
-#define ONLY_SHOW	0
-#define WITH_REDRAW	1
-#define ONLY_OPEN	2
+enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
-#define TITLE "Eolite File Manager v1.81"
+#define TITLE "Eolite File Manager v1.88"
-#define ABOUT_TITLE "Eolite v1.81"
+#define ABOUT_TITLE "Eolite v1.88"
 dword col_work    = 0xE4DFE1;
-dword col_border  = 0x819FC5;
+dword col_border  = 0x9098B0; //A0A0B8; //0x819FC5;
 dword col_padding = 0xC8C9C9;
 dword col_selec   = 0x94AECE;
 byte
 	path[4096],
 	file_path[4096],
-	file_name[256],
-	copy_file[4096],
+	file_name[256],
 	temp[4096];
-byte
-	cut_active=0,
+byte
 	rename_active=0,
 	del_active=0,
 	show_dev_name=1,
 	sort_num=2,
 #include "include\icons_f.h"
 #include "include\ini.h"
 #include "include\left_panel.h"
 #include "include\history.h"
 #include "include\file_menu.h"
+#include "include\copypaste.h"
 void main()
 {
-	word key, id, can_show, can_select;
+	word key, id, can_show, can_select, m_selected;
 	files.line_h=18;
 	mem_Init();
 	loop() switch(WaitEvent())
+	{
 		case evMouse:
 			IF (del_active) break;
 			id=GetProcessSlot(Form.ID);
-			IF (id<>GetActiveProcess()) || (Form.status_window>2) break;
+			IF (id!=GetActiveProcess()) || (Form.status_window>2) break;
 			IF (rename_active) { edit_box_mouse stdcall(#edit2); break; }
 			m.get();
+			if (m.x > files.x) && (m.x < files.x + files.w) && (m.y > files.y) && (m.y < files.y+files.h) && (!can_select)
 			if (m.x > files.x) && (m.x < files.x + files.w) && (m.y > files.y) && (m.y < files.y+files.h)
 				m_selected = m.y - 57 / files.line_h;
 				if (m.lkm) can_select = 1;
 				if (m.pkm)
+				{
 			if (!m.lkm) && (!m.pkm) && (can_select)
+			{
 				can_select = 0;
 				if (m.y<57) break;
 				id = m.y - 57 / files.line_h;
+				if (id!=m_selected) {can_show=0; break;}
-				if (files.current!=id) FileList_ReDraw(id-files.current);
+				if (files.current!=id) List_Current(id-files.current);
 				else Open();
 			};
 			// } select/open file
 			//file menu {
 			if (!m.pkm) && (!m.lkm) && (can_show)
+			{
 				can_show = 0;
 				if (m.y<57) break;
 				SwitchToAnotherThread();
-				CreateThread(#FileMenu,#stak2);
+				CreateThread(#FileMenu,#menu_stak);
 				break;
+			}
 				id=files.first;
 				j= scroll_size/2;
 				files.first = m.y -j -57 * files.count;
 				files.first /= onTop(22,57);
 				IF (files.visible+files.first>files.count) files.first=files.count-files.visible;
-				IF (id<>files.first) List_ReDraw();
+				IF (id!=files.first) List_ReDraw();
+			}
 			break;
 //Button pressed-----------------------------------------------------------------------------
 		case evButton:
 			id=GetButtonID();
 						break;
 				case 23: //up!
 						Dir_Up();
 						break;
 				case 24: //cut
+						Copy(#file_path, NOCUT);
-						key=24;
+						break;
 				case 25: //copy
-						goto CTRLC_MARK;
+						Copy(#file_path, CUT);
+						break;
 				case 26: //paste
-						Paste();
+						CreateThread(#Paste,#copy_stak);
 						break;
 				case 31...33: //sort
 						IF(sort_num==1) DrawFilledBar(onLeft(192,168)/2+210,42,6,10);
 						IF(sort_num==2) DrawFilledBar(onLeft(115,0),42,6,10);
 						IF(sort_num==3) DrawFilledBar(onLeft(44,0),42,6,10);
 						sort_num=id-30;
 						Open_Dir(#path,WITH_REDRAW);
 						break;
 				case 50...60: //Actions
-						ActionsProcess(id-50);
+						FnProcess(id-50);
 						break;
 				case 100...120:
 					DEVICE_MARK:
-						DrawRectangle3D(17,id-100*16+74,159,16, 0, 0); //auaaeaiea
+						DrawRectangle(17,id-100*16+74,159,16, 0); //auaaeaiea
 						strcpy(#path, #disk_list[id-100].Item);
 						files.first=files.current=0;
-						Open_Dir(#path,1);
+						Open_Dir(#path,WITH_REDRAW);
 						pause(5);
-						DrawRectangle3D(17,id-100*16+74,159,16, 0xFFFFFF, 0xFFFFFF);
+						DrawRectangle(17,id-100*16+74,159,16, 0xFFFFFF);
 						break;
 				case 130...160:
 						tmp_disk_del_param[1]=disk_list[id-130].Item[4];
 						RunProgram("/sys/tmpdisk", #tmp_disk_del_param);
 						pause(10);
+			{
 				IF (key==013) Del_File(true);
 				IF (key==027) Del_File(false);
 				break;
+			}
-			IF (edit2.flags<>64) && (key<>13) && (key<>27)
+			IF (edit2.flags!=64) && (key!=13) && (key!=27)
+			{
 				EAX=key<<8;
 				edit_box_key stdcall (#edit2);
 				break;
+			}
 					case 014: //Ctrl+N new window
 							IF (Form.left==98) MoveSize(Form.left-20,Form.top-20,OLD,OLD);
 							RunProgram("/sys/File Managers/Eolite", #path);
 							break;
 					case 024: //Ctrl+X
+							Copy(#file_path, CUT);
+							break;
 					case 003: //Ctrl+C
-							CTRLC_MARK:
-							IF (itdir) break;
-							strcpy(#copy_file, #file_path);
+							Copy(#file_path, NOCUT);
-							IF (key==24) cut_active=1; ELSE cut_active=0;
 							break;
 					case 022: //Ctrl+V
-							Paste();
+							CreateThread(#Paste,#copy_stak);
 							break;
 					case 027: //Esc
 							IF (rename_active==1) ReName(false);
 							break;
 					case 013: //Enter
 							IF (rename_active==1) {ReName(true); break;}
 							Open();
 							break;
 					case 178: //up
-							FileList_ReDraw(-1);
+							List_Current(-1);
 							break;
 					case 177: //down
-							FileList_ReDraw(1);
+							List_Current(1);
 							break;
 					case 180: //home
 							files.first=0;
 							files.current=0;
 							List_ReDraw();
 							files.first=files.count-files.visible;
 							files.current=files.visible-1;
 							List_ReDraw();
 							break;
 					case 183: //Page Down
-							FileList_ReDraw(files.visible-1);
+							List_Current(files.visible-1);
 							break;
 					case 184: //Page Up
-							FileList_ReDraw(-files.visible+1);
+							List_Current(-files.visible+1);
 							break;
 					case 182: //del
 							Del_Form();
 							break;
 					case 050...059: //F1-F10
-							ActionsProcess(key-49);
+							FnProcess(key-49);
 							break;
 					default:
 							for (i=files.current+files.first+1; i
+							{
 								strcpy(#temp, file_mas[i]*304+buf+72);
 								IF (temp[0]==key) || (temp[0]==key-32)
+								{
-									FileList_ReDraw(i-files.current-files.first);
+									List_Current(i-files.current-files.first);
 									break;
+								}
+							}
+			}
 			break;
 		case evReDraw:
+			draw_window();
+	}
+}
+void draw_window()
+{
-			DefineAndDrawWindow(40,20,550,500,0x73,col_work,TITLE);
+	DefineAndDrawWindow(40,20,550,500,0x73,col_work,TITLE);
-			GetProcessInfo(#Form, SelfInfo);
+	GetProcessInfo(#Form, SelfInfo);
-			if (Form.status_window>2) break;
+	if (Form.status_window>2) return;
-			files.SetSizes(192, 57, onLeft(192,27), onTop(57,6), disc_num*16+195,files.line_h);
+	files.SetSizes(192, 57, onLeft(192,27), onTop(57,6), disc_num*16+195,files.line_h);
-			if (Form.height < files.min_h) MoveSize(OLD,OLD,OLD,files.min_h);
+	if (Form.height < files.min_h) MoveSize(OLD,OLD,OLD,files.min_h);
-			if (Form.width<480) MoveSize(OLD,OLD,480,OLD);
+	if (Form.width<480) MoveSize(OLD,OLD,480,OLD);
-			GetProcessInfo(#Form, SelfInfo); //if win_size changed
+	GetProcessInfo(#Form, SelfInfo); //if win_size changed
-			draw_window();
-	}
-}
-inline fastcall void draw_window()
-{
 	//toolbar
+	PutPaletteImage(#toolbar,246,34,0,0,8,#toolbar_pal);
-	PutPaletteImage(#toolbar,246,34,0,0,8,#toolbar_pal);
+	DrawBar(127, 8, 1, 25, col_border);
 	for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,col_work);
 	for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,col_work);
-	DrawBar(246,0,onLeft(246,60),12, col_work); //ôîí íàä ïîëîñîé àäðåñà
+	DrawBar(246,0,onLeft(246,60),12, col_work); //upper editbox
-	DrawBar(246,29,onLeft(246,60),5,col_work);  //ôîí ïîä ïîëîñîé àäðåñà
+	DrawBar(246,29,onLeft(246,60),5,col_work);  //under editbox
-	DrawRectangle3D(246,12,onLeft(66,246),16,col_border,col_border);
+	DrawRectangle(246,12,onLeft(66,246),16,col_border);
-	DefineButton(onLeft(34,0),6,27,28,51+BT_HIDE+BT_NOFRAME,col_work); //about
+	DefineButton(onLeft(34,0),6,27,28,51+BT_HIDE+BT_NOFRAME,0); //about
 	PutPaletteImage(#goto_about,56,34,Form.width-65,0,8,#goto_about_pal);
 	//main rectangles
-	DrawRectangle3D(1,40,Form.cwidth-3,onTop(46,0),col_border,col_border);
+	DrawRectangle(1,40,Form.cwidth-3,onTop(46,0),col_border);
-	DrawRectangle3D(0,39,Form.cwidth-1,onTop(44,0),col_palette[4],col_palette[4]); //bg
+	DrawRectangle(0,39,Form.cwidth-1,onTop(44,0),col_palette[4]); //bg
 	for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_palette[8-i]);
 	DrawLeftPanel();
 	//ListBox
 	DrawFlatButton(files.x,40,onLeft(files.x,168),16,31,col_work,"File");
 	DrawBar(onLeft(27,0),57,1,onTop(22,57),col_border); //line to the left from the scroll
 	DrawFlatButton(onLeft(27,0),40,16,16,0,col_work,"\x18");
 	DrawFlatButton(onLeft(27,0),onTop(22,0),16,16,0,col_work,"\x19");
 	Open_Dir(#path,ONLY_SHOW);
 	if (del_active) Del_Form();
-	if (rename_active) ActionsProcess(2);
+	if (rename_active) FnProcess(2);
+}
 	PathShow_prepare stdcall(#PathShow);
 	PathShow_draw stdcall(#PathShow);
+}
-void FileList_ReDraw(int cur)
+void List_Current(int cur)
+{
 	if (cur<=0) //up
+	{
+		}
+	}
+}
 void List_ReDraw()
+{
 	int paint_y;
 	//åñëè ìû â êîíöå ñïèñêà ôàéëîâ ðàçâåðí¸ì îêíî ïîÿâÿòüñÿ ïóñòÿå áåëûå êíîïêè
 	//ýòî åñëè âûäåëåíèå ïîñëå ñõëîïûâàíèÿ îêíà çà êàäðîì
 	if (files.count-files.firstfiles.visible-1)
 	{ files.first=files.count-files.visible; files.current=files.visible-1; }
-	for (j=0; jj) Line_ReDraw(0xFFFFFF, j); else Line_ReDraw(col_selec, files.current);
+	for (j=0; j
 	//in the bottom
 	paint_y = j * files.line_h + files.y;
 	DrawBar(files.x,paint_y,files.w,onTop(paint_y,6),0xFFFFFF);
 	DrawBar(onLeft(168,0),paint_y,1,onTop(paint_y,6),col_work);
+	DrawBar(onLeft(95,0),paint_y,1,onTop(paint_y,6),col_work);
-	DrawBar(onLeft(95,0),paint_y,1,onTop(paint_y,6),col_work);
+	Scroll();
 	Scroll();
 void Line_ReDraw(dword color, filenum){
 		if (!strcmp("..",off))
 			Put_icon("..", files.line_h/2-7+y, color);
 		else
 			Put_icon("", files.line_h/2-7+y, color);
 	if (TestBit(ESDWORD[off-40],1)) || (TestBit(ESDWORD[off-40],2)) text_col=0xA6A6B7; //system or hiden?
-	if (color<>0xFFFfff)
+	if (color!=0xFFFfff)
+	{
 		itdir=TestBit(ESDWORD[off-40], 4);
 		strcpy(#file_name, off);
 		strcpy(#file_path, #path);
 		strcat(#file_path, #file_name);
 	DrawBar(onLeft(168,0),y,1,files.line_h,col_work); //gray line 1
 	DrawBar(onLeft(95,0),y,1,files.line_h,col_work); //gray line 2
+}
-void Open_Dir(dword temp_, redraw){
-	int errornum, count;
-	char path_[4096],
+void Open_Dir(dword dir_path, redraw){
-	somelen=strlen(temp_)-1;
+	int errornum, maxcount;
-	if (redraw<>ONLY_SHOW)
-	{
-		strcpy(#path_, temp_);
+	if (redraw!=ONLY_SHOW)
-		if (somelen) path_[somelen]=NULL;
+	{
+		if (ESBYTE[dir_path+1]!='\0') ESBYTE[dir_path+strlen(dir_path)-1] = '\0';
 		if (buf) free(buf);
-    	buf = malloc(32);
+		errornum = GetDir(#buf, #files.count, dir_path, DIRS_NOROOT);
-		errornum=ReadDir(0, buf, #path_);
+		if (ESBYTE[dir_path+1]!='\0') chrcat(dir_path, '/');
-		if (errornum<>0)
+		if (errornum)
+		{
 			HistoryPath(ADD_NEW_PATH);
 			GoBack();
-			Write_Error(errornum);
-			return;
-		}
-    	files.count = ESDWORD[buf+8];
-    	buf = realloc(buf, files.count * 304 + 32);
+			Write_Error(errornum);
-		ReadDir(files.count, buf, #path_);
+			return;
-		files.count=EBX;
 		count = sizeof(file_mas)/sizeof(dword)-1;
-		if (files.count>count) files.count=count;
+		maxcount = sizeof(file_mas)/sizeof(dword)-1;
 		if (files.count>maxcount) files.count = maxcount;
+	}
-	if (files.count<>-1)
+	if (files.count!=-1)
-	{
-		KEdit();
+	{
-		HistoryPath(ADD_NEW_PATH);
+		KEdit();
-		IF (!strcmp(".",buf+72)) {files.count--; memmov(buf,buf+304,files.count*304);} //oeeuo?oai yeaiaio "."
+		HistoryPath(ADD_NEW_PATH);
-		files.visible=onTop(6,57)/files.line_h;
+		files.visible = files.h / files.line_h;
-		IF (files.count
+		IF (files.count < files.visible) files.visible = files.count;
-		IF (sort_num==1) WriteText(Form.width+60/2,45,0x80,0x4E78AC,"\x19");
+		IF (sort_num==1) WriteText(Form.width+60/2,45,0x80,col_border,"\x19");
-		IF (sort_num==2) WriteText(Form.width-115,45,0x80,0x4E78AC,"\x19");
+		IF (sort_num==2) WriteText(Form.width-115,45,0x80,col_border,"\x19");
-		IF (sort_num==3) WriteText(Form.width-44,45,0x80,0x4E78AC,"\x19");
+		IF (sort_num==3) WriteText(Form.width-44,45,0x80,col_border,"\x19");
-		IF (redraw<>ONLY_SHOW) Sorting();
+		IF (redraw!=ONLY_SHOW) Sorting();
-		IF (redraw<>ONLY_OPEN) List_ReDraw();
+		IF (redraw!=ONLY_OPEN) List_ReDraw();
-	}
 	IF (files.count==-1) && (redraw<>ONLY_OPEN) {files.visible=files.count=0; List_ReDraw();}
 	IF (files.count==-1) && (redraw!=ONLY_OPEN) {files.visible=files.count=0; List_ReDraw();}
+}
 	Sort_by_Name(0,k-1);
 	IF (sort_num==1) Sort_by_Name(k,files.count-1);
 	IF (sort_num==2) Sort_by_Type(k,files.count-1);
 	IF (sort_num==3) Sort_by_Size(k,files.count-1);
 	//".." should be first
+	IF (k>0) && (strcmp(file_mas[0]*304+buf+72,"..")!=0)
-	IF (k>0) && (strcmp(file_mas[0]*304+buf+72,"..")<>0) FOR(k--; k>0; k--;) IF (!strcmp(file_mas[k]*304+buf+72,"..")) file_mas[k]>
+		FOR(k--; k>0; k--;) IF (!strcmp(file_mas[k]*304+buf+72,"..")) {file_mas[k]>
+}
 void Del_Form()
+{
-	int dform_x=Form.width/2-13;
+	int dform_x = files.w - 200 / 2 + files.x;
 	//oeia ieii
 	if (!files.count) return;
 	DrawFlatButton(dform_x,160,200,80,0,col_work, ""); //oi?ia
+		{
 			WriteText(164+dform_x,190,0x80,0,"...?");
 			ESI = 24;
 			WriteText(dform_x+20,190,0,0,#file_name); //ieoai eiy
+		}
-	//eiiii?ee
 	DrawFlatButton(dform_x+20,208,70,20,301,0xFFB6B5,"Yes");
 	DrawFlatButton(dform_x+111,208,70,20,302,0xC6DFC6,"No");
 	del_active=1;
+}
+{
 	int del_rezult;
 	IF (dodel==true)
+	{
 		del_rezult = DeleteFile(#file_path);
-		IF (del_rezult<>0)
+		IF (del_rezult)
+		{
 			Write_Error(del_rezult);
 			IF ( itdir) ShowMessage("Error. Folder isn't empty.");
 			IF (!itdir) ShowMessage("Error. Filesystem read-only.");
+		}
+ 	}
 	del_active=0;
 	DeleteButton(301); DeleteButton(302);
-	Open_Dir(#path,1);
+	Open_Dir(#path,WITH_REDRAW);
-}
-void Paste()
-{
-	char new_copy_path[4096];
-	int copy_rezult;
-	IF (!copy_file) return;
-	strcpy(#new_copy_path, #path);
-	strcat(#new_copy_path, #copy_file+strrchr(#copy_file,'/'));
-	if (!strcmp(#copy_file,#new_copy_path))
-	{
-		strcpy(#new_copy_path, #path);
-		strcat(#new_copy_path, "new_");
-		strcat(#new_copy_path, #copy_file+strrchr(#copy_file,'/'));
-	}
-	copy_rezult = CopyFile(#copy_file,#new_copy_path);
-	IF (copy_rezult!=0)
-	{
-		Write_Error(copy_rezult);
-		return;
-	}
-	IF (cut_active)
-	{
-		strcpy(#file_path, #copy_file);
-		Del_File(true);
-		copy_file=NULL;
-		cut_active=false;
-	}
-	SelectFile(#new_copy_path+strrchr(#new_copy_path,'/'));
+}
 	if (rename==true)
+	{
 		strcpy(#temp, #path);
 		strcpy(#edit_name, #file_name); //save edit name to select it later
 		strcat(#temp, #file_name);
-		if (strcmp(#file_path,#temp)<>0) && (file_name)
+		if (strcmp(#file_path,#temp)!=0) && (file_name)
-		IF (itdir)
+		if (itdir)
+		{
 			del_rezult = DeleteFile(#file_path);
-			IF (del_rezult!=0)
+			if (del_rezult!=0)
+			{
 				Write_Error(del_rezult);
 				ShowMessage("Error. Folder isn't empty.");
 				return;
+			}
 			ELSE CreateDir(#temp);
-			Open_Dir(#path,1);
+			Open_Dir(#path,WITH_REDRAW);
+		}
 		ELSE
+		{
 			copy_rezult = CopyFile(#file_path,#temp);
 			if (copy_rezult!=0) Write_Error(copy_rezult); else Del_File(true);
 	files.first=files.current=0;
    	Open_Dir(#path,ONLY_OPEN);
 	strttl(that_file);
 	for (i=files.count-1; i>=0; i--;)
 		if (!strcmp(file_mas[i]*304+buf+72,that_file)) break;
-	FileList_ReDraw(i);
+	List_Current(i);
 	List_ReDraw();
+}
 	SelectFile(#cur_folder);
+}
 void Open()
+{
 	if (!files.count) return;
 	if (!itdir)
+	{
 		GetIni(0);
+	}
 	else
+	{
 		if (!strcmp(#file_name,"..")) { Dir_Up(); return; }
 		strcpy(#path, #file_path);
 		if (path[strlen(#path)-1]!='/') chrcat(#path, '/'); //need "/" in the end
 		files.first=files.current=0;
-		Open_Dir(#path,1);
+		Open_Dir(#path,WITH_REDRAW);
+	}
+}
 	char cur_folder[4096];
 	strcpy(#cur_folder, GetCurrentFolder());
 	if (HistoryPath(GO_BACK)) SelectFile(#cur_folder);
+}
-void ActionsProcess(char N)
+void FnProcess(char N)
+{
 	switch(N)
+	{
 		case 1:
 			SwitchToAnotherThread();
-			CreateThread(#about_dialog,#stak1);
+			CreateThread(#about_dialog,#about_stak);
 			break;
 		case 2:
 			if (!files.count) break;
 			edit2.flags=100000000000010b; //set active
 			Tip(56, "Devices", 55, "-");
 			Open_Dir(#path,WITH_REDRAW);
 			pause(10);
 			GetIni(1);
 			SystemDiscsGet();
-			Open_Dir(#path,1);
+			Open_Dir(#path,WITH_REDRAW);
 			DrawLeftPanel();
 			break;
 		case 6:
 			strcpy(#temp, #path);
 			strcat(#temp, "New folder");
 			CreateDir(#temp);
 			if (!EAX){
 				SelectFile("New folder");
-				ActionsProcess(2);
+				FnProcess(2);
+			}
 			else
+			{
 				Write_Error(EAX);
 				ShowMessage("Folder can not be created.");
 			strcpy(#temp, #path);
 			strcat(#temp, "New file");
 			WriteFile(0, 0, #temp);
 			if (!EAX){
 				SelectFile("New file");
-				ActionsProcess(2);
+				FnProcess(2);
+			}
 			else
+			{
 				Write_Error(EAX);
 				ShowMessage("File can not be created.");
 			RunProgram(EDITOR_PATH, abspath("Eolite.ini"));
 			break;
+	}
+}
-void copyf_Action() {
-	return;
-stop:
+stop:
+char about_stak[512];
-char stak1[512];
+char menu_stak[512];

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c – Rev 3441 → 3444