kf_view: refactoring (-2 img sectors)

git-svn-id: svn://kolibrios.org@9601 a494cfbc-eb01-0410-851d-a64ba20cac60

data/Tupfile.lua

@@ -28,7 +28,7 @@ img_files = {
  {"UNIMG", PROGS .. "/fs/unimg/unimg"},
  {"3D/HOUSE.3DS", "common/3d/house.3ds"},
  {"File Managers/ICONS.INI", "common/File Managers/icons.ini"},
--- {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/ABOUT.TXT"},
+ {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/ABOUT.TXT"},
  {"File Managers/FNAV/FNAV", "common/File Managers/fNav/FNAV"},
  {"File Managers/FNAV/FNAV.EXT", "common/File Managers/fNav/FNAV.EXT"},
  {"File Managers/FNAV/FNAV.SET", "common/File Managers/fNav/FNAV.SET"},

programs/cmm/kf_font_viewer/compile_en.bat

@@ -1,5 +1,4 @@
 @del kf_view
 @C-- font_viewer.c
 @rename font_viewer.com kf_view
-@del warning.txt
+if not exist kf_view ( @pause )
-@pause

programs/cmm/kf_font_viewer/font_viewer.c

@@ -1,67 +1,84 @@
 #define MEMSIZE 1024*30
+#define ENTRY_POINT #main
 
 #include "../lib/kfont.h"
 #include "../lib/gui.h"
 
-#define PANELH 28
+#define BARH 28
-#define WIN_W 520
+#define WINW 528
-#define WIN_H 315
+#define WINH 315
-#define BASE_TAB_BUTTON_ID 97
 
-_tabs tabs = { WIN_W-130, 0, NULL, BASE_TAB_BUTTON_ID };
+char active_tab = 0;
-
+char colored = true;
-block preview = { 0, PANELH, WIN_W, WIN_H - PANELH };
+dword checkbox_flag;
-checkbox bold = { "Bold", false };
-checkbox smooth = { "Smooth", true };
-checkbox colored = { "Colored", true };
 
 void main()
 {   
 	proc_info Form;
-	char title[1024];
+
-	int btn;
+	mem_init();
+	checkbox_flag = memopen("CHECKBOX", NULL, SHM_READ);
 
 	if (!param) strcpy(#param, DEFAULT_FONT);
 	kfont.init(#param);
 	strcpy(#title, "Font preview: ");
 	strcat(#title, #param);
 
-	tabs.add("Phrase", #DrawPreviewPhrase);
-	tabs.add("Chars", #DrawPreviewChars);
-
 	loop() switch(@WaitEvent())
 	{
+		case evKey:
+			@GetKey();
+			EAX >>= 16;
+			if (AL == SCAN_CODE_ESC) ExitProcess();
+			if (AL == SCAN_CODE_TAB) {
+				active_tab^=1;
+				goto _DRAW_WINDOW_CONTENT;
+			}
+			break;
+
 		case evButton:
-			btn = @GetButtonID();
+			@GetButtonID();
-			if (btn==1) @ExitProcess();
+			if (EAX==1) ExitProcess();
-			bold.click(btn); 
+			if (EAX==2) kfont.bold^=1;
-			smooth.click(btn);
+			if (EAX==3) kfont.smooth^=1;
-			colored.click(btn);
+			if (EAX==4) colored^=1;
-			tabs.click(btn);
+			if (EAX==5) active_tab=0;
+			if (EAX==6) active_tab=1;
 			GOTO _DRAW_WINDOW_CONTENT;
 
 		case evReDraw:
 			sc.get();
-			DefineAndDrawWindow(215,100,WIN_W+9,WIN_H+skin_h+5,0x74,0xFFFFFF,#title,0);
+			DefineAndDrawWindow(215,100,WINW+9,WINH+GetSkinHeight()+4,0x74,0xFFFFFF,#title,0);
 			GetProcessInfo(#Form, SelfInfo);
 			if (Form.status_window&ROLLED_UP) break;
 			_DRAW_WINDOW_CONTENT:
 
-			kfont.bold = bold.checked;
+			DrawBar(0, 0, WINW, BARH-1, sc.work);
-			kfont.smooth = smooth.checked;
+			DrawBar(0, BARH-1,WINW,1,sc.work_graph);
-
-			DrawBar(0, 0, WIN_W, PANELH-1, sc.work);
-			DrawBar(0, PANELH-1,WIN_W,1,sc.work_graph);
 
 			if (!kfont.font) {
-				DrawBar(preview.x, preview.y, preview.w, preview.h, 0xFFFfff);
+				DrawBar(0, BARH, WINW, WINH - BARH, 0xFFFfff);
 				WriteText(10, 50, 0x82, 0xFF00FF, "Font is not loaded.");
 			} else {
-				bold.draw(10, 8);
+				draw_checkbox(9, kfont.bold);
-				smooth.draw(83,8);
+				draw_checkbox(81, kfont.smooth);
-				colored.draw(170,8);
+				draw_checkbox(169, colored);
-				tabs.draw();
+				WriteText(30, 8, 0x90, sc.work_text, "Bold     Smooth     Colored            Phrase   Chars");
-				tabs.draw_active_tab();
+				UnsafeDefineButton(0, 3, 70, 24, 2+BT_HIDE+BT_NOFRAME, ESI);
+				$inc edx //11
+				$add ebx, 80 << 16
+				$int 64
+				$inc edx //12
+				$add ebx, 88 << 16
+				$int 64
+				$inc edx //13
+				$add ebx, 162 << 16
+				$int 64
+				$inc edx //14
+				$add ebx, 70 << 16
+				$int 64
+				DrawBar(active_tab*70+335, BARH-4, 60, 4, 0xE44C9C);
+				if (!active_tab) DrawPreviewPhrase(); else DrawPreviewChars();
 			}
 	}
 }
@@ -71,37 +88,57 @@ dword pal[] = { 0x4E4153, 0x57417C, 0x89633B, 0x819156, 0x00CCCC, 0x2AD266,
 
 void DrawPreviewPhrase()
 {
-	dword i, y;
+	dword i, y=12;
-	dword c;
+	dword line[64];
-	char line[256];
 	kfont.raw_size = free(kfont.raw);
-	for (i=10, y=12; i<22; i++, y+=kfont.height+3;) //not flexible, need to calculate font count and max line length
+	for (i=10; i<22; i++) //not flexible, need to calculate font count and max line length
 	{
-		if (colored.checked) c = pal[i-10]; else c=0;
 		strcpy(#line, "<EFBFBD> §¬¥à èà¨äâ /font size is ");
-		strcat(#line, itoa(i));
+		itoa_(#line+27, i);
 		strcat(#line, " ¯¨ªá¥«¥©/px.");
-		kfont.WriteIntoBuffer(14,y,WIN_W,WIN_H-PANELH, 0xFFFFFF, c, i, #line);
+		kfont.WriteIntoBuffer(14,y,WINW,WINH-BARH, 0xFFFFFF, pal[i-10]*colored, i, #line);
+		y+=kfont.height+3;
 	}
-	if (kfont.smooth) kfont.ApplySmooth();
+	DrawBuf();
-	kfont.ShowBuffer(preview.x, preview.y);
 }
 
 void DrawPreviewChars()
 {
 	dword i, x=20, y=0;
-	char line[2]=0;
+	char line[2];
 	kfont.raw_size = free(kfont.raw);
-	for (i=0; i<255; i++) //not flexible, need to calculate font count and max line length
+	for (i=0; i<255; i++)
 	{
 		line[0]=i;
-		kfont.WriteIntoBuffer(x,y,WIN_W,WIN_H-PANELH, 0xFFFFFF, 0, 16, #line);
+		kfont.WriteIntoBuffer(x,y,WINW,WINH-BARH, 0xFFFFFF, 0, 16, #line);
 		x+= kfont.height+2;
-		if (x>=preview.w-30) { 
+		if (x>=WINW-30) { 
 			x=20;
 			y+=kfont.height+2;
 		}
 	}
-	if (kfont.smooth) kfont.ApplySmooth();
+	DrawBuf();
-	kfont.ShowBuffer(preview.x, preview.y);
 }
+
+void DrawBuf()
+{
+	if (kfont.smooth) kfont.ApplySmooth();
+	kfont.ShowBuffer(0, BARH);
+}
+
+void draw_checkbox(dword _x, _checked)
+{
+	#define SIZE 14
+	#define CHBOXY 7
+	DrawRectangle3D(_x, CHBOXY, SIZE, SIZE, sc.work_graph, sc.work_graph);
+	if (_checked == false)
+	{
+		DrawRectangle3D(_x+1, CHBOXY+1, SIZE-2, SIZE-2, 0xDDDddd, 0xffffff);
+		DrawBar(_x+2, CHBOXY+2, SIZE-3, SIZE-3, 0xffffff);
+	} else {
+		if (checkbox_flag) _PutImage(_x+1, CHBOXY+1, 13, 13, checkbox_flag);
+	}
+	DrawRectangle3D(_x-1,CHBOXY-1,SIZE+2,SIZE+2,sc.work_dark,sc.work_light);
+}
+
+char title[PATHLEN];

programs/cmm/misc/reshare.c

@@ -26,6 +26,41 @@ libimg_image icons16w;
 unsigned int size32;
 unsigned int size16;
 
+:unsigned char checkbox_flag[507] = {
+	0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 
+	0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 
+	0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xDC, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 
+	0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 
+	0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xDC, 
+	0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xBC, 0x04, 
+	0xFC, 0xBC, 0x04, 0xFC, 0xBC, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 
+	0xB4, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 
+	0x04, 0xFC, 0xBC, 0x04, 0xFC, 0xBC, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xB4, 0x04, 0xF9, 0x98, 0x04, 
+	0xFC, 0xF2, 0xD2, 0xFC, 0xF2, 0xD2, 0xFA, 0xA5, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 
+	0xB4, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xB4, 
+	0x04, 0xF9, 0x98, 0x04, 0xFF, 0xFF, 0xFF, 0xFD, 0xFD, 0xF6, 0xFC, 0xF9, 0xAF, 0xF9, 0x98, 0x04, 
+	0xFC, 0xB4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xF2, 0xD2, 0xFC, 0xF2, 0xD2, 0xF9, 
+	0x98, 0x04, 0xFC, 0xB4, 0x04, 0xF9, 0x98, 0x04, 0xFF, 0xFF, 0xFF, 0xFD, 0xFD, 0xF6, 0xF7, 0xE0, 
+	0x95, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xD4, 0x04, 0xF9, 0x98, 0x04, 
+	0xFD, 0xFD, 0xF6, 0xFF, 0xFF, 0xFF, 0xFC, 0xDC, 0x2C, 0xF9, 0x98, 0x04, 0xFF, 0xFF, 0xFF, 0xFD, 
+	0xFD, 0xF6, 0xF7, 0xE0, 0x95, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xA9, 
+	0x04, 0xFC, 0xD4, 0x04, 0xF9, 0x98, 0x04, 0xF7, 0xE0, 0x95, 0xFD, 0xFD, 0xF6, 0xFF, 0xFF, 0xFF, 
+	0xFF, 0xFF, 0xFF, 0xFD, 0xFD, 0xF6, 0xF7, 0xE0, 0x95, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFA, 
+	0x9F, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xD4, 0x04, 0xF9, 0x98, 0x04, 0xBC, 0x64, 
+	0x04, 0xF7, 0xE0, 0x95, 0xFD, 0xFD, 0xF6, 0xFD, 0xFD, 0xF6, 0xF7, 0xE0, 0x95, 0xBC, 0x64, 0x04, 
+	0xF9, 0x98, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 
+	0xC8, 0x04, 0xFA, 0xA5, 0x04, 0xF9, 0x98, 0x04, 0xBC, 0x64, 0x04, 0xF7, 0xE0, 0x95, 0xF7, 0xE0, 
+	0x95, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 
+	0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xF9, 
+	0x98, 0x04, 0xBC, 0x64, 0x04, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xA9, 
+	0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xC8, 0x04, 
+	0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xFA, 
+	0x9F, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xFA, 0x9F, 
+	0x04, 0xF9, 0x98, 0x04, 0xFC, 0xB4, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 
+	0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 
+	0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04
+};
+
 //===================================================//
 //                                                   //
 //                       MAIN                        //
@@ -60,8 +95,8 @@ void start_daemon()
 	char* shared_i16w;
 	char* shared_chbox;
 
-	shared_chbox = memopen("CHECKBOX", 507, SHM_CREATE+SHM_WRITE);
+	shared_chbox = memopen("CHECKBOX", sizeof(checkbox_flag), SHM_CREATE+SHM_WRITE);
-	memmov(shared_chbox, #checkbox_flag, 507);
+	memmov(shared_chbox, #checkbox_flag, sizeof(checkbox_flag));
 
 	shared_i32 = memopen("ICONS32", size32, SHM_CREATE+SHM_WRITE);
 	memmov(shared_i32, icons32.imgsrc, size32);
@@ -198,44 +233,3 @@ void draw_tab_icons32()
 		}
 	}
 }
-
-//===================================================//
-//                                                   //
-//                       DATA                        //
-//                                                   //
-//===================================================//
-
-:unsigned char checkbox_flag[507] = {
-	0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 
-	0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xD4, 
-	0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xDC, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 
-	0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 
-	0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xDC, 
-	0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xBC, 0x04, 
-	0xFC, 0xBC, 0x04, 0xFC, 0xBC, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 
-	0xB4, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xC8, 
-	0x04, 0xFC, 0xBC, 0x04, 0xFC, 0xBC, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xB4, 0x04, 0xF9, 0x98, 0x04, 
-	0xFC, 0xF2, 0xD2, 0xFC, 0xF2, 0xD2, 0xFA, 0xA5, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 
-	0xB4, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xB4, 0x04, 0xFC, 0xB4, 
-	0x04, 0xF9, 0x98, 0x04, 0xFF, 0xFF, 0xFF, 0xFD, 0xFD, 0xF6, 0xFC, 0xF9, 0xAF, 0xF9, 0x98, 0x04, 
-	0xFC, 0xB4, 0x04, 0xFC, 0xD4, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xF2, 0xD2, 0xFC, 0xF2, 0xD2, 0xF9, 
-	0x98, 0x04, 0xFC, 0xB4, 0x04, 0xF9, 0x98, 0x04, 0xFF, 0xFF, 0xFF, 0xFD, 0xFD, 0xF6, 0xF7, 0xE0, 
-	0x95, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xD4, 0x04, 0xF9, 0x98, 0x04, 
-	0xFD, 0xFD, 0xF6, 0xFF, 0xFF, 0xFF, 0xFC, 0xDC, 0x2C, 0xF9, 0x98, 0x04, 0xFF, 0xFF, 0xFF, 0xFD, 
-	0xFD, 0xF6, 0xF7, 0xE0, 0x95, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xA9, 
-	0x04, 0xFC, 0xD4, 0x04, 0xF9, 0x98, 0x04, 0xF7, 0xE0, 0x95, 0xFD, 0xFD, 0xF6, 0xFF, 0xFF, 0xFF, 
-	0xFF, 0xFF, 0xFF, 0xFD, 0xFD, 0xF6, 0xF7, 0xE0, 0x95, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFA, 
-	0x9F, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xD4, 0x04, 0xF9, 0x98, 0x04, 0xBC, 0x64, 
-	0x04, 0xF7, 0xE0, 0x95, 0xFD, 0xFD, 0xF6, 0xFD, 0xFD, 0xF6, 0xF7, 0xE0, 0x95, 0xBC, 0x64, 0x04, 
-	0xF9, 0x98, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 
-	0xC8, 0x04, 0xFA, 0xA5, 0x04, 0xF9, 0x98, 0x04, 0xBC, 0x64, 0x04, 0xF7, 0xE0, 0x95, 0xF7, 0xE0, 
-	0x95, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 
-	0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xC8, 0x04, 0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xF9, 
-	0x98, 0x04, 0xBC, 0x64, 0x04, 0xBC, 0x64, 0x04, 0xF9, 0x98, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xA9, 
-	0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xFA, 0x9F, 0x04, 0xFC, 0xC8, 0x04, 
-	0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xFA, 
-	0x9F, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFC, 0xA9, 0x04, 0xFA, 0x9F, 0x04, 0xFA, 0x9F, 
-	0x04, 0xF9, 0x98, 0x04, 0xFC, 0xB4, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 
-	0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 
-	0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04, 0xF9, 0x98, 0x04
-};