From 2ea3102d624528adb1f7f2aafd5eadd5dfe71b0e Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Mon, 17 Aug 2015 21:24:56 +0000
Subject: [PATCH] CMM End v2.0

git-svn-id: svn://kolibrios.org@5738 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/end/compile.bat       |   5 -
 programs/cmm/end/end.c             | 202 ++++++++---------------------
 programs/cmm/end/moon.bmp          | Bin 614 -> 0 bytes
 programs/cmm/end/moon.raw          | Bin 108 -> 0 bytes
 programs/cmm/eolite/Eolite.c       |  23 +++-
 programs/cmm/eolite/compile_en.bat |   2 +-
 programs/cmm/eolite/compile_ru.bat |   2 +-
 programs/cmm/lib/gui.h             |   9 ++
 8 files changed, 84 insertions(+), 159 deletions(-)
 delete mode 100644 programs/cmm/end/compile.bat
 delete mode 100644 programs/cmm/end/moon.bmp
 delete mode 100644 programs/cmm/end/moon.raw

diff --git a/programs/cmm/end/compile.bat b/programs/cmm/end/compile.bat
deleted file mode 100644
index d25fa154ac..0000000000
--- a/programs/cmm/end/compile.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-C-- end.c
-@del end
-@rename end.com end
-@del warning.txt
-@pause
diff --git a/programs/cmm/end/end.c b/programs/cmm/end/end.c
index ea9cbbe059..152c98aa90 100644
--- a/programs/cmm/end/end.c
+++ b/programs/cmm/end/end.c
@@ -1,166 +1,78 @@
-#define MEMSIZE 0x3E80
-#include "..\lib\kolibri.h" 
-#include "..\lib\gui.h" 
-#include "..\lib\strings.h" 
-#include "..\lib\random.h" 
-#include "..\lib\mem.h" 
-#include "..\lib\file_system.h"
-
-#ifndef ru
-	char *BUTTONS_CAPTIONS[]={
-	"������������    [Enter]"w, 13,
-	"����������        [End]"w, 181,
-	//"����             [Home]"w, 180,
-	"������            [Esc]"w, 27,
-	0};
-#else
-	char *BUTTONS_CAPTIONS[]={
-	" Reboot        [Enter]",13,
-	" Power off       [End]",181,
-	//" Kernel         [Home]",180,
-	" Close           [Esc]",27,
-	0};
+#ifndef AUTOBUILD
+#include "lang.h--"
 #endif
 
-unsigned char moon[6*6] = FROM "moon.raw";
+#define MEMSIZE 4096*4
+#include "../lib/gui.h"
+#include "../lib/file_system.h"
 
-int WIN_SIZE_X, WIN_SIZE_Y;
-int PANEL_X, PANEL_Y;
-
-#define NIGHT_PALEL_HEIGHT	50
-#define STARS_COUNT			25
-
-#define PANEL_SIZE_X		260
-#define PANEL_SIZE_Y		148
-
-:void ShadowScreen(dword img, w, h)
-{
-	dword to = w*h*3 + img;
-	for ( ; img < to; img+=4)
-	{
-		ESDWORD[img] >>= 1;
-		$and ESDWORD[img], 7F7F7F7Fh
-	}
-	//for ( ; img < to; img+=4) { ESDWORD[img] >>= 2;	$and ESDWORD[img], 3F3F3F3Fh }
-}
+#ifdef LANG_RUS
+#define TEXT_TITLE "Завершение работы"
+#define TEXT_RDSAVE1 "Нажмите Ctrl+S для сохранения изменений"
+#define TEXT_RDSAVE2 "сделанных в процессе работы в системе."
+#define TEXT_REBOOT "Перезагрузка"
+#define TEXT_OFF "Выключение"
+#define TEXT_CANCEL "Отмена"
+#else
+#define TEXT_TITLE "Shutdown computer"
+#define TEXT_RDSAVE1 "Press Ctrl+S to save all changes"
+#define TEXT_RDSAVE2 "that were done during system work."
+#define TEXT_REBOOT "Reboot"
+#define TEXT_OFF "Power off"
+#define TEXT_CANCEL "Close"
+#endif
 
+#define WIN_W 440
+#define WIN_H 200
+#define BOT_PANEL_H 70
 
 void main()
