wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 22:01:47 +03:00
Code Issues Projects Releases Wiki Activity

Arc -> Rc for macos

Browse Source
This commit is contained in:
Wez Furlong 2019-08-11 20:39:22 -07:00
parent da90ad7ec6
commit 8ae35f5b01
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
window/src/os/macos/connection.rs
View File

@ -3,33 +3,33 @@ use cocoa::base::{id, nil};
use failure::Fallible;
use objc::*;
use std::cell::RefCell;
use std::sync::Arc;
use std::rc::Rc;
pub struct Connection {
ns_app: id,
}
thread_local! {
static CONN: RefCell<Option<Arc<Connection>>> = RefCell::new(None);
static CONN: RefCell<Option<Rc<Connection>>> = RefCell::new(None);
}
impl Connection {
pub fn get() -> Option<Arc<Self>> {
pub fn get() -> Option<Rc<Self>> {
let mut res = None;
CONN.with(|m| {
if let Some(mux) = &*m.borrow() {
res = Some(Arc::clone(mux));
res = Some(Rc::clone(mux));
}
});
res
}
pub fn init() -> Fallible<Arc<Self>> {
pub fn init() -> Fallible<Rc<Self>> {
unsafe {
let ns_app = NSApp();
ns_app.setActivationPolicy_(NSApplicationActivationPolicyRegular);
let conn = Arc::new(Self { ns_app });
CONN.with(|m| *m.borrow_mut() = Some(Arc::clone(&conn)));
let conn = Rc::new(Self { ns_app });
CONN.with(|m| *m.borrow_mut() = Some(Rc::clone(&conn)));
Ok(conn)
}
}

21
window/src/os/macos/window.rs
View File

@ -14,8 +14,9 @@ use objc::declare::ClassDecl;
use objc::rc::{StrongPtr, WeakPtr};
use objc::runtime::{Class, Object, Sel};
use objc::*;
use std::cell::RefCell;
use std::ffi::c_void;
use std::sync::{Arc, Mutex};
use std::rc::Rc;
pub struct Window {
window: StrongPtr,
@ -46,7 +47,7 @@ impl Window {
NSSize::new(width as f64, height as f64),
);
let inner = Arc::new(Mutex::new(Inner {
let inner = Rc::new(RefCell::new(Inner {
callbacks,
view_id: None,
}));
@ -98,7 +99,7 @@ impl Drop for Inner {
const CLS_NAME: &str = "WezTermWindowView";
struct WindowView {
inner: Arc<Mutex<Inner>>,
inner: Rc<RefCell<Inner>>,
}
impl Drop for WindowView {
@ -174,7 +175,7 @@ impl<'a> PaintContext for MacGraphicsContext<'a> {
impl WindowView {
fn view_id(&self) -> id {
let inner = self.inner.lock().unwrap();
let inner = self.inner.borrow_mut();
inner.view_id.as_ref().map(|w| *w.load()).unwrap_or(nil)
}
@ -220,7 +221,7 @@ impl WindowView {
}
if let Some(this) = Self::get_this(this) {
if this.inner.lock().unwrap().callbacks.can_close() {
if this.inner.borrow_mut().callbacks.can_close() {
YES
} else {
NO
@ -239,7 +240,7 @@ impl WindowView {
eprintln!("window_will_close");
if let Some(this) = Self::get_this(this) {
// Advise the window of its impending death
this.inner.lock().unwrap().callbacks.destroy();
this.inner.borrow_mut().callbacks.destroy();
}
// Release and zero out the inner member
@ -255,7 +256,7 @@ impl WindowView {
if let Some(this) = Self::get_this(this) {
let mut ctx = MacGraphicsContext { buffer: &mut im };
this.inner.lock().unwrap().callbacks.paint(&mut ctx);
this.inner.borrow_mut().callbacks.paint(&mut ctx);
}
let cg_image = BitmapRef::with_image(&im);
@ -285,15 +286,15 @@ impl WindowView {
}
}
fn alloc(inner: &Arc<Mutex<Inner>>) -> Fallible<StrongPtr> {
fn alloc(inner: &Rc<RefCell<Inner>>) -> Fallible<StrongPtr> {
let cls = Self::get_class();
let view_id: StrongPtr = unsafe { StrongPtr::new(msg_send![cls, new]) };
inner.lock().unwrap().view_id.replace(view_id.weak());
inner.borrow_mut().view_id.replace(view_id.weak());
let view = Box::into_raw(Box::new(Self {
inner: Arc::clone(&inner),
inner: Rc::clone(&inner),
}));
unsafe {