alacritty · thunderseethe · Mar 16, 2019 · Mar 16, 2019 · Mar 16, 2019 · Mar 16, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Completions for `--class` and `-t` (short title)
 - Change the mouse cursor when hovering over the message bar and its close button
 - Support combined bold and italic text (with `font.bold_italic` to customize it)
+- Font Ligatures on Linux/BSD
 - Extra bindings for F13-F20
 - Terminal escape bindings with combined modifiers
 - Bindings for ScrollToTop and ScrollToBottom actions

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/alacritty/src/display.rs b/alacritty/src/display.rs
@@ -31,10 +31,11 @@ use alacritty_terminal::event::{Event, OnResize};
 use alacritty_terminal::index::Line;
 use alacritty_terminal::message_bar::MessageBuffer;
 use alacritty_terminal::meter::Meter;
-use alacritty_terminal::renderer::rects::{RenderLines, RenderRect};
+use alacritty_terminal::renderer::rects::{RenderRect};
 use alacritty_terminal::renderer::{self, GlyphCache, QuadRenderer};
 use alacritty_terminal::term::color::Rgb;
-use alacritty_terminal::term::{RenderableCell, SizeInfo, Term};
+use alacritty_terminal::term::{cell::Flags, SizeInfo, Term};
+use alacritty_terminal::text_run::TextRun;
 
 use crate::config::Config;
 use crate::event::{FontResize, Resize};
