svnno****@sourc*****
svnno****@sourc*****
2011年 1月 11日 (火) 21:26:17 JST
Tera TermRevision: 4273
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4273
Author: doda
Date: 2011-01-11 21:26:17 +0900 (Tue, 11 Jan 2011)
Log Message:
-----------
・DontConfirmPasteCR -> ConfirmChangePasteCR [ttssh2-devel 1813]
・辞書サーãƒã‚’è¡Œã‚ãªããªã£ã¦ã„ãŸå ´åˆãŒæœ‰ã£ãŸã®ã‚’ä¿®æ£
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 2011-01-10 14:03:49 UTC (rev 4272)
+++ trunk/installer/release/TERATERM.INI 2011-01-11 12:26:17 UTC (rev 4273)
@@ -49,9 +49,9 @@
; confirm changing clipboard string by clicking mouse right button
ConfirmChangePaste=on
+ConfirmChangePasteCR=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 2011-01-10 14:03:49 UTC (rev 4272)
+++ trunk/teraterm/common/tttypes.h 2011-01-11 12:26:17 UTC (rev 4273)
@@ -504,7 +504,7 @@
WORD DisableMenuDuplicateSession;
WORD DisableMenuNewConnection;
char TerminalUID[9];
- WORD DontConfirmPasteCR;
+ WORD ConfirmChangePasteCR;
};
typedef struct tttset TTTSet, *PTTSet;
@@ -942,7 +942,7 @@
*
* - At version 4.69, ttset_memfilemap was replaced with ttset_memfilemap_15.
* added tttset.TerminalUID.
- * added tttset.DontConfirmPasteCR.
+ * added tttset.ConfirmChangePasteCR.
*
* - 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 2011-01-10 14:03:49 UTC (rev 4272)
+++ trunk/teraterm/teraterm/clipboar.c 2011-01-11 12:26:17 UTC (rev 4273)
@@ -685,7 +685,7 @@
char *pText;
int pos;
int ret = 0;
- int confirm = 0;
+ BOOL confirm = FALSE;
if (ts.ConfirmChangePaste == 0)
return 1;
@@ -709,17 +709,21 @@
if (hText != NULL) {
pText = (char *)GlobalLock(hText);
- if (!(ts.DontConfirmPasteCR && AddCR)) {
+ if (AddCR) {
+ if (ts.ConfirmChangePasteCR) {
+ confirm = TRUE;
+ }
+ }
+ else {
pos = strcspn(pText, "\r\n"); // ‰üs‚ªŠÜ‚Ü‚ê‚Ä‚¢‚½‚ç
if (pText[pos] != '\0' || AddCR) {
- confirm = 1;
+ confirm = TRUE;
}
- } else {
- // Ž«‘‚ðƒT[ƒ`‚·‚é
- if (search_clipboard(ts.ConfirmChangePasteStringFile, pText)) {
- confirm = 1;
- }
+ }
+ // Ž«‘‚ðƒT[ƒ`‚·‚é
+ if (!confirm && search_clipboard(ts.ConfirmChangePasteStringFile, pText)) {
+ confirm = TRUE;
}
if (confirm) {
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2011-01-10 14:03:49 UTC (rev 4272)
+++ trunk/teraterm/ttpset/ttset.c 2011-01-11 12:26:17 UTC (rev 4273)
@@ -1391,8 +1391,8 @@
if (GetOnOff(Section, "LockTUID", FName, TRUE))
ts->TermFlag |= TF_LOCKTUID;
- // Don't confirm PasteCR
- ts->DontConfirmPasteCR = GetOnOff(Section, "DontConfirmPasteCR", FName, FALSE);
+ // Confirm PasteCR
+ ts->ConfirmChangePasteCR = GetOnOff(Section, "ConfirmChangePasteCR", FName, TRUE);
}
void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
@@ -2417,8 +2417,8 @@
// Lock Terminal UID
WriteOnOff(Section, "LockTUID", FName, ts->TermFlag & TF_LOCKTUID);
- // Don't confirm PasteCR
- WriteOnOff(Section, "DontConfirmPasteCR", FName, ts->DontConfirmPasteCR);
+ // Confirm PasteCR
+ WriteOnOff(Section, "ConfirmChangePasteCR", FName, ts->ConfirmChangePasteCR);
}
#define VTEditor "VT editor keypad"