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

 //GNU GPL license.
 /*
 BUGS:
-- fix a kfm2 bug with selected files on window deactivation
-- back button broken
-- bug with going to wrong path (related to prior issue?)
+- fix a kfm2 bug with selected files on window deactivation
 TODO:
-- 70.5 - get volume info and label
-- click on a path bar dropdown opens breadcrumbs
+- 70.5 - get volume info and label
 */
-#define ABOUT_TITLE "EOLITE 5 Beta12"
+#define ABOUT_TITLE "EOLITE 5 RC6"
-#define TITLE_EOLITE "Eolite File Manager 5 Beta12"
+#define TITLE_EOLITE "Eolite File Manager 5 RC6"
-#define TITLE_KFM "Kolibri File Manager 2 Beta12";
+#define TITLE_KFM "Kolibri File Manager 2 RC6";
 #define MEMSIZE 1024 * 250
 //Global data
 	bool efm = false;
 	_history history;
 //Folder data
-	dword buf;
+	dword buf, buf_inactive;
 	collection_int items=0;
 	int selected_count;
 	int folder_count;
 	dword path;
 	dword about_stak=0,properties_stak=0,settings_stak=0;
 	byte cmd_free=0;
 //Multipanes
-	int active_panel=0;
-	int disk_popin_active_on_panel=0;
+	int active_panel=0;
 	#define PANES_COUNT 2
 	dword location[PANES_COUNT];
 	llist files, files_active, files_inactive;
 	SetAppColors();
 	handle_param();
 	SystemDiscs.Get();
-	Open_Dir(path,ONLY_OPEN);
+	OpenDir(ONLY_OPEN);
 	llist_copy(#files_inactive, #files);
 	SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
 	loop() switch(@WaitEventTimeout(100))
 				SaveIniSettings();
 				ExitProcess();
+			}
+			if (active_popin) {
+				if (POPUP_BTN2==id) { EventClosePopinForm(); break; }
+				if (POPUP_BTN1==id) { EventPopinClickOkay(); break; }
 			if (active_popin) {
-				if (POPIN_DISK==active_popin) {
-					if (id>=100) && (id<=120) {
+				if (POPIN_DISK==active_popin) {
-						active_popin = NULL;
+					active_popin = NULL;
+					EventDriveClick(id-100);
+				}
+				if (POPIN_BREADCR==active_popin) {
+					EventClosePopinForm();
-						EventDriveClick(id);
+					ClickOnBreadCrumb(id-BREADCRUMB_ID);
-					}
-					EventClosePopinForm();                                //POPIN_DISK create close btn with POPUP_BTN2
+				}
-					break; }
-				if (POPUP_BTN2==id) EventClosePopinForm();
 				if (POPUP_BTN1==id) EventPopinClickOkay();
 				break;
+			}
 						break;
 				case 52...60: //Actions
 						FnProcess(id-50);
 						break;
 				case 100...120:
-						EventDriveClick(id);
+						EventDriveClick(id-100);
-						break;
-				case BREADCRUMB_ID...360:
-						ClickOnBreadCrumb(id-BREADCRUMB_ID);
 						break;
 				case KFM_FUNC_ID...KFM_FUNC_ID+10:
 						FnProcess(id-KFM_FUNC_ID);
 						break;
+			}
+			{
 				if (key_scancode == SCAN_CODE_ESC) EventClosePopinForm();
 				if (POPIN_DISK == active_popin) {
 					if (key_scancode >= SCAN_CODE_1)
-						&& (key_scancode >= SCAN_CODE_10) {
+						&& (key_scancode <= SCAN_CODE_10) {
-							EventDriveClick(key_scancode-1+100);
+							EventDriveClick(key_scancode-2);
+						}
 				} else {
 					if (key_scancode == SCAN_CODE_ENTER) EventPopinClickOkay();
 					if (popin_string[0] != -1) {
+							}
 					case SCAN_CODE_3...SCAN_CODE_10:
 							key_scancode-=2;
 							if (key_scancode >= SystemDiscs.list.count) break;
 							if (!efm) {
-								DrawRectangle(17,key_scancode*16+74,159,16, 0); //display click
+								DrawRectangle(17,key_scancode*17+74,159,17, 0); //display click
 								pause(7);
+							}
-							SystemDiscs.Click(key_scancode);
+							EventDriveClick(key_scancode);
 							break;
 					case SCAN_CODE_KEY_X:
 							CopyFilesListToClipboard(CUT);
 							break;
 					case SCAN_CODE_KEY_C:
 	for (i=0; i<6; i++) DrawBar(0, 34+i, Form.cwidth, 1, MixColors(sc.work_dark, sc.work, i*10));
 	for (i=0; i<6; i++) DrawBar(0, 5-i, Form.cwidth, 1, MixColors(sc.work_light, sc.work, i*10));
 	llist_copy(#files_active, #files);
 	DrawStatusBar();
 	if (!selected_count) {
-		Open_Dir(path,ONLY_OPEN); //if there are no selected files -> refresh folder [L001]
+		OpenDir(ONLY_OPEN); //if there are no selected files -> refresh folder [L001]
+	}
 	DrawFilePanels();
-	disk_popin_active_on_panel = 0;
+	if (files.x!=files_inactive.x) {
+		if (active_popin) ShowPopinForm(active_popin);
+	}
+}
 void DrawButtonsAroundList()
+{
+		}
 		files_inactive.x = files.x;
 		DrawButtonsAroundList();
 		path = location[active_panel^1];
-		Open_Dir(path,WITH_REDRAW);
+		OpenDir(WITH_REDRAW);
 		if (!selected_count) files_inactive.count = files.count;
 		llist_copy(#files, #files_active);
 			files.SetSizes(Form.cwidth/2, files_y, w2 -17, h2, files.item_h);
+		}
 		DrawButtonsAroundList();
 		path = location[active_panel];
-		Open_Dir(path,WITH_REDRAW);
+		OpenDir(WITH_REDRAW);
+	}
+}
 	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);
 	DrawScroll(scroll_used);
