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

 //Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2021
 //GNU GPL license.
 // 70.5 - get volume info and label
-#define ABOUT_TITLE "EOLITE 5 RC5"
+#define ABOUT_TITLE "EOLITE 5 Beta8"
-#define TITLE_EOLITE "Eolite File Manager 5 RC5"
+#define TITLE_EOLITE "Eolite File Manager 5 Beta8"
-#define TITLE_KFM "Kolibri File Manager 2 RC5";
+#define TITLE_KFM "Kolibri File Manager 2 Beta8";
 #define MEMSIZE 1024 * 250
 #include "../lib/patterns/history.h"
 #include "../lib/patterns/toolbar_button.h"
-#include "imgs/images.h"
-//Button IDs
-enum {
-	PATH_BTN = 10,
-	POPUP_BTN1 = 201,
-	POPUP_BTN2 = 202,
-	KFM_DEV_DROPDOWN_1 = 205,
-	KFM_DEV_DROPDOWN_2 = 207,
-	BREADCRUMB_ID = 300,
-	BACK_BTN = 400,
-	FWRD_BTN,
-	GOUP_BTN,
-	COPY_BTN,
-	CUT_BTN,
-	PASTE_BTN,
-	KFM_FUNC_ID = 450
-};
+#include "imgs/images.h"
-//NewElement options
-enum {
-	CREATE_FILE=1,
-	CREATE_FOLDER,
-	RENAME_ITEM
-};
-//OpenDir options
-enum {
-	WITH_REDRAW,
 	ONLY_OPEN
-};
+#include "include/const.h"
 bool efm = false;
-int toolbar_buttons_x[7]={9,46,85,134,167,203};
 bool active_about = false;
-bool active_settings = false;
-bool _not_draw = false;
-bool dir_at_fat16 = NULL;
+int toolbar_buttons_x[7]={9,46,85,134,167,203};
+bool dir_at_fat16 = NULL;
-bool disk_popin_active_on_panel=0;
+dword about_thread_id;
 dword settings_window;
-dword about_thread_id;
+bool active_about = false;
-dword settings_window;
+bool active_settings = false;
 byte del_active=0;
-byte del_active=0;
+byte new_element_active=0;
 byte new_element_active=0;
+llist files, files_active, files_inactive;
+bool list_full_redraw;
-llist files, files_active, files_inactive;
 //Folder data
-byte list_full_redraw;
+	dword buf;
 	collection_int items=0;
-dword buf;
+	int selected_count;
-collection_int items=0;
+	int folder_count;
-int selected_count;
-int count_dir;
-byte path[4096];
+	//dword path;
-byte file_path[4096];
-byte file_name[256];
-byte new_element_name[256];
-byte temp[4096];
-bool itdir;
 	char path[4096];
 char active_path[4096], inactive_path[4096];
+//Sselected element data
-dword eolite_ini_path[4096];
-_ini ini;
 	byte file_path[4096];
-char scroll_used=false;
+	byte file_name[256];
+	byte new_element_name[256];
+	byte temp[4096];
+	bool itdir;
 //Window data
+	proc_info Form;
+	int sc_slider_h;
+	bool scroll_used=false;
+	char sort_type=2;
+	bool sort_desc=false;
+	int status_bar_h;
+	int icon_size = 18;
 dword about_stak=0,properties_stak=0,settings_stak=0;
 int active_panel=0;
-proc_info Form;
+int disk_popin_active_on_panel=0;
-int sc_slider_h;
+#define PANES_COUNT 2
-int action_buf;
-int rand_n;
-char sort_type=2;
-bool sort_desc=false;
+unsigned char location[PANES_COUNT];
 int active_panel=0;
 char active_path[4096], inactive_path[4096];
-libimg_image icons16_default;
-libimg_image icons16_selected;
 dword about_stak=0,properties_stak=0,settings_stak=0;
-libimg_image icons32_default;
+byte cmd_free=0;
 libimg_image icons32_selected;
 libimg_image icons16_default;
 #include "include\menu.h"
 #include "include\about.h"
 #include "include\properties.h"
 #include "include\breadcrumbs.h"
