PolytreeDE
/
alacritty
mirror of https://github.com/alacritty/alacritty.git
1
0
Fork 0
Code Releases Activity

Log used display server on Linux/BSD 

This also fixes a bug where the welcome log message wasn't logged.
This commit is contained in:
Kirill Chibisov 2022-01-30 09:36:35 +03:00 committed by GitHub
parent f6651a997b
commit efae2cc80c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alacritty/src/display/mod.rs
View File

@ -12,7 +12,7 @@ use std::{f64, mem};
use glutin::dpi::PhysicalSize;
use glutin::event::ModifiersState;
use glutin::event_loop::EventLoopWindowTarget;
#[cfg(not(any(target_os = "macos", windows)))]
#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
use glutin::platform::unix::EventLoopWindowTargetExtUnix;
use glutin::window::CursorIcon;
use log::{debug, info};

11
alacritty/src/main.rs
View File

@ -20,6 +20,8 @@ use std::string::ToString;
use std::{fs, process};
use glutin::event_loop::EventLoop as GlutinEventLoop;
#[cfg(not(any(target_os = "macos", windows)))]
use glutin::platform::unix::EventLoopWindowTargetExtUnix;
use log::info;
#[cfg(windows)]
use winapi::um::wincon::{AttachConsole, FreeConsole, ATTACH_PARENT_PROCESS};
@ -126,8 +128,6 @@ impl Drop for TemporaryFiles {
/// Creates a window, the terminal state, PTY, I/O event loop, input processor,
/// config change monitor, and runs the main display loop.
fn alacritty(options: Options) -> Result<(), String> {
info!("Welcome to Alacritty");
// Setup glutin event loop.
let window_event_loop = GlutinEventLoop::<Event>::with_user_event();
@ -135,6 +135,13 @@ fn alacritty(options: Options) -> Result<(), String> {
let log_file = logging::initialize(&options, window_event_loop.create_proxy())
.expect("Unable to initialize logger");
info!("Welcome to Alacritty");
#[cfg(all(feature = "x11", not(any(target_os = "macos", windows))))]
info!("Running on {}", if window_event_loop.is_x11() { "X11" } else { "Wayland" });
#[cfg(not(any(feature = "x11", target_os = "macos", windows)))]
info!("Running on Wayland");
// Load configuration file.
let config = config::load(&options);
log_config_path(&config);