weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: make event loop in tray compatible with main window

Browse Source
This commit is contained in:
Kingtous
2023-05-02 12:52:27 +08:00
parent 4e7a8065b9
commit 7a82070420
8 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/platform/delegate.rs
View File

@@ -6,7 +6,7 @@ use cocoa::{
base::{id, nil, YES},
foundation::{NSAutoreleasePool, NSString},
};
use objc::runtime::Class;
use objc::runtime::{Class, NO};
use objc::{
class,
declare::ClassDecl,
@@ -107,7 +107,7 @@ pub unsafe fn set_delegate(handler: Option<Box<dyn AppHandler>>) {
);
decl.add_method(
sel!(handleEvent:withReplyEvent:),
handle_apple_event as extern "C" fn(&Object, Sel, u64, u64),
handle_apple_event as extern "C" fn(&Object, Sel, u64, u64) -> BOOL,
);
let decl = decl.register();
let delegate: id = msg_send![decl, alloc];
@@ -183,11 +183,27 @@ extern "C" fn handle_menu_item(this: &mut Object, _: Sel, item: id) {
}
}
extern "C" fn handle_apple_event(_this: &Object, _cmd: Sel, event: u64, _reply: u64) {
#[no_mangle]
extern "C" fn handle_apple_event(_this: &Object, _cmd: Sel, event: u64, _reply: u64) -> BOOL {
let event = event as *mut Object;
let url = fruitbasket::parse_url_event(event);
log::debug!("an event was received: {}", url);
std::thread::spawn(move || crate::handle_url_scheme(url));
YES
}
// Customize the service opening logic.
#[no_mangle]
fn service_should_handle_reopen(
obj: &Object,
sel: Sel,
sender: id,
has_visible_windows: BOOL,
) -> BOOL {
log::debug!("Invoking the main rustdesk process");
std::thread::spawn(move || crate::handle_url_scheme("".to_string()));
// Prevent default logic.
NO
}
unsafe fn make_menu_item(title: &str, key: &str, tag: u32) -> *mut Object {