svnno****@sourc*****
svnno****@sourc*****
2010年 12月 28日 (火) 13:55:01 JST
Tera TermRevision: 4261
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4261
Author: doda
Date: 2010-12-28 13:55:01 +0900 (Tue, 28 Dec 2010)
Log Message:
-----------
Alt+R ã®æ™‚ã¯ç¢ºèªã‚’è¡Œã‚ãªã„よã†ã«å‡ºæ¥ã‚‹ã‚ˆã†ã«ã—ãŸã€‚
Modified Paths:
--------------
trunk/installer/release/TERATERM.INI
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/clipboar.c
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2010-12-28 02:49:24 UTC (rev 4260)
+++ trunk/installer/release/TERATERM.INI 2010-12-28 04:55:01 UTC (rev 4261)
@@ -51,6 +51,7 @@
ConfirmChangePaste=on
PasteDialogSize=330,220
ConfirmChangePasteStringFile=
+DontConfirmPasteCR=off
; Scroll out the current buffer when the clear screen does.
ScrollWindowClearScreen=on
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2010-12-28 02:49:24 UTC (rev 4260)
+++ trunk/teraterm/common/tttypes.h 2010-12-28 04:55:01 UTC (rev 4261)
@@ -504,6 +504,7 @@
WORD DisableMenuDuplicateSession;
WORD DisableMenuNewConnection;
char TerminalUID[9];
+ WORD DontConfirmPasteCR;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -941,6 +942,7 @@
*
* - At version 4.69, ttset_memfilemap was replaced with ttset_memfilemap_15.
* added tttset.TerminalUID.
+ * added tttset.DontConfirmPasteCR.
*
* - At version 4.68, ttset_memfilemap was replaced with ttset_memfilemap_14.
* increase WinList(MAXNWIN) size.
Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c 2010-12-28 02:49:24 UTC (rev 4260)
+++ trunk/teraterm/teraterm/clipboar.c 2010-12-28 04:55:01 UTC (rev 4261)
@@ -709,10 +709,11 @@
if (hText != NULL) {
pText = (char *)GlobalLock(hText);
- pos = strcspn(pText, "\r\n"); // ‰üs‚ªŠÜ‚Ü‚ê‚Ä‚¢‚½‚ç
- if (pText[pos] != '\0' || AddCR) {
- confirm = 1;
-
+ if (!(ts.DontConfirmPasteCR && AddCR)) {
+ pos = strcspn(pText, "\r\n"); // ‰üs‚ªŠÜ‚Ü‚ê‚Ä‚¢‚½‚ç
+ if (pText[pos] != '\0' || AddCR) {
+ confirm = 1;
+ }
} else {
// Ž«‘‚ðƒT[ƒ`‚·‚é
if (search_clipboard(ts.ConfirmChangePasteStringFile, pText)) {
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2010-12-28 02:49:24 UTC (rev 4260)
+++ trunk/teraterm/ttpset/ttset.c 2010-12-28 04:55:01 UTC (rev 4261)
@@ -1390,6 +1390,9 @@
// Lock Terminal UID
if (GetOnOff(Section, "LockTUID", FName, TRUE))
ts->TermFlag |= TF_LOCKTUID;
+
+ // Don't confirm PasteCR
+ ts->DontConfirmPasteCR = GetOnOff(Section, "DontConfirmPasteCR", FName, FALSE);
}
void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2413,6 +2416,9 @@
// Lock Terminal UID
WriteOnOff(Section, "LockTUID", FName, ts->TermFlag & TF_LOCKTUID);
+
+ // Don't confirm PasteCR
+ WriteOnOff(Section, "DontConfirmPasteCR", FName, ts->DontConfirmPasteCR);
}
#define VTEditor "VT editor keypad"