Skip to content

Commit

Permalink
Fix Option key not working in macOS
Browse files Browse the repository at this point in the history
Alt key is used to invoke the Option key in macOS. But instead of XK_Alt,
the server expects XK_Meta keysym.

Re: #163
  • Loading branch information
gujjwal00 committed May 17, 2023
1 parent 8b0e4f8 commit f2b9947
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
6 changes: 6 additions & 0 deletions app/src/main/cpp/native-vnc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,12 @@ Java_com_gaurav_avnc_vnc_VncClient_nativeInit(JNIEnv *env, jobject thiz, jlong c
return JNI_FALSE;

}
extern "C"
JNIEXPORT jboolean JNICALL
Java_com_gaurav_avnc_vnc_VncClient_nativeIsServerMacOS(JNIEnv *env, jobject thiz, jlong client_ptr) {
auto client = (rfbClient *) client_ptr;
return client->serverMajor == 3 && client->serverMinor == 889;
}

extern "C"
JNIEXPORT void JNICALL
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/com/gaurav/avnc/vnc/VncClient.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.gaurav.avnc.vnc

import android.view.KeyEvent
import androidx.annotation.Keep
import java.io.IOException
import java.nio.ByteBuffer
Expand Down Expand Up @@ -124,6 +125,7 @@ class VncClient(private val observer: Observer) {
fun connect(host: String, port: Int) {
connected = nativeInit(nativePtr, host, port)
if (!connected) throw IOException(nativeGetLastErrorStr())
applyCompatQuirks()
}

/**
Expand Down Expand Up @@ -252,6 +254,13 @@ class VncClient(private val observer: Observer) {
block()
}

private fun applyCompatQuirks() {
if (nativeIsServerMacOS(nativePtr)) {
XKeySymAndroid.updateKeyMap(KeyEvent.KEYCODE_ALT_LEFT, XKeySym.XK_Meta_L)
XKeySymAndroid.updateKeyMap(KeyEvent.KEYCODE_ALT_RIGHT, XKeySym.XK_Meta_R)
}
}

private external fun nativeClientCreate(): Long
private external fun nativeConfigure(clientPtr: Long, securityType: Int, useLocalCursor: Boolean, imageQuality: Int, useRawEncoding: Boolean)
private external fun nativeInit(clientPtr: Long, host: String, port: Int): Boolean
Expand All @@ -270,6 +279,7 @@ class VncClient(private val observer: Observer) {
private external fun nativeUploadFrameTexture(clientPtr: Long)
private external fun nativeUploadCursor(clientPtr: Long, px: Int, py: Int)
private external fun nativeGetLastErrorStr(): String
private external fun nativeIsServerMacOS(clientPtr: Long): Boolean
private external fun nativeCleanup(clientPtr: Long)

@Keep
Expand Down
2 changes: 1 addition & 1 deletion extern/libvncserver

0 comments on commit f2b9947

Please sign in to comment.