Changeset 7318

Timestamp:

03/01/08 15:11:23 (5 years ago)

Author:

frsyuki

Message:

lang/actionscript/FxTerm: fixed new line behavior 2

Files:

• lang/actionscript/FxTerm/trunk/FxTerm.as (modified) (11 diffs)

lang/actionscript/FxTerm/trunk/FxTerm.as

@@ -429 +429 @@
                         cursorCanvas.graphics.clear();
                         // FIXME  cursor color
+                        var drow:int;
+                        var dcol:int;
+                        if( ccol >= cols ) {
+                                drow = (crow+1 < rows ? crow+1 : rows - 1);
+                                dcol = 0;
+                        } else {
+                                drow = crow;
+                                dcol = ccol;
+                        }
                         cursorCanvas.graphics.beginFill(ansiForegroundColors[7], 1.0);
                         cursorCanvas.graphics.drawRect(
-                                        (this.width / cols - 0.05) * ccol + 2,
-                                        lineHeight * crow + lineGapFilling,
-                                        ( screen[crow][ccol].wide ?
+                                        (this.width / cols - 0.05) * dcol + 2,
+                                        lineHeight * drow + lineGapFilling,
+                                        ( screen[drow][dcol].wide ?
                                           calibrateFontWidth * 2 - 2 :  // wide width
                                           calibrateFontWidth ),
@@ -595 +604 @@
                 var screen:Array = _screen;
                 var wide:Boolean = isWideCharacter(c);
-                if( wide ) {
-                        if( ccol+1 >= cols ) {
-                                screen[crow][ccol].wide = false;
-                                screen[crow][ccol].text = " ";
-                                cursorLineDown();
-                                ccol = 0;
-                        }
-                } else {
-                        /*  FIXME
-                        if( ccol >= cols ) {
-                                cursorLineDown();
-                                ccol = 0;
-                        }
-                        */
+                if( ccol >= cols ) {
+                        cursorLineDown();
+                        screen = _screen;
+                        ccol = 0;
+                } else if( wide && ccol+1 >= cols ) {
+                        screen[crow][ccol].wide = false;
+                        screen[crow][ccol].text = " ";
+                        cursorLineDown();
+                        screen = _screen;
+                        ccol = 0;
                 }
                 screen[crow][ccol].text = c;
@@ -628 +633 @@
                         }
                         ccol++;
-                }
-                if( ccol >= cols ) { // FIXME
-                        cursorLineDown();
-                        ccol = 0;
                 }
                 cursorDirty = true;
@@ -894 +895 @@
                 var r:uint;
                 var c:uint;
+                var dcol:int;
                 if( param.length > 0 && param[0] == 2 ) {
                         // clear whole screen
@@ -907 +909 @@
                         }
                         lineDirty[crow] = true;
-                        for(c = 0; c <= ccol; ++c) {
+                        dcol = (ccol < cols ? ccol : cols - 1);
+                        for(c = 0; c <= dcol; ++c) {
                                 screen[crow][c].clear(curattr);
                         }
@@ -913 +916 @@
                         // clear from current cursor position to the end
                         lineDirty[crow] = true;
-                        for(c = 0; c <= ccol; ++c) {
+                        dcol = (ccol < cols ? ccol : cols - 1);
+                        for(c = 0; c <= dcol; ++c) {
                                 screen[crow][c].clear(curattr);
                         }
@@ -1004 +1008 @@
                 switch(cmd) {
                 case 1:
-                        for(c = 0; c <= ccol; ++c) {
+                        var dcol:int = (ccol < cols ? ccol : cols - 1);
+                        for(c = 0; c <= dcol; ++c) {
                                 screen[crow][c].clear(curattr);
                         }
@@ -1012 +1017 @@
                         break;
                 default:
-                        for(c = ccol; c < cols; ++c) {
+                        for(c = ccol; c < cols; ++c) {  // FIXME dcol?
                                 screen[crow][c].clear(curattr);
                         }
@@ -1027 +1032 @@
                 var n:int = (param.length > 0 && param[0] > 0) ? param[0] : 1;
                 var c:int;
-
-                var poped:Array = screen[crow].splice(ccol + n);
-                var range:Array = screen[crow].splice(ccol);
+                var dcol:int = (ccol < cols ? ccol : cols - 1);
+
+                var poped:Array = screen[crow].splice(dcol + n);
+                var range:Array = screen[crow].splice(dcol);
                 for each(var cell:TextCell in poped) { cell.clear(); }
                 screen[crow] = screen[crow].concat(poped);
@@ -1041 +1047 @@
         {
                 var screen:Array = _screen;
+                var dcol:int = (ccol < cols ? ccol : cols - 1);
 
                 var n:int = (param.length > 0 && param[0] > 0) ? param[0] : 1;
                 var range:Array = screen[crow].splice(cols - n);
-                var poped:Array = screen[crow].splice(ccol);
+                var poped:Array = screen[crow].splice(dcol);
                 for each(var cell:TextCell in poped) { cell.clear(); }
                 screen[crow] = screen[crow].concat(poped);
@@ -1050 +1057 @@
 
                 var c:int;
-                for(c = ccol; c < cols - n; ++c) {
+                for(c = dcol; c < cols - n; ++c) {
                         screen[crow][c].copy( screen[crow][c + n] );
                 }