From ab10597e237b298029d5fcd9e7ad33f6d30b0fa5 Mon Sep 17 00:00:00 2001
From: pavelyakov <pavelyakov@kolibrios.org>
Date: Thu, 5 Nov 2015 23:26:15 +0000
Subject: [PATCH] Add application kf viewer

git-svn-id: svn://kolibrios.org@5884 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/Tupfile.lua                              |   1 +
 data/common/kfviewer                          | Bin 0 -> 3872 bytes
 data/common/settings/assoc.ini                |   5 ++
 .../kolibri font viewer/kolibri font viewer.c |  59 +++++++++++++++---
 programs/cmm/lib/font.h                       |   9 +--
 5 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 data/common/kfviewer

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index e9a28afb6..f748b3964 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -70,6 +70,7 @@ img_files = {
  {"SETTINGS/NETWORK.INI", build_type .. "/settings/network.ini"},
  {"NETWORK/FTPD.INI", "common/network/ftpd.ini"},
  {"NETWORK/USERS.INI", "common/network/users.ini"},
+ {"KFVIEWER", "common/kfviewer"},
 }
 -- For russian build, add russian-only files.
 if build_type == "rus" then tup.append_table(img_files, {
diff --git a/data/common/kfviewer b/data/common/kfviewer
new file mode 100644
index 0000000000000000000000000000000000000000..35cc97a688bdabf99a46e349d9e25de72c17b1ac
GIT binary patch
literal 3872
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

literal 0
HcmV?d00001

diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini
index fee4d2a93..aae7f711a 100644
--- a/data/common/settings/assoc.ini
+++ b/data/common/settings/assoc.ini
@@ -14,6 +14,9 @@ icon=58
 exec=/sys/media/kiv
 icon=70
 
+[FontViewer]
+exec=/sys/kfviewer
+
 [Animage]
 exec=/sys/media/animage
 icon=15
@@ -67,6 +70,8 @@ exec=/sys/develop/cObj
 [Assoc]
 /=/sys/file managers/eolite
 
+kf=$FontViewer
+
 txt=$TinyPad
 asm=$TinyPad
 inc=$TinyPad
diff --git a/programs/cmm/kolibri font viewer/kolibri font viewer.c b/programs/cmm/kolibri font viewer/kolibri font viewer.c
index eea5741d6..a05d105be 100644
--- a/programs/cmm/kolibri font viewer/kolibri font viewer.c	
+++ b/programs/cmm/kolibri font viewer/kolibri font viewer.c	
@@ -8,15 +8,36 @@
 void main()
 {   
 	proc_info Form;
+	FONT font_title = 0;
+	FONT font_option = 0;
 	word i, y, btn;
 	char line[256], title[4196];
 	font.no_bg_copy = true;
 	font.color = 0;
 	font.bg_color = 0xFFFFFF;
+	font.left = 5;
+	font.top = SKIN.height+PANELH;
 	if (!param) strcpy(#param, "/sys/fonts/Tahoma.kf");
 	font.load(#param);
+	
+	font_title.no_bg_copy = true;
+	font_title.load("/sys/fonts/Tahoma.kf");
+	font_title.size.text = 12;
+	font_title.color = 0x444444;
+	font_title.weight = 1;
+	font_title.use_smooth = 1;
+	font_title.bg_color = 0xE1E1E1;
+	
+	font_option.no_bg_copy = true;
+	font_option.load("/sys/fonts/Tahoma.kf");
+	font_option.size.text = 13;
+	font_option.color = 0x222222;
+	font_option.use_smooth = 1;
+	font_option.bg_color = 0xDADADA;
+	
 	strcpy(#title, "Kolibri font preview: ");
 	strcat(#title, #param);
+	font_title.prepare(5, 4, #title);
 	loop()
 	{
 	  switch(WaitEvent())
@@ -29,27 +50,45 @@ void main()
 			if (btn==4) font.smooth ^=1;
 			goto _DRAW_WINDOW_CONTENT;
 		case evReDraw:
-			DefineAndDrawWindow(215,100,500,320,0x74,0xFFFFFF,#title);
+			DefineAndDrawWindow(215,100,500,320,0x04,0xFFFFFF,"");
+			font_title.show();
 			GetProcessInfo(#Form, SelfInfo);
 			_DRAW_WINDOW_CONTENT:
-			DrawBar(0, 0, Form.cwidth, PANELH, 0xCCCccc);
-			CheckBox2(10, 8, 2, "Bold",  font.weight);
-			CheckBox2(70, 8, 3, "Italic",  font.italic);
-			CheckBox2(140, 8, 4, "Smooth",  font.smooth);
-			font.buffer_size = free(font.buffer);
+			DrawBar(5, SKIN.height, Form.cwidth, PANELH, 0xDADADA);
+			
+			font_option.italic = font_option.smooth = 0;
+			font_option.weight = 1;
+			font_option.prepare(30, SKIN.height+7, "Bold");
+			CheckBox2(10, SKIN.height+8, 2, "",  font.weight);
+			font_option.show();
+			
+			font_option.weight = font_option.smooth = 0;
+			font_option.italic = 1;
+			font_option.prepare(90, SKIN.height+7, "Italic");
+			CheckBox2(70, SKIN.height+8, 3, "",  font.italic);
+			font_option.show();
+			
+			font_option.weight = font_option.italic = 0;
+			font_option.smooth = 1;
+			font_option.prepare(160, SKIN.height+7, "Smooth");
+			CheckBox2(140, SKIN.height+8, 4, "Smooth",  font.smooth);
+			font_option.show();
+			
+			IF(font.buffer)font.buffer_size = 0;
+			
 			if (!font.data)
 			{
-				DrawBar(0, PANELH, Form.cwidth, Form.cheight - PANELH, 0xFFFfff);
-				WriteText(10, 50, 0x82, 0xFF00FF, "Font is not loaded.");
+				DrawBar(5, SKIN.height+PANELH, Form.cwidth, Form.cheight - PANELH, 0xFFFfff);
+				WriteText(15, 50, 0x82, 0xFF00FF, "Font is not loaded.");
 			}
 			else for (i=10, y=5; i<22; i++, y+=font.height;) //not flexible, need to calculate font count and max line length
 			{
 				font.size.text = i;
 				sprintf(#line,"Размер шрифта/size font %d пикселей.",i);
-				font.prepare_buf(10,y,Form.cwidth,Form.cheight-PANELH, #line);
+				font.prepare_buf(15,SKIN.height+y,Form.cwidth,Form.cheight-PANELH, #line);
 			}
 			if (font.smooth) SmoothFont(font.buffer, font.size.width, font.size.height);
-			font.show(0, PANELH);
+			font.show();
 	  }
 	}
 }
diff --git a/programs/cmm/lib/font.h b/programs/cmm/lib/font.h
index 0c4110513..73ea68067 100644
--- a/programs/cmm/lib/font.h
+++ b/programs/cmm/lib/font.h
@@ -27,7 +27,7 @@
 	byte r,g,b,weight,italic, smooth;
 	byte width,height;
 	byte use_smooth;
-	word left,top;
+	int left,top;
 	byte encoding;
 	dword color;
 	dword file_size;
@@ -172,7 +172,7 @@ FONT font = 0;
 		IF(s=='_') size.width--;
 		IF(size.offset.x<0)size.offset.x = X;
 }
-:dword FONT::prepare(word x,y;dword text1)
+:dword FONT::prepare(int x,y;dword text1)
 {
 	signed len=0;
 	proc_info Form_SELF_FONTS;
@@ -320,16 +320,17 @@ inline fastcall dword b24(EBX) { return DSDWORD[EBX] << 8; }
 	return true;
 }
 
-:void FONT::prepare_buf(dword x,y,w,h; dword text1)
+:void FONT::prepare_buf(int x,y,w,h; dword text1)
 {
 	dword c, new_buffer_size;
 	c = color;
+	//left = x;
 	IF(!text1)return;
 	IF(size.text)IF(!changeSIZE())return;
 	AX = c; r = AL; g = AH; c>>=16; AX = c; b = AL;
 	getsize(text1);
 	y -= size.offset.y;
-	
+	//top = y;
 	size.width = w;
 	size.height = h;