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 Beta4"
+#define ABOUT_TITLE "EOLITE 5 Beta5"
-#define TITLE_EOLITE "Eolite File Manager 5 Beta4"
+#define TITLE_EOLITE "Eolite File Manager 5 Beta5"
-#define TITLE_KFM "Kolibri File Manager 2 Beta4";
+#define TITLE_KFM "Kolibri File Manager 2 Beta5";
 	RENAME_ITEM
 };
 //OpenDir options
-enum {
-	ONLY_SHOW,
+enum {
 	WITH_REDRAW,
 	ONLY_OPEN
 };
 bool active_about = false;
 bool active_settings = false;
 bool _not_draw = false;
 bool dir_at_fat16 = NULL;
-bool dev_popin_active_on_panel=0;
+bool disk_popin_active_on_panel=0;
 dword about_thread_id;
 	llist_copy(#files_inactive, #files);
 	SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
 	loop() switch(@WaitEventTimeout(80))
+	{
 		case evMouse:
-			if (del_active) || (dev_popin_active_on_panel) || (Form.status_window>2) break;
+			if (del_active) || (disk_popin_active_on_panel) || (Form.status_window>2) break;
 			if (new_element_active)
+			{
 				edit_box_mouse stdcall(#new_file_ed);
 				break;
+			}
+				}
 				DrawRectangle3D(files.x+files.w+1,files.y+files.h-15,14,14,sc.work_light,sc.work_dark);
+			}
+			//Scrooll
-			//Scrooll
+			if (mouse.x>=files.x+files.w) && (mouse.x<=files.x+files.w+18) && (mouse.y>files.y)
-			if (mouse.x>=files.x+files.w) && (mouse.x<=files.x+files.w+18) && (mouse.y>files.y) && (mouse.y
+				&& (mouse.y
 			if (scroll_used) && (!mouse.key&MOUSE_LEFT) { scroll_used=false; Scroll(); }
 			if (scroll_used)
 				if (id!=files.first) List_ReDraw();
 				break;
+			}
 			if (efm) && (mouse.y > files.y) && (mouse.down) {
-				if (mouse.x
-				{
+				if (mouse.x
-					if (active_panel!=1) {
-						active_panel = 1;
-						ChangeActivePanel();
 					if (active_panel!=1) ChangeActivePanel();
 				} else {
-					if (active_panel!=2) {
-						active_panel = 2;
-						ChangeActivePanel();
 					if (active_panel!=2) ChangeActivePanel();
+				}
+			}
 			break;
 //Button pressed-----------------------------------------------------------------------------
 		case evButton:
+			id = GetButtonID();
+			if (id==CLOSE_BTN) {
+				KillProcess(about_thread_id);
+				SaveIniSettings();
+				ExitProcess();
-			id = GetButtonID();
+			}
-			if (new_element_active) || (del_active) || (dev_popin_active_on_panel) {
+			if (new_element_active) || (del_active) || (disk_popin_active_on_panel) {
 				if (POPUP_BTN1==id) && (del_active) EventDelete();
 				if (POPUP_BTN1==id) && (new_element_active) NewElement();
 				if (POPUP_BTN2==id) EventClosePopinForm();
-				if (dev_popin_active_on_panel) {
+				if (disk_popin_active_on_panel) {
 					if (id>=100) && (id<=120) EventDriveClick(id);
 					else EventClosePopinForm();
+				}
 				break;
+			}
-			switch(id)
-			{
-				case CLOSE_BTN:
 						KillProcess(about_thread_id);
-						SaveIniSettings();
+			switch(id)
 						ExitProcess();
 				case PATH_BTN:
 						notify(COPY_PATH_STR);
 						Clipboard__CopyText(#path);
 						break;
-				case KFM_DEV_DROPDOWN_1:
-				case KFM_DEV_DROPDOWN_1+1:
-						dev_popin_active_on_panel = 1;
+				case KFM_DEV_DROPDOWN_1:
-						DefineHiddenButton(0,0,5000,3000,9999+BT_NOFRAME);
+				case KFM_DEV_DROPDOWN_1+1:
-						SystemDiscs.DrawOptions(Form.cwidth/2-DDW, 8+DEV_H_HOR+3);
+						EventOpenDiskPopin(1);
 						break;
-				case KFM_DEV_DROPDOWN_2:
-				case KFM_DEV_DROPDOWN_2+1:
-						dev_popin_active_on_panel = 2;
+				case KFM_DEV_DROPDOWN_2:
-						DefineHiddenButton(0,0,5000,3000,9999+BT_NOFRAME);
+				case KFM_DEV_DROPDOWN_2+1:
-						SystemDiscs.DrawOptions(Form.cwidth-DDW-2, 8+DEV_H_HOR+3);
+						EventOpenDiskPopin(2);
-						break;
-				case BACK_BTN...PASTE_BTN:
-						if (active_panel==2) {
-							active_panel = 1;
+						break;
-							ChangeActivePanel();
+				case BACK_BTN...PASTE_BTN:
 						if (active_panel==2) ChangeActivePanel();
 						EventToolbarButtonClick(id);
-						break;
-				case BACK_BTN+100...PASTE_BTN+100:
-						if (active_panel==1) {
-							active_panel = 2;
+						break;
-							ChangeActivePanel();
+				case BACK_BTN+100...PASTE_BTN+100:
 						if (active_panel==1) ChangeActivePanel();
 						EventToolbarButtonClick(id-100);
 						break;
 		case evKey:
 			GetKeys();
 			if (Form.status_window>2) break;
-			if (new_element_active) || (del_active) || (dev_popin_active_on_panel)
+			if (new_element_active) || (del_active) || (disk_popin_active_on_panel)
+			{
 				if (key_scancode == SCAN_CODE_ESC) EventClosePopinForm();
 					edit_box_key stdcall (#new_file_ed);
+				}
 				break;
+			}
+			if (key_modifier&KEY_LALT) || (key_modifier&KEY_RALT) {
+				if (key_scancode == SCAN_CODE_F1) EventOpenDiskPopin(1);
+				if (key_scancode == SCAN_CODE_F2) EventOpenDiskPopin(2);
+				break;
+			}
 			if (key_modifier&KEY_LSHIFT) || (key_modifier&KEY_RSHIFT) {
 				if (key_scancode == SCAN_CODE_ENTER) {
 							RunProgram("/sys/media/kiv", #temp);
 							break;
 					case SCAN_CODE_KEY_N:
 							EventOpenNewEolite();
 							break;
-					case SCAN_CODE_KEY_M:
-							Open_Dir(#inactive_path,WITH_REDRAW);
-							break;
 					case SCAN_CODE_KEY_R:
 							EventRefresh();
 							break;
 					case SCAN_CODE_ENTER:
 							if (!itdir) ShowOpenWithDialog();
 					case SCAN_CODE_ENTER:
 							EventOpen(0);
 							break;
 					case SCAN_CODE_TAB:
 							if (!efm) break;
-							if (active_panel==1) active_panel=2; else active_panel=1;
 							ChangeActivePanel();
-							DrawFilePanels();
 							break;
 					case SCAN_CODE_MENU:
 							mouse.x = files.x+15;
 							mouse.y = files.cur_y - files.first * files.item_h + files.y + 5;
 							EventShowListMenu();
 							break;
 					case SCAN_CODE_DEL:
 							Del_Form();
 							break;
+					case SCAN_CODE_SPACE:
+							EventChooseFile(files.cur_y);
+							DrawStatusBar();
+							Line_ReDraw(col.selec, files.cur_y);
+							break;
 					case SCAN_CODE_INS:
 							EventChooseFile(files.cur_y);
 							files.KeyDown();
 							DrawStatusBar();
 							List_ReDraw();
 				action_buf=0;
+			}
 			break;
 		default:
 			if (Form.status_window<=2) 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;
-	if (show_status_bar.checked) status_bar_h = STATUS_BAR_H; else status_bar_h = 0;
+	if (show_status_bar.checked) {
+		status_bar_h = STATUS_BAR_H;
+	} else {
+		status_bar_h = 0;
+	}
 	if (efm) title = TITLE_KFM; else title = TITLE_EOLITE;
 	DefineAndDrawWindow(Form.left+rand_n,Form.top+rand_n,Form.width,Form.height,0x73,NULL,title,0);
 	GetProcessInfo(#Form, SelfInfo);
 	if (Form.status_window>2) return;
 	if (Form.height < 356) { MoveSize(OLD,OLD,OLD,356); return; }
 	llist_copy(#files_active, #files);
 	strcpy(#active_path, #path);
 	DrawStatusBar();
 	if (!selected_count) Open_Dir(#path,ONLY_OPEN); //if there are no selected files -> refresh folder [L001]
 	DrawFilePanels();
-	dev_popin_active_on_panel = 0;
+	disk_popin_active_on_panel = 0;
+}
-void DrawList()
+void DrawButtonsAroundList()
+{
 	word sorting_arrow_x;
 	dword sorting_arrow_t = "\x19";
 	if (sort_desc) sorting_arrow_t = "\x18";
 	int h2;
 	if (!efm)
+	{
 		DrawDeviceAndActionsLeftPanel();
 		files.SetSizes(192, 57, Form.cwidth - 210, Form.cheight - 59 - status_bar_h, files.item_h);
-		DrawList();
+		DrawButtonsAroundList();
-		Open_Dir(#path,ONLY_SHOW);
+		List_ReDraw();
+	}
 	else
+	{
-		//SystemDiscs.Get();
 		llist_copy(#files, #files_inactive);
 		strcpy(#path, #inactive_path);
-		col.selec = col.selec_inactive;
-		SystemDiscs.Draw();
 		files_y = files.y;
 		h2 = Form.cheight-files_y-2 - status_bar_h;
+		col.selec = col.selec_inactive;  //this is a bad code: need to use some var to set inactive panel for DrawButtonsAroundList();
 		if (active_panel==1)
-		{
-			llist_copy(#files, #files_inactive);
-			strcpy(#path, #inactive_path);
 			col.selec = col.selec_inactive; //this is a bad code: need to use some var to set inactive panel for DrawList();
 			files.SetSizes(Form.cwidth/2, files_y, w2-17, h2, files.item_h);
-			DrawList();
+			DrawButtonsAroundList();
 			Open_Dir(#path,WITH_REDRAW);
 			llist_copy(#files, #files_active);
 			strcpy(#path, #active_path);
 			col.selec = col.selec_active;
 			files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
-			DrawList();
+			DrawButtonsAroundList();
 			Open_Dir(#path,WITH_REDRAW);
+		}
 		if (active_panel==2)
+		{
 			files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
-			DrawList();
+			DrawButtonsAroundList();
 			Open_Dir(#path,WITH_REDRAW);
 			llist_copy(#files, #files_active);
 			strcpy(#path, #active_path);
 			col.selec = col.selec_active;
 			files.SetSizes(Form.cwidth/2, files_y, w2 -17, h2, files.item_h);
-			DrawList();
+			DrawButtonsAroundList();
 			Open_Dir(#path,WITH_REDRAW);
+		}
+	}
-}
+}
 void List_ReDraw()
+{
 	int all_lines_h;
 	dword j;
 	static int old_cur_y, old_first;
+	dword separator_color;
 	dword separator_color;
 	files.CheckDoesValuesOkey(); //prevent some shit
-	files.CheckDoesValuesOkey(); //prevent some shit
+	if (files.count < files.visible) files.visible = files.count;
+}
-void Open_Dir(dword dir_path, redraw){
-	int errornum;
+void Open_Dir(dword dir_path, redraw){
-	if (redraw!=ONLY_SHOW)
+	int errornum;
-		selected_count = 0;
+	selected_count = 0;
-		if (buf) free(buf);
+	if (buf) free(buf);
-		errornum = GetDir(#buf, #files.count, dir_path, DIRS_NOROOT);
+	errornum = GetDir(#buf, #files.count, dir_path, DIRS_NOROOT);
-			EventHistoryGoBack();
+		EventHistoryGoBack();
-			Write_Error(errornum);
+		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;
-	}
 	if (files.count!=-1)
+	{
 		if(!_not_draw) DrawPathBar();
 		history.add(#path);
 		SystemDiscs.Draw();
 		files.visible = files.h / files.item_h;
 		if (files.count < files.visible) files.visible = files.count;
 		if (!strncmp(dir_path, "/rd/1/",5)) || (!strncmp(dir_path, "/sys/",4))
 			dir_at_fat16 = true; else dir_at_fat16 = false;
-		if (redraw!=ONLY_SHOW) Sorting();
+		Sorting();
 		list_full_redraw = true;
 		if (redraw!=ONLY_OPEN)&&(!_not_draw) {DrawStatusBar(); List_ReDraw();}
 		SetCurDir(dir_path);
+	}
 	if (files.count==-1) && (redraw!=ONLY_OPEN)
+	}
+}
 void ChangeActivePanel()
+{
 	if (active_panel==1) active_panel=2; else active_panel=1;
 	llist_copy(#files_active, #files_inactive);
 	llist_copy(#files_inactive, #files);
 	strcpy(#active_path, #inactive_path);
 	strcpy(#inactive_path, #path);
+	}
 	if(efm)
+	{
 		if(GetRealFileCountInFolder(#inactive_path) != files_inactive.count) {
 			ChangeActivePanel();
-			Open_Dir(#path,WITH_REDRAW);
 			ChangeActivePanel();
+		}
-		if(GetRealFileCountInFolder(#path) != files.count) Open_Dir(#path,WITH_REDRAW);
-	} else {
-		if(GetRealFileCountInFolder(#path) != files.count) Open_Dir(#path,WITH_REDRAW);
+	}
+	if(GetRealFileCountInFolder(#path) != files.count) Open_Dir(#path,WITH_REDRAW);
+}
 void EventSort(dword id)
+{
 	char selected_filename[256];
 	if (sort_type == id) sort_desc ^= 1;
 	else sort_type = id;
 	strcpy(#selected_filename, #file_name);
-	DrawList();
+	DrawButtonsAroundList();
 	Open_Dir(#path,WITH_REDRAW);
 	SelectFileByName(#selected_filename);
+}
 void EventClosePopinForm()
+{
 	del_active = 0;
 	new_element_active = 0;
-	dev_popin_active_on_panel = 0;
+	disk_popin_active_on_panel = 0;
 	draw_window();
+}
+	}
+}
 void EventDriveClick(int __id)
 {
-	if (dev_popin_active_on_panel != active_panel) {
-		if (active_panel == 1) active_panel=2; else active_panel=1;
+	if (disk_popin_active_on_panel != active_panel) {
 		ChangeActivePanel();
+	}
 	SystemDiscs.Click(__id-100);
 	if (efm) {
 		draw_window();
+	}
+}
+void EventOpenDiskPopin(int panel_n)
+{
+	DefineHiddenButton(0,0,5000,3000,9999+BT_NOFRAME);
+	disk_popin_active_on_panel = panel_n;
+	SystemDiscs.Get();
+	if (disk_popin_active_on_panel==1) {
+		SystemDiscs.DrawOptions(Form.cwidth/2-DDW, 8+DEV_H_HOR+3);
+	} else {
+		SystemDiscs.DrawOptions(Form.cwidth-DDW-2, 8+DEV_H_HOR+3);
+	}

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c @ 5651 – Rev 8871 → 8872