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 "lib\file_system.h--"
 #include "imgs\toolbar.txt"
-#include "imgs\left_p.cpp"
+#include "imgs\left_p.txt"
 //ëîêàëèçàöèÿ è íàñòðîéêè
-byte header[27] = "Eolite File Manager v0.97";
+#define header "Eolite File Manager v0.97.1";
-#define videlenie 0x94AECE; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
+#define videlenie 0xFEA4B7; //0x94AECE,,0x8BCDFF,0x9EACCA,0xB8C9B8}; //öâåò âûäåëåííîãî ýëåìåíòà èç ñïèñêà ôàéëîâ
 byte toolbar_buttons_x[6]={14,51,90,139,172,208};
 //
-dword but_num=0, kolichestvo=0, curbtn=0, za_kadrom=0;
+dword but_num, kolichestvo, za_kadrom, curbtn, razm_scrl;
-byte cut_active, rename_active, del_active;
-byte show_actions=1, show_preview=0, sort_num=1, isdir;
+byte cut_active, rename_active, del_active;
-dword razm_scrl; //äëÿ ñêðîëà
+byte show_actions=1, show_preview=0, sort_num=1, isdir;
-byte path[256]="/rd/1/", edit_path[256], PathHistory[2560], temp[256]; //äëÿ ïóòåé
+char path[256]="/rd/1/", edit_path[256], PathHistory[2560], temp[256]; //äëÿ ïóòåé
-byte file_path[256], file_name[256]; //äëÿ ôàéëîâ
-byte copyfile[256],copy_name[256]; //êîïèðîâàíèå
+char file_path[256], file_name[256]; //äëÿ ôàéëîâ
-dword i; //äëÿ öèêëîâ
+char copyfile[256],copy_name[256]; //êîïèðîâàíèå
 dword file_mas[6898]; //ñïèñîê ôàéëîâ
-int temp_int, j;
+int temp_int, j, i;
 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};
+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;
-f70 open_dir_70;
+proc_info	Form;
+dword buf=0, off; //äëÿ òåêñòà è áóôåðà
+dword devbuf=0, dev_num;
+#include "include\LVabout.c--"
+#include "include\icons_f.h--"
+//IPC
+/*#include "lib\Nable_lib.h--"
+#include "lib\ipc.h--"
+int pLoadedImage;
+void GetImage(dword ipath)
+{
+	IF (pLoadedImage) free(pLoadedImage);
-dword buf=0, off; //äëÿ òåêñòà è áóôåðà
+	pLoadedImage=loadimage_viaIPC(ipath, #CurrentImage);
-dword devbuf=0, dev_num;
+	SetEventMask(100111b); //restore normal event mask
-#include "include\LVabout.c--"
+}*/
 #include "include\icons_f.h--"
 void main()
