: ""}
{handler.is_installed() && !software_update_url && handler.is_installed_lower_version() ?
@@ -391,11 +345,12 @@ class App: Reactor.Component
}
}
-class InstalllMe: Reactor.Component {
+class InstallMe: Reactor.Component {
function render() {
return
;
}
@@ -450,9 +405,9 @@ class UpgradeMe: Reactor.Component {
function render() {
var update_or_download = is_osx ? "download" : "update";
return
;
}
@@ -463,9 +418,9 @@ class UpgradeMe: Reactor.Component {
class UpdateMe: Reactor.Component {
function render() {
- var update_or_download = is_osx ? "download" : "update";
+ var update_or_download = "download"; // !is_win ? "download" : "update";
return
-
{handler.get_app_name()} Status
+
{translate('Status')}
There is a newer version of {handler.get_app_name()} ({handler.get_new_version()}) available.
Click to {update_or_download}
@@ -473,18 +428,20 @@ class UpdateMe: Reactor.Component {
}
event click $(#install-me) {
- if (is_osx) {
+ handler.open_url("https://rustdesk.com");
+ return;
+ if (!is_win) {
handler.open_url("https://rustdesk.com");
return;
}
var url = software_update_url + '.' + handler.get_software_ext();
var path = handler.get_software_store_path();
var onsuccess = function(md5) {
- $(#download-percent).content("Installing ...");
+ $(#download-percent).content(translate("Installing ..."));
handler.update_me(path);
};
var onerror = function(err) {
- handler.msgbox("custom-error", "Download Error", "Failed to download");
+ msgbox("custom-error", "Download Error", "Failed to download");
};
var onprogress = function(loaded, total) {
if (!total) total = 5 * 1024 * 1024;
@@ -511,9 +468,9 @@ class SystemError: Reactor.Component {
class TrustMe: Reactor.Component {
function render() {
return
-
Configuration Permissions
-
In order to control your Desktop remotely, you need to grant RustDesk "Accessibility" permissions
-
Configure
+
{translate('Configuration Permissions')}
+
{translate('config_acc')}
+
{translate('Configure')}
;
}
@@ -526,9 +483,9 @@ class TrustMe: Reactor.Component {
class CanScreenRecording: Reactor.Component {
function render() {
return
-
Configuration Permissions
-
In order to access your Desktop remotely, you need to grant RustDesk "Screen Recording" permissions
-
Configure
+
{translate('Configuration Permissions')}
+
{translate('config_screen')}
+
{translate('Configure')}
;
}
@@ -541,9 +498,10 @@ class CanScreenRecording: Reactor.Component {
class FixWayland: Reactor.Component {
function render() {
return
-
Warning
-
Login screen using Wayland is not supported
-
Fix it
+
{translate('Warning')}
+
{translate('Login screen using Wayland is not supported')}
+
{translate('Fix it')}
+
({translate('Reboot required')})
;
}
@@ -556,15 +514,16 @@ class FixWayland: Reactor.Component {
class ModifyDefaultLogin: Reactor.Component {
function render() {
return
-
Warning
-
Current Wayland display server is not supported
-
Fix it(re-login required)
+
{translate('Warning')}
+
{translate('Current Wayland display server is not supported')}
+
{translate('Fix it')}
+
({translate('Reboot required')})
;
}
event click $(#modify-default-login) {
if (var r = handler.modify_default_login()) {
- handler.msgbox("custom-error", "Error", r);
+ msgbox("custom-error", "Error", r);
}
app.update();
}
@@ -627,19 +586,19 @@ class Password: Reactor.Component {
event click $(li#set-password) {
var me = this;
- handler.msgbox("custom-password", "Set Password", "
\
-
Password:
\
-
Confirmation:
\
+ msgbox("custom-password", translate("Set Password"), "
\
+
" + translate('Password') + ":
\
+
" + translate('Confirmation') + ":
\
\
", function(res=null) {
if (!res) return;
var p0 = (res.password || "").trim();
var p1 = (res.confirmation || "").trim();
if (p0.length < 6) {
- return "Too short, at least 6 characters.";
+ return translate("Too short, at least 6 characters.");
}
if (p0 != p1) {
- return "The confirmation is not identical.";
+ return translate("The confirmation is not identical.");
}
handler.update_password(p0);
me.update();
@@ -649,7 +608,7 @@ class Password: Reactor.Component {
class ID: Reactor.Component {
function render() {
- return
;
}
@@ -713,10 +672,10 @@ function self.closing() {
function self.ready() {
var r = handler.get_size();
- if (r[2] == 0) {
- centerize(800, 600);
- } else {
+ if (isReasonableSize(r) && r[2] > 0) {
view.move(r[0], r[1], r[2], r[3]);
+ } else {
+ centerize(800, 600);
}
if (!handler.get_remote_id()) {
view.focus = $(#remote_id);
@@ -740,6 +699,10 @@ function checkConnectStatus() {
key_confirmed = tmp[1];
app.update();
}
+ if (tmp[2] && tmp[2] != my_id) {
+ stdout.println("id updated");
+ app.update();
+ }
tmp = handler.get_error();
if (system_error != tmp) {
system_error = tmp;
@@ -752,7 +715,7 @@ function checkConnectStatus() {
}
if (handler.recent_sessions_updated()) {
stdout.println("recent sessions updated");
- app.recent_sessions.update();
+ app.update();
}
checkConnectStatus();
});
diff --git a/src/ui/install.tis b/src/ui/install.tis
index 99befec1e..59c104354 100644
--- a/src/ui/install.tis
+++ b/src/ui/install.tis
@@ -5,17 +5,17 @@ function self.ready() {
class Install: Reactor.Component {
function render() {
return
-
Installation
-
Installation Path:
-
Create start menu shortcuts
-
Create desktop icon
-
End-user license agreement
-
By starting the installation, you accept the license agreement.
+
{translate('Installation')}
+
{translate('Installation Path')} {": "}
+
{translate('Create start menu shortcuts')}
+
{translate('Create desktop icon')}
+
{translate('End-user license agreement')}
+
{translate('agreement_tip')}
-
-
+
+
;
}
@@ -42,4 +42,4 @@ class Install: Reactor.Component {
}
}
-$(body).content(
);
\ No newline at end of file
+$(body).content(
);
diff --git a/src/ui/msgbox.tis b/src/ui/msgbox.tis
index ea84dcd02..eb0ef8a62 100644
--- a/src/ui/msgbox.tis
+++ b/src/ui/msgbox.tis
@@ -1,4 +1,5 @@
-var type, title, text, getParams, remember, retry, callback;
+var type, title, text, getParams, remember, retry, callback, contentStyle;
+var my_translate;
function updateParams(params) {
type = params.type;
@@ -7,7 +8,10 @@ function updateParams(params) {
getParams = params.getParams;
remember = params.remember;
callback = params.callback;
+ my_translate = params.translate;
retry = params.retry;
+ contentStyle = params.contentStyle;
+ try { text = translate_text(text); } catch (e) {}
if (retry > 0) {
self.timer(retry * 1000, function() {
view.close({ reconnect: true });
@@ -15,39 +19,20 @@ function updateParams(params) {
}
}
+function translate_text(text) {
+ if (text.indexOf('Failed') == 0 && text.indexOf(': ') > 0) {
+ var fds = text.split(': ');
+ for (var i = 0; i < fds.length; ++i) {
+ fds[i] = my_translate(fds[i]);
+ }
+ text = fds.join(': ');
+ }
+ return text;
+}
+
var params = view.parameters;
updateParams(params);
-var svg_eye_cross =
;
-
-class Password: Reactor.Component {
- this var visible = false;
-
- function render() {
- return
-
- {this.visible ? svg_eye_cross : svg_eye}
-
;
- }
-
- event click $(svg) {
- var el = this.$(input);
- var value = el.value;
- var start = el.xcall(#selectionStart) || 0;
- var end = el.xcall(#selectionEnd);
- this.update({ visible: !this.visible });
- self.timer(30ms, function() {
- var el = this.$(input);
- view.focus = el;
- el.value = value;
- el.xcall(#setSelection, start, end);
- });
- }
-}
-
var body;
class Body: Reactor.Component {
@@ -74,9 +59,9 @@ class Body: Reactor.Component {
function getInputPasswordContent() {
var ts = remember ? { checked: true } : {};
return
-
Please enter your password
-
-
Remember password
+
{my_translate('Please enter your password')}
+
+
{my_translate('Remember password')}
;
}
@@ -116,27 +101,27 @@ class Body: Reactor.Component {
var me = this;
self.timer(1ms, function() {
if (typeof content == "string")
- me.$(#content).html = content;
+ me.$(#content).html = my_translate(content);
else
me.$(#content).content(content);
});
return (
- {title}
+ {my_translate(title)}
-
- {show_progress ?
: ""}
- {hasCancel || hasRetry ?
: ""}
- {this.hasSkip() ?
: ""}
- {hasOk || hasRetry ?
: ""}
- {hasClose ?
: ""}
+
+
+ {hasCancel || hasRetry ?
: ""}
+ {this.hasSkip() ?
: ""}
+ {hasOk || hasRetry ?
: ""}
+ {hasClose ?
: ""}
);
@@ -149,6 +134,17 @@ class Body: Reactor.Component {
$(body).content(
);
+function show_progress(show=1, err="") {
+ if (show == -1) {
+ view.close()
+ return;
+ }
+ $(#progress).style.set {
+ display: show ? "inline-block" : "none"
+ };
+ $(#error).text = err;
+}
+
function submit() {
if ($(button#submit)) {
$(button#submit).sendEvent("click");
@@ -211,9 +207,12 @@ event click $(button#submit) {
}
var values = getValues();
if (callback) {
- var err = callback(values);
+ var err = callback(values, show_progress);
+ if (err && !err.trim()) {
+ return;
+ }
if (err) {
- $(#error).text = err;
+ show_progress(false, err);
return;
}
}
@@ -235,7 +234,7 @@ event keydown (evt) {
function set_outline_focus() {
self.timer(30ms, function() {
- var el = $(input.outline-focus);
+ var el = $(.outline-focus);
if (el) view.focus = el;
else {
el = $(#submit);
diff --git a/src/ui/port_forward.tis b/src/ui/port_forward.tis
index d30367710..a30f698c5 100644
--- a/src/ui/port_forward.tis
+++ b/src/ui/port_forward.tis
@@ -21,17 +21,17 @@ class PortForward: Reactor.Component {
});
return
{pfs.length ?
- Listening ...
- Don't close this window while you are using the tunnel
+ {translate('Listening ...')}
+ {translate('not_close_tcp_tip')}
: ""}
- | Local Port |
+ {translate('Local Port')} |
|
- Remote Host |
- Remote Port |
- {args.length ? "" : Action | }
+ {translate('Remote Host')} |
+ {translate('Remote Port')} |
+ {args.length ? "" : {translate('Action')} | }
@@ -41,7 +41,7 @@ class PortForward: Reactor.Component {
{svg_arrow} |
|
|
- |
+ |
}
{pfs}
diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index 55f31439e..fda6d1b81 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -49,13 +49,16 @@ fn get_key_state(key: enigo::Key) -> bool {
ENIGO.lock().unwrap().get_key_state(key)
}
+static mut IS_IN: bool = false;
+static mut KEYBOARD_HOOKED: bool = false;
+static mut KEYBOARD_ENABLED: bool = true;
+
#[derive(Default)]
pub struct HandlerInner {
element: Option,
sender: Option>,
thread: Option>,
close_state: HashMap,
- last_down_key: Option<(String, i32, bool)>,
}
#[derive(Clone, Default)]
@@ -65,7 +68,6 @@ pub struct Handler {
id: String,
args: Vec,
lc: Arc>,
- super_on: bool,
}
impl Deref for Handler {
@@ -147,6 +149,8 @@ impl sciter::EventHandler for Handler {
fn get_id();
fn get_default_pi();
fn get_option(String);
+ fn t(String);
+ fn set_option(String, String);
fn save_close_state(String, String);
fn is_file_transfer();
fn is_port_forward();
@@ -154,11 +158,9 @@ impl sciter::EventHandler for Handler {
fn login(String, bool);
fn new_rdp();
fn send_mouse(i32, i32, i32, bool, bool, bool, bool);
- fn key_down_or_up(bool, String, i32, bool, bool, bool, bool, bool);
+ fn enter();
+ fn leave();
fn ctrl_alt_del();
- fn ctrl_space();
- fn alt_tab();
- fn super_x();
fn transfer_file();
fn tunnel();
fn lock_screen();
@@ -218,6 +220,139 @@ impl Handler {
me
}
+ fn start_keyboard_hook(&self) {
+ if self.is_port_forward() || self.is_file_transfer() {
+ return;
+ }
+ if unsafe { KEYBOARD_HOOKED } {
+ return;
+ }
+ unsafe {
+ KEYBOARD_HOOKED = true;
+ }
+ log::info!("keyboard hooked");
+ let mut me = self.clone();
+ let peer = self.peer_platform();
+ let is_win = peer == "Windows";
+ std::thread::spawn(move || {
+ // This will block.
+ std::env::set_var("KEYBOARD_ONLY", "y"); // pass to rdev
+ use rdev::{EventType::*, *};
+ let func = move |evt: Event| {
+ if unsafe { !IS_IN || !KEYBOARD_ENABLED } {
+ return;
+ }
+ let (key, down) = match evt.event_type {
+ KeyPress(k) => (k, 1),
+ KeyRelease(k) => (k, 0),
+ _ => return,
+ };
+ let alt = get_key_state(enigo::Key::Alt);
+ let ctrl = get_key_state(enigo::Key::Control);
+ let shift = get_key_state(enigo::Key::Shift);
+ let command = get_key_state(enigo::Key::Meta);
+ let control_key = match key {
+ Key::Alt => Some(ControlKey::Alt),
+ Key::AltGr => Some(ControlKey::RAlt),
+ Key::Backspace => Some(ControlKey::Backspace),
+ Key::ControlLeft => Some(ControlKey::Control),
+ Key::ControlRight => Some(ControlKey::RControl),
+ Key::DownArrow => Some(ControlKey::DownArrow),
+ Key::Escape => Some(ControlKey::Escape),
+ Key::F1 => Some(ControlKey::F1),
+ Key::F10 => Some(ControlKey::F10),
+ Key::F11 => Some(ControlKey::F11),
+ Key::F12 => Some(ControlKey::F12),
+ Key::F2 => Some(ControlKey::F2),
+ Key::F3 => Some(ControlKey::F3),
+ Key::F4 => Some(ControlKey::F4),
+ Key::F5 => Some(ControlKey::F5),
+ Key::F6 => Some(ControlKey::F6),
+ Key::F7 => Some(ControlKey::F7),
+ Key::F8 => Some(ControlKey::F8),
+ Key::F9 => Some(ControlKey::F9),
+ Key::LeftArrow => Some(ControlKey::LeftArrow),
+ Key::MetaLeft => Some(ControlKey::Meta),
+ Key::MetaRight => Some(ControlKey::RWin),
+ Key::Return => Some(ControlKey::Return),
+ Key::RightArrow => Some(ControlKey::RightArrow),
+ Key::ShiftLeft => Some(ControlKey::Shift),
+ Key::ShiftRight => Some(ControlKey::RShift),
+ Key::Space => Some(ControlKey::Space),
+ Key::Tab => Some(ControlKey::Tab),
+ Key::UpArrow => Some(ControlKey::UpArrow),
+ Key::Delete => {
+ if is_win && ctrl && alt {
+ me.ctrl_alt_del();
+ return;
+ }
+ Some(ControlKey::Delete)
+ }
+ Key::Apps => Some(ControlKey::Apps),
+ Key::Cancel => Some(ControlKey::Cancel),
+ Key::Clear => Some(ControlKey::Clear),
+ Key::Kana => Some(ControlKey::Kana),
+ Key::Hangul => Some(ControlKey::Hangul),
+ Key::Junja => Some(ControlKey::Junja),
+ Key::Final => Some(ControlKey::Final),
+ Key::Hanja => Some(ControlKey::Hanja),
+ Key::Hanji => Some(ControlKey::Hanja),
+ Key::Convert => Some(ControlKey::Convert),
+ Key::Print => Some(ControlKey::Print),
+ Key::Select => Some(ControlKey::Select),
+ Key::Execute => Some(ControlKey::Execute),
+ Key::PrintScreen => Some(ControlKey::Snapshot),
+ Key::Help => Some(ControlKey::Help),
+ Key::Sleep => Some(ControlKey::Sleep),
+ Key::Separator => Some(ControlKey::Separator),
+ Key::KpReturn => Some(ControlKey::NumpadEnter),
+ Key::Kp0 => Some(ControlKey::Numpad0),
+ Key::Kp1 => Some(ControlKey::Numpad1),
+ Key::Kp2 => Some(ControlKey::Numpad2),
+ Key::Kp3 => Some(ControlKey::Numpad3),
+ Key::Kp4 => Some(ControlKey::Numpad4),
+ Key::Kp5 => Some(ControlKey::Numpad5),
+ Key::Kp6 => Some(ControlKey::Numpad6),
+ Key::Kp7 => Some(ControlKey::Numpad7),
+ Key::Kp8 => Some(ControlKey::Numpad8),
+ Key::Kp9 => Some(ControlKey::Numpad9),
+ Key::KpDivide => Some(ControlKey::Divide),
+ Key::KpMultiply => Some(ControlKey::Subtract),
+ Key::KpDecimal => Some(ControlKey::Decimal),
+ Key::KpMinus => Some(ControlKey::Subtract),
+ Key::KpPlus => Some(ControlKey::Add),
+ Key::CapsLock | Key::NumLock | Key::ScrollLock => {
+ return;
+ }
+ _ => None,
+ };
+ let mut key_event = KeyEvent::new();
+ if let Some(k) = control_key {
+ key_event.set_control_key(k);
+ } else {
+ let chr = match evt.name {
+ Some(ref s) => s.chars().next().unwrap_or('\0'),
+ _ => '\0',
+ };
+ if chr != '\0' {
+ if chr == 'l' && is_win && command {
+ me.lock_screen();
+ return;
+ }
+ key_event.set_chr(chr as _);
+ } else {
+ log::error!("Unknown key {:?}", evt);
+ return;
+ }
+ }
+ me.key_down_or_up(down, key_event, alt, ctrl, shift, command);
+ };
+ if let Err(error) = rdev::listen(func) {
+ log::error!("rdev: {:?}", error);
+ }
+ });
+ }
+
fn get_view_style(&mut self) -> String {
return self.lc.read().unwrap().view_style.clone();
}
@@ -287,6 +422,10 @@ impl Handler {
self.lc.read().unwrap().remember
}
+ fn t(&self, name: String) -> String {
+ crate::client::translate(name)
+ }
+
fn is_xfce(&self) -> bool {
crate::platform::is_xfce()
}
@@ -409,6 +548,10 @@ impl Handler {
self.lc.read().unwrap().get_option(&k)
}
+ fn set_option(&self, k: String, v: String) {
+ self.lc.write().unwrap().set_option(k, v);
+ }
+
fn save_close_state(&self, k: String, v: String) {
self.write().unwrap().close_state.insert(k, v);
}
@@ -535,7 +678,6 @@ impl Handler {
fn reconnect(&mut self) {
let cloned = self.clone();
let mut lock = self.write().unwrap();
- lock.last_down_key.take();
lock.thread.take().map(|t| t.join());
lock.thread = Some(std::thread::spawn(move || {
io_loop(cloned);
@@ -629,6 +771,18 @@ impl Handler {
self.send(Data::NewRDP);
}
+ fn enter(&mut self) {
+ unsafe {
+ IS_IN = true;
+ }
+ }
+
+ fn leave(&mut self) {
+ unsafe {
+ IS_IN = false;
+ }
+ }
+
fn send_mouse(
&mut self,
mask: i32,
@@ -668,7 +822,6 @@ impl Handler {
let evt_type = mask & 0x7;
if buttons == 1 && evt_type == 1 && ctrl && self.peer_platform() != "Mac OS" {
self.send_mouse((1 << 3 | 2) as _, x, y, alt, ctrl, shift, command);
- return;
}
}
}
@@ -754,6 +907,7 @@ impl Handler {
65300 => key_event.set_control_key(ControlKey::Scroll),
65421 => key_event.set_control_key(ControlKey::NumpadEnter), // numpad enter
65407 => key_event.set_control_key(ControlKey::NumLock),
+ 65515 => key_event.set_control_key(ControlKey::Meta),
65516 => key_event.set_control_key(ControlKey::RWin),
65513 => key_event.set_control_key(ControlKey::Alt),
65514 => key_event.set_control_key(ControlKey::RAlt),
@@ -811,32 +965,20 @@ impl Handler {
fn ctrl_alt_del(&mut self) {
if self.peer_platform() == "Windows" {
- let del = "CTRL_ALT_DEL".to_owned();
- self.key_down_or_up(1, del, 0, false, false, false, false, false);
+ let mut key_event = KeyEvent::new();
+ key_event.set_control_key(ControlKey::CtrlAltDel);
+ self.key_down_or_up(1, key_event, false, false, false, false);
} else {
- let del = "VK_DELETE".to_owned();
- self.key_down_or_up(1, del.clone(), 0, true, true, false, false, false);
- self.key_down_or_up(0, del, 0, true, true, false, false, false);
+ let mut key_event = KeyEvent::new();
+ key_event.set_control_key(ControlKey::Delete);
+ self.key_down_or_up(3, key_event, true, true, false, false);
}
}
- fn super_x(&mut self) {
- self.super_on = true;
- }
-
- fn ctrl_space(&mut self) {
- let key = "VK_SPACE".to_owned();
- self.key_down_or_up(3, key, 0, false, true, false, false, false);
- }
-
- fn alt_tab(&mut self) {
- let key = "VK_TAB".to_owned();
- self.key_down_or_up(3, key, 0, true, false, false, false, false);
- }
-
fn lock_screen(&mut self) {
- let lock = "LOCK_SCREEN".to_owned();
- self.key_down_or_up(1, lock, 0, false, false, false, false, false);
+ let mut key_event = KeyEvent::new();
+ key_event.set_control_key(ControlKey::LockScreen);
+ self.key_down_or_up(1, key_event, false, false, false, false);
}
fn transfer_file(&mut self) {
@@ -858,104 +1000,55 @@ impl Handler {
fn key_down_or_up(
&mut self,
down_or_up: i32,
- name: String,
- code: i32,
+ evt: KeyEvent,
alt: bool,
ctrl: bool,
shift: bool,
command: bool,
- extended: bool,
) {
- // extended: e.g. ctrl key on right side, https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-keybd_event
- // not found api of osx and xdo
- log::debug!(
- "{:?} {} {} {} {} {} {} {} {}",
- std::time::SystemTime::now(),
- down_or_up,
- name,
- code,
- alt,
- ctrl,
- shift,
- command,
- extended,
- );
+ let mut key_event = evt;
- let mut command = command;
- if self.super_on {
- command = true;
+ if alt
+ && !crate::is_control_key(&key_event, &ControlKey::Alt)
+ && !crate::is_control_key(&key_event, &ControlKey::RAlt)
+ {
+ key_event.modifiers.push(ControlKey::Alt.into());
}
-
- if down_or_up == 0 {
- self.super_on = false;
+ if shift
+ && !crate::is_control_key(&key_event, &ControlKey::Shift)
+ && !crate::is_control_key(&key_event, &ControlKey::RShift)
+ {
+ key_event.modifiers.push(ControlKey::Shift.into());
}
-
- let mut name = name;
- #[cfg(target_os = "linux")]
- if code == 65383 {
- // VK_MENU
- name = "Apps".to_owned();
+ if ctrl
+ && !crate::is_control_key(&key_event, &ControlKey::Control)
+ && !crate::is_control_key(&key_event, &ControlKey::RControl)
+ {
+ key_event.modifiers.push(ControlKey::Control.into());
}
-
- if extended {
- match name.as_ref() {
- "VK_CONTROL" => name = "RControl".to_owned(),
- "VK_MENU" => name = "RAlt".to_owned(),
- "VK_SHIFT" => name = "RShift".to_owned(),
- _ => {}
+ if command
+ && !crate::is_control_key(&key_event, &ControlKey::Meta)
+ && !crate::is_control_key(&key_event, &ControlKey::RWin)
+ {
+ key_event.modifiers.push(ControlKey::Meta.into());
+ }
+ if get_key_state(enigo::Key::CapsLock) {
+ key_event.modifiers.push(ControlKey::CapsLock.into());
+ }
+ if self.peer_platform() != "Mac OS" {
+ if get_key_state(enigo::Key::NumLock) && common::valid_for_numlock(&key_event) {
+ key_event.modifiers.push(ControlKey::NumLock.into());
}
}
-
- if let Some(mut key_event) = self.get_key_event(down_or_up, &name, code) {
- if alt
- && !crate::is_control_key(&key_event, &ControlKey::Alt)
- && !crate::is_control_key(&key_event, &ControlKey::RAlt)
- {
- key_event.modifiers.push(ControlKey::Alt.into());
- }
- if shift
- && !crate::is_control_key(&key_event, &ControlKey::Shift)
- && !crate::is_control_key(&key_event, &ControlKey::RShift)
- {
- key_event.modifiers.push(ControlKey::Shift.into());
- }
- if ctrl
- && !crate::is_control_key(&key_event, &ControlKey::Control)
- && !crate::is_control_key(&key_event, &ControlKey::RControl)
- {
- key_event.modifiers.push(ControlKey::Control.into());
- }
- if command
- && !crate::is_control_key(&key_event, &ControlKey::Meta)
- && !crate::is_control_key(&key_event, &ControlKey::RWin)
- {
- key_event.modifiers.push(ControlKey::Meta.into());
- }
- if crate::is_control_key(&key_event, &ControlKey::CapsLock) {
- return;
- } else if get_key_state(enigo::Key::CapsLock) && common::valid_for_capslock(&key_event)
- {
- key_event.modifiers.push(ControlKey::CapsLock.into());
- }
- if self.peer_platform() != "Mac OS" {
- if crate::is_control_key(&key_event, &ControlKey::NumLock) {
- return;
- } else if get_key_state(enigo::Key::NumLock)
- && common::valid_for_numlock(&key_event)
- {
- key_event.modifiers.push(ControlKey::NumLock.into());
- }
- }
- if down_or_up == 1 {
- key_event.down = true;
- } else if down_or_up == 3 {
- key_event.press = true;
- }
- let mut msg_out = Message::new();
- msg_out.set_key_event(key_event);
- log::debug!("{:?}", msg_out);
- self.send(Data::Message(msg_out));
+ if down_or_up == 1 {
+ key_event.down = true;
+ } else if down_or_up == 3 {
+ key_event.press = true;
}
+ let mut msg_out = Message::new();
+ msg_out.set_key_event(key_event);
+ log::debug!("{:?}", msg_out);
+ self.send(Data::Message(msg_out));
}
#[inline]
@@ -1132,6 +1225,9 @@ impl Remote {
};
match Client::start(&self.handler.id, conn_type).await {
Ok((mut peer, direct)) => {
+ unsafe {
+ KEYBOARD_ENABLED = true;
+ }
self.handler
.call("setConnectionType", &make_args!(peer.is_secured(), direct));
loop {
@@ -1191,6 +1287,9 @@ impl Remote {
if let Some(stop) = stop_clipboard {
stop.send(()).ok();
}
+ unsafe {
+ KEYBOARD_ENABLED = false;
+ }
}
fn handle_job_status(&mut self, id: i32, file_num: i32, err: Option) {
@@ -1586,6 +1685,9 @@ impl Remote {
log::info!("Change permission {:?} -> {}", p.permission, p.enabled);
match p.permission.enum_value_or_default() {
Permission::Keyboard => {
+ unsafe {
+ KEYBOARD_ENABLED = p.enabled;
+ }
self.handler
.call("setPermission", &make_args!("keyboard", p.enabled));
}
@@ -1738,6 +1840,7 @@ impl Interface for Handler {
crate::platform::windows::add_recent_document(&path);
}
}
+ self.start_keyboard_hook();
}
async fn handle_hash(&mut self, hash: Hash, peer: &mut Stream) {
diff --git a/src/ui/remote.tis b/src/ui/remote.tis
index f78d8ec65..0afbe13f3 100644
--- a/src/ui/remote.tis
+++ b/src/ui/remote.tis
@@ -1,5 +1,4 @@
var cursor_img = $(img#cursor);
-var last_key_time = 0;
is_file_transfer = handler.is_file_transfer();
var is_port_forward = handler.is_port_forward();
var display_width = 0;
@@ -72,46 +71,14 @@ function adaptDisplay() {
// https://sciter.com/docs/content/sciter/Event.htm
var entered = false;
-
-var keymap = {};
-for (var (k, v) in Event) {
- k = k + ""
- if (k[0] == "V" && k[1] == "K") {
- keymap[v] = k;
+if (!is_file_transfer && !is_port_forward) {
+ self.onKey = function(evt) {
+ if (!entered) return false;
+ // so that arrow key not move scrollbar
+ return true;
}
}
-// VK_ENTER = VK_RETURN
-// somehow, handler.onKey and view.onKey not working
-function self.onKey(evt) {
- last_key_time = getTime();
- if (is_file_transfer || is_port_forward) return false;
- if (!entered) return false;
- if (!keyboard_enabled) return false;
- switch (evt.type) {
- case Event.KEY_DOWN:
- handler.key_down_or_up(1, keymap[evt.keyCode] || "", evt.keyCode, evt.altKey,
- evt.ctrlKey, evt.shiftKey, evt.commandKey, evt.extendedKey);
- if (is_osx && evt.commandKey) {
- handler.key_down_or_up(0, keymap[evt.keyCode] || "", evt.keyCode, evt.altKey,
- evt.ctrlKey, evt.shiftKey, evt.commandKey, evt.extendedKey);
- }
- break;
- case Event.KEY_UP:
- handler.key_down_or_up(0, keymap[evt.keyCode] || "", evt.keyCode, evt.altKey,
- evt.ctrlKey, evt.shiftKey, evt.commandKey, evt.extendedKey);
- break;
- case Event.KEY_CHAR:
- // the keypress event is fired when the element receives character value. Event.keyCode is a UNICODE code point of the character
- handler.key_down_or_up(2, "", evt.keyCode, evt.altKey,
- evt.ctrlKey, evt.shiftKey, evt.commandKey, evt.extendedKey);
- break;
- default:
- return false;
- }
- return true;
-}
-
var wait_window_toolbar = false;
var last_mouse_mask;
var acc_wheel_delta_x = 0;
@@ -173,10 +140,14 @@ function handler.onMouse(evt)
wait_window_toolbar = true;
self.timer(300ms, function() {
if (!wait_window_toolbar) return;
+ var extra = 0;
+ // workaround for stupid Sciter, without this, click
+ // event not triggered on top part of buttons on toolbar
+ if (is_osx) extra = 10;
if (view.windowState == View.WINDOW_FULL_SCREEN) {
$(header).style.set {
display: "block",
- padding: (2 * workarea_offset) + "px 0 0 0",
+ padding: (2 * workarea_offset + extra) + "px 0 0 0",
};
}
wait_window_toolbar = false;
@@ -280,10 +251,12 @@ function handler.onMouse(evt)
case Event.MOUSE_ENTER:
entered = true;
stdout.println("enter");
+ handler.enter();
return keyboard_enabled;
case Event.MOUSE_LEAVE:
entered = false;
stdout.println("leave");
+ handler.leave();
return keyboard_enabled;
default:
return false;
@@ -396,7 +369,7 @@ function self.ready() {
var h = 640;
if (is_file_transfer || is_port_forward) {
var r = handler.get_size();
- if (r[0] > 0) {
+ if (isReasonableSize(r) && r[2] > 0) {
view.move(r[0], r[1], r[2], r[3]);
} else {
centerize(w, h);
@@ -418,7 +391,7 @@ handler.adaptSize = function() {
var (fx, fy, fw, fh) = view.screenBox(#frame, #rectw);
if (is_osx) workarea_offset = sy;
var r = handler.get_size();
- if (r[2] > 0) {
+ if (isReasonableSize(r) && r[2] > 0) {
if (r[2] >= fw && r[3] >= fh && !is_linux) {
view.windowState = View.WINDOW_FULL_SCREEN;
stdout.println("Initialize to full screen");