vtwin.cpp で次の設定をtsから直接参照するようにした
- ts.EtermLookfeel.BGNoFrame
- ts.EtermLookfeel.BGNoCopyBits
trunk/teraterm/teraterm/vtdisp.c (diff)
trunk/teraterm/teraterm/vtdisp.h (diff)
trunk/teraterm/teraterm/vtwin.cpp (diff)| @@ -171,7 +171,6 @@ | ||
| 171 | 171 | int BGEnable; |
| 172 | 172 | static int BGReverseTextAlpha; |
| 173 | 173 | static int BGUseAlphaBlendAPI; |
| 174 | -BOOL BGNoFrame; | |
| 175 | 174 | static BOOL BGFastSizeMove; |
| 176 | 175 | |
| 177 | 176 | static COLORREF BGVTColor[2]; |
| @@ -185,7 +184,6 @@ | ||
| 185 | 184 | static RECT BGPrevRect; |
| 186 | 185 | static BOOL BGReverseText; |
| 187 | 186 | |
| 188 | -BOOL BGNoCopyBits; | |
| 189 | 187 | static BOOL BGInSizeMove; |
| 190 | 188 | static HBRUSH BGBrushInSizeMove; |
| 191 | 189 |
| @@ -1449,9 +1447,7 @@ | ||
| 1449 | 1447 | |
| 1450 | 1448 | // BGシステム設定読み出し |
| 1451 | 1449 | BGUseAlphaBlendAPI = ts.EtermLookfeel.BGUseAlphaBlendAPI; |
| 1452 | - BGNoFrame = ts.EtermLookfeel.BGNoFrame; | |
| 1453 | 1450 | BGFastSizeMove = ts.EtermLookfeel.BGFastSizeMove; |
| 1454 | - BGNoCopyBits = ts.EtermLookfeel.BGNoCopyBits; | |
| 1455 | 1451 | |
| 1456 | 1452 | //テンポラリーファイル名を生成 |
| 1457 | 1453 | { |
| @@ -47,8 +47,6 @@ | ||
| 47 | 47 | void BGOnExitSizeMove(void); |
| 48 | 48 | |
| 49 | 49 | extern BOOL BGEnable; |
| 50 | -extern BOOL BGNoFrame; | |
| 51 | -extern BOOL BGNoCopyBits; | |
| 52 | 50 | //--> |
| 53 | 51 | |
| 54 | 52 | void InitDisp(); |
| @@ -355,7 +355,7 @@ | ||
| 355 | 355 | WS_BORDER | WS_THICKFRAME | WS_POPUP; |
| 356 | 356 | |
| 357 | 357 | #ifdef ALPHABLEND_TYPE2 |
| 358 | - if(BGNoFrame) | |
| 358 | + if (ts.EtermLookfeel.BGNoFrame) | |
| 359 | 359 | Style &= ~(WS_BORDER | WS_THICKFRAME); |
| 360 | 360 | #endif |
| 361 | 361 | } |
| @@ -407,7 +407,7 @@ | ||
| 407 | 407 | |
| 408 | 408 | #ifdef ALPHABLEND_TYPE2 |
| 409 | 409 | //<!--by AKASI |
| 410 | - if(BGNoFrame && ts.HideTitle > 0) { | |
| 410 | + if(ts.EtermLookfeel.BGNoFrame && ts.HideTitle > 0) { | |
| 411 | 411 | DWORD ExStyle = (DWORD)::GetWindowLongPtr(HVTWin,GWL_EXSTYLE); |
| 412 | 412 | ExStyle &= ~WS_EX_CLIENTEDGE; |
| 413 | 413 | ::SetWindowLongPtr(HVTWin,GWL_EXSTYLE,ExStyle); |
| @@ -2801,7 +2801,7 @@ | ||
| 2801 | 2801 | LRESULT CVTWindow::OnWindowPosChanging(WPARAM wParam, LPARAM lParam) |
| 2802 | 2802 | { |
| 2803 | 2803 | #ifdef ALPHABLEND_TYPE2 |
| 2804 | - if(BGEnable && BGNoCopyBits) { | |
| 2804 | + if(BGEnable && ts.EtermLookfeel.BGNoCopyBits) { | |
| 2805 | 2805 | ((WINDOWPOS*)lParam)->flags |= SWP_NOCOPYBITS; |
| 2806 | 2806 | } |
| 2807 | 2807 | #endif |
| @@ -3254,7 +3254,7 @@ | ||
| 3254 | 3254 | WS_MINIMIZEBOX | WS_MAXIMIZEBOX) | WS_BORDER | WS_POPUP; |
| 3255 | 3255 | |
| 3256 | 3256 | #ifdef ALPHABLEND_TYPE2 |
| 3257 | - if(BGNoFrame) { | |
| 3257 | + if(ts.EtermLookfeel.BGNoFrame) { | |
| 3258 | 3258 | Style &= ~(WS_THICKFRAME | WS_BORDER); |
| 3259 | 3259 | ExStyle &= ~WS_EX_CLIENTEDGE; |
| 3260 | 3260 | }else{ |
Tera Term