diff options
author | Tom Marshall <tdm@cyngn.com> | 2014-12-31 10:42:02 -0800 |
---|---|---|
committer | Tom Marshall <tdm@cyngn.com> | 2014-12-31 10:42:02 -0800 |
commit | d3090cb2c2ca1d6a2441c3bd1413da129ceadc38 (patch) | |
tree | 360c72dbea70ab70d21a659f07f9e9c22dedc1db /jni/com_android_terminal_Terminal.cpp | |
parent | 1c4704e650a86914e3afdc57ce9df4f95d7c7d44 (diff) | |
download | Terminal-d3090cb2c2ca1d6a2441c3bd1413da129ceadc38.tar.gz |
Remove rows/cols from nativeInit
* These are hardcoded, no sense passing them as arguments.
Change-Id: I40c26b894b2e668bbebfb779ec5d83a1f34dc0a8
Diffstat (limited to 'jni/com_android_terminal_Terminal.cpp')
-rw-r--r-- | jni/com_android_terminal_Terminal.cpp | 15 |
1 files changed, 7 insertions, 8 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 }, |