-	if (files.x!=files_inactive.x) {
-		if (active_popin) ShowPopinForm(active_popin);
-	}
+}
 void Line_ReDraw(dword bgcol, filenum){
 	dword text_col=col.list_gb_text,
 	DrawIconByExtension(#full_path, ext1, files.x+4, icon_y, bgcol);
 	if (current_inactive) DrawWideRectangle(files.x+2, y, files.w-4, files.item_h, 2, col.selec);
+}
-void Open_Dir(dword dir_path, redraw){
+void OpenDir(char redraw){
 	int errornum;
 	selected_count = 0;
 	if (buf) free(buf);
-	if (errornum = GetDir(#buf, #files.count, dir_path, DIRS_NOROOT))
+	if (errornum = GetDir(#buf, #files.count, path, DIRS_NOROOT))
+	{
 		history.add(path);
 		EventHistoryGoBack();
 		Write_Error(errornum);
+		return;
 		return;
-	}
+	if (files.count>0) && (files.cur_y-files.first==-1) files.cur_y=0;
-	if (files.count>0) && (files.cur_y-files.first==-1) files.cur_y=0;
-	SystemDiscs.Draw();
+	history.add(path);
-	files.visible = files.h / files.item_h;
+	SystemDiscs.Draw();
-	if (files.count < files.visible) files.visible = files.count;
+	files.visible = math.min(files.h / files.item_h, files.count);
-	if (!strncmp(dir_path, "/rd/1",5)) || (!strncmp(dir_path, "/sys/",4))
+	if (!strncmp(path, "/rd/1",5)) || (!strncmp(path, "/sys/",4))
 		dir_at_fat16 = true; else dir_at_fat16 = false;
-	Sorting();
-	list_full_redraw = true;
+	Sorting();
-	SetCurDir(dir_path);
+	list_full_redraw = true;
-	if (redraw!=ONLY_OPEN) {
+	SetCurDir(path);
-		history.add(path);
+	if (redraw!=ONLY_OPEN) {
 		List_ReDraw();
 void SelectFileByName(dword that_file)
+{
 	int ind;
 	files.KeyHome();
-	Open_Dir(path,ONLY_OPEN);
+	OpenDir(ONLY_OPEN);
 	if (dir_at_fat16) && (file_name_is_8_3(that_file)) strttl(that_file);
 	for (ind=files.count-1; ind>=0; ind--;) { if (!strcmpi(items.get(ind)*304+buf+72,that_file)) break; }
 	files.cur_y = ind - 1;
 	files.KeyDown();
 	else
+	{
 		if (!strncmp(#file_name,"..",3)) { Dir_Up(); return; }
 		strcpy(path, #file_path);
 		files.first=files.cur_y=0;
-		Open_Dir(path,WITH_REDRAW);
+		OpenDir(WITH_REDRAW);
+	}
+}
-inline fastcall void EventHistoryGoBack()
+void EventHistoryGoBack()
+{
 	char cur_folder[4096];
 	strcpy(#cur_folder, path);
 	if (history.back()) {
 		strcpy(path, history.current());
+		SelectFileByName(#cur_folder+strrchr(#cur_folder,'/'));
-		SelectFileByName(#cur_folder+strrchr(#cur_folder,'/'));
+		DrawPathBar();
+	}
+}
+void EventHistoryGoForward()
+{
+	if (history.forward()) {
+		strcpy(path, history.current());
+		files.KeyHome();
+		OpenDir(WITH_REDRAW);
+		DrawPathBar();
+	}
+}
 void ShowOpenWithDialog()
+{
 	byte open_param[4097];
 							DeleteFile(#file_path);
+						}
+					}
+				}
+	}
-	Open_Dir(path,WITH_REDRAW);
 	SelectFileByName(popin_text.text);
 	return true;
 	__FAIL:
 	Write_Error(EAX);
 	return false;
 void EventPopinClickOkay()
+{
 	switch(active_popin) {
 		case POPIN_PATH:
 			strcpy(path, #popin_string);
-			Open_Dir(path, WITH_REDRAW);
+			OpenDir(WITH_REDRAW);
 			break;
 		case POPIN_DELETE:
 			CopyFilesListToClipboard(DELETE);
 			EventClosePopinForm();
 			sprintf(#param, "-d %s", #file_path);
+					}
+				}
 				WriteTextCenter(popinx, 192, POPIN_W, sc.work_text, #param);
 				break;
 		case POPIN_DISK:
-				DefineHiddenButton(0,0,5000,3000,9999+BT_NOFRAME);
+				DefineHiddenButton(0,0,5000,3000,POPUP_BTN2+BT_NOFRAME);
 				if (active_panel==0) {
 					SystemDiscs.DrawOptions(1);
 				} else {
 					SystemDiscs.DrawOptions(Form.cwidth/2-1);
+				}
 				break;
 		case POPIN_BREADCR:
-				notify("'Not implemented yet' C");
+				DefineHiddenButton(0,0,5000,3000,POPUP_BTN2+BT_NOFRAME);
-				return;
-				//DrawBreadCrumbs();
+				DrawBreadCrumbs();
 				break;
+	}
 	active_popin = _popin_type;
+}
 		if (GetRealFileCountInFolder("/")+dir_exists("/kolibrios") != SystemDiscs.dev_num) {
 			SystemDiscs.Get();
 			SystemDiscs.Draw();
+		}
+	}
-	if(GetRealFileCountInFolder(path) != files.count) Open_Dir(path,WITH_REDRAW);
+	if(GetRealFileCountInFolder(path) != files.count) OpenDir(WITH_REDRAW);
+}
 void EventManualFolderRefresh()
+{
 	char selected_filename[256];
 	if (sort_type == id) sort_desc ^= 1;
 	else sort_type = id;
 	strcpy(#selected_filename, #file_name);
 	DrawButtonsAroundList();
-	Open_Dir(path,WITH_REDRAW);
+	OpenDir(WITH_REDRAW);
 	SelectFileByName(#selected_filename);
+}
-void EventHistoryGoForward()
-{
-	if (history.forward()) {
-		strcpy(path, history.current());
-		files.KeyHome();
-		Open_Dir(path,WITH_REDRAW);
-	}
-}
 void EventOpenNewEolite()
+{
 	RunProgram(I_Path, path);
+	}
+}
 void EventDriveClick(int __id)
+{
 	if (__id >= SystemDiscs.list.count) return;
+	if (efm) {
-	if (efm) {
+		EventClosePopinForm();
 		draw_window();
 	}
+	strcpy(path, SystemDiscs.list.get(__id));
+	files.KeyHome();
-	SystemDiscs.Click(__id-100);
+	OpenDir(WITH_REDRAW);
+}

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c – Rev 8953 → 8956