Remove rows/cols from nativeInit

 * These are hardcoded, no sense passing them as arguments.

Change-Id: I40c26b894b2e668bbebfb779ec5d83a1f34dc0a8

2 files changed, 9 insertions, 10 deletions

diff --git a/jni/com_android_terminal_Terminal.cpp b/jni/com_android_terminal_Terminal.cpp
index 03f27b1..15e57a3 100644
--- a/jni/com_android_terminal_Terminal.cpp
+++ b/jni/com_android_terminal_Terminal.cpp
@@ -109,7 +109,7 @@ private:
  */
 class Terminal {
 public:
-    Terminal(jobject callbacks, dimen_t rows, dimen_t cols);
+    Terminal(jobject callbacks);
     ~Terminal();
 
     status_t run();
@@ -266,8 +266,8 @@ static VTermScreenCallbacks cb = {
     .sb_popline = term_sb_popline,
 };
 
-Terminal::Terminal(jobject callbacks, dimen_t rows, dimen_t cols) :
-        mCallbacks(callbacks), mRows(rows), mCols(cols), mKilled(false),
+Terminal::Terminal(jobject callbacks) :
+        mCallbacks(callbacks), mRows(25), mCols(80), mKilled(false),
         mScrollCur(0), mScrollSize(100) {
     JNIEnv* env = AndroidRuntime::getJNIEnv();
     mCallbacks = env->NewGlobalRef(callbacks);
@@ -276,7 +276,7 @@ Terminal::Terminal(jobject callbacks, dimen_t rows, dimen_t cols) :
     memset(mScroll, 0, sizeof(ScrollbackLine*) * mScrollSize);
 
     /* Create VTerm */
-    mVt = vterm_new(rows, cols);
+    mVt = vterm_new(mRows, mCols);
     vterm_parser_set_utf8(mVt, 1);
 
     /* Set up screen */
@@ -550,9 +550,8 @@ jobject Terminal::getCallbacks() const {
  * JNI glue
  */
 
-static jlong com_android_terminal_Terminal_nativeInit(JNIEnv* env, jclass clazz, jobject callbacks,
-        jint rows, jint cols) {
-    return reinterpret_cast<jlong>(new Terminal(callbacks, rows, cols));
+static jlong com_android_terminal_Terminal_nativeInit(JNIEnv* env, jclass clazz, jobject callbacks) {
+    return reinterpret_cast<jlong>(new Terminal(callbacks));
 }
 
 static jint com_android_terminal_Terminal_nativeDestroy(JNIEnv* env, jclass clazz, jlong ptr) {
@@ -681,7 +680,7 @@ static jboolean com_android_terminal_Terminal_nativeDispatchKey(JNIEnv *env, jcl
 }
 
 static JNINativeMethod gMethods[] = {
-    { "nativeInit", "(Lcom/android/terminal/TerminalCallbacks;II)J", (void*)com_android_terminal_Terminal_nativeInit },
+    { "nativeInit", "(Lcom/android/terminal/TerminalCallbacks;)J", (void*)com_android_terminal_Terminal_nativeInit },
     { "nativeDestroy", "(J)I", (void*)com_android_terminal_Terminal_nativeDestroy },
     { "nativeRun", "(J)I", (void*)com_android_terminal_Terminal_nativeRun },
     { "nativeResize", "(JIII)I", (void*)com_android_terminal_Terminal_nativeResize },
diff --git a/src/com/android/terminal/Terminal.java b/src/com/android/terminal/Terminal.java
index c8739b1..7aa7949 100644
--- a/src/com/android/terminal/Terminal.java
+++ b/src/com/android/terminal/Terminal.java
@@ -97,7 +97,7 @@ public class Terminal {
     };
 
     public Terminal() {
-        mNativePtr = nativeInit(mCallbacks, 25, 80);
+        mNativePtr = nativeInit(mCallbacks);
         key = sNumber++;
         mTitle = TAG + " " + key;
         mThread = new Thread(mTitle) {
@@ -162,7 +162,7 @@ public class Terminal {
         return nativeDispatchCharacter(mNativePtr, modifiers, character);
     }
 
-    private static native long nativeInit(TerminalCallbacks callbacks, int rows, int cols);
+    private static native long nativeInit(TerminalCallbacks callbacks);
     private static native int nativeDestroy(long ptr);
 
     private static native int nativeRun(long ptr);