fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 02:35:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed: Ensure FN extra key is read by the terminal

Browse Source 
Can't find info on why it wasn't being read before
This commit is contained in:
agnostic-apollo
2021-08-23 08:56:36 +05:00
parent 9117240961
commit d1478fb6c3
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/termux/app/terminal/TermuxTerminalViewClient.java
View File

@@ -302,6 +302,11 @@ public class TermuxTerminalViewClient extends TermuxTerminalViewClientBase {
return readExtraKeysSpecialButton(SpecialButton.SHIFT); return readExtraKeysSpecialButton(SpecialButton.SHIFT);
} }
@Override
public boolean readFnKey() {
return readExtraKeysSpecialButton(SpecialButton.FN);
}
public boolean readExtraKeysSpecialButton(SpecialButton specialButton) { public boolean readExtraKeysSpecialButton(SpecialButton specialButton) {
if (mActivity.getExtraKeysView() == null) return false; if (mActivity.getExtraKeysView() == null) return false;
Boolean state = mActivity.getExtraKeysView().readSpecialButton(specialButton, true); Boolean state = mActivity.getExtraKeysView().readSpecialButton(specialButton, true);

5
terminal-view/src/main/java/com/termux/view/TerminalView.java
View File

@@ -599,6 +599,7 @@ public final class TerminalView extends View {
final boolean controlDown = event.isCtrlPressed() || mClient.readControlKey(); final boolean controlDown = event.isCtrlPressed() || mClient.readControlKey();
final boolean leftAltDown = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0 || mClient.readAltKey(); final boolean leftAltDown = (metaState & KeyEvent.META_ALT_LEFT_ON) != 0 || mClient.readAltKey();
final boolean shiftDown = event.isShiftPressed() || mClient.readShiftKey(); final boolean shiftDown = event.isShiftPressed() || mClient.readShiftKey();
final boolean fnDown = event.isFunctionPressed() || mClient.readFnKey();
final boolean rightAltDownFromEvent = (metaState & KeyEvent.META_ALT_RIGHT_ON) != 0; final boolean rightAltDownFromEvent = (metaState & KeyEvent.META_ALT_RIGHT_ON) != 0;
int keyMod = 0; int keyMod = 0;
@@ -606,7 +607,8 @@ public final class TerminalView extends View {
if (event.isAltPressed() || leftAltDown) keyMod |= KeyHandler.KEYMOD_ALT; if (event.isAltPressed() || leftAltDown) keyMod |= KeyHandler.KEYMOD_ALT;
if (shiftDown) keyMod |= KeyHandler.KEYMOD_SHIFT; if (shiftDown) keyMod |= KeyHandler.KEYMOD_SHIFT;
if (event.isNumLockOn()) keyMod |= KeyHandler.KEYMOD_NUM_LOCK; if (event.isNumLockOn()) keyMod |= KeyHandler.KEYMOD_NUM_LOCK;
if (!event.isFunctionPressed() && handleKeyCode(keyCode, keyMod)) { // https://github.com/termux/termux-app/issues/731
if (!fnDown && handleKeyCode(keyCode, keyMod)) {
if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) mClient.logInfo(LOG_TAG, "handleKeyCode() took key event"); if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) mClient.logInfo(LOG_TAG, "handleKeyCode() took key event");
return true; return true;
} }
@@ -622,6 +624,7 @@ public final class TerminalView extends View {
int effectiveMetaState = event.getMetaState() & ~bitsToClear; int effectiveMetaState = event.getMetaState() & ~bitsToClear;
if (shiftDown) effectiveMetaState |= KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON; if (shiftDown) effectiveMetaState |= KeyEvent.META_SHIFT_ON | KeyEvent.META_SHIFT_LEFT_ON;
if (fnDown) effectiveMetaState |= KeyEvent.META_FUNCTION_ON;
int result = event.getUnicodeChar(effectiveMetaState); int result = event.getUnicodeChar(effectiveMetaState);
if (TERMINAL_VIEW_KEY_LOGGING_ENABLED) if (TERMINAL_VIEW_KEY_LOGGING_ENABLED)

2
terminal-view/src/main/java/com/termux/view/TerminalViewClient.java
View File

@@ -56,6 +56,8 @@ public interface TerminalViewClient {
boolean readShiftKey(); boolean readShiftKey();
boolean readFnKey();
boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session); boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession session);

6
termux-shared/src/main/java/com/termux/shared/terminal/TermuxTerminalViewClientBase.java
View File

@@ -67,10 +67,16 @@ public class TermuxTerminalViewClientBase implements TerminalViewClient {
return false; return false;
} }
@Override
public boolean readShiftKey() { public boolean readShiftKey() {
return false; return false;
} }
@Override
public boolean readFnKey() {
return false;
}
@Override @Override