Add initial support for extra keys

app/src/main/java/com/termux/app/BackgroundJob.java

@@ -0,0 +1,112 @@
+package com.termux.app;
+
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * A background job launched by Termux.
+ */
+public final class BackgroundJob {
+
+    private static final String LOG_TAG = "termux-background";
+
+    final Process mProcess;
+
+    public BackgroundJob(File cwd, File fileToExecute, String[] args) throws IOException {
+        String[] env = buildEnvironment(false, cwd.getAbsolutePath());
+
+        String[] progArray = new String[args.length+1];
+
+        mProcess = Runtime.getRuntime().exec(progArray, env, cwd);
+
+        new Thread() {
+            @Override
+            public void run() {
+                while (true) {
+                    try {
+                        int exitCode = mProcess.waitFor();
+                        if (exitCode == 0) {
+                            Log.i(LOG_TAG, "exited normally");
+                            return;
+                        } else {
+                            Log.i(LOG_TAG, "exited with exit code: " + exitCode);
+                        }
+                    } catch (InterruptedException e) {
+                        // Ignore.
+                    }
+                }
+            }
+        }.start();
+
+        new Thread() {
+            @Override
+            public void run() {
+                InputStream stdout = mProcess.getInputStream();
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stdout, StandardCharsets.UTF_8));
+                String line;
+                try {
+                    // FIXME: Long lines.
+                    while ((line = reader.readLine()) != null) {
+                        Log.i(LOG_TAG, line);
+                    }
+                } catch (IOException e) {
+                    // Ignore.
+                }
+            }
+        }.start();
+
+
+        new Thread() {
+            @Override
+            public void run() {
+                InputStream stderr = mProcess.getErrorStream();
+                BufferedReader reader = new BufferedReader(new InputStreamReader(stderr, StandardCharsets.UTF_8));
+                String line;
+                try {
+                    // FIXME: Long lines.
+                    while ((line = reader.readLine()) != null) {
+                        Log.e(LOG_TAG, line);
+                    }
+                } catch (IOException e) {
+                    // Ignore.
+                }
+            }
+        };
+    }
+
+    public String[] buildEnvironment(boolean failSafe, String cwd) {
+            new File(TermuxService.HOME_PATH).mkdirs();
+
+            if (cwd == null) cwd = TermuxService.HOME_PATH;
+
+            final String termEnv = "TERM=xterm-256color";
+            final String homeEnv = "HOME=" + TermuxService.HOME_PATH;
+            final String prefixEnv = "PREFIX=" + TermuxService.PREFIX_PATH;
+            final String androidRootEnv = "ANDROID_ROOT=" + System.getenv("ANDROID_ROOT");
+            final String androidDataEnv = "ANDROID_DATA=" + System.getenv("ANDROID_DATA");
+            // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
+            // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
+            final String externalStorageEnv = "EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE");
+            String[] env;
+            if (failSafe) {
+                // Keep the default path so that system binaries can be used in the failsafe session.
+                final String pathEnv = "PATH=" + System.getenv("PATH");
+                return new String[] { termEnv, homeEnv, prefixEnv, androidRootEnv, androidDataEnv, pathEnv, externalStorageEnv };
+            } else {
+                final String ps1Env = "PS1=$ ";
+                final String ldEnv = "LD_LIBRARY_PATH=" + TermuxService.PREFIX_PATH + "/lib";
+                final String langEnv = "LANG=en_US.UTF-8";
+                final String pathEnv = "PATH=" + TermuxService.PREFIX_PATH + "/bin:" + TermuxService.PREFIX_PATH + "/bin/applets";
+                final String pwdEnv = "PWD=" + cwd;
+
+                return new String[] { termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, pwdEnv, androidRootEnv, androidDataEnv, externalStorageEnv };
+            }
+        }
+
+}

app/src/main/java/com/termux/app/TermuxActivity.java

@@ -29,6 +29,9 @@ import android.os.IBinder;
 import android.os.Vibrator;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v4.widget.DrawerLayout;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -52,17 +55,18 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.termux.R;
