keyboard support

Author: echoline

Make.android

@@ -5,20 +5,23 @@ OBJS=lib/arm64-v8a/libdrawterm.so lib/armeabi-v7a/libdrawterm.so lib/x86/libdraw
 
 all: drawterm.apk
 
+clean:
+	rm -f *.apk lib/*/*.so
+
 lib/arm64-v8a/libdrawterm.so:
-	CONF=android-arm64 make;
+	CONF=android-arm64 make -j5;
 	CONF=android-arm64 make clean;
 
 lib/armeabi-v7a/libdrawterm.so:
-	CONF=android-arm make;
+	CONF=android-arm make -j5;
 	CONF=android-arm make clean;
 
 lib/x86/libdrawterm.so:
-	CONF=android-386 make;
+	CONF=android-386 make -j5;
 	CONF=android-386 make clean;
 
 lib/x86_64/libdrawterm.so:
-	CONF=android-amd64 make;
+	CONF=android-amd64 make -j5;
 	CONF=android-amd64 make clean;
 
 drawterm.apk: drawterm-signed.apk

README

@@ -20,19 +20,16 @@ To build on Mac OS X with Cocoa, run CONF=osx-cocoa make and "cp drawterm gui-co
 
 To build for Android, make sure Make.android* files are correct for your build and target systems, then run make -f Make.android
 
-On Android, there is no keyboard support in the app, the bitsy/keyboard on-screen keyboard must be used. From $home/lib/profile:
+USAGE
+-------
+On Android the five checkboxes at the top represent the three mouse buttons and mousewheel, determining which "buttons" are clicked. The "kb" button toggles the soft keyboard.
 
-	if(test -e /mnt/term/root/mnt/sdcard)
-		rio -s -k 'bitsy/keyboard -n' -i riostart
-	if not
-		rio -s -i riostart
-
-The five checkboxes at the top represent the three mouse buttons and mousewheel, determining which "buttons" are clicked.
 
 CAVEATS
 --------
 Be aware that right now on Android the login details are saved as a plaintext string if saved, and there is no secstore support.
 
+
 BINARIES
 ---------
 http://drawterm.9front.org/

gui-android/AndroidManifest.xml

@@ -15,7 +15,8 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:windowSoftInputMode="stateUnchanged|adjustNothing">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

gui-android/cpp/devandroid.c

@@ -116,7 +116,7 @@ androidinit(void)
 	output = malloc(sizeof(ACaptureSessionOutput*) * Ncameras);
 	target = malloc(sizeof(ACameraOutputTarget*) * Ncameras);
 
-	sensorManager = ASensorManager_getInstanceForPackage("org.echoline.drawterm");
+	sensorManager = ASensorManager_getInstance();
 }
 
 static Chan*
@@ -227,7 +227,7 @@ androidopen(Chan *c, int omode)
 		ACaptureSessionOutputContainer_add(container[s], output[s]);
 		ACameraDevice_createCaptureSession(devices[s], container[s], &CSSCBs, &sessions[s]);
 		ACameraOutputTarget_create(windows[s], &target[s]);
-		ACameraDevice_createCaptureRequest(devices[s], TEMPLATE_STILL_CAPTURE, &requests[s]);
+		ACameraDevice_createCaptureRequest(devices[s], TEMPLATE_ZERO_SHUTTER_LAG, &requests[s]);
 		ACaptureRequest_addTarget(requests[s], target[s]);
 		ACameraCaptureSession_capture(sessions[s], &CBs, 1, &requests[s], &i);
 	}

gui-android/cpp/native-lib.c

@@ -6,6 +6,7 @@
 #include <libc.h>
 #include <draw.h>
 #include <string.h>
+#include <keyboard.h>
 
 void absmousetrack(int, int, int, ulong);
 ulong ticks(void);
@@ -32,6 +33,22 @@ Java_org_echoline_drawterm_MainActivity_setObject(
     assert(rs == JNI_OK);
 }
 
+JNIEXPORT void JNICALL
+Java_org_echoline_drawterm_MainActivity_keyDown(
+        JNIEnv *env,
+        jobject obj,
+        jint c) {
+    kbdkey(c, 1);
+}
+
+JNIEXPORT void JNICALL
+Java_org_echoline_drawterm_MainActivity_keyUp(
+        JNIEnv *env,
+        jobject obj,
+        jint c) {
+    kbdkey(c, 0);
+}
+
 JNIEXPORT void JNICALL
 Java_org_echoline_drawterm_MainActivity_setPass(
         JNIEnv *env,

gui-android/java/org/echoline/drawterm/MainActivity.java

@@ -20,6 +20,8 @@
 import android.view.WindowManager;
 import android.view.WindowMetrics;
 import android.view.Surface;
+import android.view.inputmethod.InputMethodManager;
+import android.view.KeyEvent;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
@@ -101,11 +103,20 @@ public void onClick(final View view) {
 
 				setContentView(R.layout.drawterm_main);
 
+				Button kbutton = (Button)findViewById(R.id.keyboardToggle);
+				kbutton.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(final View view) {
+						InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
+						imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, 0);
+					}
+				});
+
 				int rid = res.getIdentifier("navigation_bar_height", "dimen", "android");
 				if (rid > 0) {
 					hp -= res.getDimensionPixelSize(rid);
 				}
-				LinearLayout ll = findViewById(R.id.mouseButtons);
+				LinearLayout ll = findViewById(R.id.dtButtons);
 				hp -= ll.getHeight();
 
 				int w = (int)(wp * (160.0/dm.xdpi));
@@ -156,6 +167,85 @@ public void onClick(View v) {
 		});
 	}
 
+	@Override
+	public boolean dispatchKeyEvent(KeyEvent event)
+	{
+		int k = event.getUnicodeChar();
+		if (k == 0) {
+			k = event.getDisplayLabel();
+			if (k != 0)
+				k |= 0x20;
+		}
+
+		switch (event.getKeyCode()) {
+		case KeyEvent.KEYCODE_DEL:
+			k = 0x0008;
+			break;
+		case KeyEvent.KEYCODE_FORWARD_DEL:
+			k = 0x007F;
+			break;
+		case KeyEvent.KEYCODE_ESCAPE:
+			k = 0x001B;
+			break;
+		case KeyEvent.KEYCODE_MOVE_HOME:
+			k = 0xF00D;
+			break;
+		case KeyEvent.KEYCODE_MOVE_END:
+			k = 0xF018;
+			break;
+		case KeyEvent.KEYCODE_PAGE_UP:
+			k = 0xF00F;
+			break;
+		case KeyEvent.KEYCODE_PAGE_DOWN:
+			k = 0xF013;
+			break;
+		case KeyEvent.KEYCODE_INSERT:
+			k = 0xF014;
+			break;
+		case KeyEvent.KEYCODE_SYSRQ:
+			k = 0xF010;
+			break;
+		case KeyEvent.KEYCODE_DPAD_UP:
+			k = 0xF00E;
+			break;
+		case KeyEvent.KEYCODE_DPAD_LEFT:
+			k = 0xF011;
+			break;
+		case KeyEvent.KEYCODE_DPAD_RIGHT:
+			k = 0xF012;
+			break;
+		case KeyEvent.KEYCODE_DPAD_DOWN:
+			k = 0xF800;
+			break;
+		}
+
+		if (k == 0)
+			return true;
+
+		if (event.isCtrlPressed()) {
+			keyDown(0xF017);
+		}
+		if (event.isAltPressed()) {
+			keyDown(0xF015);
+		}
+
+		if (event.getAction() == KeyEvent.ACTION_DOWN) {
+			keyDown(k);
+		}
+		else if (event.getAction() == KeyEvent.ACTION_UP) {
+			keyUp(k);
+		}
+
+		if (event.isCtrlPressed()) {
+			keyUp(0xF017);
+		}
+		if (event.isAltPressed()) {
+			keyUp(0xF015);
+		}
+
+		return true;
+	}
+
 	@Override
 	public void onBackPressed()
 	{
@@ -188,4 +278,6 @@ public String getClipBoard() {
 	public native void setDTSurface(Surface surface);
 	public native void setMouse(int[] args);
 	public native void setObject();
+	public native void keyDown(int c);
+	public native void keyUp(int c);
 }

gui-android/res/layout/drawterm_main.xml

@@ -13,7 +13,7 @@
         android:layout_gravity="bottom"
         android:gravity="center_horizontal"
         android:orientation="horizontal"
-        android:id="@+id/mouseButtons">
+        android:id="@+id/dtButtons">
 
         <CheckBox
             android:id="@+id/mouseLeft"
@@ -35,5 +35,10 @@
             android:id="@+id/mouseDown"
             android:layout_width="wrap_content"
             android:layout_height="match_parent" />
+        <Button
+            android:id="@+id/keyboardToggle"
+            android:text="kb"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent" />
     </LinearLayout>
 </LinearLayout>