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

 #define ONLY_SHOW	0
 #define WITH_REDRAW	1
 #define ONLY_OPEN	2
 //ïåðåìåííûå
-#define title "Eolite File Manager v1.27"
+#define title "Eolite File Manager v1.28"
-dword videlenie=0x94AECE; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
+dword selection_col=0x94AECE; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
+//
+/*
+int  f_visible,
+     f_count,
+     f_first,
+     f_current;
+*/
 //
 int  but_num,
      count,
      za_kadrom,
-     curbtn,
+     curbtn;
      scroll_size;
 byte cut_active,
      rename_active,
      del_active;
 byte show_actions=1,
      edit_path[4096],
      file_path[4096],
      file_name[4096],
      copy_file[4096],
      temp[4096];
+int scroll_size;
 void main()
 word key, id;
 mouse m;
 int pressed_y;
+{
-	//
 	load_editbox_lib();
 	GetSystemDiscs();
 	GetIni(1);
-	edit1.shift_color=videlenie;
+	edit1.shift_color=selection_col;
-	edit2.shift_color=videlenie;
+	edit2.shift_color=selection_col;
 	HistoryPath(add_new_path);
-	IF (param[0]<>'') //áûë ëè çàïóñê ñ ïàðàìåòðîì
+	IF (param)
+	{
 		copystr(#param, #path);
+		IF (strcmp(#path+strlen(#path)-1,"/")<>0) copystr("/",#path+strlen(#path)); //åñëè íåò, + "/"
-		IF (strcmp(#path+strlen(#path)-1,"/")<>0) copystr("/",#path+strlen(#path)); //åñëè íåò, + "/"
+	}
+	else
 		copystr("/rd/1/", #path);
 	else copystr("/rd/1/", #path);
 	Open_Dir(#path,ONLY_OPEN);
 	loop()	switch(WaitEvent())
 	{
 		case evMouse:
-				IF (del_active==1) break;
+				IF (del_active) break;
 				id=GetSlot(Form.ID);
 				IF (id<>ActiveProcess()) break; //åñëè îêíî íå àêòèâíî íà ñîáûòèÿ ìûøè íå ðåàãèðóåì
 					m.get();
+				}
 				break;
 //Button pressed-----------------------------------------------------------------------------
 		case evButton:
-			IF (edit1.flags<>64) {edit1.flags=64; edit_box_draw stdcall(#edit1);} //ñáðàñûâàåì âûäåëåíèå ïðè íàæàòèè íà áàòîí
 			id=GetButtonID();
 			IF (id==1) ExitProcess();
+			IF (del_active)
+			{
-			IF (del_active==1) {IF (id==301) || (id==302) Del_File(302-id); break;}
+				IF (id==301) || (id==302) Del_File(302-id);
+				break;
+			}
 			switch(id)
+			{
 				case 21: //Back
 						GoBack();
 						break;
 				case 22: //Forward
-						HistoryPath(go_forward);
+						HistoryPath(GO_FORWARD);
+						za_kadrom=curbtn=0; //ââåðõ ñïèñêà
+						Open_Dir(#path,WITH_REDRAW);
 						break;
 				case 23: //up!
 						Dir_Up();
 						break;
 				case 24: //cut
+			}
 			break;
 //Key pressed-----------------------------------------------------------------------------
 		case evKey:
 			key = GetKey();
-			IF (del_active==1)
+			IF (del_active)
+			{
 				IF (key==013) Del_File(true);
 				IF (key==027) Del_File(false);
 				break;
+			}
 							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;
-					case 024: //Ctrl+X cut
+					case 024: //Ctrl+X
-					case 003: //Ctrl+C copy
+					case 003: //Ctrl+C
 							CTRLC_MARK:
 							IF (isdir) break; //ïàïêè ïîêà ÷òî êîïèðîâàòü íå óìååì
 							copystr(#file_path,#copy_file); //âû÷èñëÿåì êàêîé ôàéë êîïèðîâàòü
 							IF (key==24) cut_active=1; ELSE cut_active=0;
 							break;
-					case 022: Paste(); break;//Ctrl+V paste
+					case 022: //Ctrl+V
+							Paste();
+							break;
 					case 027: //Esc
 							IF (rename_active==1) ReName(false);
 							break;
 					case 013: //Enter
 							IF (rename_active==1) {ReName(true); break;}
 	DefineAndDrawWindow(98,90,582,482,0x73,0x10E4DFE1,0,0,title);
 	Form.GetInfo(#Form, SelfInfo);
 	IF (Form.status_window>2) return; //íè÷åãî íå äåëàòü åñëè îêíî ñõëîïíóòî â çàãîëîâîê
 	  IF (Form.height<280) MoveSize(OLD,OLD,OLD,280);
 	  IF (Form.width<480) MoveSize(OLD,OLD,480,OLD);
 	//toolbar buttons
 	PutPaletteImage(#toolbar,246,39,0,0,#toolbar_pal);
 	FOR (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,0xE4DFE1);
 	FOR (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,0xE4DFE1);
 	//ïîëîñà àäðåñà
 	Open_Dir(#path,ONLY_SHOW);
 	//ïðîêðóòêà
 	DrawBar(onLeft(27,0),57,1,onTop(22,57),0x94AECE); //ëèíèÿ ñëåâà îò ïðîêðóòêè
 	DrawFlatButton(onLeft(27,0),40,16,16,0,0xE4DFE1,"\x18");		//ïðîêðóòêà ââåðõ
 	DrawFlatButton(onLeft(27,0),onTop(22,0),16,16,0,0xE4DFE1,"\x19");//ïðîêðóòêà âíèç
-	if (del_active==1) Del_Form();
+	if (del_active) Del_Form();
+}
 		IF (za_kadrom==0) && (curbtn<=0) return;
 		IF (-curbtn_-1
+		{
 			Line_ReDraw(0xFFFFFF, curbtn); //áåëàÿ ïîëîñà
 			curbtn+=curbtn_;
-			Line_ReDraw(videlenie, curbtn); //âûäåëåíèå
+			Line_ReDraw(selection_col, curbtn); //âûäåëåíèå
 			return;
+		}
 		ELSE
+		{
 			IF (-curbtn_
 		IF (za_kadrom==count-but_num) && (curbtn==but_num-1) return;
 		IF (but_num-curbtn>curbtn_)
+		{
 			Line_ReDraw(0xFFFFFF, curbtn); //áåëàÿ ïîëîñà
 			curbtn+=curbtn_;
-			Line_ReDraw(videlenie, curbtn); //âûäåëåíèå
+			Line_ReDraw(selection_col, curbtn); //âûäåëåíèå
 			return;
+		}
 		else
+		{
 			IF(za_kadrom+curbtn+curbtn_>=count)
+{
 	int paint_x=but_num*BUTTON_HEIGHT+57;
 	IF (count-za_kadrombut_num-1) //åñëè ìû â êîíöå ñïèñêà ôàéëîâ ðàçâåðí¸ì îêíî ïîÿâÿòüñÿ ïóñòÿå áåëûå êíîïêè
 	{ za_kadrom=count-but_num; curbtn=but_num-1; } //ýòî åñëè âûäåëåíèå ïîñëå ñõëîïûâàíèÿ îêíà çà êàäðîì
 	//
-	FOR (j=0; jj) Line_ReDraw(0xFFFFFF, j); ELSE Line_ReDraw(videlenie, curbtn);
+	FOR (j=0; jj) Line_ReDraw(0xFFFFFF, j); ELSE Line_ReDraw(selection_col, curbtn);
 		DrawBar(192,paint_x,onLeft(27,192),onTop(paint_x,6),0xFFFFFF); //çàëèâêà áåëûì äîêîíöà
 		DrawBar(onLeft(168,0),paint_x,1,onTop(paint_x,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
 		DrawBar(onLeft(95,0),paint_x,1,onTop(paint_x,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
 	TVScroll();
+}
+/*#include "def_file.txt"
+#define CELL_SIZE 58
+void List_ReDraw()
+{
+	int i,
+		po_gor, po_ver,
+		on_xx, name_len;
+	po_gor=onLeft(22,197)/CELL_SIZE;
+	po_ver=onTop(57,6)/CELL_SIZE;
+	for (j=0; j
+	{
+		if (j*po_gor+i+za_kadrom>=count)
+		{
+			DrawBar(i*CELL_SIZE+192,j*CELL_SIZE+57,CELL_SIZE,CELL_SIZE,0xFFFFFF);
+			continue;
+		}
+		DefineButton(i*CELL_SIZE+192,j*CELL_SIZE+57,CELL_SIZE,CELL_SIZE,j*po_gor+i+201+BT_HIDE,0xFFFFFF);
+		DrawBar(i*CELL_SIZE+192,j*CELL_SIZE+57,CELL_SIZE,CELL_SIZE,0xFFFFFF);
+		off=file_mas[j*po_gor+i+za_kadrom]*304 + buf+72;
+		name_len=strlen(off);
+		if (name_len>9) name_len=9;
+		on_xx=-name_len*3+29;
+		WriteText(i*CELL_SIZE+193+on_xx,j*CELL_SIZE+57+CELL_SIZE-16,0,0,off,name_len);
+		if (!TestBit(ESDWORD[off-40], 4))
+			PutImage(#file32,32,32,i*CELL_SIZE+197+9,j*CELL_SIZE+57+5);
+		else
+			PutImage(#folder32,32,32,i*CELL_SIZE+197+9,j*CELL_SIZE+57+5);
+	}
+	TVScroll();
+}*/
+//-------------------------------------------------------------------------------------
 void Line_ReDraw(dword color, filenum){
 	dword text_col=0, name_len,
 		if (buf) free(buf);
     	buf = malloc(32);
 		errornum=ReadDir(0, buf, #path_);
 		if (errornum<>0) //îøèáêà ïðè ÷òåíèè ïàïêè
+		{
-			HistoryPath(add_new_path);
+			HistoryPath(ADD_NEW_PATH);
 			GoBack();
 			Write_Error(errornum);
 			return;
+		}
     	count = ESDWORD[buf+8];
 	if (count<>-1)
+	{
 		//debug("successfully \n");
 		copystr(temp_,#edit_path);
 		KEdit();
-		HistoryPath(add_new_path);
+		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)/BUTTON_HEIGHT;
 		IF (count
 		//ñòðåëî÷êà ñîðòèðîâêè
 	Open_Dir(#path,1);
+}
 void Paste()
 {
-	char new_copy_path[4096]='';
+	char new_copy_path[4096];
 	int copy_rezult;
 	IF (!copy_file) return; //îòìåíà, åøè åù¸ íè÷¸ íå ñêîïèðîâàëè
 	copystr(#path,#new_copy_path);
 	copystr(#copy_file+find_symbol(#copy_file,'/'),#new_copy_path+strlen(#new_copy_path));
-	if (strcmp(#copy_file,#new_copy_path)==0) //åñëè ìû êîïèðóåì è âñòàâëÿåì â îäíîé è òîé æå ïàïêå
+	if (!strcmp(#copy_file,#new_copy_path)) //åñëè ìû êîïèðóåì è âñòàâëÿåì â îäíîé è òîé æå ïàïêå
+	{
-			copystr(#path,#new_copy_path);
+		copystr(#path,#new_copy_path);
-			copystr("new_",#new_copy_path+strlen(#new_copy_path));
+		copystr("new_",#new_copy_path+strlen(#new_copy_path));
+	{
 		Write_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) //åñëè ìû âûáðàëè âûðåçàòü
+	IF (cut_active) //åñëè ìû âûáðàëè âûðåçàòü
+		{
 			copystr(#copy_file,#file_path);
 			Del_File(true);
 			copy_file='';
 			cut_active=0;
 void ReName(byte rename)
 {
 	int del_file_rez;
-	char edit_name[256]='';
+	char edit_name[256];
 	rename_active=0;
 	edit2.flags=64;
 	DefineButton(192,curbtn*BUTTON_HEIGHT+57,onLeft(27,192),BUTTON_HEIGHT,curbtn+201+BT_HIDE+BT_NOFRAME,0xFFFFFF);
 			CopyFile(#file_path,#temp);
 			Del_File(true);
+		}
 		SelectFile(#edit_name);
+	}
-	Line_ReDraw(videlenie,curbtn);
+	Line_ReDraw(selection_col,curbtn);
+}
 void Goto_edit_path()
+{
+	IF (!strcmp(#path,#edit_path)) return; //ïðîâåðêà íå â ýòîé ëè ìû ïàïêå
-	IF (strcmp(#path,#edit_path)==0) return; //ïðîâåðêà íå â ýòîé ëè ìû ïàïêå
+ 	IF (strcmp(#edit_path+strlen(#edit_path)-1,"/")<>0) copystr("/",#edit_path+strlen(#edit_path)); //åñëè íåò, + "/"
+	Open_Dir(#edit_path,ONLY_OPEN); //ïðîâåðÿåì åñëè ôàéëû â ïàïêå, òàê ìû óçíà¸ì ñóùåñòâóåò ëè îíà
+	IF (count<1)
- 	IF (strcmp(#edit_path+strlen(#edit_path)-1,"/")<>0) copystr("/",#edit_path+strlen(#edit_path)); //åñëè íåò, + "/"
+		KEdit(); //ïðîñòî î÷èùàåì ïîëîñó àäðåñà
+	ELSE
+	{
-	Open_Dir(#edit_path,ONLY_OPEN); //ïðîâåðÿåì åñëè ôàéëû â ïàïêå, òàê ìû óçíà¸ì ñóùåñòâóåò ëè îíà
+		za_kadrom=curbtn=0; //íàâåðõ ñïèñêà
-	IF (count<1) KEdit(); ELSE //ïðîñòî î÷èùàåì ïîëîñó àäðåñà
+		copystr(#edit_path,#path);
 		{za_kadrom=curbtn=0; copystr(#edit_path,#path);}//íàâåðõ ñïèñêà
 	Open_Dir(#path,1);
+}
 void SelectFile(dword that_file)
+{
 	za_kadrom=curbtn=0; //ââåðõ ñïèñêà
    	Open_Dir(#path,ONLY_OPEN);
 	ChangeCase(that_file);
 	for (i=count-1; i>=0; i--;)
 inline fastcall void GoBack()   //âíà÷àëå óäàëÿåì òåêóùèé ïóòü, à ïîòîì êîïèðóåì òî, ÷òî îñòàëîñü
+{
 	char cur_folder[4096];
 	copystr(GetCurrentFolder(), #cur_folder);
-	HistoryPath(go_back);
+	HistoryPath(GO_BACK);
 	SelectFile(#cur_folder);
+}

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- – Rev 2820 → 2833