svnno****@sourc*****
svnno****@sourc*****
2012年 4月 3日 (火) 21:40:28 JST
Tera TermRevision: 4874
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4874
Author: maya
Date: 2012-04-03 21:40:28 +0900 (Tue, 03 Apr 2012)
Log Message:
-----------
フォントの品質を選べるようにした
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=27719
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/en/html/menu/setup-additional.html
trunk/doc/en/html/menu/setup-font.html
trunk/doc/ja/html/about/history.html
trunk/doc/ja/html/menu/setup-additional.html
trunk/doc/ja/html/menu/setup-font.html
trunk/installer/release/TERATERM.INI
trunk/installer/release/lang/English.lng
trunk/installer/release/lang/French.lng
trunk/installer/release/lang/German.lng
trunk/installer/release/lang/Japanese.lng
trunk/teraterm/common/tt_res.h
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/addsetting.cpp
trunk/teraterm/teraterm/ttermpro.rc
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/doc/en/html/about/history.html 2012-04-03 12:40:28 UTC (rev 4874)
@@ -47,6 +47,10 @@
<li>A named pipe can be specified into the TCP/IP:Host entry of <a href="../menu/file-new.html">New connection dialog</a>.</li>
<li>added the <a href="../commandline/teraterm.html#NAMEDPIPE">/NAMEDPIPE</a> option by specifying the named pipe.</li>
</ul></li>
+ <!--li>\x95\\x8E\xA6\x83t\x83H\x83\x93\x83g\x82̕i\x8E\xBF\x82\xF0\x91I\x91\xF0\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B
+ <ul>
+ <li><a href="../menu/setup-additional.html">Additional settings \x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xC9 Font quality \x90ݒ荀\x96ڂ\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
+ </ul></li-->
</ul>
</li>
Modified: trunk/doc/en/html/menu/setup-additional.html
===================================================================
--- trunk/doc/en/html/menu/setup-additional.html 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/doc/en/html/menu/setup-additional.html 2012-04-03 12:40:28 UTC (rev 4874)
@@ -247,6 +247,17 @@
</pre>
</dd>
+ <!--dt>Font quality</dt>
+ <dd>
+ \x83t\x83H\x83\x93\x83g\x82̕i\x8E\xBF\x82\xF0\x90ݒ肷\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81BOS\x82\xAA\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82\xE9\x8E\xED\x97ނ̂ݗL\x8C\xF8\x82ɓ\xAE\x8D삵\x82܂\xB7\x81B
+<pre>
+Default = OS\x82̐ݒ\xE8(\x83X\x83N\x83\x8A\x81[\x83\x93 \x83t\x83H\x83\x93\x83g\x82̉\x8F\x82\xF0\x8A\x8A\x82炩\x82ɂ\xB7\x82\xE9)\x82Ɉˑ\xB6
+Non-Antialiased = \x83A\x83\x93\x83`\x83G\x83C\x83\x8A\x83A\x83X\x82\xF8\x82ɂ\xB7\x82\xE9
+Antialiased = \x83A\x83\x93\x83`\x83G\x83C\x83\x8A\x83A\x83X\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9
+ClearType = ClearType\x82𗘗p\x82\xB7\x82\xE9
+</pre>
+ </dd-->
+
<dt>ANSI color</dt>
<dd>Specifies the RGB value of the color for PC style and aixterm style 16 colors mode.</dd>
Modified: trunk/doc/en/html/menu/setup-font.html
===================================================================
--- trunk/doc/en/html/menu/setup-font.html 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/doc/en/html/menu/setup-font.html 2012-04-03 12:40:28 UTC (rev 4874)
@@ -43,5 +43,9 @@
can not be selected in this dialog box. It is used automatically by
Tera Term.
</p>
+
+ <!--p class="indent1">
+ "<a href="./setup-additional.html">Additional settings</a>" \x82\xCC "Visual" \x83^\x83u\x82ɂ\xA8\x82\xA2\x82āA\x83t\x83H\x83\x93\x83g\x82̕i\x8E\xBF\x82\xF0\x91I\x91\xF0\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B
+ </p-->
</body>
</html>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/doc/ja/html/about/history.html 2012-04-03 12:40:28 UTC (rev 4874)
@@ -47,6 +47,10 @@
<li><a href="../menu/file-new.html">New connection\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCCTCP/IP:Host\x82ɖ\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
<li><a href="../commandline/teraterm.html#NAMEDPIPE">/NAMEDPIPE</a> \x83I\x83v\x83V\x83\x87\x83\x93\x82Ŗ\xBC\x91O\x95t\x82\xAB\x83p\x83C\x83v\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
</ul></li>
+ <li>\x95\\x8E\xA6\x83t\x83H\x83\x93\x83g\x82̕i\x8E\xBF\x82\xF0\x91I\x91\xF0\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B
+ <ul>
+ <li><a href="../menu/setup-additional.html">Additional settings \x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xC9 Font quality \x90ݒ荀\x96ڂ\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
+ </ul></li>
</ul>
</li>
Modified: trunk/doc/ja/html/menu/setup-additional.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional.html 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/doc/ja/html/menu/setup-additional.html 2012-04-03 12:40:28 UTC (rev 4874)
@@ -245,6 +245,17 @@
</pre>
</dd>
+ <dt>Font quality</dt>
+ <dd>
+ \x83t\x83H\x83\x93\x83g\x82̕i\x8E\xBF\x82\xF0\x90ݒ肷\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81BOS\x82\xAA\x91Ή\x9E\x82\xB5\x82Ă\xA2\x82\xE9\x8E\xED\x97ނ̂ݗL\x8C\xF8\x82ɓ\xAE\x8D삵\x82܂\xB7\x81B
+<pre>
+Default = OS\x82̐ݒ\xE8(\x83X\x83N\x83\x8A\x81[\x83\x93 \x83t\x83H\x83\x93\x83g\x82̉\x8F\x82\xF0\x8A\x8A\x82炩\x82ɂ\xB7\x82\xE9)\x82Ɉˑ\xB6
+Non-Antialiased = \x83A\x83\x93\x83`\x83G\x83C\x83\x8A\x83A\x83X\x82\xF8\x82ɂ\xB7\x82\xE9
+Antialiased = \x83A\x83\x93\x83`\x83G\x83C\x83\x8A\x83A\x83X\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9
+ClearType = ClearType\x82𗘗p\x82\xB7\x82\xE9
+</pre>
+ </dd>
+
<dt>ANSI color</dt>
<dd>PC\x8C`\x8E\xAE\x82\xA8\x82\xE6\x82\xD1aixterm\x8C`\x8E\xAE\x82\xCC16\x90F\x83\x82\x81[\x83h\x82Ŏg\x97p\x82\xB7\x82\xE9\x90F\x82\xCCRGB\x92l\x82\xF0\x90ݒ肵\x82܂\xB7\x81B</dd>
Modified: trunk/doc/ja/html/menu/setup-font.html
===================================================================
--- trunk/doc/ja/html/menu/setup-font.html 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/doc/ja/html/menu/setup-font.html 2012-04-03 12:40:28 UTC (rev 4874)
@@ -44,5 +44,9 @@
\x82͂\xB1\x82̃_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X\x82ł͑I\x91\xF0\x82ł\xAB\x82܂\xB9\x82\xF1\x81B
Tera Term \x82ɂ\xE6\x82\xC1\x82Ď\xA9\x93\xAE\x93I\x82Ɏg\x97p\x82\xB3\x82\xEA\x82܂\xB7\x81B
</p>
+
+ <p class="indent1">
+ "<a href="./setup-additional.html">Additional settings</a>" \x82\xCC "Visual" \x83^\x83u\x82ɂ\xA8\x82\xA2\x82āA\x83t\x83H\x83\x93\x83g\x82̕i\x8E\xBF\x82\xF0\x91I\x91\xF0\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B
+ </p>
</body>
</html>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/installer/release/TERATERM.INI 2012-04-03 12:40:28 UTC (rev 4874)
@@ -238,6 +238,8 @@
EnableBold=on
; Font for TEK window
TEKFont=
+; Font quality(default/non-antialiased/antialiased/cleartype)
+FontQuality=default
; Russian code set of the font
RussFont=Windows
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/installer/release/lang/English.lng 2012-04-03 12:40:28 UTC (rev 4874)
@@ -198,6 +198,11 @@
DLG_TAB_VISUAL_ALHPA=&Alpha blend
DLG_TAB_VISUAL_ETERM=&Eterm lookfeel
DLG_TAB_VISUAL_MOUSE=&Mouse cursor
+DLG_TAB_VISUAL_FONT_QUALITY=&Font quality
+DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
+DLG_TAB_VISUAL_FONT_QUALITY_NONANTIALIASED=Non-Antialiased
+DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED=Antialiased
+DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE=ClearType
DLG_TAB_VISUAL_RED=&Red
DLG_TAB_VISUAL_GREEN=&Green
DLG_TAB_VISUAL_BLUE=&Blue
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/installer/release/lang/French.lng 2012-04-03 12:40:28 UTC (rev 4874)
@@ -198,6 +198,11 @@
DLG_TAB_VISUAL_ALHPA=M\xE9lange alpha
DLG_TAB_VISUAL_ETERM=Apparence Eterm
DLG_TAB_VISUAL_MOUSE=Curseur de la souris
+DLG_TAB_VISUAL_FONT_QUALITY=&Font quality
+DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
+DLG_TAB_VISUAL_FONT_QUALITY_NONANTIALIASED=Non-Antialiased
+DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED=Antialiased
+DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE=ClearType
DLG_TAB_VISUAL_RED=Rouge
DLG_TAB_VISUAL_GREEN=Vert
DLG_TAB_VISUAL_BLUE=Bleu
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/installer/release/lang/German.lng 2012-04-03 12:40:28 UTC (rev 4874)
@@ -198,6 +198,11 @@
DLG_TAB_VISUAL_ALHPA=&Transparenz
DLG_TAB_VISUAL_ETERM=&Eterm-Aussehen
DLG_TAB_VISUAL_MOUSE=&Mauszeiger
+DLG_TAB_VISUAL_FONT_QUALITY=&Font quality
+DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
+DLG_TAB_VISUAL_FONT_QUALITY_NONANTIALIASED=Non-Antialiased
+DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED=Antialiased
+DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE=ClearType
DLG_TAB_VISUAL_RED=&Rot
DLG_TAB_VISUAL_GREEN=&Gr\xFCn
DLG_TAB_VISUAL_BLUE=&Blau
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/installer/release/lang/Japanese.lng 2012-04-03 12:40:28 UTC (rev 4874)
@@ -198,6 +198,11 @@
DLG_TAB_VISUAL_ALHPA=\x94\xBC\x93\xA7\x96\xBE\x93x(&A)
DLG_TAB_VISUAL_ETERM=&Eterm\x95\x97\x82ɂ\xB7\x82\xE9
DLG_TAB_VISUAL_MOUSE=\x83}\x83E\x83X\x83J\x81[\x83\\x83\x8B(&M)
+DLG_TAB_VISUAL_FONT_QUALITY=\x83t\x83H\x83\x93\x83g\x82̕i\x8E\xBF(&F)
+DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=\x83f\x83t\x83H\x83\x8B\x83g
+DLG_TAB_VISUAL_FONT_QUALITY_NONANTIALIASED=\x83A\x83\x93\x83`\x83G\x83C\x83\x8A\x83A\x83X\x82Ȃ\xB5
+DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED=\x83A\x83\x93\x83`\x83G\x83C\x83\x8A\x83A\x83X
+DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE=ClearType
DLG_TAB_VISUAL_RED=\x90\xD4(&R)
DLG_TAB_VISUAL_GREEN=\x97\xCE(&G)
DLG_TAB_VISUAL_BLUE=\x90\xC2(&B)
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/teraterm/common/tt_res.h 2012-04-03 12:40:28 UTC (rev 4874)
@@ -63,6 +63,7 @@
#define IDC_ENV2 1041
#define IDC_MOUSE 1042
#define IDC_DELIMITER 1043
+#define IDC_FONT_QUALITY_LABEL 1043
#define IDC_ANSICOLOR 1044
#define IDC_RED 1045
#define IDC_GREEN 1046
@@ -144,6 +145,7 @@
#define IDC_CONFIRM_STRING_FILE_LABEL 2522
#define IDC_CLEAR_ON_RESIZE 2523
#define IDC_CURSOR_CHANGE_IME 2524
+#define IDC_FONT_QUALITY 2524
#define IDC_PROT_ELAPSED 2525
#define IDC_PROTOELAPSEDTIME 2526
#define IDC_TRANS_ELAPSED 2527
@@ -243,7 +245,7 @@
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 122
#define _APS_NEXT_COMMAND_VALUE 52031
-#define _APS_NEXT_CONTROL_VALUE 2524
+#define _APS_NEXT_CONTROL_VALUE 2525
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/teraterm/common/tttypes.h 2012-04-03 12:40:28 UTC (rev 4874)
@@ -554,6 +554,7 @@
char ClickableUrlBrowserArg[MAX_PATH];
WORD LogLockExclusive;
WORD KermitOpt;
+ WORD FontQuality;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -1008,6 +1009,9 @@
* Increment the number of this macro value
* when you change TMap or member of TMap.
*
+ * - At version 4.74, ttset_memfilemap was replaced with ttset_memfilemap_19.
+ * added tttset.FontQuality
+ *
* - At version 4.73, ttset_memfilemap was replaced with ttset_memfilemap_18.
* added tttset.LogLockExclusive
* added tttset.KermitOpt
@@ -1118,4 +1122,4 @@
* added tttset.VTCompatTab.
*/
-#define TT_FILEMAPNAME "ttset_memfilemap_18"
+#define TT_FILEMAPNAME "ttset_memfilemap_19"
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/teraterm/teraterm/addsetting.cpp 2012-04-03 12:40:28 UTC (rev 4874)
@@ -739,6 +739,7 @@
char uimsg[MAX_UIMSG];
CListBox *listbox;
CButton *btn;
+ CComboBox *cmb;
int i;
CPropertyPage::OnInitDialog();
@@ -751,6 +752,8 @@
SendDlgItemMessage(IDC_ETERM_LOOKFEEL, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(IDC_MOUSE, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(IDC_MOUSE_CURSOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
+ SendDlgItemMessage(IDC_FONT_QUALITY_LABEL, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
+ SendDlgItemMessage(IDC_FONT_QUALITY, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(IDC_ANSICOLOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(IDC_ANSI_COLOR, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(IDC_RED, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
@@ -780,6 +783,9 @@
GetDlgItemText(IDC_MOUSE, uimsg, sizeof(uimsg));
get_lang_msg("DLG_TAB_VISUAL_MOUSE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
SetDlgItemText(IDC_MOUSE, ts.UIMsg);
+ GetDlgItemText(IDC_FONT_QUALITY_LABEL, uimsg, sizeof(uimsg));
+ get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+ SetDlgItemText(IDC_FONT_QUALITY_LABEL, ts.UIMsg);
GetDlgItemText(IDC_RED, uimsg, sizeof(uimsg));
get_lang_msg("DLG_TAB_VISUAL_RED", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
SetDlgItemText(IDC_RED, ts.UIMsg);
@@ -808,6 +814,15 @@
get_lang_msg("DLG_TAB_VISUAL_URLUL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
SetDlgItemText(IDC_URL_UNDERLINE, ts.UIMsg);
+ get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT", ts.UIMsg, sizeof(ts.UIMsg), "Default", ts.UILanguageFile);
+ SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+ get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_NONANTIALIASED", ts.UIMsg, sizeof(ts.UIMsg), "Non-Antialiased", ts.UILanguageFile);
+ SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+ get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED", ts.UIMsg, sizeof(ts.UIMsg), "Antialiased", ts.UILanguageFile);
+ SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+ get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE", ts.UIMsg, sizeof(ts.UIMsg), "ClearType", ts.UILanguageFile);
+ SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+
// (1)AlphaBlend
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", ts.AlphaBlend);
SetDlgItemText(IDC_ALPHA_BLEND, buf);
@@ -823,7 +838,24 @@
}
listbox->SelectString(0, ts.MouseCursorName);
- // (4)ANSI color
+ // (4)Font quality
+ cmb = (CComboBox *)GetDlgItem(IDC_FONT_QUALITY);
+ switch (ts.FontQuality) {
+ case DEFAULT_QUALITY:
+ cmb->SetCurSel(0);
+ break;
+ case NONANTIALIASED_QUALITY:
+ cmb->SetCurSel(1);
+ break;
+ case ANTIALIASED_QUALITY:
+ cmb->SetCurSel(2);
+ break;
+ default: // CLEARTYPE_QUALITY
+ cmb->SetCurSel(3);
+ break;
+ }
+
+ // (5)ANSI color
listbox = (CListBox *)GetDlgItem(IDC_ANSI_COLOR);
for (i = 0 ; i < 16 ; i++) {
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", i);
@@ -836,27 +868,27 @@
(LPARAM)GetDlgItem(IDC_SAMPLE_COLOR));
#endif
- // (5)Bold Attr Color
+ // (6)Bold Attr Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_BOLD);
btn->SetCheck((ts.ColorFlag&CF_BOLDCOLOR) != 0);
- // (6)Blink Attr Color
+ // (7)Blink Attr Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_BLINK);
btn->SetCheck((ts.ColorFlag&CF_BLINKCOLOR) != 0);
- // (7)Reverse Attr Color
+ // (8)Reverse Attr Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_REVERSE);
btn->SetCheck((ts.ColorFlag&CF_REVERSECOLOR) != 0);
- // (8)URL Color
+ // (9)URL Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_URL_COLOR);
btn->SetCheck((ts.ColorFlag&CF_URLCOLOR) != 0);
- // (9)Color
+ // (10)Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_ANSI_COLOR);
btn->SetCheck((ts.ColorFlag&CF_ANSICOLOR) != 0);
- // (10)URL Underline
+ // (11)URL Underline
btn = (CButton *)GetDlgItem(IDC_URL_UNDERLINE);
btn->SetCheck((ts.FontFlag&FF_URLUNDERLINE) != 0);
@@ -966,6 +998,7 @@
{
CListBox *listbox;
CButton *btn;
+ CComboBox *cmb;
int sel;
int beforeAlphaBlend;
char buf[MAXPATHLEN];
@@ -993,19 +1026,36 @@
strncpy_s(ts.MouseCursorName, sizeof(ts.MouseCursorName), MouseCursor[sel].name, _TRUNCATE);
}
- // (5) Attr Bold Color
+ // (4)Font quality
+ cmb = (CComboBox *)GetDlgItem(IDC_FONT_QUALITY);
+ switch (cmb->GetCurSel()) {
+ case 0:
+ ts.FontQuality = DEFAULT_QUALITY;
+ break;
+ case 1:
+ ts.FontQuality = NONANTIALIASED_QUALITY;
+ break;
+ case 2:
+ ts.FontQuality = ANTIALIASED_QUALITY;
+ break;
+ default: // 3
+ ts.FontQuality = CLEARTYPE_QUALITY;
+ break;
+ }
+
+ // (6) Attr Bold Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_BOLD);
if (((ts.ColorFlag & CF_BOLDCOLOR) != 0) != btn->GetCheck()) {
ts.ColorFlag ^= CF_BOLDCOLOR;
}
- // (6) Attr Blink Color
+ // (7) Attr Blink Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_BLINK);
if (((ts.ColorFlag & CF_BLINKCOLOR) != 0) != btn->GetCheck()) {
ts.ColorFlag ^= CF_BLINKCOLOR;
}
- // (7) Attr Reverse Color
+ // (8) Attr Reverse Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_ATTR_COLOR_REVERSE);
if (ts.ColorFlag & CF_REVERSEVIDEO) { // Reverse Video\x83\x82\x81[\x83h(DECSCNM)\x8E\x9E\x82͏\x88\x97\x9D\x82\xF0\x95ς\xA6\x82\xE9
if (ts.ColorFlag & CF_REVERSECOLOR) {
@@ -1031,19 +1081,19 @@
ts.ColorFlag ^= CF_REVERSECOLOR;
}
- // (8) URL Color
+ // (9) URL Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_URL_COLOR);
if (((ts.ColorFlag & CF_URLCOLOR) != 0) != btn->GetCheck()) {
ts.ColorFlag ^= CF_URLCOLOR;
}
- // (9) Color
+ // (10) Color
btn = (CButton *)GetDlgItem(IDC_ENABLE_ANSI_COLOR);
if (((ts.ColorFlag & CF_ANSICOLOR) != 0) != btn->GetCheck()) {
ts.ColorFlag ^= CF_ANSICOLOR;
}
- // (10) URL Underline
+ // (11) URL Underline
btn = (CButton *)GetDlgItem(IDC_URL_UNDERLINE);
if (((ts.FontFlag & FF_URLUNDERLINE) != 0) != btn->GetCheck()) {
ts.FontFlag ^= FF_URLUNDERLINE;
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/teraterm/teraterm/ttermpro.rc 2012-04-03 12:40:28 UTC (rev 4874)
@@ -61,7 +61,7 @@
EDITTEXT IDC_EDIT_COMMENT,6,3,189,12,ES_AUTOHSCROLL
END
-IDD_TABSHEET_GENERAL DIALOGEX 0, 0, 242, 148
+IDD_TABSHEET_GENERAL DIALOGEX 0, 0, 242, 158
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
@@ -79,7 +79,7 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,100,220,10
END
-IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 242, 148
+IDD_TABSHEET_SEQUENCE DIALOGEX 0, 0, 242, 158
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
@@ -98,7 +98,7 @@
COMBOBOX IDC_CLIPBOARD_ACCESS,162,114,45,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
END
-IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 242, 148
+IDD_TABSHEET_COPYPASTE DIALOGEX 0, 0, 242, 158
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
@@ -121,37 +121,39 @@
LTEXT "ms",IDC_PASTEDELAY_LABEL2,113,130,23,10
END
-IDD_TABSHEET_VISUAL DIALOGEX 0, 0, 242, 148
+IDD_TABSHEET_VISUAL DIALOGEX 0, 0, 242, 158
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
LTEXT "&Alpha blend",IDC_ALPHABLEND,10,10,43,8
EDITTEXT IDC_ALPHA_BLEND,58,8,28,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "&Eterm lookfeel",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,116,8,72,12
- RTEXT "&Mouse cursor",IDC_MOUSE,8,37,70,8
- LISTBOX IDC_MOUSE_CURSOR,82,25,48,35,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- LTEXT "ANSI color",IDC_ANSICOLOR,10,66,43,8
- LISTBOX IDC_ANSI_COLOR,10,78,28,51,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- LTEXT "&Red",IDC_RED,45,81,22,8
- EDITTEXT IDC_COLOR_RED,69,79,15,14,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "&Green",IDC_GREEN,45,98,22,8
- EDITTEXT IDC_COLOR_GREEN,69,96,15,14,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "&Blue",IDC_BLUE,45,115,22,8
- EDITTEXT IDC_COLOR_BLUE,69,113,15,14,ES_AUTOHSCROLL | ES_NUMBER
- LTEXT "SAMPLE",IDC_SAMPLE_COLOR,90,98,25,8
+ LTEXT "&Mouse cursor",IDC_MOUSE,10,26,70,8
+ LISTBOX IDC_MOUSE_CURSOR,10,36,48,35,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Font Quality",IDC_FONT_QUALITY_LABEL,100,26,70,8
+ COMBOBOX IDC_FONT_QUALITY,100,36,80,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ LTEXT "ANSI color",IDC_ANSICOLOR,10,78,43,8
+ LISTBOX IDC_ANSI_COLOR,10,88,28,51,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+ LTEXT "&Red",IDC_RED,45,91,22,8
+ EDITTEXT IDC_COLOR_RED,69,89,15,14,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "&Green",IDC_GREEN,45,108,22,8
+ EDITTEXT IDC_COLOR_GREEN,69,106,15,14,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "&Blue",IDC_BLUE,45,125,22,8
+ EDITTEXT IDC_COLOR_BLUE,69,123,15,14,ES_AUTOHSCROLL | ES_NUMBER
+ LTEXT "SAMPLE",IDC_SAMPLE_COLOR,90,108,25,8
CONTROL "Enable B&old attribute color",IDC_ENABLE_ATTR_COLOR_BOLD,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,68,105,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,78,105,12
CONTROL "Enable B&link attribute color",IDC_ENABLE_ATTR_COLOR_BLINK,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,80,105,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,90,105,12
CONTROL "Enable Re&verse attribute color",IDC_ENABLE_ATTR_COLOR_REVERSE,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,92,105,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,102,105,12
CONTROL "Enable &URL attribute color",IDC_ENABLE_URL_COLOR,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,104,105,12
- CONTROL "Enable A&NSI color",IDC_ENABLE_ANSI_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,116,105,12
- CONTROL "Un&derline URL string",IDC_URL_UNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,128,105,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,114,105,12
+ CONTROL "Enable A&NSI color",IDC_ENABLE_ANSI_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,126,105,12
+ CONTROL "Un&derline URL string",IDC_URL_UNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,138,105,12
END
-IDD_TABSHEET_LOG DIALOGEX 0, 0, 242, 148
+IDD_TABSHEET_LOG DIALOGEX 0, 0, 242, 158
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
@@ -166,7 +168,7 @@
CONTROL "A&uto start logging",IDC_AUTOSTART,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,102,124,10
END
-IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 242, 148
+IDD_TABSHEET_CYGWIN DIALOGEX 0, 0, 242, 158
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_SYSMENU
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
@@ -287,26 +289,26 @@
IDD_TABSHEET_GENERAL, DIALOG
BEGIN
- LEFTMARGIN, 7
+ LEFTMARGIN, 5
RIGHTMARGIN, 236
- TOPMARGIN, 7
- BOTTOMMARGIN, 145
+ TOPMARGIN, 5
+ BOTTOMMARGIN, 155
END
IDD_TABSHEET_SEQUENCE, DIALOG
BEGIN
- LEFTMARGIN, 7
+ LEFTMARGIN, 5
RIGHTMARGIN, 236
- TOPMARGIN, 7
- BOTTOMMARGIN, 145
+ TOPMARGIN, 5
+ BOTTOMMARGIN, 155
END
IDD_TABSHEET_COPYPASTE, DIALOG
BEGIN
- LEFTMARGIN, 7
+ LEFTMARGIN, 5
RIGHTMARGIN, 236
- TOPMARGIN, 7
- BOTTOMMARGIN, 145
+ TOPMARGIN, 5
+ BOTTOMMARGIN, 155
END
IDD_TABSHEET_VISUAL, DIALOG
@@ -314,7 +316,7 @@
LEFTMARGIN, 5
RIGHTMARGIN, 236
TOPMARGIN, 5
- BOTTOMMARGIN, 145
+ BOTTOMMARGIN, 155
END
IDD_TABSHEET_LOG, DIALOG
@@ -322,7 +324,7 @@
LEFTMARGIN, 5
RIGHTMARGIN, 236
TOPMARGIN, 5
- BOTTOMMARGIN, 145
+ BOTTOMMARGIN, 155
END
IDD_TABSHEET_CYGWIN, DIALOG
@@ -330,7 +332,7 @@
LEFTMARGIN, 5
RIGHTMARGIN, 236
TOPMARGIN, 5
- BOTTOMMARGIN, 145
+ BOTTOMMARGIN, 155
END
IDD_BROADCAST_DIALOG, DIALOG
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/teraterm/teraterm/vtdisp.c 2012-04-03 12:40:28 UTC (rev 4874)
@@ -1913,7 +1913,7 @@
VTlf.lfCharSet = ts.VTFontCharSet;
VTlf.lfOutPrecision = OUT_CHARACTER_PRECIS;
VTlf.lfClipPrecision = CLIP_CHARACTER_PRECIS;
- VTlf.lfQuality = DEFAULT_QUALITY;
+ VTlf.lfQuality = (BYTE)ts.FontQuality;
VTlf.lfPitchAndFamily = FIXED_PITCH | FF_DONTCARE;
strncpy_s(VTlf.lfFaceName, sizeof(VTlf.lfFaceName),ts.VTFont, _TRUNCATE);
}
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/teraterm/teraterm/vtwin.cpp 2012-04-03 12:40:28 UTC (rev 4874)
@@ -4075,6 +4075,7 @@
#endif
DispSetNearestColors(IdBack, IdFore+8, NULL);
ChangeWin();
+ ChangeFont();
break;
default:
/* nothing to do */
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2012-04-03 00:54:04 UTC (rev 4873)
+++ trunk/teraterm/ttpset/ttset.c 2012-04-03 12:40:28 UTC (rev 4874)
@@ -19,6 +19,10 @@
#include "compat_w95.h"
+#ifndef CLEARTYPE_QUALITY
+#define CLEARTYPE_QUALITY 5
+#endif
+
#define Section "Tera Term"
static PCHAR far TermList[] =
@@ -1476,6 +1480,18 @@
// Exclusive Lock when open the log file
ts->LogLockExclusive = GetOnOff(Section, "LogLockExclusive", FName, TRUE);
+
+ // Font quality
+ GetPrivateProfileString(Section, "FontQuality", "default",
+ Temp, sizeof(Temp), FName);
+ if (_stricmp(Temp, "nonantialiased") == 0)
+ ts->FontQuality = NONANTIALIASED_QUALITY;
+ else if (_stricmp(Temp, "antialiased") == 0)
+ ts->FontQuality = ANTIALIASED_QUALITY;
+ else if (_stricmp(Temp, "cleartype") == 0)
+ ts->FontQuality = CLEARTYPE_QUALITY;
+ else
+ ts->FontQuality = DEFAULT_QUALITY;
}
void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2596,6 +2612,17 @@
// Exclusive Lock when open the log file
WriteOnOff(Section, "LogLockExclusive", FName, ts->LogLockExclusive);
+
+ // Font quality
+ if (ts->FontQuality == NONANTIALIASED_QUALITY)
+ strncpy_s(Temp, sizeof(Temp), "nonantialiased", _TRUNCATE);
+ else if (ts->FontQuality == ANTIALIASED_QUALITY)
+ strncpy_s(Temp, sizeof(Temp), "antialiased", _TRUNCATE);
+ else if (ts->FontQuality == CLEARTYPE_QUALITY)
+ strncpy_s(Temp, sizeof(Temp), "cleartype", _TRUNCATE);
+ else
+ strncpy_s(Temp, sizeof(Temp), "default", _TRUNCATE);
+ WritePrivateProfileString(Section, "FontQuality", Temp, FName);
}
#define VTEditor "VT editor keypad"