svnno****@sourc*****
svnno****@sourc*****
2016年 6月 29日 (水) 10:55:06 JST
Tera TermRevision: 6415
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6415
Author: doda
Date: 2016-06-29 10:55:06 +0900 (Wed, 29 Jun 2016)
Log Message:
-----------
ペーストの条件を整理
動作は変わっていないはず
Modified Paths:
--------------
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2016-06-28 14:19:58 UTC (rev 6414)
+++ trunk/teraterm/teraterm/vtwin.cpp 2016-06-29 01:55:06 UTC (rev 6415)
@@ -916,8 +916,6 @@
void CVTWindow::ButtonUp(BOOL Paste)
{
BOOL disableBuffEndSelect = false;
- BOOL pasteRButton = RButton && Paste;
- BOOL pasteMButton = MButton && Paste;
/* disable autoscrolling */
::KillTimer(HVTWin,IdScrollTimer);
@@ -942,27 +940,14 @@
BuffEndSelect();
}
- // added ConfirmPasteMouseRButton (2007.3.17 maya)
- if (pasteRButton && !ts.ConfirmPasteMouseRButton) {
+ if (Paste) {
if (CBStartPasteConfirmChange(HVTWin, FALSE)) {
CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
- /* \x8Dʼn\xBA\x8Ds\x82ł\xBE\x82\xAF\x8E\xA9\x93\xAE\x83X\x83N\x83\x8D\x81[\x83\x8B\x82\xB7\x82\xE9\x90ݒ\xE8\x82̏ꍇ
- \x83y\x81[\x83X\x83g\x8F\x88\x97\x9D\x82ŃX\x83N\x83\x8D\x81[\x83\x8B\x82\xB3\x82\xB9\x82\xE9 */
if (ts.AutoScrollOnlyInBottomLine != 0 && WinOrgY != 0) {
DispVScroll(SCROLL_BOTTOM, 0);
}
}
}
- else if (pasteMButton) {
- if (CBStartPasteConfirmChange(HVTWin, FALSE)) {
- CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
- /* \x8Dʼn\xBA\x8Ds\x82ł\xBE\x82\xAF\x8E\xA9\x93\xAE\x83X\x83N\x83\x8D\x81[\x83\x8B\x82\xB7\x82\xE9\x90ݒ\xE8\x82̏ꍇ
- \x83y\x81[\x83X\x83g\x8F\x88\x97\x9D\x82ŃX\x83N\x83\x8D\x81[\x83\x8B\x82\xB3\x82\xB9\x82\xE9 */
- if (ts.AutoScrollOnlyInBottomLine != 0 && WinOrgY != 0) {
- DispVScroll(SCROLL_BOTTOM, 0);
- }
- }
- }
}
void CVTWindow::ButtonDown(POINT p, int LMR)
@@ -2547,8 +2532,14 @@
return;
}
- // \x89E\x83{\x83^\x83\x93\x89\x9F\x89\xBA\x82ł̃y\x81[\x83X\x83g\x82\xF0\x8B֎~\x82\xB7\x82\xE9 (2005.3.16 yutaka)
- if (ts.DisablePasteMouseRButton || mousereport) {
+ /*
+ * \x83y\x81[\x83X\x83g\x8F\xF0\x8C\x8F:
+ * \x81Ets.DisableMouseRButton -> \x89E\x83{\x83^\x83\x93\x82ɂ\xE6\x82\xE9\x83y\x81[\x83X\x83g\x96\xB3\x8C\xF8
+ * \x81Ets.ConfirmPasteMouseRButton -> \x95\\x8E\xA6\x82\xB3\x82ꂽ\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x83y\x81[\x83X\x83g\x82\xF0\x8Ds\x82\xA4\x82̂ŁA
+ * \x89E\x83{\x83^\x83\x93\x83A\x83b\x83v\x82ɂ\xE6\x82\xE9\x83y\x81[\x83X\x83g\x82͍s\x82\xED\x82Ȃ\xA2
+ * \x81Emousereport -> \x83}\x83E\x83X\x83g\x83\x89\x83b\x83L\x83\x93\x83O\x92\x86\x82̓y\x81[\x83X\x83g\x82\xF0\x8Ds\x82\xED\x82Ȃ\xA2
+ */
+ if (ts.DisablePasteMouseRButton || ts.ConfirmPasteMouseRButton || mousereport) {
ButtonUp(FALSE);
} else {
ButtonUp(TRUE);