WebSVN – Kolibri OS – Diff – /programs/fs/Eolite/trunk/Eolite.c--

 //Leency & Veliant -=- KolibriOS Team -=- 2011
 //GNU GPL licence.
-//íå âûäåëÿåò, åñëè ïåðåèìåíîâàòü â /rd/1/ -----   ñòðî÷êà 392
 //ïðè îòêðûòèè ïðîãðàììû ñ ïàðàìåòðîì âûäåëÿåò ïîñëåäíèé ôàéë â ïàïêå
 //íåìíîãî êðèâàÿ ïðîêðóòêà
 #include "lib\kolibri.h--"
 #include "lib\memory.h--"
 #include "lib\edit_box_lib.h--"
 #include "lib\file_system.h--"
+#include "imgs\toolbar.txt"
+#include "imgs\left_p.txt"
+//for OpenDir
-#include "imgs\toolbar.txt"
+#define ONLY_SHOW	0
-#include "imgs\left_p.txt"
+#define WITH_REDRAW	1
 #define ONLY_OPEN	2
 //ïåðåìåííûå
-#define title "Eolite File Manager v0.99"
+#define title "Eolite File Manager v0.99.8"
 #define videlenie 0x94AECE //0xFEA4B7,0x8BCDFF,0xB8C9B8}; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
 edit_box edit2= {250,213,80,0xFFFFCC,videlenie,0xFFFFCC,0xffffff,0,248,#file_name,#mouse_dd,64,6,6};
 proc_info Form;
 dword buf, off; //äëÿ òåêñòà è áóôåðà
+dword devbuf, dev_num;
 dword devbuf, dev_num;
 #include "include\LVabout.h--"
 #include "include\sorting.h--"
 #include "include\icons_f.h--"
 #include "include\ini.h--"
-void Devices()
-{
+void Devices()
-	//on load
+{
-	/*devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè
-	ReadDir(10, devbuf, "/");
-	dev_num=EBX;
+	byte dev_icon;
-	*/
+	dword drive_name[30];
 	char dev_name[4];
 	byte dev_icon; dword drive_name[30]; char dev_name[4];
 	DrawBar(2,41,190,15,0x00699C);		//ñèíèé ïðÿìîóãîëüíèê - ñâåðõó
 	load_editbox_lib();
 	devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè
 	ReadDir(10, devbuf, "/");
 	dev_num=EBX;
 	//
-	IF (param[0]<>'')
+	//curbtn=za_kadrom=0;
+	HistoryPath(add_new_path);
+	IF (param[0]<>'') //áûë ëè çàïóñê ñ ïàðàìåòðîì
+	{
-		IF (strcmp(#path,#param)==0) copystr("/sys/",#path); //ýòî ïîòîìó ÷òî åñëè çàïóñòèòü Eolite '/rd/1/' áóäåò ïóñòîå îêíî
-		copystr(#param,#edit_path);
+		copystr(#param, #path);
+		IF (strcmp(#path+strlen(#path)-1,"/")<>0) copystr("/",#path+strlen(#path)); //åñëè íåò, + "/"
+	}
-		Goto_edit_path();
+	Open_Dir(#path,ONLY_OPEN);
-	} ELSE Open_Dir(#path,2); //áûë ëè çàïóñê ñ ïàðàìåòðîì
 	loop()
+	{
 		switch(WaitEvent())
+		{
 			CASE evMouse:
 					IF (del_active==1) break;
+					id=GetSlot(Form.ID);
+					IF (id<>ActiveProcess()) break; //åñëè îêíî íå àêòèâíî íà ñîáûòèÿ ìûøè íå ðåàãèðóåì
 					m.get();
-					if (m.x>=Form.width-21) && (m.x<=Form.width-6) && (m.y>40) && (m.y<57)
+					if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>40) && (m.y<57)
+					{
 						IF (m.lkm==1) DrawRegion_3D(onLeft(26,0),41,14,14,0xC7C7C7,0xFFFFFF);
 						WHILE (m.lkm==1) && (za_kadrom>0)
+						{
 							m.get();
+						}
 						DrawRegion_3D(onLeft(26,0),41,14,14,0xFFFFFF,0xC7C7C7);
+					}
-					if (m.x>=Form.width-21) && (m.x<=Form.width-6) && (m.y>onTop(22,0)+1) && (m.y
+					if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>onTop(22,0)+1) && (m.y
+					{
 						IF (m.lkm==1) DrawRegion_3D(onLeft(26,0),onTop(21,0),14,14,0xC7C7C7,0xFFFFFF);
 						while (m.lkm==1) && (za_kadrom
+						{
 					//êîë¸ñèêî ìûøè
 					IF (m.vert==65535) IF (curbtn==0) FileList_ReDraw(-3); ELSE FileList_ReDraw(-1);
 					IF (m.vert==1) IF (curbtn==but_num-1) FileList_ReDraw(3); ELSE FileList_ReDraw(1);
 					//ñêðîëë
-					if (m.x>=Form.width-21) && (m.x<=Form.width-6) && (m.y>56) while (m.lkm)
+					if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>56) while (m.lkm)
+					{
 						IF (scroll_size/2+57>m.y) || (m.y<0) || (m.y>4000) m.y=scroll_size/2+57; //åñëè êóðñîð íàä îêíîì
 						id=za_kadrom; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
 						j= scroll_size/2;
 							break;
 					CASE 27: //goto edit_path
 							Goto_edit_path();
 							break;
 					CASE 31...33: //sort
-							IF (sort_num==id-30) break;
-							IF(sort_num==1)DrawBar(onLeft(192,168)/2+210,45,6,9,0xE4DFE1);
+							IF(sort_num==1) DrawBar(onLeft(192,168)/2+210,45,6,9,0xE4DFE1);
-							IF(sort_num==2)DrawBar(onLeft(115,0),45,6,9,0xE4DFE1);
+							IF(sort_num==2) DrawBar(onLeft(115,0),45,6,9,0xE4DFE1);
-							IF(sort_num==3)DrawBar(onLeft(44,0),45,6,9,0xE4DFE1);
+							IF(sort_num==3) DrawBar(onLeft(44,0),45,6,9,0xE4DFE1);
 							sort_num=id-30;
 							Open_Dir(#path,1);
+				{
 					IF (key==013) Del_File(true);
 					IF (key==027) Del_File(false);
 				 	break;
+				}
-				IF (edit1.flags<>64) && (edit1.flags<>0) && (key<>13) {EAX=key<<8; edit_box_key stdcall (#edit1); break;}
+				IF (edit1.flags<>64) && (edit1.flags<>0) && (key<>13)
+				{
+					EAX=key<<8;
+					edit_box_key stdcall (#edit1);
+					break;
+				}
-                IF (edit2.flags<>64) && (key<>13) && (key<>27) {EAX=key<<8; edit_box_key stdcall (#edit2); break;}
+                IF (edit2.flags<>64) && (key<>13) && (key<>27)
+				{
+					EAX=key<<8;
+					edit_box_key stdcall (#edit2);
+					break;
+				}
 				switch (key)
+				{
 						case 209...217:
 								id=key-110;
 								IF (id-100>=dev_num) break;
 								break;
 						case 004: //Ctrl+D ðèñ íà ðàá ñòîë ðàñòÿíóòü
 								copystr("\\S__", #temp);
 								copystr(#file_path, #temp+strlen(#temp));
 								RunProgram("/sys/media/kiv", #temp);
-								WriteDebug(#temp);
 								break;
 						case 014: //Ctrl+N íîâîå îêíî
 								IF (Form.left==98) MoveSize(Form.left-20,Form.top-20,OLD,OLD);
 								RunProgram("/sys/File Managers/Eolite", #path);
 								break;
 								break;
 						case 182: //delete file
 								Del_Form();
 								break;
 						default:
-								//FOR (i=curbtn+za_kadrom+1; i
 								for (i=curbtn+za_kadrom+1; i
+								{
 									copystr(file_mas[i]*304+buf+72,#temp);
 									AL=DSBYTE[#temp];
 									IF(AL>='A')&&(AL<='Z')DSBYTE[#temp]=AL|0x20;
 inline fastcall void draw_window()
 {
 	WindowRedrawStatus(1);
-	DefineAndDrawWindow(98,90,560,481,0x73,0x10E4DFE1,0,0,title);
+	DefineAndDrawWindow(98,90,580,481,0x73,0x10E4DFE1,0,0,title);
 	WindowRedrawStatus(2);
-	Form.GetInfo(SelfInfo);
+	Form.GetInfo(#Form, SelfInfo);
 	IF (Form.height==GetSkinWidth()+3) return; //íè÷åãî íå äåëàòü åñëè îêíî ñõëîïíóòî â çàãîëîâîê
 	  IF (Form.height<280) MoveSize(OLD,OLD,OLD,280);
 	  IF (Form.width<480) MoveSize(OLD,OLD,480,OLD);
 				//WriteDebug(IntToStr(curbtn));
 				//ShowMessage("Bug found! Tell it Leency!");
 				curbtn=but_num-1;
+			}
 			List_ReDraw();
-			//WriteDebug(IntToStr(curbtn)); //=0
-			//WriteDebug(IntToStr(za_kadrom)); //=0
-			//WriteDebug(IntToStr(but_num)); //=41
-			//WriteDebug(IntToStr(count)); //=41
 			/*WriteDebug("");
 			WriteDebug(#path);
 			WriteDebug("Number of files:"); WriteDebug(IntToStr(count));
+		}
+	}
+}
 void List_ReDraw()
+{
 	int paint_x=but_num*18+57;
 void Line_ReDraw(dword color, filenum){
 	dword text_col=0, temp_int,
 	y=filenum*18+57; //ïîëîæåíèå òåêñòà ïî Y
 	IF (rename_active==1) ReName(false);
 	//äà, ÿ íå ñïîðþ ÷òî èçâðàò, íî ïåðåðèñîâêà çàòî ìàëåíüêàÿ
+	DefineButton(192,y,onLeft(28,192),18,201+filenum+BT_HIDE+BT_NOFRAME,color); //êíîïà
 	DrawBar(192,y,3,18,color); DrawBar(195,y,16,2,color);
 	DrawBar(192+19,y,onLeft(46,192),18,color); DrawBar(195,y+17,16,1,color);
 	//
 	off=file_mas[filenum+za_kadrom]*304 + buf+72;
 	if (TestBit(ESDWORD[off-40],1)) || (TestBit(ESDWORD[off-40],2)) text_col=0xA6A6B7;
-	if (!TestBit(ESDWORD[off-40],4))
+		if (!TestBit(ESDWORD[off-40],4))
+		{
-		copystr(off,#temp);
+			copystr(off,#temp);
-		temp_int = Put_icon(#temp+find_symbol(#temp,'.'), y+2);
+			temp_int = Put_icon(#temp+find_symbol(#temp,'.'), y+2);
-		WriteText(7-strlen(ConvertSize(ESDWORD[off-8]))*6+onLeft(75,0),y+6,0x80,0,ConvertSize(ESDWORD[off-8]),0); //size
+			WriteText(7-strlen(ConvertSize(ESDWORD[off-8]))*6+onLeft(75,0),y+6,0x80,0,ConvertSize(ESDWORD[off-8]),0); //size
+		}
+		ELSE
-	} ELSE IF (!strcmp("..",off)) temp_int=Put_icon("..", y+2); ELSE temp_int=Put_icon("", y+2);
+			IF (!strcmp("..",off)) temp_int=Put_icon("..", y+2);
+	ELSE
+		temp_int=Put_icon("", y+2);
 	if (color==videlenie)
+	{
 		isdir=TestBit(ESDWORD[off-40], 4);
 		IconFairing(temp_int, y+2); //çàêðàøèâàåì èêîíêó
 		copystr(off,#file_name);
+}
 void Open_Dir(dword temp_, redraw){
 	int errornum;
-	byte path_[256],
+	byte path_[4096],
 	somelen=strlen(temp_)-1;
 	if (redraw<>ONLY_SHOW)
+	{
 		copystr(temp_, #path_);
 		IF (somelen) path_[somelen]=0x00;
 		//
 		IF (buf) free(buf);
-    		buf = malloc(32);
+    	buf = malloc(32);
 		errornum=ReadDir(0, buf, #path_);
-		if (errornum<>0) //îøèáêà ïðè ÷òåíèè ïàïêè
 		if (errornum<>0) //îøèáêà ïðè ÷òåíèè ïàïêè
 			//WriteDebug(#path_);
 			Write_Debug_Error(errornum);
 			HistoryPath(add_new_path);
 			GoBack();
 		HistoryPath(add_new_path);
 		IF (!strcmp(".",buf+72)) {memmov(buf,buf+304,count-1*304); count--;} //ôèëüòðóåì ýëåìåíò "."
 		FOR (j=0;j
 		but_num=onTop(6,57)/18;
 		IF (count
-		FOR (j=0;j
 		//ñòðåëî÷êà ñîðòèðîâêè
 		IF (sort_num==1) WriteText(Form.width+60/2,45,0x80,0x4E78AC,"\x19",0);
 		IF (sort_num==2) WriteText(Form.width-115,45,0x80,0x4E78AC,"\x19",0);
 		IF (sort_num==3) WriteText(Form.width-44,45,0x80,0x4E78AC,"\x19",0);
 		IF (redraw<>ONLY_SHOW) Sorting(); //äëÿ áîëüøèõ ïàïîê ïðè ðåïåèíòå îêíà
 	del_active=0;
 	DeleteButton(301); DeleteButton(302); //óäàëÿåì êíîïî÷êè Yes/No
 	Open_Dir(#path,1);
+}
 void Paste()
+{
+	char new_copy_path[4096]='';
+	int copy_rezult;
 	IF (!copy_file) return; //îòìåíà, åøè åù¸ íè÷¸ íå ñêîïèðîâàëè
-	copystr(#path,#temp);
+	copystr(#path,#new_copy_path);
-	copystr(#copy_file+find_symbol(#copy_file,'/'),#temp+strlen(#temp));
+	copystr(#copy_file+find_symbol(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path));
-	if (strcmp(#copy_file,#temp)==0) //åñëè ìû êîïèðóåì è âñòàâëÿåì â îäíîé è òîé æå ïàïêå
+	if (strcmp(#copy_file,#new_copy_path)==0) //åñëè ìû êîïèðóåì è âñòàâëÿåì â îäíîé è òîé æå ïàïêå
 		{
-			copystr(#path,#temp);
+			copystr(#path,#new_copy_path);
-			copystr("new_",#temp+strlen(#temp));
+			copystr("new_",#new_copy_path+strlen(#new_copy_path));
-			copystr(#copy_file+find_symbol(#copy_file,'/'),#temp+strlen(#temp));
+			copystr(#copy_file+find_symbol(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path));
 		}
-	CopyFile(#copy_file,#temp);
+	copy_rezult=CopyFile(#copy_file,#new_copy_path);
-	IF (EAX<>0) //îøèáêà
+	IF (copy_rezult<>0) //îøèáêà
 	{
-		Write_Debug_Error(EAX);
+		Write_Debug_Error(copy_rezult);
 		DrawFlatButton(Form.width/2-13,160,200,80,0,0xFFB6B5, "Error. You can't paste here.");
 		Pause(150);
+	}
 	IF (cut_active==1) //åñëè ìû âûáðàëè âûðåçàòü
+		{
 			copystr(#copy_file,#file_path);
 			Del_File(true);
 			copy_file='';
 			cut_active=0;
 		}
-	SelectFile(#copy_file+find_symbol(#copy_file,'/'));
+	SelectFile(#new_copy_path+find_symbol(#new_copy_path,'/'));
+}
 	WriteText(165,y+5,0x80,0,arrow,0); //ñòðåëêà âíèç
 	DrawBar(17,y+17,160,1,0x94AECE);		//ïîä÷¸ðêèâàíèå
+}
+void ReName(byte rename)
+{
-void ReName(byte rename)
+	int del_file_rez;
 	char edit_name[256]='';
 	rename_active=0;
 	edit2.flags=64;
 	DefineButton(192,curbtn*18+57,onLeft(27,192),18,curbtn+201+BT_HIDE+BT_NOFRAME,0xFFFFFF);
 	if (rename==true)
+	{
 		copystr(#path,#temp);
-		copystr(#path,#temp);
+		copystr(#file_name,#edit_name); //ñîõðàíÿåì íîâîå èìÿ ôàéëà, äëÿ òîãî, ÷òîáû åãî ïîòîì âûäåëèòü
 		copystr(#file_name,#temp+strlen(#temp));
 		if (strcmp(#file_path,#temp)<>0) && (file_name)
+		IF (isdir)
+		{
+			del_file_rez=DeleleFile(#file_path);
+			IF (del_file_rez<>0)
-		IF (isdir)
+			{
+				Write_Debug_Error(del_file_rez);
+				ShowMessage("Error. Folder isn't empty.");
 				return;
 			IF (DeleleFile(#file_path)<>0) ShowMessage("Error. Folder isn't empty.");
 			ELSE CreateFolder(#temp);
 			Open_Dir(#path,1);
+		}
 		ELSE
+		{
 			CopyFile(#file_path,#temp);
 			Del_File(true);
+		}
-		SelectFile(#temp+find_symbol(#path,'/'));
+		SelectFile(#edit_name);
+	}
+}
 void SelectFile(dword that_file)
+{
 	za_kadrom=curbtn=0; //ââåðõ ñïèñêà
-   	Open_Dir(#path,2);
+   	Open_Dir(#path,ONLY_OPEN);
 	ChangeCase(that_file);
 	FOR (i=count-1; i>=0; i--;) IF(strcmp(file_mas[i]*304+buf+72,that_file)==0) BREAK;
-	IF (i>but_num-1) && (i>count-but_num)
+	/*IF (i>but_num-1) && (i>count-but_num) //âñ¸ ýòî ïî-èäåå ìîæíî ñäåëàòü ÷åðåç FileList_ReDraw(i) èëè ÿ íåïðàâ?
+	{
 		za_kadrom=count-but_num;
 		curbtn=i-count+but_num;
 	}
+	ELSE FileList_ReDraw(i);*/
-	ELSE FileList_ReDraw(i);
+	FileList_ReDraw(i);
 	List_ReDraw();
+}
 void Dir_Up()
+{
-	byte temp_[256];
+	byte temp_[4096];
 	i=strlen(#path)-1;
 	path[i]=0x00;

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- – Rev 2098 → 2134