From eed037b63788902306b30bc698f95400762ca1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 9 May 2008 03:44:37 +0000
Subject: [PATCH] - SetPosX/Y were wrong, but not yet used. - implemented
 HPA/VPA (CV/CH) sequences (set absolute v and h position). It's optional but
 because the beterm termcap advertises it we must implement it. Also note
 beterm increments args unlike others. This fixes all obvious display issues
 with the rhapsody IRC client (a small ncurses client I ported). - maybe we
 should switch the CASE_* to an enum ?

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25392 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/terminal/TermParse.cpp | 20 ++++++++++++++++++++
 src/apps/terminal/TermView.cpp  |  4 ++--
 src/apps/terminal/VTPrsTbl.c    |  4 ++--
 src/apps/terminal/VTparse.h     |  3 +++
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/apps/terminal/TermParse.cpp b/src/apps/terminal/TermParse.cpp
index de7474d61b..801b9a509a 100644
--- a/src/apps/terminal/TermParse.cpp
+++ b/src/apps/terminal/TermParse.cpp
@@ -883,6 +883,26 @@ TermParse::EscParse()
 					parsestate = groundtable;
 					break;
 
+				case CASE_VPA:		// ESC [...d move cursor absolute vertical
+					/* VPA (CV) */
+					if ((row = param[0]) < 1)
+						row = 1;
+
+					// note beterm wants it 1-based unlike usual terminals
+					fView->SetCurY(row - 1);
+					parsestate = groundtable;
+					break;
+
+				case CASE_HPA:		// ESC [...G move cursor absolute horizontal
+					/* HPA (CH) */
+					if ((col = param[0]) < 1)
+						col = 1;
+
+					// note beterm wants it 1-based unlike usual terminals
+					fView->SetCurX(col - 1);
+					parsestate = groundtable;
+					break;
+
 				default:
 					break;
 		}
diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp
index 31fa6f3531..21de80e8d5 100644
--- a/src/apps/terminal/TermView.cpp
+++ b/src/apps/terminal/TermView.cpp
@@ -838,7 +838,7 @@ TermView::SetCurPos(int x, int y)
 void
 TermView::SetCurX(int x)
 {
-	if (x >= 0 && x < fTermRows) {
+	if (x >= 0 && x < fTermColumns) {
 		UpdateLine();
 		fCurPos.x = x;
 	}
@@ -849,7 +849,7 @@ TermView::SetCurX(int x)
 void
 TermView::SetCurY(int y)
 {
-	if (y >= 0 && y < fTermColumns) {
+	if (y >= 0 && y < fTermRows) {
 		UpdateLine();
 		fCurPos.y = y;
 	}
diff --git a/src/apps/terminal/VTPrsTbl.c b/src/apps/terminal/VTPrsTbl.c
index b0665b9e5e..7f5f1fe2b4 100644
--- a/src/apps/terminal/VTPrsTbl.c
+++ b/src/apps/terminal/VTPrsTbl.c
@@ -1096,7 +1096,7 @@ CASE_CUF,
 CASE_CUB,
 CASE_GROUND_STATE,
 CASE_GROUND_STATE,
-CASE_GROUND_STATE,
+CASE_HPA,
 /*	H		I		J		K	*/
 CASE_CUP,
 CASE_GROUND_STATE,
@@ -1133,7 +1133,7 @@ CASE_GROUND_STATE,
 CASE_GROUND_STATE,
 CASE_GROUND_STATE,
 /*	d		e		f		g	*/
-CASE_GROUND_STATE,
+CASE_VPA,
 CASE_GROUND_STATE,
 CASE_CUP,
 CASE_GROUND_STATE,
diff --git a/src/apps/terminal/VTparse.h b/src/apps/terminal/VTparse.h
index 1870147d2e..bb546949af 100644
--- a/src/apps/terminal/VTparse.h
+++ b/src/apps/terminal/VTparse.h
@@ -116,3 +116,6 @@
 #define CASE_SJIS_KANA 84
 #define CASE_PRINT_GR 85
 #define CASE_PRINT_CS96 86
+// additions, maybe reorder/reuse older ones ?
+#define CASE_VPA 87
+#define CASE_HPA 88