-void load_libraries()
-{
-	load_dll(boxlib, #box_lib_init,0);
-	load_dll(libini, #lib_init,1);
-	load_dll(libimg, #libimg_init,1);
-}
 void handle_param()
+{
 	//-p  : just show file/folder properties dialog
 	//-d  : delete file/folder
+	//-v : paste files/folder from clipboard
-	//-v : paste files/folder from clipboard
+	int i;
 	dword p = #param;
 	if (param[0]=='\\') && (param[1]=='E') && (param[2]=='F') && (param[3]=='M') {
 		efm = true;
 		p += 4;
 		if (param[4]==' ') p++;
+	}
+	LoadIniSettings();
+	for (i=0; i
+		location[i] = malloc(4096);
+		strcpy(location[i], #path_start);
+	}
-	LoadIniSettings();
+	//path = location[0];
 	if (ESBYTE[p]=='\0') return;
 void main()
+{
 	dword id;
 	int old_cur_y;
-	load_libraries();
+	load_dll(boxlib, #box_lib_init,0);
-	SetAppColors();
+	load_dll(libini, #lib_init,1);
+	load_dll(libimg, #libimg_init,1);
 	ESBYTE[0] = NULL;
-	handle_param();
+	SetAppColors();
-	rand_n = random(80);
+	handle_param();
 	ESBYTE[0] = NULL;
 	SystemDiscs.Get();
 	Open_Dir(#path,ONLY_OPEN);
 	strcpy(#inactive_path, #path);
 	llist_copy(#files_inactive, #files);
 	SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
-	loop() switch(@WaitEventTimeout(80))
+	loop() switch(@WaitEventTimeout(100))
+	{
 				DrawRectangle3D(files.x+files.w+1,files.y+files.h-15,14,14,sc.work_light,sc.work_dark);
+			}
 			//Scrooll
 			if (mouse.x>=files.x+files.w) && (mouse.x<=files.x+files.w+18) && (mouse.y>files.y)
 				&& (mouse.y
-			if (scroll_used) && (!mouse.key&MOUSE_LEFT) { scroll_used=false; Scroll(); }
+			if (scroll_used) && (!mouse.key&MOUSE_LEFT) { scroll_used=false; DrawScroll(scroll_used); }
 			if (scroll_used)
+			{
 							break;
 					case SCAN_CODE_KEY_N:
 							EventOpenNewEolite();
 							break;
 					case SCAN_CODE_KEY_R:
-							EventRefreshDisksAndFolders();
+							EventManualFolderRefresh();
 							break;
 					case SCAN_CODE_ENTER:
 							if (!itdir) ShowOpenWithDialog();
 							else EventOpen(1);
 							break;
 			break;
 		case evIPC:
 		case evReDraw:
 			draw_window();
 			if (CheckActiveProcess(Form.ID)) && (GetMenuClick()) break;
-			if (action_buf==OPERATION_END) {
-				EventRefresh();
-				action_buf=0;
-			}
 			break;
 		default:
-			if (Form.status_window<=2) EventRefreshDisksAndFolders();
+			if (!Form.status_window&ROLLED_UP) EventRefreshDisksAndFolders();
-			//sprintf(#param, "/tmp0/1/%i", random(99999)); //for testing purpose
-			//CreateFile(0, 0, #param);
+	}
 	if(cmd_free)
+	{
 void draw_window()
+{
 	dword i=0;
 	incn x;
 	dword title;
+	static int rand_n;
+	if (rand_n) rand_n = random(80);
 	if (show_status_bar.checked) {
 		#define STBAR_EOLITE_H 16;
 		#define STBAR_KFM_H 21+16;
 		if (efm) status_bar_h = STBAR_KFM_H;
 		else status_bar_h = STBAR_EOLITE_H;
+	}
 	if (!show_status_bar.checked) return;
 	if (files.count>0) && (streq(items.get(0)*304+buf+72,"..")) go_up_folder_exists=1;
 	DrawBar(0, Form.cheight - status_bar_h, Form.cwidth,  status_bar_h, sc.work);
-	sprintf(#status_bar_str, T_STATUS_EVEMENTS, count_dir-go_up_folder_exists, files.count-count_dir);
+	sprintf(#status_bar_str, T_STATUS_EVEMENTS, folder_count-go_up_folder_exists, files.count-folder_count);
 	WriteText(6,Form.cheight - 13,0x80,sc.work_text,#status_bar_str);
 	if (selected_count) {
 		sprintf(#status_bar_str, T_STATUS_SELECTED, selected_count);
 		WriteText(Form.cwidth - calc(strlen(#status_bar_str)*6)-6,Form.cheight - 13,
 	all_lines_h = j * files.item_h;
 	DrawBar(files.x,all_lines_h + files.y,files.w,files.h - all_lines_h, col.list_bg);
 	if (colored_lines.checked) separator_color = col.list_bg; else separator_color = col.list_vert_line;
 	DrawBar(files.x+files.w-141,all_lines_h + files.y,1,files.h - all_lines_h, separator_color);
 	DrawBar(files.x+files.w-68,all_lines_h + files.y,1,files.h - all_lines_h, separator_color);
-	Scroll();
+	DrawScroll(scroll_used);
 	if (del_active) Del_Form();
 	if (new_element_active) && (col.selec != 0xCCCccc) NewElement_Form(new_element_active, #new_element_name);
 		Write_Error(errornum);
 		return;
+	}
 	if (files.count>0) && (files.cur_y-files.first==-1) files.cur_y=0;
-	if (files.count!=-1)
-	{
 		if(!_not_draw) DrawPathBar();
-		history.add(#path);
+	history.add(#path);
-		SystemDiscs.Draw();
+	SystemDiscs.Draw();
-		files.visible = files.h / files.item_h;
+	files.visible = files.h / files.item_h;
-		if (files.count < files.visible) files.visible = files.count;
+	if (files.count < files.visible) files.visible = files.count;
-		if (!strncmp(dir_path, "/rd/1/",5)) || (!strncmp(dir_path, "/sys/",4))
+	if (!strncmp(dir_path, "/rd/1/",5)) || (!strncmp(dir_path, "/sys/",4))
-			dir_at_fat16 = true; else dir_at_fat16 = false;
+		dir_at_fat16 = true; else dir_at_fat16 = false;
-		Sorting();
+	Sorting();
-		list_full_redraw = true;
-		if (redraw!=ONLY_OPEN)&&(!_not_draw) {DrawStatusBar(); List_ReDraw();}
+	list_full_redraw = true;
-		SetCurDir(dir_path);
+	SetCurDir(dir_path);
-	}
+	DrawPathBar();
-	if (files.count==-1) && (redraw!=ONLY_OPEN)
-	{
+	if (redraw!=ONLY_OPEN) {
-		files.KeyHome();
+		List_ReDraw();
-		if(!_not_draw) { list_full_redraw=true; DrawStatusBar(); List_ReDraw(); }
+		DrawStatusBar();
+	}
+}
 	items.drop();
 	if (!strcmp(#path,"/")) //do not sort root folder
+	{
 		for(d=1;d
-		count_dir = d;
+		folder_count = d;
 		return;
+	}
 	for (j=files.count-1, file_off=files.count-1*304+buf+32; j>=0; j--, file_off-=304;)  //files | folders
+	{
 		} else {
 			items.set(files.count-f, j);
 			f++;
+		}
+	}
-	count_dir = d;
+	folder_count = d;
 	//sorting: files first, then folders
 	Sort_by_Name(0,d-1);
 	if (sort_type==1) Sort_by_Name(d,files.count-1);
 	else if (sort_type==2) Sort_by_Type(d,files.count-1);
 	else if (sort_type==3) Sort_by_Size(d,files.count-1);
 		case 5:
 			if (efm) {
 				CopyFilesListToClipboard(COPY);
 				EventPaste(#inactive_path);
 			} else {
-				EventRefreshDisksAndFolders();
+				EventManualFolderRefresh();
+			}
 			break;
 		case 6:
 			if (efm) {
 				CopyFilesListToClipboard(CUT);
+			}
 			break;
+	}
+}
-void EventRefresh()
-{
-	if (efm)
-	{
-		DrawFilePanels();
-	} else {
-		Tip(56, T_DEVICES, 55, "-");
-		Open_Dir(#path,WITH_REDRAW);
-		pause(10);
-		DrawDeviceAndActionsLeftPanel();
-	}
-}
 void SetActivePanel(int _active)
+{
 	if (active_panel != _active) {
 		active_panel = _active;
 	return fcount;
+}
 void EventRefreshDisksAndFolders()
+{
+	if(efm) {
+		if (GetRealFileCountInFolder(#inactive_path) != files_inactive.count) {
+			DrawFilePanels();
+			return;
+		}
 	} else {
-	if(GetRealFileCountInFolder("/")+dir_exists("/kolibrios") != SystemDiscs.dev_num) {
+		if (GetRealFileCountInFolder("/")+dir_exists("/kolibrios") != SystemDiscs.dev_num) {
-		SystemDiscs.Get();
+			SystemDiscs.Get();
-		EventRefresh();
+			DrawDeviceAndActionsLeftPanel();
-	} else {
-		if(GetRealFileCountInFolder(#path) != files.count) EventRefresh();
-		else if(efm) && (GetRealFileCountInFolder(#inactive_path) != files_inactive.count) {
 			EventRefresh();
+	}
 	if(GetRealFileCountInFolder(#path) != files.count) Open_Dir(#path,WITH_REDRAW);
+}
+void EventManualFolderRefresh()
+{
+	Tip(56, T_DEVICES, 55, "-");
+	pause(10);
+	EventRefreshDisksAndFolders();
 	DrawDeviceAndActionsLeftPanel();
+}
 void EventSort(dword id)

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c – Rev 8946 → 8947