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

 #codesize
 #include "lib\kolibri.h--"
 #include "lib\memory.h--"
 #include "lib\edit_box_lib.h--"
 #include "include\run_file.h--"
-#include "include\icons_f.h--"
-#include "imgs\toolbar_new.cpp"
+#include "imgs\toolbar.txt"
 #include "imgs\left_p.cpp"
 //ëîêàëèçàöèÿ è íàñòðîéêè
-byte header[27] = "Eolite File Manager v0.96.7";
+byte header[27] = "Eolite File Manager v0.97";
 #define videlenie 0x94AECE; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
-int toolbar_buttons_x[6]={14,51,90,139,172,208};
+byte toolbar_buttons_x[6]={14,51,90,139,172,208};
 //
 dword but_num=0, kolichestvo=0, curbtn=0, za_kadrom=0;
 byte cut_active, rename_active, del_active;
 byte show_actions=1, show_preview=0, sort_num=1, isdir;
 dword razm_scrl; //äëÿ ñêðîëà
 byte path[256]="/rd/1/", edit_path[256], PathHistory[2560], temp[256]; //äëÿ ïóòåé
 byte file_path[256], file_name[256]; //äëÿ ôàéëîâ
 byte copyfile[256],copy_name[256]; //êîïèðîâàíèå
 dword i; //äëÿ öèêëîâ
 dword file_mas[6898]; //ñïèñîê ôàéëîâ
