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

 dword file_mas[6898];
 int j, i;
 int action_buf;
 int rand_n;
 int selected_count;
+byte CMD_REFRESH;
 mouse gestures;
 signed x_old, y_old, dif_x, dif_y, adif_x, adif_y;
 void main()
+{
 	word key, id, can_show, can_select, m_selected;
+	dword selected_offset;
+	dword IPC_LEN,IPC_ID;
+	char IPC_BUF[10];
-	dword selected_offset;
+	dword tmp;
 	rand_n = random(40);
 	gestures.get();
 	mem_Init();
 	if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(ERROR_1);
 	LoadIniSettings();
 	GetSystemDiscs();
 	SetAppColors();
 	if (param)
+	{
+		tmp = strlen(#path);
-		strcpy(#path, #param);
+		strncpy(#path, #param, tmp);
+		$dec tmp
-		if (path[strlen(#path)-1]!='/') chrcat(#path, '/'); //add "/" to the end of the string
+		if (path[tmp]!='/') DSBYTE[#path+tmp] = '/'; //add "/" to the end of the string
+	}
 	else
+	{
-		strcpy(#path, "/rd/1/");
+		strncpy(#path, "/rd/1/", 6);
+	}
 	Open_Dir(#path,ONLY_OPEN);
 	SetEventMask(0x27);
+	loop(){
-	loop(){ switch(WaitEvent())
+		switch(WaitEvent())
-	{
+		{
-		case evMouse:
+			case evMouse:
-			if (del_active) || (!CheckActiveProcess(Form.ID)) || (Form.status_window>2) break;
+				if (del_active) || (!CheckActiveProcess(Form.ID)) || (Form.status_window>2) break;
-			if (new_element_active) || (!CheckActiveProcess(Form.ID)) || (Form.status_window>2)
+				if (new_element_active) || (!CheckActiveProcess(Form.ID)) || (Form.status_window>2)
-			{
+				{
-				edit_box_mouse stdcall(#new_file_ed);
+					edit_box_mouse stdcall(#new_file_ed);
-				break;
+					break;
-			}
+				}
-			m.get();
+				m.get();
-			gestures.get();
-			if (!gestures.mkm) && (stats>0) stats = 0;
-			if (gestures.mkm) && (stats==0)
-			{
-				x_old = gestures.x;
-				y_old = gestures.y;
-				stats = 1;
-			}
-			if (gestures.mkm) && (stats==1)
-			{
-				dif_x = gestures.x-x_old;
-				dif_y = gestures.y-y_old;
-				adif_x = fabs(dif_x);
-				adif_y = fabs(dif_y);
+				gestures.get();
+				if (!gestures.mkm) && (stats>0) stats = 0;
-				if (adif_x>adif_y)
+				if (gestures.mkm) && (stats==0)
+				{
+					x_old = gestures.x;
+					y_old = gestures.y;
+					stats = 1;
+				}
+				if (gestures.mkm) && (stats==1)
+				{
+					dif_x = gestures.x-x_old;
+					dif_y = gestures.y-y_old;
+					adif_x = fabs(dif_x);
+					adif_y = fabs(dif_y);
-				{
-					if (dif_x > 150)
+					if (adif_x>adif_y)
+					{
+						if (dif_x > 150)
-					{
+						{
-						if (HistoryPath(GO_FORWARD))
+							if (HistoryPath(GO_FORWARD))
-							{
+								{
-								files.first=files.current=NULL;
+									files.first=files.current=NULL;
-								Open_Dir(#path,WITH_REDRAW);
+									Open_Dir(#path,WITH_REDRAW);
+								}
+							stats = 0;
+						}
+						if (dif_x < -150)
+						{
-							}
+							GoBack();
+							stats = 0;
 						stats = 0;
 					}
-					if (dif_x < -150)
+					else
+					{
+						if (dif_y < -100)
-					{
+						{
-						GoBack();
+							Dir_Up();
+							stats = 0;
 						stats = 0;
 					}
 				}
-				else
+				if (files.MouseOver(m.x, m.y))&&((m.up)||(m.down)||(m.dblclick))
 				{
+					//select/open file {
-					if (dif_y < -100)
+					if (m.key&MOUSE_LEFT)&&((m.down)||(m.dblclick))
+					{
+						if (m.y>=files.y)//&&(m.click)
+						{
+							id = m.y - files.y / files.line_h;
+							if (files.current!=id)
-					{
+							{
+								m.clearTime();
-						Dir_Up();
+								if (id
+							}
+							else if(m.dblclick)Open(0);
 						stats = 0;
-					}
-				}
-			}
-			if (files.MouseOver(m.x, m.y))&&((m.up)||(m.down)||(m.dblclick))
-			{
+					}
-				//select/open file {
-				if (m.key&MOUSE_LEFT)&&((m.down)||(m.dblclick))
+					// } select/open file
+					else
-				{
+					//file menu {
-					if (m.y>=files.y)//&&(m.click)
+					if (m.key&MOUSE_RIGHT)&&(m.up)
 					{
-						id = m.y - files.y / files.line_h;
+						menu_call_mouse = 1;
-						if (files.current!=id)
+						if (m.y>=files.y)//&&(m.click)
 						{
-							m.clearTime();
+							id = m.y - files.y / files.line_h;
+							if (files.current!=id) List_Current(id-files.current);
+							//SwitchToAnotherThread();
+							menu_stak = malloc(4096);
-							if (id
+							CreateThread(#FileMenu,menu_stak+4092);
 						}
-						else if(m.dblclick)Open(0);
+						break;
+					}
 					// } file menu
-				}
-				// } select/open file
+				}
-				else
-				//file menu {
-				if (m.key&MOUSE_RIGHT)&&(m.up)
+				if (m.vert)
-				{
-					menu_call_mouse = 1;
-					if (m.y>=files.y)//&&(m.click)
-					{
-						id = m.y - files.y / files.line_h;
+				{
-						if (files.current!=id) List_Current(id-files.current);
-						//SwitchToAnotherThread();
-						menu_stak = malloc(4096);
-						CreateThread(#FileMenu,menu_stak+4092);
 					if (files.MouseScroll(m.vert)) List_ReDraw();
 					break;
-				}
-				// } file menu
-			}
-			if (m.vert)
-			{
-				if (files.MouseScroll(m.vert)) List_ReDraw();
-				break;
-			}
+				}
-			if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>40) && (m.y
-			{
 				IF (m.lkm==1) DrawRectangle3D(Form.cwidth - 17,41,14,14,0xC7C7C7,0xFFFFFF);
+				if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>40) && (m.y
+				{
+					if (m.lkm==1) DrawRectangle3D(Form.cwidth - 17,41,14,14,0xC7C7C7,0xFFFFFF);
-				WHILE (m.lkm==1) && (files.first>0)
+					WHILE (m.lkm==1) && (files.first>0)
-				{
+					{
-					pause(8);
+						pause(8);
-					files.first--;
+						files.first--;
+						List_ReDraw();
+						m.get();
 					List_ReDraw();
-					m.get();
-				}
-				DrawRectangle3D(Form.cwidth - 17,41,14,14,0xFFFFFF,0xC7C7C7);
+					DrawRectangle3D(Form.cwidth - 17,41,14,14,0xFFFFFF,0xC7C7C7);
-			}
-			if (m.x>=Form.width-26) && (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) DrawRectangle3D(Form.cwidth - 17,onTop(21,0),14,14,0xC7C7C7,0xFFFFFF);
+					if (m.lkm==1) DrawRectangle3D(Form.cwidth - 17,onTop(21,0),14,14,0xC7C7C7,0xFFFFFF);
-				while (m.lkm==1) && (files.first
+					while (m.lkm==1) && (files.first
-				{
+					{
-					pause(8);
+						pause(8);
+						files.first++;
+						List_ReDraw();
-					files.first++;
+						m.get();
-					List_ReDraw();
-					m.get();
-				}
+					}
-				DrawRectangle3D(Form.cwidth - 17,onTop(21,0),14,14,0xFFFFFF,0xC7C7C7);
+					DrawRectangle3D(Form.cwidth - 17,onTop(21,0),14,14,0xFFFFFF,0xC7C7C7);
-			}
+				}
-			//Scrooll
+				//Scrooll
-			if (!m.lkm) && (scroll_used) { scroll_used=NULL; Scroll(); }
+				if (!m.lkm) && (scroll_used) { scroll_used=NULL; Scroll(); }
-			if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>56) && (m.y
+				if (m.x>=Form.width-26) && (m.x<=Form.width-6) && (m.y>56) && (m.y
-			if (scroll_used)
+				if (scroll_used)
-			{
+				{
-				IF (sc_slider_h/2+files.y>m.y) || (m.y<0) || (m.y>4000) m.y=sc_slider_h/2+files.y; //anee eo?ni? iaa ieiii
+					if (sc_slider_h/2+files.y>m.y) || (m.y<0) || (m.y>4000) m.y=sc_slider_h/2+files.y; //anee eo?ni? iaa ieiii
-				id=files.first;
+					id=files.first;
-				j= sc_slider_h/2;
+					j= sc_slider_h/2;
-				files.first = m.y -j -files.y * files.count;
+					files.first = m.y -j -files.y * files.count;
-				files.first /= onTop(22,files.y);
+					files.first /= onTop(22,files.y);
-				IF (files.visible+files.first>files.count) files.first=files.count-files.visible;
+					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;
+				break;
-//Button pressed-----------------------------------------------------------------------------
+	//Button pressed-----------------------------------------------------------------------------
-		case evButton:
+			case evButton:
-			id=GetButtonID();
+				id=GetButtonID();
-			if (id==1)
+				if (id==1)
-			{
+				{
-				KillProcess(about_window);
+					KillProcess(about_window);
-				ExitProcess();
+					ExitProcess();
-			}
+				}
-			if (del_active)
+				if (del_active)
-			{
+				{
-				IF (id==301) || (id==302) Del_File(302-id);
+					if (id==301) || (id==302) Del_File(302-id);
-				break;
+					break;
-			}
+				}
-			if (new_element_active)
+				if (new_element_active)
-			{
+				{
-				IF (id==301) || (id==302) NewElement(302-id);
+					if (id==301) || (id==302) NewElement(302-id);
-				break;
+					break;
-			}
+				}
-			switch(id)
+				switch(id)
-			{
+				{
-				case 21: //Back
+					case 21: //Back
-						GoBack();
+							GoBack();
-						break;
+							break;
-				case 22: //Forward
+					case 22: //Forward
-						if (HistoryPath(GO_FORWARD))
+							if (HistoryPath(GO_FORWARD))
-						{
+							{
-							files.first=files.current=NULL; //aaa?o nienea
+								files.first=files.current=NULL; //aaa?o nienea
-							Open_Dir(#path,WITH_REDRAW);
-						}
-						break;
-				case 23: //up!
-						Dir_Up();
-						break;
-				case 24: //cut
-						Copy(#file_path, CUT);
-						break;
-				case 25: //copy
-						Copy(#file_path, NOCUT);
-						break;
-				case 26: //paste
-						copy_stak = malloc(4096);
-						CreateThread(#Paste,copy_stak+4092);
-						break;
-				case 31...33: //sort
-						IF(sort_num==1) DrawFilledBar(sorting_arrow_x,42,6,10);
-						IF(sort_num==2) DrawFilledBar(sorting_arrow_x,42,6,10);
-						IF(sort_num==3) DrawFilledBar(sorting_arrow_x,42,6,10);
-						sort_num=id-30;
-						Open_Dir(#path,WITH_REDRAW);
-						break;
-				case 50...60: //Actions
-						FnProcess(id-50);
-						break;
-				case 100...120:
-					DEVICE_MARK:
-						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,WITH_REDRAW);
-						pause(5);
-						DrawRectangle(17,id-100*16+74,159,16, 0xFFFFFF);
-						break;
-			}
-			break;
-//Key pressed-----------------------------------------------------------------------------
-		case evKey:
-			key = GetKey();
-			if (Form.status_window>2) break;
-			IF (del_active)
-			{
-				IF (key==013) Del_File(true);
-				IF (key==027) Del_File(false);
-				break;
-			}
-			IF (new_element_active)
-			{
-				IF (key==027) NewElement(0);
-				IF (key==013) NewElement(1);
-				EAX=key<<8;
-				edit_box_key stdcall (#new_file_ed);
-				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>=disc_num) break;
+								Open_Dir(#path,WITH_REDRAW);
-							GOTO DEVICE_MARK;
-					case ASCII_KEY_BS:
-							//GoBack();
-							Dir_Up();
-							break;
 					case 004: //Ctrl+D set as bg
-							strcpy(#temp, "\\S__");
-							strcat(#temp, #file_path);
-							RunProgram("/sys/media/kiv", #temp);
-							break;
-					case 014: //Ctrl+N new window
+							break;
-							IF (Form.left==98) MoveSize(Form.left-20,Form.top-20,OLD,OLD);
+					case 23: //up!
-							RunProgram("/sys/File Managers/Eolite", #path);
+							Dir_Up();
 							break;
-					case 024: //Ctrl+X
+					case 24: //cut
 							Copy(#file_path, CUT);
 							break;
-					case 003: //Ctrl+C
+					case 25: //copy
 							Copy(#file_path, NOCUT);
 							break;
-					case 022: //Ctrl+V
+					case 26: //paste
-							copy_stak = malloc(4096);
-							CreateThread(#Paste,copy_stak+4092);
-							break;
-					case 001: //Ctrl+A
+							copy_stak = malloc(4096);
-							debugln("press Ctrl+A");
-							for (i=0; i
-							{
-								selected_offset = file_mas[i]*304 + buf+32 + 7;
-								ESBYTE[selected_offset] = 1;
-								selected_count++;
-							}
-							List_ReDraw();
-							break;
-					case 021: //Ctrl+U
+							CreateThread(#Paste,copy_stak+4092);
-							debugln("press Ctrl+A");
-							for (i=0; i
-							{
-								selected_offset = file_mas[i]*304 + buf+32 + 7;
-								ESBYTE[selected_offset] = 0;
-							}
-							selected_count = 0;
-							List_ReDraw();
-							break;
-					case ASCII_KEY_ESC:
-							break;
-					case ASCII_KEY_ENTER:
-							Open(0);
-							break;
-					case 074: //menu
+							break;
-							menu_call_mouse=0;
-							//SwitchToAnotherThread();
-							menu_stak = malloc(4096);
-							CreateThread(#FileMenu,menu_stak+4092);
-							break;
-					case 173: //Ctrl+Enter
-							if (!itdir) ShowOpenWithDialog();
+					case 31...33: //sort
-							else Open(1);
-							break;
-					case ASCII_KEY_UP:
-							List_Current(-1);
-							break;
-					case ASCII_KEY_DOWN:
-							List_Current(1);
-							break;
-					case ASCII_KEY_HOME:
-							if (files.KeyHome()) List_ReDraw();
-							break;
-					case ASCII_KEY_END:
+							if(sort_num==1) DrawFilledBar(sorting_arrow_x,42,6,10);
-							if (files.KeyEnd()) List_ReDraw();
-							break;
-					case ASCII_KEY_PGDN:
-							List_Current(files.visible-1);
+							if(sort_num==2) DrawFilledBar(sorting_arrow_x,42,6,10);
-							break;
+							if(sort_num==3) DrawFilledBar(sorting_arrow_x,42,6,10);
-					case ASCII_KEY_PGUP:
+							sort_num=id-30;
-							List_Current(-files.visible+1);
+							Open_Dir(#path,WITH_REDRAW);
 							break;
-					case ASCII_KEY_DEL:
-							Del_Form();
-							break;
+					case 50...60: //Actions
-					case ASCII_KEY_INS:
+							FnProcess(id-50);
-							selected_offset = file_mas[files.current+files.first]*304 + buf+32 + 7;
+							break;
-							if (ESBYTE[selected_offset])
-							{
-								ESBYTE[selected_offset]=0;
-								selected_count--;
+					case 100...120:
-							}
+						DEVICE_MARK:
-							else
+							DrawRectangle(17,id-100*16+74,159,16, 0); //auaaeaiea
-							{
+							strcpy(#path, #disk_list[id-100].Item);
-								ESBYTE[selected_offset] = 1;
+							files.first=files.current=0;
+							Open_Dir(#path,WITH_REDRAW);
+							pause(5);
+							DrawRectangle(17,id-100*16+74,159,16, 0xFFFFFF);
+							break;
+				}
+				break;
+	//Key pressed-----------------------------------------------------------------------------
+			case evKey:
+				key = GetKey();
+				if (Form.status_window>2) break;
+				if (del_active)
+				{
+					if (key==013) Del_File(true);
+					if (key==027) Del_File(false);
+					break;
+				}
+				if (new_element_active)
+				{
+					if (key==027) NewElement(0);
+					if (key==013) NewElement(1);
+					EAX=key<<8;
+					edit_box_key stdcall (#new_file_ed);
+					break;
+				}
+				if (edit2.flags!=64) && (key!=13) && (key!=27)
+				{
+					EAX=key<<8;
+					edit_box_key stdcall (#edit2);
-								selected_count++;
+					break;
-							}
+				}
+				switch (key)
+				{
+						case 209...217:
+								id=key-110;
+								if (id-100>=disc_num) break;
-							List_Current(1);
+								GOTO DEVICE_MARK;
+						case ASCII_KEY_BS:
+								//GoBack();
+								Dir_Up();
+								break;
-							break;
+						case 004: //Ctrl+D set as bg
+								strncpy(#temp, "\\S__",4);
-					case 048...059: //F1-F10
+								strcat(#temp, #file_path);
+								RunProgram("/sys/media/kiv", #temp);
-							FnProcess(key-49);
+								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;
-							break;
+						case 024: //Ctrl+X
+								Copy(#file_path, CUT);
+								break;
+						case 003: //Ctrl+C
-					default:
+								Copy(#file_path, NOCUT);
+								break;
+						case 022: //Ctrl+V
+								copy_stak = malloc(4096);
+								CreateThread(#Paste,copy_stak+4092);
-							for (i=files.current+files.first+1; i
+								break;
-							{
+						case 001: //Ctrl+A
+								debugln("press Ctrl+A");
-								strcpy(#temp, file_mas[i]*304+buf+72);
+								for (i=0; i
 								IF (temp[0]==key) || (temp[0]==key-32)
+									selected_offset = file_mas[i]*304 + buf+32 + 7;
+									ESBYTE[selected_offset] = 1;
+									selected_count++;
+								}
+								List_ReDraw();
+								break;
+						case 021: //Ctrl+U
+								debugln("press Ctrl+A");
+								for (i=0; i
+								{
+									selected_offset = file_mas[i]*304 + buf+32 + 7;
+									ESBYTE[selected_offset] = 0;
+								}
+								selected_count = 0;
+								List_ReDraw();
+								break;
+						case ASCII_KEY_ESC:
+								break;
+						case ASCII_KEY_ENTER:
+								Open(0);
+								break;
+						case 074: //menu
+								menu_call_mouse=0;
+								//SwitchToAnotherThread();
+								menu_stak = malloc(4096);
+								CreateThread(#FileMenu,menu_stak+4092);
+								break;
+						case 173: //Ctrl+Enter
+								if (!itdir) ShowOpenWithDialog();
+								else Open(1);
+								break;
+						case ASCII_KEY_UP:
+								List_Current(-1);
+								break;
+						case ASCII_KEY_DOWN:
+								List_Current(1);
+								break;
+						case ASCII_KEY_HOME:
+								if (files.KeyHome()) List_ReDraw();
+								break;
+						case ASCII_KEY_END:
+								if (files.KeyEnd()) List_ReDraw();
+								break;
+						case ASCII_KEY_PGDN:
+								List_Current(files.visible-1);
+								break;
+						case ASCII_KEY_PGUP:
+								List_Current(-files.visible+1);
+								break;
+						case ASCII_KEY_DEL:
+								Del_Form();
+								break;
+						case ASCII_KEY_INS:
+								selected_offset = file_mas[files.current+files.first]*304 + buf+32 + 7;
+								if (ESBYTE[selected_offset])
+								{
+									ESBYTE[selected_offset]=0;
+									selected_count--;
+								}
+								else
+								{
+									ESBYTE[selected_offset] = 1;
+									selected_count++;
+								}
+								List_Current(1);
+								break;
+						case 048...059: //F1-F10
+								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)
-								{
+									{
-									List_Current(i-files.current-files.first);
+										List_Current(i-files.current-files.first);
-									break;
+										break;
-								}
+									}
+								}
-							}
+				}
+			break;
+			case evReDraw:
-			}
+				DRAW_WINDOW:
+				draw_window();
+				if (action_buf)
+				{
+					menu_action(action_buf);
+					action_buf=0;
+				}
+			break;
+			/*default:
+				if(CMD_REFRESH)
+				{
-			break;
+					CMD_REFRESH = false;
+					goto DRAW_WINDOW;
-		case evReDraw:
+				}
+			*/
 			draw_window();
 			if (action_buf) { menu_action(action_buf); action_buf=0;}
 		if(cmd_free)
 		if(cmd_free){
 			if(cmd_free==1)     free(menu_stak);
 			else if(cmd_free==2)free(about_stak);
 			else if(cmd_free==3)free(properties_stak);
 			else if(cmd_free==4)free(settings_stak);
 			else if(cmd_free==5)free(copy_stak);
-			cmd_free = 0;
+			cmd_free = false;
+		}
+	}
 }
 inline fastcall signed int _strrchr( ESI,BL)
+{
 	int jj=0, last=strlen(ESI);
-	do{
+	do {
 	if (id==201) ShowOpenWithDialog();
 	if (id==202) FnProcess(3); //F3
 	if (id==203) FnProcess(4); //F4
 	if (id==104) Copy(#file_path, NOCUT);
 	if (id==105) Copy(#file_path, CUT);
+	if (id==106)
+	{
+		copy_stak = malloc(4096);
-	if (id==106) { copy_stak = malloc(4096); CreateThread(#Paste,copy_stak+4092);}
+		CreateThread(#Paste,copy_stak+4092);
+	}
 	if (id==207) FnProcess(2);
 	if (id==108) Del_Form();
 	if (id==109) FnProcess(5);
 	if (id==110) FnProcess(8);
+	if (id==300)
+	{
+		FnProcess(5);
-	if (id==300) { FnProcess(5); List_ReDraw(); }
+		List_ReDraw();
+	}
+}
 void List_Current(signed int cur)
+{
 	if (cur<=0) //up
 	{
-		IF (files.first==0) && (files.current<=0) return;
+		if (files.first==0) && (files.current<=0) return;
-		IF (-cur-1
+		if (-cur-1
+		{
 			Line_ReDraw(0xFFFFFF, files.current);
 			files.current+=cur;
 			Line_ReDraw(col_selec, files.current);
 			return;
 		}
-		ELSE
+		else
 		{
-			IF (-cur
+			if (-cur
 			files.current=0;
 			List_ReDraw();
 			return;
+		}
+	}
 	else  //down
 	{
-		IF (files.first==files.count-files.visible) && (files.current==files.visible-1)
+		if (files.first==files.count-files.visible) && (files.current==files.visible-1)
+		{
 			Line_ReDraw(col_selec, files.current);
 			return;
 		}
-		IF (files.visible-files.current>cur)
+		if (files.visible-files.current>cur)
+		{
 			Line_ReDraw(0xFFFFFF, files.current);
 			files.current+=cur;
 			Line_ReDraw(col_selec, files.current);
 			return;
+		}
 		else
 		{
-			IF(files.first+files.current+cur>=files.count)
+			if(files.first+files.current+cur>=files.count)
+			{
 				files.first=files.count-files.visible;
 				files.current=cur-files.first+files.current;
 				}
-			ELSE
+			else
+			{
 				files.first+=cur+files.current-files.visible+1;
 				files.current=files.visible-1;
 			}
-			IF (files.current<0) || (files.current>files.visible)
+			if (files.current<0) || (files.current>files.visible)
+			{
 				files.current=files.visible-1;
+			}
 	if (files.count!=-1)
+	{
 		KEdit();
 		HistoryPath(ADD_NEW_PATH);
 		files.visible = files.h / files.line_h;
-		IF (files.count < files.visible) files.visible = files.count;
+		if (files.count < files.visible) files.visible = files.count;
-		IF (sort_num==1) sorting_arrow_x = Form.width+60/2;
+		if (sort_num==1) sorting_arrow_x = Form.width+60/2;
-		IF (sort_num==2) sorting_arrow_x = Form.width-115;
+		if (sort_num==2) sorting_arrow_x = Form.width-115;
-		IF (sort_num==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w;
+		if (sort_num==3) sorting_arrow_x = strlen(T_SIZE)*3-30+files.x+files.w;
 		WriteText(sorting_arrow_x,45,0x80,sc.work_graph,"\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();}
+}
 inline Sorting()
+{
 	dword k=0, l=1;
 	dword file_off;
 	int i;
 	if (!strcmp(#path,"/")) //do not sort
+	{
-		FOR(k=1;k
+		for(k=1;k
 		return;
+	}
-	FOR (j=files.count-1, file_off=files.count-1*304+buf+32; j>=0; j--, file_off-=304;)  //files | folders
+	for (j=files.count-1, file_off=files.count-1*304+buf+32; j>=0; j--, file_off-=304;)  //files | folders
+	{
 		if (!real_files_names_case) strttl(file_off+40);
 		if (TestBit(ESDWORD[file_off],4)) //directory?
 			l++;
+		}
+	}
 	//sorting: files first, then folders
 	Sort_by_Name(0,k-1);
-	IF (sort_num==1) Sort_by_Name(k,files.count-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==2) Sort_by_Type(k,files.count-1);
-	IF (sort_num==3) Sort_by_Size(k,files.count-1);
+	if (sort_num==3) Sort_by_Size(k,files.count-1);
 	//make ".." first item in list
-	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()
+{
 	dword selected_offset2;
 	int cont = 0;
 	byte f_count[128];
 	int dform_x = files.w - 220 / 2 + files.x;
-	if (strcmp(#file_name,".")==0) || (strcmp(#file_name,"..")==0) return;
+	if (!strncmp(#file_name,".",1)) || (!strncmp(#file_name,"..",2)) return;
 	if (del_active==2)
+	{
 		if (itdir) ShowMessage(WAIT_DELETING_FOLDER, 0);
 			sprintf(#f_count,"%s%d%s",DEL_MORE_FILES_1,cont,DEL_MORE_FILES_2);
 			WriteText(-strlen(#f_count)*3+110+dform_x,190,0x80,sc.work_text,#f_count);
+		}
 		else
+		{
-			IF (strlen(#file_name)<28)
+			if (strlen(#file_name)<28)
+			{
 				WriteText(strlen(#file_name)*3+110+dform_x+2,190,0x80,sc.work_text,"?");
 				WriteText(-strlen(#file_name)*3+110+dform_x,190,0x80,sc.work_text,#file_name);
+			}
 			else
 		if (error = GetDir(#dirbuf, #fcount, way, DIRS_ONLYREAL)) del_error = error;
 		for (i=0; i
+		{
 			if (CheckEvent()==evReDraw) draw_window();
 			filename = i*304+dirbuf+72;
-			strcpy(#del_from, way);
+			/*strcpy(#del_from, way);
 			chrcat(#del_from, '/');
-			strcat(#del_from, filename);
+			strcat(#del_from, filename);*/
+			sprintf(#del_from,"%s/%s",way,filename);
 			if ( TestBit(ESDWORD[filename-40], 4) )
+			{
 				Del_File2(#del_from);
+			}
 			else
+		{
    		   for (i=0; i
+           {
                 selected_offset2 = file_mas[i]*304 + buf+32 + 7;
                 if (ESBYTE[selected_offset2]) {
-                    strcpy(#del_from, #path);
+                    /*strcpy(#del_from, #path);
-                    strcat(#del_from, file_mas[i]*304+buf+72);
+                    strcat(#del_from, file_mas[i]*304+buf+72);*/
+					sprintf(#del_from,"%s%s",#path,file_mas[i]*304+buf+72);
                     Del_File2(#del_from);
+                }
+            }
+		}
 		else
+{
 	byte temp[4096];
 	selected_count = 0;
 	if (rez)
+	{
-		if (!strcmp(#file_name,"..")) return;
+		if (!strncmp(#file_name,"..",2)) return;
 		strcpy(#temp, #file_path);
 		if (path[strlen(#temp)-1]!='/') chrcat(#temp, '/'); //need "/" in the end
 		RunProgram("/sys/File Managers/Eolite", #temp);
 		return;
+	}
+	{
 		if (strrchr(#file_name, '.')==0) RunProgram(#file_path, ""); else RunProgram("/sys/@open", #file_path);
+	}
 	else
+	{
-		if (!strcmp(#file_name,"..")) { Dir_Up(); return; }
+		if (!strncmp(#file_name,"..",2)) { 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,WITH_REDRAW);
+	}
+}
 void ShowOpenWithDialog()
+{
 	byte param[4097];
-	param[0] = '~';
+	/*param[0] = '~';
 	param[1] = '\0';
+	strcat(#param, #file_path);*/
-	strcat(#param, #file_path);
+	sprintf(#param,"~%s",#file_path);
 	RunProgram("/sys/@open", #param);
+}
 void NewElement(byte newf)
+{
 	BDVK element_info;
 	byte del_rezult, copy_rezult, info_result;
 	if (newf)
 	{
+		/*strcpy(#temp, #path);
-		strcpy(#temp, #path);
+		strcat(#temp, new_file_ed.text);*/
-		strcat(#temp, new_file_ed.text);
+		sprintf(#temp,"%s%s",#path,new_file_ed.text);
 		info_result = GetFileInfo(#temp, #element_info);
 		switch(new_element_active)
+		{
 	DrawPopup(dform_x,160,220,85,1,sc.work,sc.work_graph);
 	new_file_ed.left = dform_x+24;
 	edit_box_draw  stdcall (#new_file_ed);
 	DrawRectangle(new_file_ed.left-1, new_file_ed.top-1, new_file_ed.width+2, 16, 0xFFFfff);
 	DrawRectangle(new_file_ed.left-2, new_file_ed.top-2, new_file_ed.width+4, 18, sc.work_graph);
-	IF (new_element_active==3) DrawFlatButton(dform_x+22,208,85,22,301,0xFFB6B5,T_RENAME);
+	if (new_element_active==3) DrawFlatButton(dform_x+22,208,85,22,301,0xFFB6B5,T_RENAME);
-	ELSE DrawFlatButton(dform_x+27,208,70,22,301,0xFFB6B5,T_CREATE);
+	else DrawFlatButton(dform_x+27,208,70,22,301,0xFFB6B5,T_CREATE);
 	DrawFlatButton(dform_x+120,208,70,22,302,0xC6DFC6,T_CANCEL);
+}
 void FnProcess(byte N)
 		case 2:
 			if (!files.count) break;
 			NewElement_Form(RENAME_ITEM, #file_name);
 			break;
 		case 3:
-			IF (!itdir) RunProgram("/sys/tinypad", #file_path);
+			if (!itdir) RunProgram("/sys/tinypad", #file_path);
 			break;
 		case 4:
-			IF (!itdir) RunProgram("/sys/develop/heed", #file_path);
+			if (!itdir) RunProgram("/sys/develop/heed", #file_path);
 			break;
 		case 5: //refresh cur dir & devs
 			Tip(56, T_DEVICES, 55, "-");
 			Open_Dir(#path,WITH_REDRAW);
 			pause(10);

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c @ 7252 – Rev 5581 → 5591