@@ -244,7 +245,7 @@ impl Display {
         config: &Config,
     ) -> Result<(GlyphCache, f32, f32), Error> {
         let font = config.font.clone();
-        let rasterizer = font::Rasterizer::new(dpr as f32, config.font.use_thin_strokes())?;
+        let rasterizer = font::Rasterizer::new(dpr as f32, config.font.use_thin_strokes(), config.font.ligatures())?;
 
         // Initialize glyph cache
         let glyph_cache = {
@@ -362,7 +363,7 @@ impl Display {
         message_buffer: &MessageBuffer,
         config: &Config,
     ) {
-        let grid_cells: Vec<RenderableCell> = terminal.renderable_cells(config).collect();
+        let grid_text_runs: Vec<TextRun> = terminal.text_runs(config).collect();
         let visual_bell_intensity = terminal.visual_bell.intensity();
         let background_color = terminal.background_color();
         let metrics = self.glyph_cache.font_metrics();
@@ -380,26 +381,31 @@ impl Display {
             api.clear(background_color);
         });
 
-        let mut lines = RenderLines::new();
+        let mut rects: Vec<RenderRect> = Vec::new();
 
         // Draw grid
         {
             let _sampler = self.meter.sampler();
 
             self.renderer.with_api(&config, &size_info, |mut api| {
                 // Iterate over all non-empty cells in the grid
-                for cell in grid_cells {
+                for text_run in grid_text_runs {
                     // Update underline/strikeout
-                    lines.update(cell);
+                    if text_run.flags.contains(Flags::UNDERLINE) {
+                        let underline_metrics = (metrics.descent, metrics.underline_position, metrics.underline_thickness);
+                        rects.push(RenderRect::from_text_run(&text_run, underline_metrics, &size_info));
+                    }
+                    if text_run.flags.contains(Flags::STRIKEOUT) {
+                        let strikeout_metrics = (metrics.descent, metrics.strikeout_position, metrics.strikeout_thickness);
+                        rects.push(RenderRect::from_text_run(&text_run, strikeout_metrics, &size_info));
+                    }
 
                     // Draw the cell
-                    api.render_cell(cell, glyph_cache);
+                    api.render_text_run(text_run, glyph_cache);
                 }
             });
         }
 
-        let mut rects = lines.into_rects(&metrics, &size_info);
-
         if let Some(message) = message_buffer.message() {
             let text = message.text(&size_info);
 

diff --git a/alacritty_terminal/src/config/font.rs b/alacritty_terminal/src/config/font.rs
@@ -5,7 +5,6 @@ use log::error;
 use serde::de::Visitor;
 use serde::{Deserialize, Deserializer};
 
-#[cfg(target_os = "macos")]
 use crate::config::DefaultTrueBool;
 use crate::config::{failure_default, Delta, LOG_TARGET_CONFIG};
 
@@ -49,6 +48,11 @@ pub struct Font {
     #[cfg(target_os = "macos")]
     #[serde(deserialize_with = "failure_default")]
     use_thin_strokes: DefaultTrueBool,
+
+    /// Toggles rendering of font ligatures
+    #[cfg(not(any(target_os = "macos", windows)))]
+    #[serde(deserialize_with = "failure_default")]
+    ligatures: DefaultTrueBool,
 }
 
 impl Default for Font {
@@ -61,6 +65,8 @@ impl Default for Font {
             bold_italic: Default::default(),
             glyph_offset: Default::default(),
             offset: Default::default(),
+            #[cfg(not(any(target_os = "macos", windows)))]
+            ligatures: Default::default(),
             #[cfg(target_os = "macos")]
             use_thin_strokes: Default::default(),
         }
@@ -102,6 +108,16 @@ impl Font {
     pub fn use_thin_strokes(&self) -> bool {
         false
     }
+
+    #[cfg(not(any(target_os = "macos", windows)))]
+    pub fn ligatures(&self) -> bool {
+        self.ligatures.0
+    }
+
+    #[cfg(any(target_os = "macos", windows))]
+    pub fn ligatures(&self) -> bool {
+        false
+    }
 }
 
 fn default_font_size() -> Size {

diff --git a/alacritty_terminal/src/cursor.rs b/alacritty_terminal/src/cursor.rs
@@ -18,7 +18,7 @@ use std::cmp;
 
 use serde::Deserialize;
 
-use font::{Metrics, RasterizedGlyph};
+use font::{Metrics, RasterizedGlyph, PLACEHOLDER_GLYPH};
 
 use crate::ansi::CursorStyle;
 
@@ -64,7 +64,14 @@ pub fn get_underline_cursor_glyph(width: i32, line_width: i32) -> RasterizedGlyp
     let buf = vec![255u8; (width * line_width * 3) as usize];
 
     // Create a custom glyph with the rectangle data attached to it
-    RasterizedGlyph { c: ' ', top: line_width, left: 0, height: line_width, width, buf }
+    RasterizedGlyph {
+        c: PLACEHOLDER_GLYPH,
+        top: line_width,
+        left: 0,
+        height: line_width,
+        width,
+        buf,
+    }
 }
 
 // Returns a custom beam cursor character
@@ -73,7 +80,7 @@ pub fn get_beam_cursor_glyph(height: i32, line_width: i32) -> RasterizedGlyph {
     let buf = vec![255u8; (line_width * height * 3) as usize];
 
     // Create a custom glyph with the rectangle data attached to it
-    RasterizedGlyph { c: ' ', top: height, left: 0, height, width: line_width, buf }
+    RasterizedGlyph { c: PLACEHOLDER_GLYPH, top: height, left: 0, height, width: line_width, buf }
 }
 
 // Returns a custom box cursor character
@@ -95,7 +102,7 @@ pub fn get_box_cursor_glyph(height: i32, width: i32, line_width: i32) -> Rasteri
     }
 
     // Create a custom glyph with the rectangle data attached to it
-    RasterizedGlyph { c: ' ', top: height, left: 0, height, width, buf }
+    RasterizedGlyph { c: PLACEHOLDER_GLYPH, top: height, left: 0, height, width, buf }
 }
 
 // Returns a custom block cursor character
@@ -104,5 +111,5 @@ pub fn get_block_cursor_glyph(height: i32, width: i32) -> RasterizedGlyph {
     let buf = vec![255u8; (width * height * 3) as usize];
 
     // Create a custom glyph with the rectangle data attached to it
-    RasterizedGlyph { c: ' ', top: height, left: 0, height, width, buf }
+    RasterizedGlyph { c: PLACEHOLDER_GLYPH, top: height, left: 0, height, width, buf }
 }
diff --git a/alacritty_terminal/src/lib.rs b/alacritty_terminal/src/lib.rs
@@ -37,6 +37,7 @@ pub mod renderer;
 pub mod selection;
 pub mod sync;
 pub mod term;
+pub mod text_run;
 pub mod tty;
 pub mod url;
 pub mod util;