aboutsummaryrefslogtreecommitdiff
path: root/alacritty/src
diff options
context:
space:
mode:
Diffstat (limited to 'alacritty/src')
-rw-r--r--alacritty/src/clipboard.rs4
-rw-r--r--alacritty/src/display/mod.rs2
-rw-r--r--alacritty/src/display/window.rs20
-rw-r--r--alacritty/src/event.rs4
-rw-r--r--alacritty/src/main.rs9
-rw-r--r--alacritty/src/renderer/platform.rs2
-rw-r--r--alacritty/src/window_context.rs4
7 files changed, 25 insertions, 20 deletions
diff --git a/alacritty/src/clipboard.rs b/alacritty/src/clipboard.rs
index bb90a13d..7853de47 100644
--- a/alacritty/src/clipboard.rs
+++ b/alacritty/src/clipboard.rs
@@ -1,5 +1,5 @@
use log::{debug, warn};
-use raw_window_handle::RawDisplayHandle;
+use winit::raw_window_handle::RawDisplayHandle;
use alacritty_terminal::term::ClipboardType;
@@ -23,7 +23,7 @@ impl Clipboard {
#[cfg(all(feature = "wayland", not(any(target_os = "macos", windows))))]
RawDisplayHandle::Wayland(display) => {
let (selection, clipboard) =
- wayland_clipboard::create_clipboards_from_external(display.display);
+ wayland_clipboard::create_clipboards_from_external(display.display.as_ptr());
Self { clipboard: Box::new(clipboard), selection: Some(Box::new(selection)) }
},
_ => Self::default(),
diff --git a/alacritty/src/display/mod.rs b/alacritty/src/display/mod.rs
index 4dafa80f..1841b167 100644
--- a/alacritty/src/display/mod.rs
+++ b/alacritty/src/display/mod.rs
@@ -14,10 +14,10 @@ use glutin::surface::{Surface, SwapInterval, WindowSurface};
use log::{debug, info};
use parking_lot::MutexGuard;
-use raw_window_handle::RawWindowHandle;
use serde::{Deserialize, Serialize};
use winit::dpi::PhysicalSize;
use winit::keyboard::ModifiersState;
+use winit::raw_window_handle::RawWindowHandle;
use winit::window::CursorIcon;
use crossfont::{Rasterize, Rasterizer, Size as FontSize};
diff --git a/alacritty/src/display/window.rs b/alacritty/src/display/window.rs
index 09793fa0..da5d85bc 100644
--- a/alacritty/src/display/window.rs
+++ b/alacritty/src/display/window.rs
@@ -26,12 +26,12 @@ use {
winit::platform::macos::{OptionAsAlt, WindowAttributesExtMacOS, WindowExtMacOS},
};
-use raw_window_handle::{HasRawWindowHandle, RawWindowHandle};
use winit::dpi::{PhysicalPosition, PhysicalSize};
use winit::event_loop::ActiveEventLoop;
use winit::monitor::MonitorHandle;
#[cfg(windows)]
use winit::platform::windows::IconExtWindows;
+use winit::raw_window_handle::{HasWindowHandle, RawWindowHandle};
use winit::window::{
CursorIcon, Fullscreen, ImePurpose, Theme, UserAttentionType, Window as WinitWindow,
WindowAttributes, WindowId,
@@ -190,7 +190,7 @@ impl Window {
let scale_factor = window.scale_factor();
log::info!("Window scale factor: {}", scale_factor);
- let is_x11 = matches!(window.raw_window_handle(), RawWindowHandle::Xlib(_));
+ let is_x11 = matches!(window.window_handle().unwrap().as_raw(), RawWindowHandle::Xlib(_));
Ok(Self {
requested_redraw: false,
@@ -206,7 +206,7 @@ impl Window {
#[inline]
pub fn raw_window_handle(&self) -> RawWindowHandle {
- self.window.raw_window_handle()
+ self.window.window_handle().unwrap().as_raw()
}
#[inline]
@@ -444,14 +444,15 @@ impl Window {
/// This prevents rendering artifacts from showing up when the window is transparent.
#[cfg(target_os = "macos")]
pub fn set_has_shadow(&self, has_shadows: bool) {
- let raw_window = match self.raw_window_handle() {
- RawWindowHandle::AppKit(handle) => handle.ns_window as id,
+ let ns_view = match self.raw_window_handle() {
+ RawWindowHandle::AppKit(handle) => handle.ns_view.as_ptr() as id,
_ => return,
};
let value = if has_shadows { YES } else { NO };
unsafe {
- let _: id = msg_send![raw_window, setHasShadow: value];
+ let ns_window: id = msg_send![ns_view, window];
+ let _: id = msg_send![ns_window, setHasShadow: value];
}
}
@@ -487,12 +488,13 @@ impl Window {
#[cfg(target_os = "macos")]
fn use_srgb_color_space(window: &WinitWindow) {
- let raw_window = match window.raw_window_handle() {
- RawWindowHandle::AppKit(handle) => handle.ns_window as id,
+ let ns_view = match window.window_handle().unwrap().as_raw() {
+ RawWindowHandle::AppKit(handle) => handle.ns_view.as_ptr() as id,
_ => return,
};
unsafe {
- let _: () = msg_send![raw_window, setColorSpace: NSColorSpace::sRGBColorSpace(nil)];
+ let ns_window: id = msg_send![ns_view, window];
+ let _: () = msg_send![ns_window, setColorSpace: NSColorSpace::sRGBColorSpace(nil)];
}
}
diff --git a/alacritty/src/event.rs b/alacritty/src/event.rs
index b9bf3030..8da758df 100644
--- a/alacritty/src/event.rs
+++ b/alacritty/src/event.rs
@@ -17,13 +17,13 @@ use ahash::RandomState;
use crossfont::Size as FontSize;
use glutin::display::{Display as GlutinDisplay, GetGlDisplay};
use log::{debug, error, info, warn};
-use raw_window_handle::HasRawDisplayHandle;
use winit::application::ApplicationHandler;
use winit::event::{
ElementState, Event as WinitEvent, Ime, Modifiers, MouseButton, StartCause,
Touch as TouchEvent, WindowEvent,
};
use winit::event_loop::{ActiveEventLoop, ControlFlow, DeviceEvents, EventLoop, EventLoopProxy};
+use winit::raw_window_handle::HasDisplayHandle;
use winit::window::WindowId;
use alacritty_terminal::event::{Event as TerminalEvent, EventListener, Notify};
@@ -99,7 +99,7 @@ impl Processor {
// SAFETY: Since this takes a pointer to the winit event loop, it MUST be dropped first,
// which is done in `loop_exiting`.
- let clipboard = unsafe { Clipboard::new(event_loop.raw_display_handle()) };
+ let clipboard = unsafe { Clipboard::new(event_loop.display_handle().unwrap().as_raw()) };
Processor {
initial_window_options,
diff --git a/alacritty/src/main.rs b/alacritty/src/main.rs
index 2951c224..6219dd78 100644
--- a/alacritty/src/main.rs
+++ b/alacritty/src/main.rs
@@ -19,11 +19,11 @@ use std::path::PathBuf;
use std::{env, fs};
use log::info;
-#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
-use raw_window_handle::{HasRawDisplayHandle, RawDisplayHandle};
#[cfg(windows)]
use windows_sys::Win32::System::Console::{AttachConsole, FreeConsole, ATTACH_PARENT_PROCESS};
use winit::event_loop::EventLoop;
+#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
+use winit::raw_window_handle::{HasDisplayHandle, RawDisplayHandle};
use alacritty_terminal::tty;
@@ -137,7 +137,10 @@ fn alacritty(mut options: Options) -> Result<(), Box<dyn Error>> {
#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
info!(
"Running on {}",
- if matches!(window_event_loop.raw_display_handle(), RawDisplayHandle::Wayland(_)) {
+ if matches!(
+ window_event_loop.display_handle().unwrap().as_raw(),
+ RawDisplayHandle::Wayland(_)
+ ) {
"Wayland"
} else {
"X11"
diff --git a/alacritty/src/renderer/platform.rs b/alacritty/src/renderer/platform.rs
index 3568bd20..87ed29c2 100644
--- a/alacritty/src/renderer/platform.rs
+++ b/alacritty/src/renderer/platform.rs
@@ -12,10 +12,10 @@ use glutin::prelude::*;
use glutin::surface::{Surface, SurfaceAttributesBuilder, WindowSurface};
use log::{debug, LevelFilter};
-use raw_window_handle::{RawDisplayHandle, RawWindowHandle};
use winit::dpi::PhysicalSize;
#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
use winit::platform::x11;
+use winit::raw_window_handle::{RawDisplayHandle, RawWindowHandle};
/// Create the GL display.
pub fn create_gl_display(
diff --git a/alacritty/src/window_context.rs b/alacritty/src/window_context.rs
index f5fb5cc5..062f9ef0 100644
--- a/alacritty/src/window_context.rs
+++ b/alacritty/src/window_context.rs
@@ -14,10 +14,10 @@ use glutin::display::GetGlDisplay;
#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
use glutin::platform::x11::X11GlConfigExt;
use log::info;
-use raw_window_handle::HasRawDisplayHandle;
use serde_json as json;
use winit::event::{Event as WinitEvent, Modifiers, WindowEvent};
use winit::event_loop::{ActiveEventLoop, EventLoopProxy};
+use winit::raw_window_handle::HasDisplayHandle;
use winit::window::WindowId;
use alacritty_terminal::event::Event as TerminalEvent;
@@ -75,7 +75,7 @@ impl WindowContext {
config: Rc<UiConfig>,
options: WindowOptions,
) -> Result<Self, Box<dyn Error>> {
- let raw_display_handle = event_loop.raw_display_handle();
+ let raw_display_handle = event_loop.display_handle().unwrap().as_raw();
let mut identity = config.window.identity.clone();
options.window_identity.override_identity_config(&mut identity);
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion