svnno****@sourc*****
svnno****@sourc*****
2015年 11月 8日 (日) 02:59:01 JST
Tera TermRevision: 6095
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6095
Author: yutakapon
Date: 2015-11-08 02:59:01 +0900 (Sun, 08 Nov 2015)
Log Message:
-----------
チケット #35696
背景画像の透過設定
Setup - Additional settings - Visual tabに、"Image Brightness"を追加した。
Ticket Links:
------------
http://sourceforge.jp/projects/ttssh2/tracker/detail/35696
Modified Paths:
--------------
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/installer/release/lang/Korean.lng
trunk/installer/release/lang/Russian.lng
trunk/installer/release/lang/Simplified Chinese.lng
trunk/installer/release/lang/Traditional Chinese.lng
trunk/teraterm/common/teraterm.h
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/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/installer/release/lang/English.lng 2015-11-07 17:59:01 UTC (rev 6095)
@@ -210,6 +210,7 @@
DLG_TAB_VISUAL_ALHPA=&Alpha blend
DLG_TAB_VISUAL_ETERM=&Eterm lookfeel(*)
DLG_TAB_VISUAL_BGIMG=Background &Image
+DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
DLG_TAB_VISUAL_MOUSE=&Mouse cursor
DLG_TAB_VISUAL_FONT_QUALITY=&Font quality
DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/installer/release/lang/French.lng 2015-11-07 17:59:01 UTC (rev 6095)
@@ -211,6 +211,7 @@
DLG_TAB_VISUAL_ALHPA=M\xE9lange alpha
DLG_TAB_VISUAL_ETERM=Apparence Eterm(*)
DLG_TAB_VISUAL_BGIMG=Background &Image
+DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
DLG_TAB_VISUAL_MOUSE=Curseur de la souris
DLG_TAB_VISUAL_FONT_QUALITY=&Font quality
DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/installer/release/lang/German.lng 2015-11-07 17:59:01 UTC (rev 6095)
@@ -211,6 +211,7 @@
DLG_TAB_VISUAL_ALHPA=&Transparenz
DLG_TAB_VISUAL_ETERM=&Eterm-Aussehen(*)
DLG_TAB_VISUAL_BGIMG=Background &Image
+DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
DLG_TAB_VISUAL_MOUSE=&Mauszeiger
DLG_TAB_VISUAL_FONT_QUALITY=&Font quality
DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/installer/release/lang/Japanese.lng 2015-11-07 17:59:01 UTC (rev 6095)
@@ -210,6 +210,7 @@
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_BGIMG=\x94w\x8Ci\x89摜(&I)
+DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=\x89摜\x82̖\xBE\x82邳(&T)
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
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/installer/release/lang/Korean.lng 2015-11-07 17:59:01 UTC (rev 6095)
@@ -211,6 +211,7 @@
DLG_TAB_VISUAL_ALHPA=\xC5\xF5\xB8\x{DD75}(&A)
DLG_TAB_VISUAL_ETERM=Eterm \xB4\xC0\xB3\xA6(*)(&E)
DLG_TAB_VISUAL_BGIMG=\xB9\xE8\xB0\xE6\xB1\xB2(&I)
+DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
DLG_TAB_VISUAL_MOUSE=\xB8\xB6\xBF콺 Ŀ\xBC\xAD(&M)
DLG_TAB_VISUAL_FONT_QUALITY=\xB1۲\xC3 ǰ\xC1\xFA(&F)
DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Default
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/installer/release/lang/Russian.lng 2015-11-07 17:59:01 UTC (rev 6095)
@@ -211,6 +211,7 @@
DLG_TAB_VISUAL_ALHPA=&\xCF\xF0\xEE\xE7\xF0\xE0\xF7\xED\xFB\xE9
DLG_TAB_VISUAL_ETERM=&\xD1\xF2\xE8\xEB\xFC Eterm (*)
DLG_TAB_VISUAL_BGIMG=&\xD4\xEE\xED\xEE\xE2\xFB\xE9 \xF0\xE8\xF1\xF3\xED\xEE\xEA
+DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
DLG_TAB_VISUAL_MOUSE=&\xCA\xF3\xF0\xF1\xEE\xF0 \xEC\xFB\xF8\xE8
DLG_TAB_VISUAL_FONT_QUALITY=&\xCA\xE0\xF7\xE5\xF1\xF2\xE2\xEE \xF8\xF0\xE8\xF4\xF2\xE0
DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=\xCF\xEE \xF3\xEC\xEE\xEB\xF7\xE0\xED\xE8\xFE
Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/installer/release/lang/Simplified Chinese.lng 2015-11-07 17:59:01 UTC (rev 6095)
@@ -211,6 +211,7 @@
DLG_TAB_VISUAL_ALHPA=\xC3\xF7\xB6\xC8(&A)
DLG_TAB_VISUAL_ETERM=&Eterm \xB7\xE7\xB8\xF1 (*)
DLG_TAB_VISUAL_BGIMG=\xB1\xB3\xBE\xB0ͼ\xCF\xF1(&I)
+DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
DLG_TAB_VISUAL_MOUSE=\xB9\xE2\xB1\xEA(&M)
DLG_TAB_VISUAL_FONT_QUALITY=\xD7\xD6\xCC\xE5\xD6\xCA\xC1\xBF(&F)
DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=Ĭ\xC8\xCF
Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/installer/release/lang/Traditional Chinese.lng 2015-11-07 17:59:01 UTC (rev 6095)
@@ -211,6 +211,7 @@
DLG_TAB_VISUAL_ALHPA=\xB3z\xA9\xFA\xAB\xD7(&A)
DLG_TAB_VISUAL_ETERM=&Eterm \xAD\xB7\xAE\xE6 (*)
DLG_TAB_VISUAL_BGIMG=\xADI\xB4\xBA\xB9Ϲ\xB3(&I)
+DLG_TAB_VISUAL_BGIMG_BRIGHTNESS=Image Brigh&tness
DLG_TAB_VISUAL_MOUSE=\xB4\xE5\xBC\xD0(&M)
DLG_TAB_VISUAL_FONT_QUALITY=\xA6r\xC5\xE9\xAB~\xBD\xE8(&F)
DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT=\xB9w\xB3]
Modified: trunk/teraterm/common/teraterm.h
===================================================================
--- trunk/teraterm/common/teraterm.h 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/teraterm/common/teraterm.h 2015-11-07 17:59:01 UTC (rev 6095)
@@ -18,6 +18,9 @@
#define BG_DESTFILE "BGDestFile"
#define BG_THEME_IMAGEFILE "theme\\ImageFile.INI"
#define BG_THEME_IMAGEFILE_DEFAULT "theme\\*.INI"
+#define BG_THEME_IMAGE_BRIGHTNESS_DEFAULT 64
+#define BG_THEME_IMAGE_BRIGHTNESS1 "BGSrc1Alpha"
+#define BG_THEME_IMAGE_BRIGHTNESS2 "BGSrc2Alpha"
// Added by 337 2006/03/01
#define USE_NORMAL_BGCOLOR
Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/teraterm/common/tt_res.h 2015-11-07 17:59:01 UTC (rev 6095)
@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by c:\work\ttssh2\teraterm\teraterm\ttermpro.rc
+// Microsoft Visual C++ \x82Ő\xB6\x90\xAC\x82\xB3\x82ꂽ\x83C\x83\x93\x83N\x83\x8B\x81[\x83h \x83t\x83@\x83C\x83\x8B\x81B
+// C:\usr\ttssh2_vc2015\trunk\teraterm\teraterm\ttermpro.rc \x82Ŏg\x97p
//
#define IDI_TTERM 100
#define IDR_ACC 100
@@ -196,6 +196,9 @@
#define IDC_CYGTERM_SETUPDIR_BUTTON_FILE 2550
#define IDC_CYGTERM_SETUPDIR_BUTTON_FILE2 2551
#define IDC_SSH_SETUPDIR_BUTTON_FILE 2551
+#define IDC_BGIMG_BRIGHTNESS 2551
+#define IDC_EDIT2 2552
+#define IDC_EDIT_BGIMG_BRIGHTNESS 2552
#define ID_ACC_SENDBREAK 50001
#define ID_ACC_COPY 50002
#define ID_ACC_NEWCONNECTION 50003
@@ -293,7 +296,7 @@
#define _APS_NO_MFC 1
#define _APS_NEXT_RESOURCE_VALUE 124
#define _APS_NEXT_COMMAND_VALUE 52031
-#define _APS_NEXT_CONTROL_VALUE 2550
+#define _APS_NEXT_CONTROL_VALUE 2553
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/teraterm/common/tttypes.h 2015-11-07 17:59:01 UTC (rev 6095)
@@ -587,6 +587,7 @@
int SendBreakTime;
WORD FileSendBulkPacket;
WORD AutoComDisReConnect;
+ WORD BGImgBrightness;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -1053,6 +1054,7 @@
* - At version 4.89, ttset_memfilemap was replaced with ttset_memfilemap_26.
* added tttset.FileSendBulkPacket
* added tttset.AutoComDisReConnect
+ * added tttset.BGImgBrightness
*
* - At version 4.85, ttset_memfilemap was replaced with ttset_memfilemap_25.
* added tttset.AcceleratorNewConnection
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/teraterm/teraterm/addsetting.cpp 2015-11-07 17:59:01 UTC (rev 6095)
@@ -748,6 +748,8 @@
SendDlgItemMessage(IDC_BGIMG_EDIT, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(IDC_BGIMG_BUTTON, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(IDC_RESTART, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE,0));
+ SendDlgItemMessage(IDC_BGIMG_BRIGHTNESS, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(IDC_EDIT_BGIMG_BRIGHTNESS, WM_SETFONT, (WPARAM)DlgVisualFont, MAKELPARAM(TRUE, 0));
}
else {
DlgVisualFont = NULL;
@@ -762,6 +764,9 @@
GetDlgItemText(IDC_BGIMG_CHECK, uimsg, sizeof(uimsg));
get_lang_msg("DLG_TAB_VISUAL_BGIMG", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
SetDlgItemText(IDC_BGIMG_CHECK, ts.UIMsg);
+ GetDlgItemText(IDC_BGIMG_BRIGHTNESS, uimsg, sizeof(uimsg));
+ get_lang_msg("DLG_TAB_VISUAL_BGIMG_BRIGHTNESS", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
+ SetDlgItemText(IDC_BGIMG_BRIGHTNESS, ts.UIMsg);
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);
@@ -821,6 +826,10 @@
// Eterm look-feel\x82̔w\x8Ci\x89摜\x8Ew\x92\xE8\x81B
SetDlgItemText(IDC_BGIMG_EDIT, ts.BGImageFilePath);
+
+ _snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", ts.BGImgBrightness);
+ SetDlgItemText(IDC_EDIT_BGIMG_BRIGHTNESS, buf);
+
if (ts.EtermLookfeel.BGEnable) {
GetDlgItem(IDC_BGIMG_CHECK)->EnableWindow(TRUE);
@@ -829,15 +838,24 @@
btn->SetCheck(BST_CHECKED);
GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(TRUE);
GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(TRUE);
+
+ GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
+ GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
} else {
btn->SetCheck(BST_UNCHECKED);
GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+
+ GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+ GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
}
} else {
GetDlgItem(IDC_BGIMG_CHECK)->EnableWindow(FALSE);
GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+
+ GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+ GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
}
// (3)Mouse cursor type
@@ -924,19 +942,29 @@
if (btn->GetCheck()) {
GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(TRUE);
GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(TRUE);
+
+ GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
+ GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
} else {
GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+
+ GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+ GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
}
} else {
GetDlgItem(IDC_BGIMG_CHECK)->EnableWindow(FALSE);
GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+ GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+ GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+
// \x96\xB3\x8C\x{27B0B3}\x82ꂽ\x82\xE7\x81ABGThemeFile \x82\xF0\x8C\xB3\x82ɖ߂\xB7\x81B
strncpy_s(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE_DEFAULT, sizeof(ts.EtermLookfeel.BGThemeFile));
// \x94w\x8Ci\x89摜\x82\xE0\x96\xB3\x8C\x{27B0B7}\x82\xE9\x81B
SetDlgItemText(IDC_BGIMG_EDIT, "");
+ SetDlgItemInt(IDC_EDIT_BGIMG_BRIGHTNESS, BG_THEME_IMAGE_BRIGHTNESS_DEFAULT);
}
return TRUE;
@@ -946,15 +974,22 @@
GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(TRUE);
GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(TRUE);
+ GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
+ GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(TRUE);
+
strncpy_s(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE, sizeof(ts.EtermLookfeel.BGThemeFile));
} else {
GetDlgItem(IDC_BGIMG_EDIT)->EnableWindow(FALSE);
GetDlgItem(IDC_BGIMG_BUTTON)->EnableWindow(FALSE);
+ GetDlgItem(IDC_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+ GetDlgItem(IDC_EDIT_BGIMG_BRIGHTNESS)->EnableWindow(FALSE);
+
// \x96\xB3\x8C\x{27B0B3}\x82ꂽ\x82\xE7\x81ABGThemeFile \x82\xF0\x8C\xB3\x82ɖ߂\xB7\x81B
strncpy_s(ts.EtermLookfeel.BGThemeFile, BG_THEME_IMAGEFILE_DEFAULT, sizeof(ts.EtermLookfeel.BGThemeFile));
// \x94w\x8Ci\x89摜\x82\xE0\x96\xB3\x8C\x{27B0B7}\x82\xE9\x81B
SetDlgItemText(IDC_BGIMG_EDIT, "");
+ SetDlgItemInt(IDC_EDIT_BGIMG_BRIGHTNESS, BG_THEME_IMAGE_BRIGHTNESS_DEFAULT);
}
return TRUE;
@@ -1094,6 +1129,13 @@
strncpy_s(ts.BGImageFilePath, sizeof(ts.BGImageFilePath), "%SystemRoot%\\Web\\Wallpaper\\*.bmp", _TRUNCATE);
}
+ GetDlgItemText(IDC_EDIT_BGIMG_BRIGHTNESS, buf, sizeof(buf));
+ if (isdigit(buf[0])) {
+ ts.BGImgBrightness = atoi(buf);
+ ts.BGImgBrightness = max(0, ts.BGImgBrightness);
+ ts.BGImgBrightness = min(255, ts.BGImgBrightness);
+ }
+
// (3)
listbox = (CListBox *)GetDlgItem(IDC_MOUSE_CURSOR);
sel = listbox->GetCurSel();
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/teraterm/teraterm/ttermpro.rc 2015-11-07 17:59:01 UTC (rev 6095)
@@ -117,11 +117,11 @@
CONTROL "&Eterm lookfeel(*)",IDC_ETERM_LOOKFEEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,99,8,72,12
LTEXT "&Mouse cursor",IDC_MOUSE,10,22,70,8
LISTBOX IDC_MOUSE_CURSOR,10,32,48,35,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Background &Image",IDC_BGIMG_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,102,20,104,10
- EDITTEXT IDC_BGIMG_EDIT,101,31,108,14,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_BGIMG_BUTTON,216,31,14,14
- LTEXT "&Font Quality",IDC_FONT_QUALITY_LABEL,100,47,70,8
- COMBOBOX IDC_FONT_QUALITY,100,56,80,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Background &Image",IDC_BGIMG_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,104,27,73,10
+ EDITTEXT IDC_BGIMG_EDIT,103,38,108,14,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_BGIMG_BUTTON,217,38,14,14
+ RTEXT "&Font Quality",IDC_FONT_QUALITY_LABEL,93,59,70,8
+ COMBOBOX IDC_FONT_QUALITY,167,58,80,52,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "ANSI color",IDC_ANSICOLOR,10,74,43,8
LISTBOX IDC_ANSI_COLOR,10,84,28,51,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
LTEXT "&Red",IDC_RED,45,87,22,8
@@ -142,6 +142,9 @@
CONTROL "Enable A&NSI color",IDC_ENABLE_ANSI_COLOR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,122,105,12
CONTROL "Un&derline URL string",IDC_URL_UNDERLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,125,134,105,12
LTEXT "(*)Need to Save setup and restart Tera Term",IDC_RESTART,5,147,247,8
+ GROUPBOX "",IDC_STATIC,97,5,155,51
+ LTEXT "Image Brightness",IDC_BGIMG_BRIGHTNESS,167,19,56,8
+ EDITTEXT IDC_EDIT_BGIMG_BRIGHTNESS,225,18,22,14,ES_AUTOHSCROLL | ES_NUMBER
END
IDD_TABSHEET_LOG DIALOGEX 0, 0, 258, 158
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/teraterm/teraterm/vtdisp.c 2015-11-07 17:59:01 UTC (rev 6095)
@@ -1502,6 +1502,10 @@
// \x94w\x8Ci\x89摜\x82̓ǂݍ\x9E\x82\xDD
_snprintf_s(path, sizeof(path), _TRUNCATE, "%s\\%s", ts.HomeDir, BG_THEME_IMAGEFILE);
GetPrivateProfileString(BG_SECTION, BG_DESTFILE, "", ts.BGImageFilePath, sizeof(ts.BGImageFilePath), path);
+
+ // \x94w\x8Ci\x89摜\x82̖\xBE\x82邳\x82̓ǂݍ\x9E\x82݁B
+ // BGSrc1Alpha \x82\xC6 BGSrc2Alpha\x82͓\xAF\x92l\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA4\x81B
+ ts.BGImgBrightness = GetPrivateProfileInt(BG_SECTION, BG_THEME_IMAGE_BRIGHTNESS1, BG_THEME_IMAGE_BRIGHTNESS_DEFAULT, path);
}
if(!BGEnable)
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2015-11-07 13:53:42 UTC (rev 6094)
+++ trunk/teraterm/ttpset/ttset.c 2015-11-07 17:59:01 UTC (rev 6095)
@@ -2495,6 +2495,8 @@
ts->EtermLookfeel.BGThemeFile, FName);
_snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%s\\%s", ts->HomeDir, BG_THEME_IMAGEFILE);
WritePrivateProfileString(BG_SECTION, BG_DESTFILE, ts->BGImageFilePath, Temp);
+ WriteInt(BG_SECTION, BG_THEME_IMAGE_BRIGHTNESS1, Temp, ts->BGImgBrightness);
+ WriteInt(BG_SECTION, BG_THEME_IMAGE_BRIGHTNESS2, Temp, ts->BGImgBrightness);
#ifdef USE_NORMAL_BGCOLOR
// UseNormalBGColor