OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr

[Ttssh2-commit] [4260] ConfirmChangePaste が on の時、Alt+Rでの張り付けは一行のみでも確認するようにした。

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2010年 12月 28日 (火) 11:49:24 JST 

Revision: 4260
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4260
Author:   doda
Date:     2010-12-28 11:49:24 +0900 (Tue, 28 Dec 2010)

Log Message:
-----------
ConfirmChangePaste が on の時、Alt+Rでの張り付けは一行のみでも確認するようにした。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/teraterm/clipboar.c
    trunk/teraterm/teraterm/clipboar.h
    trunk/teraterm/teraterm/vtwin.cpp


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/doc/en/html/about/history.html	2010-12-28 02:49:24 UTC (rev 4260)
@@ -46,6 +46,7 @@
       <li>addes support for the DECRQSS (Request terminal setting) control sequence. Supported control sequences are DECSCA, DECSCL, DECSTBM and SGR.</li>
       <li>added support for the DECFI, DECBI control sequences.</li>
       <!-- li>ƒEƒBƒ“ƒhƒEƒTƒCƒY–â‚¢‡‚킹§ŒäƒV[ƒPƒ“ƒX‚ɑ΂µ‚ďí‚É480x640‚ð‰ž“š‚µ‚Ä‚¢‚½‚Ì‚ðAŽÀÛ‚̃EƒBƒ“ƒhƒEƒTƒCƒY‚ð•Ô‚·‚悤‚ɕύX‚µ‚½B</li -->
+      <!-- li>•¡”s‚Ì“\‚è•t‚¯‚ðŠm”F‚·‚éÝ’è‚ÌŽžAAlt+R‚Å‚Ì’£‚è•t‚¯Žž‚͈ês‚݂̂̏ꍇ‚Å‚àŠm”F‚·‚é‚悤‚É‚µ‚½B</li -->
       <li>added the "<a href="../macro/command/basename.html">basename</a>" and "<a href="../macro/command/dirname.html">dirname</a>" macro command.</li>
     </ul>
   </li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/doc/ja/html/about/history.html	2010-12-28 02:49:24 UTC (rev 4260)
@@ -46,6 +46,7 @@
       <li>DECRQSS(Ý’è–â‚¢‡‚킹)§ŒäƒV[ƒPƒ“ƒX‚ɑΉž‚µ‚½B–â‚¢‡‚킹‚ɑΉž‚µ‚Ä‚¢‚éÝ’è‚Í DECSCA, DECSCL, DECSTBM, SGRB</li>
       <li>DECFI, DECBI §ŒäƒV[ƒPƒ“ƒX‚ɑΉž‚µ‚½B</li>
       <li>ƒEƒBƒ“ƒhƒEƒTƒCƒY–â‚¢‡‚킹§ŒäƒV[ƒPƒ“ƒX‚ɑ΂µ‚ďí‚É480x640‚ð‰ž“š‚µ‚Ä‚¢‚½‚Ì‚ðAŽÀÛ‚̃EƒBƒ“ƒhƒEƒTƒCƒY‚ð•Ô‚·‚悤‚ɕύX‚µ‚½B</li>
+      <li>•¡”s‚Ì“\‚è•t‚¯‚ðŠm”F‚·‚éÝ’è‚ÌŽžAAlt+R‚Å‚Ì’£‚è•t‚¯Žž‚͈ês‚݂̂̏ꍇ‚Å‚àŠm”F‚·‚é‚悤‚É‚µ‚½B</li>
       <li>ƒ}ƒNƒƒRƒ}ƒ“ƒh "<a href="../macro/command/basename.html">basename</a>", "<a href="../macro/command/dirname.html">dirname</a>" ‚ð’ljÁ‚µ‚½B</li>
     </ul>
   </li>

Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/teraterm/teraterm/clipboar.c	2010-12-28 02:49:24 UTC (rev 4260)
@@ -678,7 +678,7 @@
 //
 // (2008.2.3 yutaka)
 //
-int CBStartPasteConfirmChange(HWND HWin)
+int CBStartPasteConfirmChange(HWND HWin, BOOL AddCR)
 {
 	UINT Cf;
 	HANDLE hText;
@@ -710,7 +710,7 @@
 	if (hText != NULL) {
 		pText = (char *)GlobalLock(hText);
 		pos = strcspn(pText, "\r\n");  // ‰üs‚ªŠÜ‚Ü‚ê‚Ä‚¢‚½‚ç
-		if (pText[pos] != '\0') {
+		if (pText[pos] != '\0' || AddCR) {
 			confirm = 1;
 
 		} else {

Modified: trunk/teraterm/teraterm/clipboar.h
===================================================================
--- trunk/teraterm/teraterm/clipboar.h	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/teraterm/teraterm/clipboar.h	2010-12-28 02:49:24 UTC (rev 4260)
@@ -17,7 +17,7 @@
 void CBSend();
 void CBEcho();
 void CBEndPaste();
-int CBStartPasteConfirmChange(HWND HWin);
+int CBStartPasteConfirmChange(HWND HWin, BOOL AddCR);
 
 #ifdef __cplusplus
 }

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2010-12-27 02:41:32 UTC (rev 4259)
+++ trunk/teraterm/teraterm/vtwin.cpp	2010-12-28 02:49:24 UTC (rev 4260)
@@ -783,7 +783,7 @@
 
 	// added ConfirmPasteMouseRButton (2007.3.17 maya)
 	if (pasteRButton && !ts.ConfirmPasteMouseRButton) {
-		if (CBStartPasteConfirmChange(HVTWin)) {
+		if (CBStartPasteConfirmChange(HVTWin, FALSE)) {
 			CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
 			/* Å‰ºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚̏ꍇ
 			   ƒy[ƒXƒgˆ—‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */
@@ -793,7 +793,7 @@
 		}
 	}
 	else if (pasteMButton) {
-		if (CBStartPasteConfirmChange(HVTWin)) {
+		if (CBStartPasteConfirmChange(HVTWin, FALSE)) {
 			CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
 			/* Å‰ºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚̏ꍇ
 			   ƒy[ƒXƒgˆ—‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */
@@ -3972,7 +3972,7 @@
 void CVTWindow::OnEditPaste()
 {
 	// add confirm (2008.2.4 yutaka)
-	if (CBStartPasteConfirmChange(HVTWin)) {
+	if (CBStartPasteConfirmChange(HVTWin, FALSE)) {
 		CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
 		/* Å‰ºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚̏ꍇ
 		   ƒy[ƒXƒgˆ—‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */
@@ -3985,7 +3985,7 @@
 void CVTWindow::OnEditPasteCR()
 {
 	// add confirm (2008.3.11 maya)
-	if (CBStartPasteConfirmChange(HVTWin)) {
+	if (CBStartPasteConfirmChange(HVTWin, TRUE)) {
 		CBStartPaste(HVTWin, TRUE, BracketedPasteMode(), 0, NULL, 0);
 		/* Å‰ºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚̏ꍇ
 		   ƒy[ƒXƒgˆ—‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */


Ttssh2-commit メーリングリストの案内
Back to archive index