-void main()
-byte pressed, key, id;
-mouse m;
-{
-		devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè
-		open_dir_70.func = 1;
-		open_dir_70.param1 = 0;
+byte pressed, key, id;
-		open_dir_70.param2 = 0;
-		open_dir_70.param3 = 10;
-		open_dir_70.param4 = devbuf;
-		open_dir_70.rezerv = 0;
+mouse m;
-		open_dir_70.name = "/";
+int pressed_y;
 		$mov eax,70
-		$mov ebx,#open_dir_70.func
+		devbuf= malloc(3112); //áóôåð ãäå-òî íà 10 äåâàéñîâ â ëåâîé ïàíåëè
+		ReadDir(10, devbuf, "/");
+		dev_num=EBX;
-		$int 0x40
+	load_dll(); //ïîäãðóæàåò ëèáó ñ åäèò_áîêñîì
-		dev_num=EBX;
+	IF (param[0]<>'') {copystr(#param,#edit_path); Goto_edit_path();}
-	load_dll(); //ïîäãðóæàåò ëèáó ñ åäèò_áîêñîì
+	Open_Dir(#path,2);
-	IF (param[0]<>'') {copystr(#param,#edit_path); Goto_edit_path();}
+	//GetImage("/sys/wallpaper.gif");
-	Open_Dir(#path,2);
+	//DrawImage(#CurrentImage, 0*65536+0);
 					//
 					IF (vert==65535) IF (curbtn==0) FileList_ReDraw(-3); ELSE FileList_ReDraw(-1);
 					IF (vert==1) IF (curbtn==but_num-1) FileList_ReDraw(3); ELSE FileList_ReDraw(1);
 					//âûäåëåíèå èñïîëüçóÿ ÏÊÌ
 					//IF (m.pkm==1) && (m.x>197) && (m.x56)
-					//	IF (m.y-skin_width-56/18<>curbtn) FileList_ReDraw(m.y-skin_width-56/18-curbtn);
+					//	&& (m.y-skin_width-56/18<>curbtn) FileList_ReDraw(m.y-skin_width-56/18-curbtn);
 					//ñêðîëë
-					IF (m.y>Form.width) || (57+razm_scrl>m.y) m.y=57+razm_scrl; //åñëè êóðñîð íàä îêíîì
+					IF (m.y>Form.width) || (razm_scrl/2+57>m.y) m.y=razm_scrl/2+57; //åñëè êóðñîð íàä îêíîì
 					IF (m.lkm==0) pressed=0; ELSE
 					IF (m.x>=Form.width-21) && (m.x<=Form.width-6) pressed=1;
 					IF (pressed==1)
+					{
 						temp_int=za_kadrom; //ñîõðàíÿåì ñòàðîå êîëè÷åñòâî
+						j= razm_scrl/2;
-						za_kadrom = m.y -57-razm_scrl * kolichestvo / onTop(22,57);
+						za_kadrom = m.y -j -57 * kolichestvo / onTop(22,57);
 						IF (but_num+za_kadrom>kolichestvo) za_kadrom=kolichestvo-but_num;
 						IF (temp_int<>za_kadrom) List_ReDraw(); //÷òîá ëèøíèé ðàç íå ïåðåðèñîâûâàòü
+					}
 					break;
 //Button pressed-----------------------------------------------------------------------------
 						ECX = #authors; EDX = #stak;
 						$int 40h;
 						break;
 					case 50: //ñòðåëêà ââåðõ íà ñêðîëå
 						FileList_ReDraw(-1);
-						BREAK;
+						break;
 					case 51: //ñòðåëêà âíèç íà ñêðîëå
 						FileList_ReDraw(1);
-						BREAK;
+						break;
 					case 78: //preview
 						IF (show_preview==1) show_preview=0; ELSE show_preview=1;
 						Preview();
-						BREAK;
+						break;
 					case 77: //actions
 						IF (show_actions==1) show_actions=0; ELSE show_actions=1;
 						Actions();	Preview();
-						BREAK;
+						break;
-					case 80: goto REN_MARK; //rename
+					case 80: //rename
+						goto REN_MARK;
-					case 81: Del_Form(); BREAK;//Delete file
+					case 81: //Delete file
+						Del_Form();
+						break;
+					case 82: //create folder
+						NEW_FOLDER_MARK:
+						copystr(#path, #temp);
+						copystr("New folder", #temp+strlen(#temp));
+						CreateFolder(#temp);
+						za_kadrom=curbtn=0;
+						Open_Dir(#path,1);
+						FOR (i=0; i
+							IF (strcmp("New folder",file_mas[i]*304+buf+72)==0) {IF(!strcmp("..",buf+72+304))i--; FileList_ReDraw(i); break;}
+						goto REN_MARK;
+					case 100...120:
+						DEVICE_MARK:
+						copystr(id-100*304+ devbuf+72, #path);
+						IF (path[0]=='r') copystr("/rd/1",#file_path);
+						ELSE  {
+							copystr("/", #file_path);
+							copystr(#path, #file_path+strlen(#file_path));
+							}
+						goto OPEN_DEV;
+					default:
-				if (id>200) //êíîïêè èç ñïèñêà ôàéëîâ
+						if (id<200) break; //êíîïêè èç ñïèñêà ôàéëîâ
-				{
-					IF (curbtn!=id-201) {FileList_ReDraw(id-201-curbtn); break;}
+						IF (curbtn!=id-201) {FileList_ReDraw(id-201-curbtn); break;}
-					else OPEN_MARK:
+						else OPEN_MARK:
-					if (!isdir) Run_File(#file_path); else
+						if (!isdir) Run_File(#file_path); else
-					if (strcmp(za_kadrom+curbtn+1*304 + buf+72,"..")==0) Dir_Up(); else
+						if (strcmp(za_kadrom+curbtn+1*304 + buf+72,"..")==0) Dir_Up(); else
-					{	OPEN_DEV:
+						{	OPEN_DEV:
-							za_kadrom=curbtn=0;
+								za_kadrom=curbtn=0;
-							Open_Dir(#path,1);
+								Open_Dir(#path,1);
+						}
-					break;
+						break;
+				}
-				if (id>=100) && (id<130) //ïîäêëþ÷¸ííûå íîñèòåëè èíôîðìàöèè
-				{   DEVICE_MARK:
-					copystr(id-100*304+ devbuf+72, #path);
-					IF (strcmp(#path,"rd")==0) copystr("/rd/1",#file_path);
-					ELSE  {
-						copystr("/", #file_path);
-						copystr(#path, #file_path+strlen(#file_path));
-						}
-					GOTO OPEN_DEV;
-				}
 				break;
 //Key pressed-----------------------------------------------------------------------------
 			case evKey:
 				key = GetKey();
 				IF (del_active==1)
                 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; //íîâîå îêíî
+						case 014: MoveSize(80,80,OLD,OLD); RunProgram("/sys/File Managers/Eolite", #path); break; //íîâîå îêíî
 						case 024:  //Ctrl+X cut
 						case 089: //Ctrl+Ins copy
 						case 003: //Ctrl+C copy
 								CTRLC_MARK:
 								IF (isdir) break; //ïàïêè ïîêà ÷òî êîïèðîâàòü íå óìååì
 								copystr(#file_path,#copyfile); //âû÷èñëÿåì êàêîé ôàéë êîïèðîâàòü
 								IF (key==24) cut_active=1; ELSE cut_active=0;
 								break;
 						case 022: Paste(); break;//Ctrl+V paste
 						case 027: //Esc
-								IF (rename_active==1) Line_ReDraw(videlenie, 100);
+								IF (rename_active==1) {Line_ReDraw(videlenie, 100);}
 								break;
 						case 013:	//Enter
 								IF (rename_active==1) {Line_ReDraw(videlenie, curbtn); break;}
 								IF (strcmp(#path,#edit_path)<>0) Goto_edit_path();
 								ELSE GOTO OPEN_MARK;
 								break;
+						case 55: //F6 - new folder
+								goto NEW_FOLDER_MARK;
 						case 56:  //IF (rename_active==1) break;//up
 						case 178: //up
 								FileList_ReDraw(-1);
 								break;
 						case 177: //down
 						case 184: //Page Up
 								FileList_ReDraw(-but_num+1);
 								break;
 						case 051: //Íàæàòà F2
-									REN_MARK:
+								REN_MARK:
-									IF (isdir==1) break; //ïàïêè ïîêà ÷òî êîïèðîâàòü íå óìååì
+								//IF (isdir==1) break; //ïàïêè ïîêà ÷òî êîïèðîâàòü íå óìååì
-										edit2.flags=66; //äåëàåì êîìïîíåíò àêòèâíûì
+								edit2.flags=66; //äåëàåì êîìïîíåíò àêòèâíûì
-										DeleteButton(curbtn+201); //ýòî ÷òîá ìîæíî áûëî âûäåëÿòü ìûøüþ
+								DeleteButton(curbtn+201); //ýòî ÷òîá ìîæíî áûëî âûäåëÿòü ìûøüþ
-										edit2.width=onLeft(24,217);
+								edit2.width=onLeft(24,217);
-										edit2.top=curbtn*18+59+skin_width;
+								edit2.top=curbtn*18+59+skin_width;
-										edit2.size=strlen(#file_name); edit2.pos=strlen(#file_name);
+								edit2.size=strlen(#file_name); edit2.pos=strlen(#file_name);
-										edit_box_draw  stdcall (#edit2);
+								edit_box_draw  stdcall (#edit2);
-										DrawBar(218,curbtn*18+58,edit2.width+1,1,0xFFFFCC); //ïîëîñà æåëòàÿ ñâåðõó äëÿ îäèíàêîâîñòè
+								DrawBar(218,curbtn*18+58,edit2.width+1,1,0xFFFFCC); //ïîëîñà æåëòàÿ ñâåðõó äëÿ îäèíàêîâîñòè
-										rename_active=1;
+								rename_active=1;
-									break;
+								break;
 						case 052: //Íàæàòà F3
-								IF (isdir==false) Run_Program("/sys/tinypad", #file_path); break;
+								IF (isdir==false) RunProgram("/sys/tinypad", #file_path); break;
 						case 054: Open_Dir(#path,1); break; //ïåðåðèñîâàòü îêíî F5
 						case 182: Del_Form(); break; //delete file
 						default:
 								IF (strcmp("..",buf+72+304)<>0) temp_int=0; ELSE temp_int=1;
 								for (i=curbtn+za_kadrom+1; i
 inline fastcall void draw_window()
+{
 	WindowRedrawStatus(1);
 	skin_width = GetSkinWidth();
-	DefineAndDrawWindow(100,100,600,410,0x43,0x10E4DFE1,0,0,#header);
+	DefineAndDrawWindow(100,100,600,410,0x43,0x10E4DFE1,0,0,header);
-	Form.getme();
+	Form.GetInfo(SelfInfo);
 	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
 	KEdit();
 	DrawRegion(251,12,onLeft(61,251),16,0x94AECE);	//îáîäîê
 	DrawBar(251,29,onLeft(251,60),10,0xE4DFE1); //ôîí ïîä ïîëîñîé àäðåñà
 	DefineButton(onLeft(34,0),6,27,28,30+BT_HIDE+BT_NOFRAME,0xE4DFE1); //about
 	DefineButton(onLeft(61,0),12,18,16,27+BT_HIDE,0xE4DFE1); //êíîïêà ïåðåõîäà
-	PutImage(#goto_about,56,40,onLeft(60,0),0);
+	PutPaletteImage(#goto_about,56,40,Form.width-60,0,#goto_about_pal);
 	//ïðÿìîóãîëüíèêè âíóòðè
 	DrawRegion(6,40,Form.width-12,Form.height-skin_width-46,0x94AECE); //ñèíèé îáîäîê
 	DrawRegion(5,39,Form.width-10,Form.height-skin_width-44,0xE4DFE1); //ôîí
     Devices(); //ïàíåëü ñëåâà íà ñèíåì ôîíå
 	//Buttons
 		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=filenum*18+57; //ïîëîæåíèå òåêñòà ïî Y;
+	dword y;//ïîëîæåíèå òåêñòà ïî Y;
 	if (rename_active==1)
+	{
 		rename_active=0;
 		edit2.flags=64;
 		DefineButton(197,curbtn*18+57,onLeft(22,197),18,curbtn+201+BT_HIDE+BT_NOFRAME,0xFFFFFF);
-		IF (filenum==100) filenum=curbtn; ELSE
+		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)
+			IF (isdir)
+			{
+				//Del_File(true);
+				DeleleFile(#file_path);
+				IF (EAX<>0) {DrawFlatButton(Form.width-200+197/2,160,200,80,0,0xFFB6B5, "Error. Folder isn't empty."); Pause(200);}
+				ELSE CreateFolder(#temp);
-			copystr(#file_name,#temp+strlen(#temp));
+				Open_Dir(#path,1);
 			IF (strcmp(#file_path,#temp)<>0) && (strlen(#file_name)>0)
-				{ CopyFile(#file_path,#temp);	Del_File(true); }
+			ELSE { CopyFile(#file_path,#temp);	Del_File(true); }
+		}
+	}
 	y=filenum*18+57;
 	//äà, ÿ íå ñïîðþ ÷òî èçâðàò, íî ïåðåðèñîâêà çàòî ìàëåíüêàÿ
 	DrawBar(197,y,3,18,color);
 	DrawBar(200,y,16,2,color);
 	DrawBar(197+19,y,onLeft(22+19,197),18,color);
 	DrawBar(200,y+17,16,1,color);
 	//
 	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 (color==videlenie) isdir=EAX;
 	if (!EAX)
+	{
 		temp_int = Put_icon(off+strlen(off)-4, y+2);
 		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+2); ELSE temp_int=Put_icon("", y+2);
+	} ELSE IF (!strcmp("..",off)) temp_int=Put_icon("..", y+2); ELSE temp_int=Put_icon("", y+2);
 	IF (color==videlenie)
+	{
-		IconFairing(temp_int, y+2, videlenie); //çàêðàøèâàåì èêîíêó
+		IconFairing(temp_int, y+2); //çàêðàøèâàåì èêîíêó
 		copystr(#path,#file_path);
 		copystr(off,#file_name);
 		copystr(off,#file_path+strlen(#file_path)); //èòàê, file_path=ôàéëó, ò.ê. ïî-óìîë÷àíèþ ýòî ïðîãà
+}
-void Open_Dir(dword path_,redraw){
-  IF (buf) free(buf);
+void Open_Dir(dword path_,redraw){
-	open_dir_70.param3 = 6898; //filenum
-	buf = malloc(2097152);
+  IF (buf) free(buf);
-	open_dir_70.param4 = buf;
-	open_dir_70.name = path_;
-	$mov eax,70
-	$mov ebx,#open_dir_70.func
+	buf = malloc(2097152);
-	$int 0x40
+	ReadDir(6898, buf, path_);
 	kolichestvo=EBX;
 	//
 	if (kolichestvo<>-1) && (redraw>0)
 dword onTop(dword down,up) {return Form.height-skin_width-down-up;}
-void Del_Form()
 void Del_Form()
 	IF (isdir==true) return; //ïàïêè ïîêà ÷òî óäàëÿòü íå óìååì
 	temp_int=Form.width-200+197/2;
 	//òèïà îêíî
 	FOR (i=5;i<11;i++) DeleteButton(201+i); //óäàëÿåì êíîïêè ïîä ôîðìîé
 	DrawFlatButton(temp_int,160,200,80,0,0xE4DFE1, ""); //ôîðìà
-	WriteText(temp_int+19,175,0x80,0,"Do you really want to delete",28);
+	WriteText(temp_int+19,175,0x80,0,"Do you really want to delete",0);
 	IF (strlen(#file_name)<28)
 		{
-			WriteText(strlen(#file_name)*6+temp_int+20,190,0x80,0,"?",1);
+			WriteText(strlen(#file_name)*6+temp_int+20,190,0x80,0,"?",0);
-			WriteText(temp_int+20,190,0x80,0,#file_name,24); //ïèøåì èìÿ
+			WriteText(temp_int+20,190,0x80,0,#file_name,0); //ïèøåì èìÿ
+		}
 	ELSE
+		{
-			WriteText(164+temp_int,190,0x80,0,"...?",4);
+			WriteText(164+temp_int,190,0x80,0,"...?",0);
 			WriteText(temp_int+20,190,0,0,#file_name,24); //ïèøåì èìÿ
+		}
 	//êíîïî÷êè
 	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;
+//f70 del_file_70;
 void Del_File(byte dodel)
-{
-  IF (dodel==true){
-	del_file_70.func = 8;
-	del_file_70.param1 = 0;
-	del_file_70.param2 = 0;
-	del_file_70.param3 = 0;
+{
-	del_file_70.param4 = 0;
-	del_file_70.rezerv = 0;
+	IF (dodel==true)
-	del_file_70.name = #file_path;
+	{
-	$mov eax,70
+		DeleleFile(#file_path);
-	$mov ebx,#del_file_70.func
+		IF (EAX<>0) && (isdir==true) {DrawFlatButton(temp_int,160,200,80,0,0xFFB6B5, "Error. Folder isn't empty."); Pause(200);}
 	$int 0x40}
-	 del_active=0;
+	del_active=0;

Subversion Repositories Kolibri OS

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