svnno****@sourc*****
svnno****@sourc*****
2010年 8月 19日 (木) 16:29:01 JST
Tera TermRevision: 4021
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4021
Author: doda
Date: 2010-08-19 16:29:01 +0900 (Thu, 19 Aug 2010)
Log Message:
-----------
DECELR が有効になっていない時は、DECEFR で何も行わないようにした。
Modified Paths:
--------------
trunk/teraterm/teraterm/vtterm.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c 2010-08-19 05:09:11 UTC (rev 4020)
+++ trunk/teraterm/teraterm/vtterm.c 2010-08-19 07:29:01 UTC (rev 4021)
@@ -2440,27 +2440,29 @@
int i, x, y;
switch (b) {
case 'w': // Enable Filter Rectangle (DECEFR)
- if (DecLocatorFlag & DecLocatorPixel) {
- x = LastX + 1;
- y = LastY + 1;
+ if (MouseReportMode == IdMouseTrackDECELR) {
+ if (DecLocatorFlag & DecLocatorPixel) {
+ x = LastX + 1;
+ y = LastY + 1;
+ }
+ else {
+ DispConvWinToScreen(LastX, LastY, &x, &y, NULL);
+ x++;
+ y++;
+ }
+ FilterTop = (NParam<1 || Param[1]<1)? y : Param[1];
+ FilterLeft = (NParam<2 || Param[2]<1)? x : Param[2];
+ FilterBottom = (NParam<3 || Param[3]<1)? y : Param[3];
+ FilterRight = (NParam<4 || Param[4]<1)? x : Param[4];
+ if (FilterTop > FilterBottom) {
+ i = FilterTop; FilterTop = FilterBottom; FilterBottom = i;
+ }
+ if (FilterLeft > FilterRight) {
+ i = FilterLeft; FilterLeft = FilterRight; FilterRight = i;
+ }
+ DecLocatorFlag |= DecLocatorFiltered;
+ DecLocatorReport(IdMouseEventMove, 0);
}
- else {
- DispConvWinToScreen(LastX, LastY, &x, &y, NULL);
- x++;
- y++;
- }
- FilterTop = (NParam<1 || Param[1]<1)? y : Param[1];
- FilterLeft = (NParam<2 || Param[2]<1)? x : Param[2];
- FilterBottom = (NParam<3 || Param[3]<1)? y : Param[3];
- FilterRight = (NParam<4 || Param[4]<1)? x : Param[4];
- if (FilterTop > FilterBottom) {
- i = FilterTop; FilterTop = FilterBottom; FilterBottom = i;
- }
- if (FilterLeft > FilterRight) {
- i = FilterLeft; FilterLeft = FilterRight; FilterRight = i;
- }
- DecLocatorFlag |= DecLocatorFiltered;
- DecLocatorReport(IdMouseEventMove, 0);
break;
case 'z': // Enable DEC Locator reporting (DECELR)