From 88b0e3bc8b08503b4c14aab6ae61d076a4d309df Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Mon, 14 Oct 2013 23:16:04 +0000
Subject: [PATCH] Eolite 0.98.4: use action_buf

git-svn-id: svn://kolibrios.org@4028 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/browser/include/menu_rmb.h |  1 -
 programs/cmm/eolite/Eolite.c            | 27 ++++++++++++++++++++++---
 programs/cmm/eolite/include/copypaste.h | 10 ++++-----
 programs/cmm/eolite/include/file_menu.h | 20 +++++-------------
 4 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/programs/cmm/browser/include/menu_rmb.h b/programs/cmm/browser/include/menu_rmb.h
index d0105b3f91..5d5583405a 100644
--- a/programs/cmm/browser/include/menu_rmb.h
+++ b/programs/cmm/browser/include/menu_rmb.h
@@ -74,7 +74,6 @@ void menu_rmb()
 		case evReDraw:
 				DefineAndDrawWindow(Form.left+m.x,Form.top+m.y+GetSkinHeight()+3,menu.w+2,menu.count*menu.line_h+4,0x01, 0, 0, 0x01fffFFF);
 				DrawPopup(0,0,menu.w,menu.count*menu.line_h+3,0, col_work,col_border);
-				//PutPixel();
 
 				_ITEMS_DRAW:
 				for (N=0; N<menu.count; N++;)
diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 74249360e6..92ce125578 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -76,8 +76,8 @@
 
 enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
 
-#define TITLE "Eolite File Manager v1.98.3"
-#define ABOUT_TITLE "Eolite v1.98.3"
+#define TITLE "Eolite File Manager v1.98.4"
+#define ABOUT_TITLE "Eolite v1.98.4"
 dword col_work    = 0xE4DFE1;
 dword col_border  = 0x9098B0; //A0A0B8; //0x819FC5;
 dword col_padding = 0xC8C9C9;
@@ -108,8 +108,9 @@ int mouse_dd, scroll_used, scroll_size, sorting_arrow_x;
 dword buf, off;
 dword file_mas[6898];
 int j, i;
+int action_buf;
 
-edit_box edit2= {250,213,80,0xFFFFCC,0x94AECE,0xFFFFCC,0xffffff,0,248,#file_name,#mouse_dd,64,6,6};
+edit_box edit2 = {250,213,80,0xFFFFCC,0x94AECE,0xFFFFCC,0xffffff,0,248,#file_name,#mouse_dd,64,6,6};
 PathShow_data PathShow = {0, 17,250, 6, 250, 0, 0, 0x0, 0xFFFfff, #path, #temp, 0};
 PathShow_data FileShow = {0, 56,215, 6, 100, 0, 0, 0x0, 0xFFFfff, #file_name, #temp, 0};
 
@@ -403,10 +404,30 @@ void main()
 			}                         
 			break;
 		case evReDraw:
+			if (action_buf) { menu_action(action_buf); action_buf=0;}
 			draw_window();
 	}
 }
 
+void menu_action(dword id)
+{
+	if (id==COPY_PASTE_END)
+	{
+		FnProcess(5);
+		SelectFile(#copy_to+strrchr(#copy_to,'/'));
+	}
+	if (id==100) Open();
+	if (id==201) notify("Not compleated yet");
+	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) CreateThread(#Paste,#copy_stak);
+	if (id==107) FnProcess(2);
+	if (id==108) Del_Form();
+	if (id==109) FnProcess(5);
+}
+
 
 void draw_window()
 {
diff --git a/programs/cmm/eolite/include/copypaste.h b/programs/cmm/eolite/include/copypaste.h
index c036286d36..08924f2cca 100644
--- a/programs/cmm/eolite/include/copypaste.h
+++ b/programs/cmm/eolite/include/copypaste.h
@@ -1,8 +1,8 @@
 //Leency 2008-2013
 
 
-byte copy_from[4096], cut_active=0;
-enum {NOCUT, CUT};
+byte copy_from[4096], copy_to[4096], cut_active=0;
+enum {NOCUT, CUT, COPY_PASTE_END};
 #define WIN_W 300
 #define WIN_H 50
 
@@ -28,7 +28,7 @@ void copyf_Draw_Progress(dword filename) {
 
 void Paste()
 {
-	char copy_to[4096], copy_rezult;
+	char copy_rezult;
 	
 	if (!copy_from) ExitProcess();
 	strcpy(#copy_to, #path);
@@ -55,9 +55,7 @@ void Paste()
 		copy_from=NULL;
 		cut_active=false;
 	}
+	action_buf = COPY_PASTE_END;
 	ActivateWindow(GetProcessSlot(Form.ID));
-	SendWindowMessage(evKey, 54);
-	SelectFile(#copy_to+strrchr(#copy_to,'/'));
-	pause(20);
 	ExitProcess();
 }
diff --git a/programs/cmm/eolite/include/file_menu.h b/programs/cmm/eolite/include/file_menu.h
index b9af84003c..b55e9d64ba 100644
--- a/programs/cmm/eolite/include/file_menu.h
+++ b/programs/cmm/eolite/include/file_menu.h
@@ -10,9 +10,9 @@ char *file_captions[] = {
 	"Š®¯¨à®¢ âì",            "Crl+C",104,
 	"‚ë१ âì",              "Crl+X",105,
 	"‚áâ ¢¨âì",              "Crl+V",106,
-	"�¥à¥¨¬¥­®¢ âì",         "F2",107,
+	"�¥à¥¨¬¥­®¢ âì",         "F2",207,
 	"“¤ «¨âì",               "Del",108,
-	"Ž¡­®¢¨âì",              "F5",109,
+	"Ž¡­®¢¨âì ¯ ¯ªã",        "F5",109,
 	0, 0, 0};
 #elif LANG_EST
 char *file_captions[] = {
@@ -23,7 +23,7 @@ char *file_captions[] = {
 	"Kopeeri",        "Crl+C",104,
 	"Lõika",          "Crl+X",105,
 	"Aseta",          "Crl+V",106,
-	"Nimeta ümber",   "F2",107,
+	"Nimeta ümber",   "F2",207,
 	"Kustuta",        "Del",108,
 	"Värskenda",      "F5",109,
 	0, 0, 0};
@@ -36,7 +36,7 @@ char *file_captions[] = {
 	"Copy",          "Crl+C",104,
 	"Cut",           "Crl+X",105,
 	"Paste",         "Crl+V",106,
-	"Rename",        "F2",107,
+	"Rename",        "F2",207,
 	"Delete",        "Del",108,
 	"Refresh",       "F5",109,
 	0, 0, 0};
@@ -76,17 +76,7 @@ void FileMenu()
 				break;
 
 		case evButton: 
-				id=GetButtonID();
-				if (id==100) Open();
-				if (id==201) notify("Not compleated yet");
-				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) CreateThread(#Paste,#copy_stak);
-				if (id==107) FnProcess(2);
-				if (id==108) Del_Form();
-				if (id==109) FnProcess(5);
+				action_buf = GetButtonID();
 				ExitProcess();
 				break;