-{   
+{
 	int key;
-	dword s1,s2, s3, s4, sides_w,i;
+	int WIN_X = GetScreenWidth() - WIN_W / 2;
+	int WIN_Y = GetScreenHeight() - WIN_H / 2;
 
-	WIN_SIZE_X=GetScreenWidth()+1;
-	WIN_SIZE_Y=GetScreenHeight()+1;
-	PANEL_X=WIN_SIZE_X-PANEL_SIZE_X/2;
-	PANEL_Y=WIN_SIZE_Y-PANEL_SIZE_Y/2;
-
-	sides_w = WIN_SIZE_X-PANEL_SIZE_X/2;
-	s1 = mem_Alloc(WIN_SIZE_X*PANEL_Y*3);
-	s2 = mem_Alloc(sides_w*PANEL_Y*3);
-	s3 = mem_Alloc(sides_w*PANEL_Y*3);
-	s4 = mem_Alloc(WIN_SIZE_X*PANEL_Y*3);	
-
-	CopyScreen(s1, 0, 0, WIN_SIZE_X, PANEL_Y);
-	ShadowScreen(s1, WIN_SIZE_X, PANEL_Y);
-
-	CopyScreen(s2, 0, PANEL_Y, sides_w, PANEL_SIZE_Y+1);
-	ShadowScreen(s2, sides_w, PANEL_SIZE_Y+1);
-
-	CopyScreen(s3, sides_w+PANEL_SIZE_X+1, PANEL_Y, sides_w-1, PANEL_SIZE_Y+1);
-	ShadowScreen(s3, sides_w, PANEL_SIZE_Y+1);
-
-	CopyScreen(s4, 0, PANEL_Y+PANEL_SIZE_Y+1, WIN_SIZE_X, PANEL_Y-1);
-	ShadowScreen(s4, WIN_SIZE_X, PANEL_Y-1);
-
-
-	goto _DRAW;
 	loop()
-   {
-		WaitEventTimeout(7);
-		switch(EAX & 0xFF)
-		{
-		case evButton:
+	{
+	  switch(WaitEvent())
+	  {
+		 case evButton:
 			key=GetButtonID();               
 			if (key==1) ExitProcess();
 			GOTO _BUTTON_MARK;
-			
+	  
 		case evKey:
 			key = GetKey();
 			_BUTTON_MARK:
-			if (key== 13) ExitSystem(REBOOT);   //ENTER
-			if (key==180) ExitSystem(KERNEL);   //HOME
-			if (key==181) ExitSystem(TURN_OFF); //END
-			if (key== 27) ExitProcess();        //ESC
-			if (key== 19) //CTRL+S
-			{
-				RunProgram("rdsave",0);
-				ExitProcess();
-			}
+			if (key==ASCII_KEY_ENTER) ExitSystem(REBOOT);
+			if (key==ASCII_KEY_END) ExitSystem(TURN_OFF);
+			if (key==ASCII_KEY_ESC) ExitProcess();
+			if (key==19) RunProgram("rdsave",0);
 			break;
-         
-		case evReDraw:
-			system.color.get();
-			DefineAndDrawWindow(0,0,WIN_SIZE_X, WIN_SIZE_Y, 0x01, 0, 0, 0x01fffFFF);
-			//_PutImage(0,0,WIN_SIZE_X,WIN_SIZE_Y,shadow_buf);
-			_PutImage(0,0,WIN_SIZE_X, PANEL_Y,s1);
-			_PutImage(0,PANEL_Y,sides_w, PANEL_SIZE_Y+1,s2);
-			_PutImage(sides_w+PANEL_SIZE_X+1,PANEL_Y,sides_w-1, PANEL_SIZE_Y+1,s3);
-			_PutImage(0,PANEL_Y+PANEL_SIZE_Y+1,WIN_SIZE_X, PANEL_Y-1,s4);
-			draw_main_area(PANEL_X, PANEL_Y, PANEL_SIZE_X, PANEL_SIZE_Y);
+		 
+		 case evReDraw:
+			DefineAndDrawWindow(WIN_X, WIN_Y, WIN_W-1, WIN_H-1, 0x41, 0, 0, 0);
+			DrawWideRectangle(0, 0, WIN_W, WIN_H, 2, 0xA3A7AA);
+			DrawBar(2, 2, WIN_W-4, WIN_H-BOT_PANEL_H-2, 0x202020);
+			DrawBar(2, WIN_H-BOT_PANEL_H-2, WIN_W-4, BOT_PANEL_H, 0x4B4B4B);
+			WriteText(30, 27, 10110001b, 0xFFFfff, TEXT_TITLE);
+			WriteText(30, 70, 10110000b, 0xFFFfff, TEXT_RDSAVE1);
+			WriteText(30, 85, 10110000b, 0xFFFfff, TEXT_RDSAVE2);
+			EndButton( 20, 0x4E91C5, ASCII_KEY_ESC, TEXT_CANCEL, "Esc");
+			EndButton(160, 0x55C891, ASCII_KEY_ENTER, TEXT_REBOOT, "Enter");
+			EndButton(300, 0xC75C54, ASCII_KEY_END, TEXT_OFF, "End");
 			break;
-		default: _DRAW:
-			draw_stars();
-      }
+	  }
    }
 }
 
-
-void draw_main_area()
+void EndButton(dword x, bgcol, id, but_text, hotkey_text)
 {
-	int i=0;
-	
-	DrawRectangle(PANEL_X, PANEL_Y, PANEL_SIZE_X, PANEL_SIZE_Y, 0);
-	DrawBar(PANEL_X+1, PANEL_Y+NIGHT_PALEL_HEIGHT+1, PANEL_SIZE_X-1, PANEL_SIZE_Y-NIGHT_PALEL_HEIGHT-1, system.color.work);
-	
-	for (i=0; i<3; i++)
-	{
-		DefineButton(PANEL_X+33, i*23 + PANEL_Y+NIGHT_PALEL_HEIGHT+16, 190,19, BUTTONS_CAPTIONS[i*2+1],system.color.work_button);
-		WriteText(PANEL_X+59, i*23 + PANEL_Y+NIGHT_PALEL_HEIGHT+22, 0x80,system.color.work_button_text, BUTTONS_CAPTIONS[i*2]);
-	}
-		
-	draw_stars();
-}
-
-dword stars_col[4]={0xD2CF19, 0x716900, 0x002041, 0xEAE0DE}; //0x005BFF - �������, �����
-
-void draw_stars()
-{
-
-	int i, x_pic, y_pic, col;
-	
-	DrawBar(PANEL_X+1, PANEL_Y+1, PANEL_SIZE_X-1, NIGHT_PALEL_HEIGHT, 0x002041);
-	
-	for (i=0; i<STARS_COUNT; i++)
-	{
-		x_pic = random(PANEL_SIZE_X-2);
-		y_pic = random(NIGHT_PALEL_HEIGHT-2);
-		col = random(4);
-		PutPixel(PANEL_X+2 +x_pic, PANEL_Y+2 +y_pic, stars_col[col]);
-		if (stars_col[col]==0xD2CF19)
-		{
-			PutPixel(PANEL_X+2 +x_pic+1, PANEL_Y+2 +y_pic, stars_col[col+1]);
-			PutPixel(PANEL_X+2 +x_pic-1, PANEL_Y+2 +y_pic, stars_col[col+1]);
-			PutPixel(PANEL_X+2 +x_pic, PANEL_Y+2 +y_pic-1, stars_col[col+1]);
-			PutPixel(PANEL_X+2 +x_pic, PANEL_Y+2 +y_pic+1, stars_col[col+1]);
-		}
-
-	}
-	_PutImage(PANEL_X+PANEL_SIZE_X-60+random(3),PANEL_Y+10+random(3), 6,6, #moon);
-}
-
-
-
-
-
-stop:
+	word buty=WIN_H-60;
+	word butw=116;
+	word buth=43;
+	DrawWideRectangle(x-3, buty-3, butw+6, buth+6, 3, 0x202020);
+	DefineButton(x, buty, butw-1, buth-1, id, bgcol);
+	WriteTextB(-utf8_strlen(but_text)*8 + butw / 2 + x, buty+8, 10110000b, 0xFFFfff, but_text);
+	WriteTextCenter(x, buty+26, butw, 0xFFFfff, hotkey_text);
+}
\ No newline at end of file
diff --git a/programs/cmm/end/moon.bmp b/programs/cmm/end/moon.bmp
deleted file mode 100644
index f85b1f9eb151e8dd9a90831d91e3fb931264cdd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 614
zcmZ?rO=DsJgEAng0mRZkEDywt3@ktr0))637(f^X92FQC+FThJ*7VN@3rU{8#K4eQ
z$Z+7G5rcKs1_mRegAD)w|7SS4?mtWm$+QDD9js`AApxiY=<=wt#Pbkd$EgR+W|%r0
v!Z2xKX$M>i!4kNf7mBKj#RV8gNWdi^1c}GM;DW-#<g*}a$7Ls)8CbaheSj7I

diff --git a/programs/cmm/end/moon.raw b/programs/cmm/end/moon.raw
deleted file mode 100644
index 7402226a5930704e48bfca547689d3ed6b83ad86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 108
pcmZ=%V30h235Xan3mp|0fC$2cu<?sPv;aw<7Pv+<(}1#YlL1(eA^-pY

diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 77be127eb8..99a19d235f 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -279,7 +279,7 @@ void main()
 						if (active_panel!=1)
 						{
 							active_panel = 1;
-							goto __SET_VALS_AND_DRAW;
+							ChangeActivePanel();
 						}
 					}
 					else
@@ -287,12 +287,7 @@ void main()
 						if (active_panel!=2)
 						{
 							active_panel = 2;
-							__SET_VALS_AND_DRAW:
-							llist_copy(#files_active, #files_inactive);
-							llist_copy(#files_inactive, #files);
-							strcpy(#active_path, #inactive_path);
-							strcpy(#inactive_path, #path);
-							DrawFilePanels();
+							ChangeActivePanel();
 						}
 					}
 				}
@@ -448,6 +443,11 @@ void main()
 						case SCAN_CODE_ENTER:
 								Open(0);
 								break; 
+						case SCAN_CODE_TAB:
+								if (!two_panels) break;
+								if (active_panel==1) active_panel=2; else active_panel=1;
+								ChangeActivePanel();
+								break;
 						case 093: //menu
 								menu_call_mouse=0;
 								menu_stak = malloc(4096);
@@ -1128,6 +1128,15 @@ void FnProcess(byte N)
 	}
 }
 
+void ChangeActivePanel()
+{
+	llist_copy(#files_active, #files_inactive);
+	llist_copy(#files_inactive, #files);
+	strcpy(#active_path, #inactive_path);
+	strcpy(#inactive_path, #path);
+	DrawFilePanels();
+}
+
 //need to remove these functiones, they are a very old shit :)
 dword onTop(dword down,up) {EAX=Form.height-GetSkinHeight()-down-up;}
 
diff --git a/programs/cmm/eolite/compile_en.bat b/programs/cmm/eolite/compile_en.bat
index e8cc851018..f33b599eee 100644
--- a/programs/cmm/eolite/compile_en.bat
+++ b/programs/cmm/eolite/compile_en.bat
@@ -4,7 +4,7 @@
 @del Eolite
 cls
 c-- Eolite.c
-@kpack Eolite.com
+rem @kpack Eolite.com
 @rename Eolite.com Eolite
 @del warning.txt
 @del lang.h--
diff --git a/programs/cmm/eolite/compile_ru.bat b/programs/cmm/eolite/compile_ru.bat
index 6e74dac0ac..ef16bdf7f4 100644
--- a/programs/cmm/eolite/compile_ru.bat
+++ b/programs/cmm/eolite/compile_ru.bat
@@ -4,7 +4,7 @@
 @del Eolite
 cls
 c-- Eolite.c
-@kpack Eolite.com
+rem @kpack Eolite.com
 @rename Eolite.com Eolite
 @del warning.txt
 @del lang.h--
diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h
index 0b10f14b45..debe44314a 100644
--- a/programs/cmm/lib/gui.h
+++ b/programs/cmm/lib/gui.h
@@ -19,6 +19,15 @@
 	DrawBar(x+w,y,1,h+1,color1);
 }
 
+:void DrawWideRectangle(dword x,y,w,h,boder,color1)
+{
+	if (w<=0) || (h<=0) return;
+	DrawBar(x, y, w, boder, color1);
+	DrawBar(x, y+h-boder, w, boder, color1);
+	DrawBar(x, y+boder, boder, h-boder-boder, color1);
+	DrawBar(x+w-boder, y+boder, boder, h-boder-boder, color1);
+}
+
 :void DrawRectangle3D(dword x,y,w,h,color1,color2)
 {
 	if (w<=0) || (h<=0) return;