Cleanup.

2 files changed, 28 insertions, 11 deletions

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index e979b34..fd91ad0 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -30,7 +30,6 @@ import org.connectbot.service.TerminalKeyListener;
 import org.connectbot.service.TerminalManager;
 import org.connectbot.util.PreferenceConstants;
 
-import android.annotation.TargetApi;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.ComponentName;
@@ -662,6 +661,15 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 		if (tabs != null)
 			setupTabLayoutWithViewPager();
 
+		pager.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				if (keyboardGroup.getVisibility() == View.GONE) {
+					showEmulatedKeys(false);
+				}
+			}
+		});
+
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
 			pager.setOnTouchListener(new OnTouchListener() {
 				public boolean onTouch(View v, MotionEvent event) {
@@ -670,10 +678,6 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 					boolean isCopyingInProgress =
 						(copySource != null && copySource.isSelectingForCopy());
 
-					if (!isCopyingInProgress && keyboardGroup.getVisibility() == View.GONE) {
-						showEmulatedKeys(true);
-					}
-
 					// when copying, highlight the area
 					if (isCopyingInProgress) {
 						SelectionArea area = copySource.getSelectionArea();
diff --git a/app/src/main/java/org/connectbot/TerminalView.java b/app/src/main/java/org/connectbot/TerminalView.java
index 6d051f6..9167366 100644
--- a/app/src/main/java/org/connectbot/TerminalView.java
+++ b/app/src/main/java/org/connectbot/TerminalView.java
@@ -26,8 +26,8 @@ import org.connectbot.service.FontSizeChangedListener;
 import org.connectbot.service.TerminalBridge;
 import org.connectbot.service.TerminalKeyListener;
 
-import android.annotation.TargetApi;
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -391,7 +391,20 @@ public class TerminalView extends TextView implements FontSizeChangedListener {
 			case MotionEvent.ACTION_SCROLL:
 				// Process scroll wheel movement:
 				float yDistance = MotionEventCompat.getAxisValue(event, MotionEvent.AXIS_VSCROLL);
-				if (yDistance != 0) {
+				boolean mouseReport = ((vt320) bridge.buffer).isMouseReportEnabled();
+				if (mouseReport) {
+					int row = (int) Math.floor(event.getY() / bridge.charHeight);
+					int col = (int) Math.floor(event.getX() / bridge.charWidth);
+
+							((vt320) bridge.buffer).mouseWheel(
+											yDistance > 0,
+											col,
+											row,
+											(event.getMetaState() & KeyEvent.META_CTRL_ON) != 0,
+											(event.getMetaState() & KeyEvent.META_SHIFT_ON) != 0,
+											(event.getMetaState() & KeyEvent.META_META_ON) != 0);
+					return true;
+				} else if (yDistance != 0) {
 					int base = bridge.buffer.getWindowBase();
 					bridge.buffer.setWindowBase(base - Math.round(yDistance));
 					return true;
@@ -530,10 +543,10 @@ public class TerminalView extends TextView implements FontSizeChangedListener {
 				SelectionArea area = bridge.getSelectionArea();
 				canvas.save(Canvas.CLIP_SAVE_FLAG);
 				canvas.clipRect(
-						area.getLeft() * bridge.charWidth,
-						area.getTop() * bridge.charHeight,
-						(area.getRight() + 1) * bridge.charWidth,
-						(area.getBottom() + 1) * bridge.charHeight
+					area.getLeft() * bridge.charWidth,
+					area.getTop() * bridge.charHeight,
+					(area.getRight() + 1) * bridge.charWidth,
+					(area.getBottom() + 1) * bridge.charHeight
 				);
 				canvas.drawPaint(cursorPaint);
 				canvas.restore();