-import com.termux.drawer.DrawerLayout;
 import com.termux.terminal.TerminalSession;
 import com.termux.terminal.TerminalSession.SessionChangedCallback;
 import com.termux.view.TerminalKeyListener;
 import com.termux.view.TerminalView;
 
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -165,14 +169,73 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 		// Prevent overdraw:
 		getWindow().getDecorView().setBackground(null);
 
-		setContentView(R.layout.drawer_layout);
+        mSettings = new TermuxPreferences(this);
+
+        setContentView(R.layout.drawer_layout);
 		mTerminalView = (TerminalView) findViewById(R.id.terminal_view);
-		mSettings = new TermuxPreferences(this);
-		mTerminalView.setTextSize(mSettings.getFontSize());
+
+        mTerminalView.setTextSize(mSettings.getFontSize());
 		mFullScreenHelper.setImmersive(mSettings.isFullScreen());
 		mTerminalView.requestFocus();
 
-		OnKeyListener keyListener = new OnKeyListener() {
+        final ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
+        if (mSettings.isShowExtraKeys()) viewPager.setVisibility(View.VISIBLE);
+
+        viewPager.setAdapter(new PagerAdapter() {
+            @Override
+            public int getCount() {
+                return 2;
+            }
+
+            @Override
+            public boolean isViewFromObject(View view, Object object) {
+                return view == object;
+            }
+
+            @Override
+            public Object instantiateItem(ViewGroup collection, int position) {
+                LayoutInflater inflater = LayoutInflater.from(TermuxActivity.this);
+                View layout;
+                if (position == 0) {
+                    layout = (View) inflater.inflate(R.layout.extra_keys_main, collection, false);
+                    mTerminalView.mModifiers = (TerminalView.KeyboardModifiers) layout;
+                } else {
+                    layout = (View) inflater.inflate(R.layout.extra_keys_right, collection, false);
+                    final EditText editText = (EditText) layout.findViewById(R.id.text_input);
+                    editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+                        @Override
+                        public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                            String s = editText.getText().toString() + "\n";
+                            getCurrentTermSession().write(s);
+                            editText.setText("");
+                            return true;
+                        }
+                    });
+                }
+                collection.addView(layout);
+                return layout;
+            }
+
+            @Override
+            public void destroyItem(ViewGroup collection, int position, Object view) {
+                collection.removeView((View) view);
+            }
+        });
+
+        viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                int newHeight;
+                if (position == 0) {
+                    mTerminalView.requestFocus();
+                } else {
+                    final EditText editText = (EditText) viewPager.findViewById(R.id.text_input);
+                    if (editText != null) editText.requestFocus();
+                }
+            }
+        });
+
+        OnKeyListener keyListener = new OnKeyListener() {
 			@Override
 			public boolean onKey(View v, int keyCode, KeyEvent event) {
 				if (event.getAction() != KeyEvent.ACTION_DOWN) return false;
@@ -213,7 +276,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 					if (--index < 0) index = mTermService.getSessions().size() - 1;
 					switchToSession(mTermService.getSessions().get(index));
 				} else if (keyCode == KeyEvent.KEYCODE_DPAD_RIGHT) {
-					getDrawer().openDrawer(Gravity.START);
+					getDrawer().openDrawer(Gravity.LEFT);
 				} else if (keyCode == KeyEvent.KEYCODE_DPAD_LEFT) {
 					getDrawer().closeDrawers();
 				} else if (unicodeChar == 'f'/* full screen */) {
@@ -315,7 +378,17 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 			}
 		});
 
-		registerForContextMenu(mTerminalView);
+        findViewById(R.id.toggle_keyboard_button).setOnLongClickListener(new OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                View extraKeysView = findViewById(R.id.viewpager);
+                mSettings.toggleShowExtraKeys(TermuxActivity.this);
+                extraKeysView.setVisibility(mSettings.isShowExtraKeys() ? View.VISIBLE : View.GONE);
+                return true;
+            }
+        });
+
+        registerForContextMenu(mTerminalView);
 
 		Intent serviceIntent = new Intent(this, TermuxService.class);
 		// Start the service and make it run regardless of who is bound to it:
@@ -362,7 +435,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 					finish();
 					return;
 				}
-				if (mIsVisible && finishedSession != getCurrentTermSession()) {
+                if (mIsVisible && finishedSession != getCurrentTermSession()) {
 					// Show toast for non-current sessions that exit.
 					int indexOfSession = mTermService.getSessions().indexOf(finishedSession);
 					// Verify that session was not removed before we got told about it finishing:
@@ -543,10 +616,11 @@ public final class TermuxActivity extends Activity implements ServiceConnection
 
 	@Override
 	public void onBackPressed() {
-		if (getDrawer().isDrawerOpen(Gravity.START))
-			getDrawer().closeDrawers();
-		else
-			finish();
+		if (getDrawer().isDrawerOpen(Gravity.LEFT)) {
+            getDrawer().closeDrawers();
+        } else {
+            finish();
+        }
 	}
 
 	@Override

app/src/main/java/com/termux/drawer/DrawerLayoutCompatApi21.java

@@ -1,88 +0,0 @@
-package com.termux.drawer;
-
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowInsets;
-
-/**
- * Provides functionality for DrawerLayout unique to API 21
- */
-@SuppressLint("RtlHardcoded")
-@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-class DrawerLayoutCompatApi21 {
-
-	private static final int[] THEME_ATTRS = { android.R.attr.colorPrimaryDark };
-
-	public static void configureApplyInsets(DrawerLayout drawerLayout) {
-		drawerLayout.setOnApplyWindowInsetsListener(new InsetsListener());
-		drawerLayout.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-	}
-
-	public static void dispatchChildInsets(View child, Object insets, int gravity) {
-		WindowInsets wi = (WindowInsets) insets;
-		if (gravity == Gravity.LEFT) {
-			wi = wi.replaceSystemWindowInsets(wi.getSystemWindowInsetLeft(), wi.getSystemWindowInsetTop(), 0, wi.getSystemWindowInsetBottom());
-		} else if (gravity == Gravity.RIGHT) {
-			wi = wi.replaceSystemWindowInsets(0, wi.getSystemWindowInsetTop(), wi.getSystemWindowInsetRight(), wi.getSystemWindowInsetBottom());
-		}
-		child.dispatchApplyWindowInsets(wi);
-	}
-
-	public static void applyMarginInsets(ViewGroup.MarginLayoutParams lp, Object insets, int gravity) {
-		WindowInsets wi = (WindowInsets) insets;
-		if (gravity == Gravity.LEFT) {
-			wi = wi.replaceSystemWindowInsets(wi.getSystemWindowInsetLeft(), wi.getSystemWindowInsetTop(), 0, wi.getSystemWindowInsetBottom());
-		} else if (gravity == Gravity.RIGHT) {
-			wi = wi.replaceSystemWindowInsets(0, wi.getSystemWindowInsetTop(), wi.getSystemWindowInsetRight(), wi.getSystemWindowInsetBottom());
-		}
-		lp.leftMargin = wi.getSystemWindowInsetLeft();
-		lp.topMargin = wi.getSystemWindowInsetTop();
-		lp.rightMargin = wi.getSystemWindowInsetRight();
-		lp.bottomMargin = wi.getSystemWindowInsetBottom();
-	}
-
-	public static int getTopInset(Object insets) {
-		return insets != null ? ((WindowInsets) insets).getSystemWindowInsetTop() : 0;
-	}
-
-	public static Drawable getDefaultStatusBarBackground(Context context) {
-		final TypedArray a = context.obtainStyledAttributes(THEME_ATTRS);
-		try {
-			return a.getDrawable(0);
-		} finally {
-			a.recycle();
-		}
-	}
-
-	static class InsetsListener implements View.OnApplyWindowInsetsListener {
-		@Override
-		public WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
-			final DrawerLayout drawerLayout = (DrawerLayout) v;
-			drawerLayout.setChildInsets(insets, insets.getSystemWindowInsetTop() > 0);
-			return insets.consumeSystemWindowInsets();
-		}
-	}
-}

app/src/main/java/com/termux/drawer/package-info.java

@@ -1,10 +0,0 @@
-/**
- * Extraction (and some minor cleanup to get rid of warnings) of DrawerLayout from the
- * <a href="http://developer.android.com/tools/support-library/index.html">Android Support Library</a>.
- * 
- * Source at:
- * https://android.googlesource.com/platform/frameworks/support/+/refs/heads/master/v4/java/android/support/v4/widget/DrawerLayout.java
- * https://android.googlesource.com/platform/frameworks/support/+/refs/heads/master/v4/java/android/support/v4/widget/ViewDragHelper.java
- */
-package com.termux.drawer;
-

app/src/main/res/layout/drawer_layout.xml

@@ -1,58 +1,73 @@
-<com.termux.drawer.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-    <com.termux.view.TerminalView
-        android:id="@+id/terminal_view"
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:focusableInTouchMode="true"
-        android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
-        android:scrollbars="vertical" />
+        android:layout_alignParentTop="true"
+        android:layout_above="@+id/viewpager"
+        android:layout_height="match_parent">
 
-    <LinearLayout
-        android:id="@+id/left_drawer"
-        android:layout_width="240dp"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:background="@android:color/white"
-        android:choiceMode="singleChoice"
-        android:divider="@android:color/transparent"
-        android:dividerHeight="0dp"
-        android:orientation="vertical" >
-
-        <ListView
-            android:id="@+id/left_drawer_list"
+        <com.termux.view.TerminalView
+            android:id="@+id/terminal_view"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_gravity="top"
-            android:layout_weight="1"
-            android:choiceMode="singleChoice"
-            android:longClickable="true" />
+            android:layout_height="match_parent"
+            android:focusableInTouchMode="true"
+            android:scrollbarThumbVertical="@drawable/terminal_scroll_shape"
+            android:scrollbars="vertical" />
 
         <LinearLayout
-            style="?android:attr/buttonBarStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" >
+            android:id="@+id/left_drawer"
+            android:layout_width="240dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:background="@android:color/white"
+            android:choiceMode="singleChoice"
+            android:divider="@android:color/transparent"
+            android:dividerHeight="0dp"
+            android:orientation="vertical">
 
-            <Button
-                android:id="@+id/toggle_keyboard_button"
-                style="?android:attr/buttonBarButtonStyle"
+            <ListView
+                android:id="@+id/left_drawer_list"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_gravity="top"
+                android:layout_weight="1"
+                android:choiceMode="singleChoice"
+                android:longClickable="true" />
+
+            <LinearLayout
+                style="?android:attr/buttonBarStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/toggle_soft_keyboard" />
+                android:orientation="horizontal">
 
-            <Button
-                android:id="@+id/new_session_button"
-                style="?android:attr/buttonBarButtonStyle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/new_session" />
+                <Button
+                    android:id="@+id/toggle_keyboard_button"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/toggle_soft_keyboard" />
+
+                <Button
+                    android:id="@+id/new_session_button"
+                    style="?android:attr/buttonBarButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/new_session" />
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
 
-</com.termux.drawer.DrawerLayout>
+    </android.support.v4.widget.DrawerLayout>
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/viewpager"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_alignParentBottom="true" />
+</RelativeLayout>

app/src/main/res/layout/extra_keys_main.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.termux.app.ExtraKeysView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/extra_keys"
+    style="?android:attr/buttonBarStyle"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_alignParentBottom="true"
+    android:background="#263238"
+    android:orientation="horizontal"
+    android:textColor="@android:color/white" />

app/src/main/res/layout/extra_keys_right.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<EditText xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/text_input"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#263238"
+    android:imeOptions="actionSend"
+    android:maxLines="1"
+    android:singleLine="true"
+    android:textColor="@android:color/white" />