-dword temp_int;
+int temp_int, j;
 dword stak[100]=0; //îêíî About
 edit_box edit1= {250,252,17,0xffffff,0x94AECE,0xD3DDEB,0xffffff,0,248,#edit_path,64,6,6};
-edit_box edit2= {250,218,80,0xFFFFCC,0x94AECE,0xFFFFCC,0xffffff,0,248,#file_name,64,6,6};
-proc_info	Form;
-struct {
-	int	func;
-	int	pos;
-	int	rezerv;
-	int	sizefile;
-	int	buffer;
+edit_box edit2= {250,218,80,0xFFFFCC,0x94AECE,0xFFFFCC,0xffffff,0,248,#file_name,64,6,6};
 	char rezerv2;
-	int	stroka;
+proc_info	Form;
-}open_file_70;
+f70 open_dir_70;
-dword buf=0, off; //äëÿ òåêñòà è áóôåðà
+dword buf=0, off; //äëÿ òåêñòà è áóôåðà
 dword devbuf=0, dev_num;
 #include "include\LVabout.c--"
 #include "include\icons_f.h--"
 void main()
 byte pressed, key, id;
 mouse m;
 {
 		devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè
-		open_file_70.func = 1;
+		open_dir_70.func = 1;
-		open_file_70.pos = 0;
+		open_dir_70.param1 = 0;
-		open_file_70.rezerv = 0;
+		open_dir_70.param2 = 0;
-		open_file_70.sizefile = 10;
+		open_dir_70.param3 = 10;
-		open_file_70.buffer = devbuf;
+		open_dir_70.param4 = devbuf;
-		open_file_70.rezerv2 = 0;
+		open_dir_70.rezerv = 0;
-		open_file_70.stroka = "/";
+		open_dir_70.name = "/";
 		$mov eax,70
-		$mov ebx,#open_file_70.func
+		$mov ebx,#open_dir_70.func
 		$int 0x40
 		dev_num=EBX;
 	load_dll(); //ïîäãðóæàåò ëèáó ñ åäèò_áîêñîì
 	IF (param[0]<>'') {copystr(#param,#edit_path); Goto_edit_path();}
 	Open_Dir(#path,2);
-	SetEventMask();
+	//SetEventMask(100111b);
 	loop()
 					break;
 //Button pressed-----------------------------------------------------------------------------
 			case evButton:
 				IF (edit1.flags<>64) {edit1.flags=64; edit_box_draw stdcall(#edit1);} //ñáðàñûâàåì âûäåëåíèå ïðè íàæàòèè íà áàòîí
 				id=GetButtonID();
-				IF (id==1) ExitProcess();
+				IF (id==1) {IF(buf)free(buf); ExitProcess();}
 				IF (del_active==1) {IF (id==301) || (id==302) Del_File(302-id); break;}
 				switch(id)
+				{
 					CASE 21: GoBack(); break;//Íàçàä
 					CASE 23: IF (strcmp(#path,"/")<>0) Dir_Up(); break;//up!
+					{
 					IF (key==013) Del_File(true);
 					IF (key==027) Del_File(false);
 				 	break;
+				 	}
+				IF (edit1.flags<>64) && (key<>13) {EAX=key<<8; edit_box_key stdcall (#edit1); break;}
-				IF (edit1.flags<>64) || (edit2.flags<>64) SWITCH (key) { CASE 8: CASE 180...182: CASE 051...056: goto EDIT_KEY_MARK; } //1..10 è íîóì/åíä â åäèòáîêñàõ
+                IF (edit2.flags<>64) && (key<>13) && (key<>27) {EAX=key<<8; edit_box_key stdcall (#edit2); break;}
 				switch (key)
+				{
 						case 209...217: id=key-109; IF(dev_num>id-100)GOTO DEVICE_MARK; break;
 						case 8: GoBack(); break; //Íàçàä
 						case 014: MoveSize(80,80,OLD,OLD); Run_Program("/sys/File Managers/Eolite", #path); break; //íîâîå îêíî
 										edit2.top=curbtn*18+59+skin_width;
 										edit2.size=strlen(#file_name); edit2.pos=strlen(#file_name);
 										edit_box_draw  stdcall (#edit2);
 										DrawBar(218,curbtn*18+58,edit2.width+1,1,0xFFFFCC); //ïîëîñà æåëòàÿ ñâåðõó äëÿ îäèíàêîâîñòè
 										rename_active=1;
-									BREAK;
+									break;
 						case 052: //Íàæàòà F3
-								IF (isdir==false) Run_Program("/sys/tinypad", #file_path); BREAK;
+								IF (isdir==false) Run_Program("/sys/tinypad", #file_path); break;
-						case 054: Open_Dir(#path,1); BREAK; //ïåðåðèñîâàòü îêíî F5
+						case 054: Open_Dir(#path,1); break; //ïåðåðèñîâàòü îêíî F5
-						case 182: Del_Form(); BREAK; //delete file
+						case 182: Del_Form(); break; //delete file
-						default:  EDIT_KEY_MARK:
+						default:
+								IF (strcmp("..",buf+72+304)<>0) temp_int=0; ELSE temp_int=1;
+								for (i=curbtn+za_kadrom+1; i
+								{
+									copystr(file_mas[i+temp_int]*304+buf+72,#temp);
-								EAX=key <<8;
+									AL=DSBYTE[#temp];
+									IF(AL>='A')&&(AL<='Z')DSBYTE[#temp]=AL|0x20;
-								IF (rename_active==0) edit_box_key stdcall (#edit1); ELSE edit_box_key stdcall (#edit2);
+									IF (temp[0]==key) {FileList_ReDraw(i-curbtn-za_kadrom); break;}
+								}
+				}
 				break;
 				case evReDraw:	draw_window();	BREAK;
+		}
 		IF (rename_active==0) edit_box_mouse stdcall(#edit1); ELSE edit_box_mouse stdcall(#edit2);
 inline fastcall void draw_window()
+{
 	WindowRedrawStatus(1);
 	skin_width = GetSkinWidth();
-	DefineAndDrawWindow(100,100,600,410,0x43,0x10E4DFE1,0,0,#header); //DrawTitle(#header);
+	DefineAndDrawWindow(100,100,600,410,0x43,0x10E4DFE1,0,0,#header);
 	Form.getme();
 	IF (Form.height==skin_width+3) {WindowRedrawStatus(2); return;} //ýòî çà÷¸ò!
 	  IF (Form.height<280) MoveSize(OLD,OLD,OLD,280);
 	  IF (Form.width<480) MoveSize(OLD,OLD,480,OLD);
 	//toolbar buttons
-	PutImage(#toolbar,246,39,5,0);
+	PutPaletteImage(#toolbar,246,39,5,0,#toolbar_pal);
 	FOR (j=0; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,0xE4DFE1);
 	//ïîëîñà àäðåñà
 	DrawBar(251,0,onLeft(251,60),12,0xE4DFE1); //ôîí íàä ïîëîñîé àäðåñà
 	edit1.width=Form.width-314;
 		ELSE IF (sort_num==2) WriteText(onLeft(110,0),45,0x80,0x4E78AC,"\x19",0);
 		ELSE WriteText(onLeft(39,0),45,0x80,0x4E78AC,"\x19",0);
 	//ïðîêðóòêà
 	DrawFlatButton(onLeft(22,0),40,16,16,50,0xE4DFE1,"\x18");		//ïðîêðóòêà ââåðõ
 	DrawFlatButton(onLeft(22,0),onTop(22,0),16,16,51,0xE4DFE1,"\x19");//ïðîêðóòêà âíèç
+	//
+	//DrawBar(197,57,onLeft(22,197),onTop(57,6),0xFFFFFF); //çàëèâêà áåëûì
+	//
 	DrawBar(onLeft(22,0),57,1,onTop(22,57),0x94AECE); 			//ëèíèÿ ñëåâà îò ïðîêðóòêè
 		but_num=onTop(6,57)/18;
 		IF (but_num>100) but_num=1; ELSE IF (kolichestvo
 		FOR (j=0;j
 		List_ReDraw();
 	IF (del_active==1) Del_Form();
 	WindowRedrawStatus(2);
+}
 	IF (kolichestvo-za_kadrom
 	{ za_kadrom=kolichestvo-but_num; DrawBar(197,curbtn*18+57,onLeft(22,197),18,0xFFFFFF); curbtn=but_num-1; }
 		ELSE IF (curbtn>but_num-1) curbtn=but_num-1; //ýòî åñëè âûäåëåíèå ïîñëå ñõëîïûâàíèÿ îêíà çà êàäðîì
 	//
 	FOR (j=0; jj) Line_ReDraw(0xFFFFFF, j); ELSE Line_ReDraw(videlenie, curbtn);
-		temp_int=but_num-1*18+75;
+		temp_int=but_num*18+57;
 		DrawBar(197,temp_int,onLeft(22,197),onTop(temp_int,6),0xFFFFFF); //çàëèâêà áåëûì äîêîíöà
 		DrawBar(onLeft(163,0),temp_int,1,onTop(temp_int,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
 		DrawBar(onLeft(90,0),temp_int,1,onTop(temp_int,6),0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
 	TVScroll();
+}
+/*void List_ReDraw()
+{
+	int i;
+	for (j=0; j<5; j++;) for (i=0; i<6; i++;)
+	{
+		PutImage(#def_file,48,48,i*64+197,j*64+57);
+		off=file_mas[i+j+za_kadrom]*304 + buf+72;
+		DrawBar(i*64+197,j*64+57+50,10*6,9,0xFFFFFF); //çàëèâêà áåëûì
+		WriteText(i*64+197,j*64+57+50,0,0,off,10);
+	}
+	TVScroll();
+}*/
 void Line_ReDraw(dword color, filenum){
-	dword y, size;
+	dword y=filenum*18+57; //ïîëîæåíèå òåêñòà ïî Y;
 	if (rename_active==1)
+	{
 		rename_active=0;
 		edit2.flags=64;
-		DefineButton(197,curbtn+1*18+39,onLeft(22,197),18,curbtn+201+BT_HIDE+BT_NOFRAME,0xFFFFFF);
+		DefineButton(197,curbtn*18+57,onLeft(22,197),18,curbtn+201+BT_HIDE+BT_NOFRAME,0xFFFFFF);
 		IF (filenum==100) filenum=curbtn; ELSE
+		{
 			copystr(#path,#temp);
 			copystr(#file_name,#temp+strlen(#temp));
 			IF (strcmp(#file_path,#temp)<>0) && (strlen(#file_name)>0)
 				{ CopyFile(#file_path,#temp);	Del_File(true); }
 		}
+	}
+	//äà, ÿ íå ñïîðþ ÷òî èçâðàò, íî ïåðåðèñîâêà çàòî ìàëåíüêàÿ
+	DrawBar(197,y,3,18,color);
+	DrawBar(200,y,16,2,color);
 	DrawBar(197+19,y,onLeft(22+19,197),18,color);
-	DrawBar(197,filenum*18+57,onLeft(22,197),18,color); //ïîëîñà áåëàÿ èëè âûäåëåíèÿ
-	//
+	DrawBar(200,y+17,16,1,color);
-	y= filenum*18+85; //ïîëîæåíèå òåêñòà ïî Y
-	IF (strcmp(".",buf+72)<>0) off=file_mas[filenum+za_kadrom]*304 + buf+72; ELSE off=file_mas[filenum+za_kadrom+1]*304 + buf+72;
-	temp_int = onLeft(220,160)/6;
-	IF (strlen(off)
-		WriteText(220,y-22,0,0,off,temp_int);  //èìÿ ôàéëà
+	//
-	size=ESDWORD[off-8];
+	IF (strcmp(".",buf+72)<>0) off=file_mas[filenum+za_kadrom]*304 + buf+72; ELSE off=file_mas[filenum+za_kadrom+1]*304 + buf+72;
 	EAX=ESDWORD[off-40];
 	$shr eax,4
 	$and eax,1
 	IF (color==videlenie) isdir=EAX; //íàäî îáüåäèíèòü ñ òåì øî ñíèçó
-	IF (!EAX)
+	if (!EAX)
 	{
-		temp_int = Put_icon(off+strlen(off)-4, y);
+		temp_int = Put_icon(off+strlen(off)-4, y+2);
-		WriteText(7-strlen(ConvertSize(size))*6+onLeft(75,0),y-22,0x80,0,ConvertSize(size),0);
+		WriteText(7-strlen(ConvertSize(ESDWORD[off-8]))*6+onLeft(75,0),y+6,0x80,0,ConvertSize(ESDWORD[off-8]),0); //size
-	} ELSE IF (strcmp("..",off)==0) temp_int=Put_icon("    ", y); ELSE temp_int=Put_icon("", y);
+	} ELSE IF (strcmp("..",off)==0) temp_int=Put_icon("..", y+2); ELSE temp_int=Put_icon("", y+2);
 	IF (color==videlenie)
+	{
-		IconFairing(temp_int, y, videlenie); //çàêðàøèâàåì èêîíêó
+		IconFairing(temp_int, y+2, videlenie); //çàêðàøèâàåì èêîíêó
 		copystr(#path,#file_path);
 		copystr(off,#file_name);
+		copystr(off,#file_path+strlen(#file_path)); //èòàê, file_path=ôàéëó, ò.ê. ïî-óìîë÷àíèþ ýòî ïðîãà
+	}
+	temp_int = onLeft(220,160)/6;
-		copystr(off,#file_path+strlen(#file_path)); //èòàê, file_path=ôàéëó, ò.ê. ïî-óìîë÷àíèþ ýòî ïðîãà
+	IF (strlen(off)
-	}
+		WriteText(220,y+6,0,0,off,temp_int);  //èìÿ ôàéëà
-	DrawBar(onLeft(163,0),filenum*18+57,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
+	DrawBar(onLeft(163,0),y,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 1
-	DrawBar(onLeft(90,0),filenum*18+57,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
+	DrawBar(onLeft(90,0),y,1,18,0xE4DFE1); //ïîëîñà ñåðàÿ âåðòèêàëüíàÿ 2
 	//Preview();
+}
-void Open_Dir(dword path_,redraw){
-  IF (buf) free(buf);
 	//open_file_70.func = 1;    //à íàôèãà, îíè ñâåðõó åñòü...
-	//open_file_70.pos = 0;
+void Open_Dir(dword path_,redraw){
-	//open_file_70.rezerv = 0;
-	open_file_70.sizefile = 6898;
+  IF (buf) free(buf);
-	buf = malloc(2097152);
+	open_dir_70.param3 = 6898; //filenum
-	open_file_70.buffer = buf;
+	buf = malloc(2097152);
-	//open_file_70.rezerv2 = 0;
+	open_dir_70.param4 = buf;
-	open_file_70.stroka = path_;
+	open_dir_70.name = path_;
 	$mov eax,70
-	$mov ebx,#open_file_70.func
+	$mov ebx,#open_dir_70.func
 	$int 0x40
 void FoldesGoUp()
+{
 	dword k=0, l=0; off=buf+72;
 	IF (strcmp(#path,"/rd/1/")==0) || (strcmp(#path,"/fd/1/")==0) kolichestvo--;
 	IF (strcmp(".",buf+72)<>0) && (strlen(#path)>6) kolichestvo--; //ôàê! ýòî áðåä! õç êàê îíî ðàáîòàåò
-	FOR (i=0;i<=kolichestvo;i++)  //à ïàïêè âñ¸ âûøå è âûøå...
+	FOR (j=0;j<=kolichestvo;j++)  //à ïàïêè ââåðõ, ôàéëû âíèç
+	{
 		EAX=ESDWORD[off-40];
 		$shr eax,4
 		$and eax,1
-		IF (EAX) {file_mas[k]=i; k++;}
+		IF (EAX) {file_mas[k]=j; k++;}
-			ELSE {file_mas[kolichestvo-l]=i; l++;}
+			ELSE {file_mas[kolichestvo-l]=j; l++;}
 		off += 304;
+	}
 	//k=0; l=kolichestvo;
 	switch(sort_num)
+	{
 	DrawFlatButton(temp_int+20,208,70,20,301,0xFFB6B5,"Yes");
 	DrawFlatButton(temp_int+111,208,70,20,302,0xC6DFC6,"No");
 	del_active=1;
+}
 f70 del_file_70;
 void Del_File(byte dodel)
+{
   IF (dodel==true){
-	run_file_70.func = 8;
+	del_file_70.func = 8;
-	run_file_70.flag = 0;
+	del_file_70.param1 = 0;
-	run_file_70.param= 0;
+	del_file_70.param2 = 0;
-	run_file_70.rez1 = 0;
+	del_file_70.param3 = 0;
-	run_file_70.rez2 = 0;
+	del_file_70.param4 = 0;
-	run_file_70.rezerv2 = 0;
+	del_file_70.rezerv = 0;
-	run_file_70.stroka = #file_path;
+	del_file_70.name = #file_path;
 	$mov eax,70
-	$mov ebx,#run_file_70.func
+	$mov ebx,#del_file_70.func
 	$int 0x40}
 	 del_active=0;
 	 DeleteButton(301); DeleteButton(302); //óäàëÿåì êíîïî÷êè Yes/No
 	 Open_Dir(#path,1);
+	}
 	Actions();  //ôóíêöèè ôàéëîâ è ïàïîê
 	Preview();
+}
 void Actions()
+{
 	DrawBar(22,dev_num*16+75,160,15,0x00699C); //ñèíèé ïðÿìîóãîëüíèê - ïîä äåâàéñàìè
 	if (show_actions==1)
 	DrawBar(22,dev_num*16+108,160,51,0x00699C); //ñèíåå
+	}
+}
-/*void Dir_Up()
-{
-	byte temp_[256];
-	i=strlen(#path)-1;
-	path[i]=0x00;
-	do i--; while (path[i]<>'/'); copystr(#path+i+1,#temp_);
-	path[i+1]=0x00;
-	ChangeCase(#temp_);
-	za_kadrom=curbtn=0; //ââåðõ ñïèñêà
-   	Open_Dir(#path,2);
-	FOR (i=kolichestvo; i>0; i--;)	IF(strcmp(file_mas[i]*304+buf+72,#temp_)==0) BREAK;
-	//
-	IF (i0) za_kadrom=i; ELSE za_kadrom=i-1;}
-		ELSE {za_kadrom=kolichestvo-but_num; curbtn=i-kolichestvo+but_num;}
-	List_ReDraw();
-}*/
-/*void Dir_Up()
-{
-	i=strlen(#path)-1;
-	do i--; while (path[i]<>'/');
-	path[i+1]=0x00;
-	za_kadrom=0; curbtn=0; //ââåðõ ñïèñêà
-   	Open_Dir(#path,1);
-}*/
 //áàã - åñëè ñâåðõó, òî ñâåðõó,à íå ñíèçó
 void Dir_Up()
+{
 	byte temp_[256];
 void Preview()
 {
 	dword top_pr=dev_num*16+123;
-	top_pr+=show_actions*51; //íè÷èíàåì íèæå, åñëè Àêøíñ âèäèìû
+	top_pr+=show_actions*51; //íà÷èíàåì íèæå, åñëè Ýêøíñ âèäèìû
 	DeleteButton(78);
 	if (show_preview==1)
+	{
 		//WriteText(30,top_pr+40,0x80,0,"but_num:",0);	 WriteText(105,top_pr+40,0x80,0,IntToStr(but_num),0);
 		//WriteText(30,top_pr+50,0x80,0,"curbtn",0);		 WriteText(105,top_pr+50,0x80,0,IntToStr(curbtn),0);
 		//WriteText(30,top_pr+60,0x80,0,"ra_kadrom:",0);	 WriteText(105,top_pr+60,0x80,0,IntToStr(za_kadrom),0);
 		//WriteText(30,top_pr+70,0x80,0,#file_path,0);
 		//WriteText(30,top_pr+80,0x80,0,#file_name,0);
-		WriteText(30,top_pr+60,0x80,0,"Not realized... Yet.",0);
+		WriteText(30,top_pr+60,0x80,0,"Not realized... I think",0);
-		//WriteText(30,top_pr+70,0x80,0,"Nable, I'm waiting (:",0);
+		WriteText(30,top_pr+70,0x80,0,"it will be realired soon.",0);
 		DrawBar(22,top_pr+118,160,onTop(top_pr+118,6),0x00699C); //ñèíåå
+	}
 	ELSE  {
 		Tip(top_pr,"Preview",78,"\x18");
 		DrawBar(22,top_pr+18,160,onTop(top_pr+18,6),0x00699C); //ñèíåå

Subversion Repositories Kolibri OS

(root)/programs/fs/Eolite/trunk/Eolite.c-- – Rev 905 → 935