• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7392 (tree)
Time2019-01-13 18:35:33
Authorzmatsuo

Log Message

Merge branch 'trunk' r7390 into cmake

Change Summary

Incremental Difference

--- branches/cmake/teraterm/common/ttlib.c (revision 7391)
+++ branches/cmake/teraterm/common/ttlib.c (revision 7392)
@@ -1,6 +1,6 @@
11 /*
22 * Copyright (C) 1994-1998 T. Teranishi
3- * (C) 2006-2017 TeraTerm Project
3+ * (C) 2006-2019 TeraTerm Project
44 * All rights reserved.
55 *
66 * Redistribution and use in source and binary forms, with or without
--- branches/cmake/teraterm/common/ttlib.h (revision 7391)
+++ branches/cmake/teraterm/common/ttlib.h (revision 7392)
@@ -1,5 +1,5 @@
11 /*
2- * Copyright (C) 1994-1998 T. Teranishi
2+ * Copyright (C) 1994-1999 T. Teranishi
33 * (C) 2006-2018 TeraTerm Project
44 * All rights reserved.
55 *
--- branches/cmake/teraterm/common/tttypes.h (revision 7391)
+++ branches/cmake/teraterm/common/tttypes.h (revision 7392)
@@ -1,6 +1,6 @@
11 /*
22 * Copyright (C) 1994-1998 T. Teranishi
3- * (C) 2004-2018 TeraTerm Project
3+ * (C) 2004-2019 TeraTerm Project
44 * All rights reserved.
55 *
66 * Redistribution and use in source and binary forms, with or without
@@ -550,8 +550,8 @@
550550 /* protocol used in connect() */
551551 int ProtocolFamily;
552552 char MouseCursorName[16];
553- int AlphaBlendActive;
554- int AlphaBlendInactive;
553+ BYTE AlphaBlendActive;
554+ BYTE AlphaBlendInactive;
555555 char CygwinDirectory[MAX_PATH];
556556 #define DEFAULT_LOCALE "japanese"
557557 char Locale[80];
--- branches/cmake/teraterm/teraterm/addsetting.cpp (revision 7391)
+++ branches/cmake/teraterm/teraterm/addsetting.cpp (revision 7392)
@@ -1,5 +1,5 @@
11 /*
2- * Copyright (C) 2008-2018 TeraTerm Project
2+ * Copyright (C) 2008-2019 TeraTerm Project
33 * All rights reserved.
44 *
55 * Redistribution and use in source and binary forms, with or without
@@ -655,9 +655,9 @@
655655 SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)uimsg);
656656
657657 // (1)AlphaBlend
658- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", ts.AlphaBlendActive);
658+
659659 SetDlgItemNum(IDC_ALPHA_BLEND_ACTIVE, ts.AlphaBlendActive);
660- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", ts.AlphaBlendInactive);
660+
661661 SetDlgItemNum(IDC_ALPHA_BLEND_INACTIVE, ts.AlphaBlendInactive);
662662
663663 // (2)[BG] BGEnable
--- branches/cmake/teraterm/teraterm/vtdisp.c (revision 7391)
+++ branches/cmake/teraterm/teraterm/vtdisp.c (revision 7392)
@@ -3701,27 +3701,41 @@
37013701 }
37023702 }
37033703
3704-void DispShowWindow(int mode) {
3704+void DispShowWindow(int mode)
3705+{
37053706 switch (mode) {
3706- case WINDOW_MINIMIZE:
3707+ case WINDOW_MINIMIZE:
37073708 ShowWindow(HVTWin, SW_MINIMIZE);
37083709 break;
3709- case WINDOW_MAXIMIZE:
3710+ case WINDOW_MAXIMIZE:
37103711 ShowWindow(HVTWin, SW_MAXIMIZE);
37113712 break;
3712- case WINDOW_RESTORE:
3713+ case WINDOW_RESTORE:
37133714 ShowWindow(HVTWin, SW_RESTORE);
37143715 break;
3715- case WINDOW_RAISE:
3716- SetWindowPos(HVTWin, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
3716+ case WINDOW_RAISE: {
3717+ //何も起きないことあり
3718+ // SetWindowPos(HVTWin, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
3719+//#define RAISE_AND_GET_FORCUS
3720+#if defined(RAISE_AND_GET_FORCUS)
3721+ //フォーカスを奪う
3722+ SetForegroundWindow(HVTWin);
3723+#else
3724+ //フォーカスは奪わず最上面に来る
3725+ BringWindowToTop(HVTWin);
3726+ if (GetForegroundWindow() != HVTWin) {
3727+ FlashWindow(HVTWin, TRUE);
3728+ }
3729+#endif
3730+ }
37173731 break;
3718- case WINDOW_LOWER:
3732+ case WINDOW_LOWER:
37193733 SetWindowPos(HVTWin, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
37203734 break;
3721- case WINDOW_REFRESH:
3735+ case WINDOW_REFRESH:
37223736 InvalidateRect(HVTWin, NULL, FALSE);
37233737 break;
3724- case WINDOW_TOGGLE_MAXIMIZE:
3738+ case WINDOW_TOGGLE_MAXIMIZE:
37253739 if (IsZoomed(HVTWin)) {
37263740 ShowWindow(HVTWin, SW_RESTORE);
37273741 }
--- branches/cmake/teraterm/teraterm/vtwin.cpp (revision 7391)
+++ branches/cmake/teraterm/teraterm/vtwin.cpp (revision 7392)
@@ -1,6 +1,6 @@
11 /*
22 * Copyright (C) 1994-1998 T. Teranishi
3- * (C) 2004-2018 TeraTerm Project
3+ * (C) 2004-2019 TeraTerm Project
44 * All rights reserved.
55 *
66 * Redistribution and use in source and binary forms, with or without
@@ -2449,6 +2449,24 @@
24492449
24502450 int line, i;
24512451
2452+ if (pSetLayeredWindowAttributes != NULL) {
2453+ BOOL InTitleBar;
2454+ POINT point = pt;
2455+ GetPositionOnWindow(HVTWin, &point,
2456+ NULL, NULL, &InTitleBar);
2457+ if (InTitleBar) {
2458+ int delta = zDelta < 0 ? -1 : 1;
2459+ int newAlpha = Alpha;
2460+ newAlpha += delta * ts.MouseWheelScrollLine;
2461+ if (newAlpha > 255)
2462+ newAlpha = 255;
2463+ else if (newAlpha < 0)
2464+ newAlpha = 0;
2465+ SetWindowAlpha(newAlpha);
2466+ return TRUE;
2467+ }
2468+ }
2469+
24522470 ::ScreenToClient(HVTWin, &pt);
24532471
24542472 line = abs(zDelta) / WHEEL_DELTA; // ライン数
--- branches/cmake/teraterm/teraterm/vtwin.h (revision 7391)
+++ branches/cmake/teraterm/teraterm/vtwin.h (revision 7392)
@@ -1,6 +1,6 @@
11 /*
22 * Copyright (C) 1994-1998 T. Teranishi
3- * (C) 2004-2018 TeraTerm Project
3+ * (C) 2004-2019 TeraTerm Project
44 * All rights reserved.
55 *
66 * Redistribution and use in source and binary forms, with or without
--- branches/cmake/teraterm/ttpset/ttset.c (revision 7391)
+++ branches/cmake/teraterm/ttpset/ttset.c (revision 7392)
@@ -1,6 +1,6 @@
11 /*
22 * Copyright (C) 1994-1998 T. Teranishi
3- * (C) 2004-2018 TeraTerm Project
3+ * (C) 2004-2019 TeraTerm Project
44 * All rights reserved.
55 *
66 * Redistribution and use in source and binary forms, with or without
Show on old repository browser