svnno****@sourc*****
svnno****@sourc*****
2011年 5月 18日 (水) 00:17:53 JST
Tera TermRevision: 4469
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4469
Author: doda
Date: 2011-05-18 00:17:53 +0900 (Wed, 18 May 2011)
Log Message:
-----------
Revert r4377
æ–¹é‡ãŒã¾ã 定ã¾ã‚‰ãªã„ã—ã€å ±å‘Šè€…も無効ã«ã™ã‚‹ã‚ˆã‚Šã¯å…ƒã®ã¾ã¾ã®æ–¹ãŒã„ã„ã¨ã„ã†äº‹ãªã®ã§ã€å…ƒã«æˆ»ã™ã€‚
Modified Paths:
--------------
trunk/teraterm/teraterm/buffer.c
trunk/teraterm/teraterm/vtdisp.c
trunk/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c 2011-05-08 12:14:02 UTC (rev 4468)
+++ trunk/teraterm/teraterm/buffer.c 2011-05-17 15:17:53 UTC (rev 4469)
@@ -1766,7 +1766,7 @@
Wrap = FALSE;
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚é*/
- if (!(ts.AutoScrollOnlyInBottomLine && ts.TermIsWin) || WinOrgY == 0) {
+ if (ts.AutoScrollOnlyInBottomLine == 0 || WinOrgY == 0) {
DispScrollToCursor(CursorX, CursorY);
}
}
@@ -1777,7 +1777,7 @@
{
CursorX++;
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚é */
- if (!(ts.AutoScrollOnlyInBottomLine && ts.TermIsWin) || WinOrgY == 0) {
+ if (ts.AutoScrollOnlyInBottomLine == 0 || WinOrgY == 0) {
DispScrollToCursor(CursorX, CursorY);
}
}
@@ -1832,7 +1832,7 @@
if ((CursorTop == 0) && (CursorBottom == NumOfLines-1)) {
WinOrgY = WinOrgY-n;
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚é */
- if (ts.AutoScrollOnlyInBottomLine && ts.TermIsWin && NewOrgY != 0) {
+ if (ts.AutoScrollOnlyInBottomLine != 0 && NewOrgY != 0) {
NewOrgY = WinOrgY;
}
BuffScroll(n,CursorBottom);
@@ -1840,7 +1840,7 @@
}
else if ((CursorTop==0) && (CursorY<=CursorBottom)) {
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚é */
- if (ts.AutoScrollOnlyInBottomLine && ts.TermIsWin && NewOrgY != 0) {
+ if (ts.AutoScrollOnlyInBottomLine != 0 && NewOrgY != 0) {
/* ƒXƒNƒ[ƒ‹‚³‚¹‚È‚¢ê‡‚̈— */
WinOrgY = WinOrgY-n;
NewOrgY = WinOrgY;
Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c 2011-05-08 12:14:02 UTC (rev 4468)
+++ trunk/teraterm/teraterm/vtdisp.c 2011-05-17 15:17:53 UTC (rev 4469)
@@ -3162,7 +3162,7 @@
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚Ìê‡
NewOrgY‚ª•Ï‰»‚µ‚Ä‚¢‚È‚‚Ä‚àƒoƒbƒtƒ@s”‚ª•Ï‰»‚·‚é‚Ì‚ÅXV‚·‚é */
- if (ts.AutoScrollOnlyInBottomLine && ts.TermIsWin)
+ if (ts.AutoScrollOnlyInBottomLine != 0)
{
if ((BuffEnd==WinHeight) &&
(ts.EnableScrollBuff>0))
@@ -3206,7 +3206,7 @@
if (NewOrgX!=WinOrgX)
SetScrollPos(HVTWin,SB_HORZ,NewOrgX,TRUE);
- if (!(ts.AutoScrollOnlyInBottomLine && ts.TermIsWin) && NewOrgY!=WinOrgY)
+ if (ts.AutoScrollOnlyInBottomLine == 0 && NewOrgY!=WinOrgY)
{
if ((BuffEnd==WinHeight) &&
(ts.EnableScrollBuff>0))
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2011-05-08 12:14:02 UTC (rev 4468)
+++ trunk/teraterm/teraterm/vtwin.cpp 2011-05-17 15:17:53 UTC (rev 4469)
@@ -788,7 +788,7 @@
CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚Ìê‡
ƒy[ƒXƒgˆ—‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */
- if (ts.AutoScrollOnlyInBottomLine && ts.TermIsWin && WinOrgY != 0) {
+ if (ts.AutoScrollOnlyInBottomLine != 0 && WinOrgY != 0) {
DispVScroll(SCROLL_BOTTOM, 0);
}
}
@@ -798,7 +798,7 @@
CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚Ìê‡
ƒy[ƒXƒgˆ—‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */
- if (ts.AutoScrollOnlyInBottomLine && ts.TermIsWin && WinOrgY != 0) {
+ if (ts.AutoScrollOnlyInBottomLine != 0 && WinOrgY != 0) {
DispVScroll(SCROLL_BOTTOM, 0);
}
}
@@ -1708,7 +1708,7 @@
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚Ìê‡
ƒŠƒ‚[ƒg‚ւ̃L[“ü—Í‘—M‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */
- if (ts.AutoScrollOnlyInBottomLine && ts.TermIsWin && WinOrgY != 0) {
+ if (ts.AutoScrollOnlyInBottomLine != 0 && WinOrgY != 0) {
DispVScroll(SCROLL_BOTTOM, 0);
}
}
@@ -2005,7 +2005,7 @@
case KEYDOWN_COMMOUT:
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚Ìê‡
ƒŠƒ‚[ƒg‚ւ̃L[“ü—Í‘—M‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */
- if (ts.AutoScrollOnlyInBottomLine && ts.TermIsWin && WinOrgY != 0) {
+ if (ts.AutoScrollOnlyInBottomLine != 0 && WinOrgY != 0) {
DispVScroll(SCROLL_BOTTOM, 0);
}
return;
@@ -3974,7 +3974,7 @@
CBStartPaste(HVTWin, FALSE, BracketedPasteMode(), 0, NULL, 0);
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚Ìê‡
ƒy[ƒXƒgˆ—‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */
- if (ts.AutoScrollOnlyInBottomLine && ts.TermIsWin && WinOrgY != 0) {
+ if (ts.AutoScrollOnlyInBottomLine != 0 && WinOrgY != 0) {
DispVScroll(SCROLL_BOTTOM, 0);
}
}
@@ -3987,7 +3987,7 @@
CBStartPaste(HVTWin, TRUE, BracketedPasteMode(), 0, NULL, 0);
/* ʼnºs‚Å‚¾‚¯Ž©“®ƒXƒNƒ[ƒ‹‚·‚éÝ’è‚Ìê‡
ƒy[ƒXƒgˆ—‚ŃXƒNƒ[ƒ‹‚³‚¹‚é */
- if (ts.AutoScrollOnlyInBottomLine && ts.TermIsWin && WinOrgY != 0) {
+ if (ts.AutoScrollOnlyInBottomLine != 0 && WinOrgY != 0) {
DispVScroll(SCROLL_BOTTOM, 0);
}
}