PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-18 13:55:23 -05:00
Code Releases Activity

Refactor window builder

Browse source
This commit is contained in:
Christian Duerr 2019-02-06 00:40:43 +01:00
parent 84a8837b22
commit d4785cd679
No known key found for this signature in database
GPG key ID: 85CDAE3C164BA7B4
2 changed files with 24 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cli.rs
View file

@ -16,7 +16,7 @@ use clap::{Arg, App, crate_name, crate_version, crate_authors, crate_description
use crate::index::{Line, Column};
use crate::config::{Dimensions, Shell};
use crate::window::{DEFAULT_TITLE, DEFAULT_CLASS};
use crate::window::{DEFAULT_TITLE};
use std::path::{Path, PathBuf};
use std::borrow::Cow;
@ -91,7 +91,7 @@ impl Options {
.arg(Arg::with_name("class")
.long("class")
.takes_value(true)
.help(&format!("Defines window class on X11 [default: {}]", DEFAULT_CLASS)))
.help(&format!("Defines window class on X11 [default: {}]", DEFAULT_TITLE)))
.arg(Arg::with_name("q")
.short("q")
.multiple(true)

70
src/window.rs
View file

@ -38,18 +38,6 @@ static WINDOW_ICON: &'static [u8] = include_bytes!("../assets/windows/alacritty.
/// In X11, this the default value for the `WM_NAME` property.
pub const DEFAULT_TITLE: &str = "Alacritty";
/// Default text for general window class, X11 specific.
///
/// In X11, this is the default value for the `WM_CLASS` property. The
/// second value of `WM_CLASS` is **never** changed to anything but
/// the default value.
///
/// ```ignore
/// $ xprop | grep WM_CLASS
/// WM_CLASS(STRING) = "Alacritty", "Alacritty"
/// ```
pub const DEFAULT_CLASS: &str = "Alacritty";
/// Window errors
#[derive(Debug)]
pub enum Error {
@ -150,8 +138,7 @@ impl Window {
let title = options.title.as_ref().map_or(DEFAULT_TITLE, |t| t);
let class = options.class.as_ref().map_or(DEFAULT_TITLE, |c| c);
let window_builder = Window::get_platform_window(title, window_config);
let window_builder = Window::platform_builder_ext(window_builder, &class);
let window_builder = Window::get_platform_window(title, class, window_config);
let window = create_gl_window(window_builder.clone(), &event_loop, false)
.or_else(|_| create_gl_window(window_builder, &event_loop, true))?;
window.show();
@ -262,39 +249,14 @@ impl Window {
}
}
#[cfg(
any(
target_os = "linux",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "openbsd"
)
)]
fn platform_builder_ext(window_builder: WindowBuilder, wm_class: &str) -> WindowBuilder {
use glutin::os::unix::WindowBuilderExt;
window_builder
// X11
.with_class(wm_class.to_owned(), "Alacritty".to_owned())
// Wayland
.with_app_id("Alacritty".to_owned())
}
#[cfg(
not(
any(
target_os = "linux",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "openbsd"
)
)
)]
fn platform_builder_ext(window_builder: WindowBuilder, _: &str) -> WindowBuilder {
window_builder
}
#[cfg(not(any(target_os = "macos", windows)))]
pub fn get_platform_window(title: &str, window_config: &WindowConfig) -> WindowBuilder {
pub fn get_platform_window(
title: &str,
class: &str,
window_config: &WindowConfig
) -> WindowBuilder {
use glutin::os::unix::WindowBuilderExt;
let decorations = match window_config.decorations() {
Decorations::None => false,
_ => true,
@ -306,10 +268,18 @@ impl Window {
.with_transparency(true)
.with_maximized(window_config.start_maximized())
.with_decorations(decorations)
// X11
.with_class(class.into(), DEFAULT_TITLE.into())
// Wayland
.with_app_id(class.into())
}
#[cfg(windows)]
pub fn get_platform_window(title: &str, window_config: &WindowConfig) -> WindowBuilder {
pub fn get_platform_window(
title: &str,
_class: &str,
window_config: &WindowConfig
) -> WindowBuilder {
let icon = Icon::from_bytes_with_format(WINDOW_ICON, ImageFormat::ICO).unwrap();
let decorations = match window_config.decorations() {
@ -327,7 +297,11 @@ impl Window {
}
#[cfg(target_os = "macos")]
pub fn get_platform_window(title: &str, window_config: &WindowConfig) -> WindowBuilder {
pub fn get_platform_window(
title: &str,
_class: &str,
window_config: &WindowConfig
) -> WindowBuilder {
use glutin::os::macos::WindowBuilderExt;
let window = WindowBuilder::new()