enum_dispatch

crlf0710 · Feb 7, 2021 · 50c7330 · 50c7330
1 parent 75db98b
commit 50c7330
Show file tree

Hide file tree

Showing 5 changed files with 297 additions and 290 deletions.
diff --git a/engine/src/text_layout_engine.rs b/engine/src/text_layout_engine.rs
@@ -4,6 +4,7 @@
 use crate::node::NativeWord;
 use crate::xetex_font_info::{GlyphBBox, XeTeXFontInst};
 //use crate::xetex_font_manager::PlatformFontRef;
+use crate::cmd::XetexExtCmd;
 use crate::xetex_font_info::GlyphID;
 use crate::xetex_layout_interface::FixedPoint;
 use crate::xetex_layout_interface::XeTeXLayoutEngine;
@@ -200,6 +201,8 @@ pub(crate) trait TextLayoutEngine {
     /// getFontFilename
     fn font_filename(&self, index: &mut u32) -> String;
 
+    //unsafe fn print_font_name(&self, c: i32, arg1: i32, arg2: i32);
+
     /// getFontInst
     //fn font_instance(&self) -> &XeTeXFontInst;
 
@@ -210,6 +213,27 @@ pub(crate) trait TextLayoutEngine {
 
     // XXX: make a single struct for make_font_def to consume, of all the required values
 
+    unsafe fn get_font_metrics(&self) -> (Scaled, Scaled, Scaled, Scaled, Scaled);
+
+    /// ot_font_get, aat_font_get
+    unsafe fn poorly_named_getter(&self, what: XetexExtCmd) -> i32;
+
+    /// ot_font_get_1, aat_font_get_1
+    unsafe fn poorly_named_getter_1(&self, what: XetexExtCmd, param1: i32) -> i32;
+
+    /// ot_font_get_2, aat_font_get_2
+    unsafe fn poorly_named_getter_2(&self, what: XetexExtCmd, param1: i32, param2: i32) -> i32;
+
+    unsafe fn poorly_named_getter_3(
+        &self,
+        what: XetexExtCmd,
+        param1: i32,
+        param2: i32,
+        param3: i32,
+    ) -> i32;
+
+    unsafe fn get_flags(&self, font_number: usize) -> u16;
+
     /// getExtendFactor
     fn extend_factor(&self) -> f64;
     /// getPointSize
@@ -247,15 +271,15 @@ pub(crate) trait TextLayoutEngine {
     /// This is used for 'fallback in case lacks an OS/2 table', and also for adding accents
     /// (get_native_char_sidebearings).
     /// Although the shaping engine should probably be doing the latter, not xetex0!
-    unsafe fn map_char_to_glyph(&self, chr: char) -> u32;
+    fn map_char_to_glyph(&self, chr: char) -> u32;
 
     /// getFontCharRange
     /// Another candidate for using XeTeXFontInst directly
-    unsafe fn font_char_range(&self, reqFirst: libc::c_int) -> libc::c_int;
+    fn font_char_range(&self, reqFirst: i32) -> i32;
 
     /// mapGlyphToIndex
     /// Should use engine.font directly
-    unsafe fn map_glyph_to_index(&self, glyphName: *const libc::c_char) -> i32;
+    fn map_glyph_to_index(&self, glyph_name: &str) -> i32;
 
     // Provided methods, override if using stuff
 

diff --git a/engine/src/xetex_aatfont.rs b/engine/src/xetex_aatfont.rs
@@ -4,6 +4,7 @@
 use super::xetex_layout_interface::GlyphBBox;
 use crate::text_layout_engine::{LayoutRequest, NodeLayout, TextLayoutEngine};
 use crate::xetex_font_info::GlyphID;
+use std::ffi::CString;
 
 use crate::cf_prelude::*;
 
@@ -257,6 +258,53 @@ impl TextLayoutEngine for AATLayoutEngine {
     fn font_filename(&self, index: &mut u32) -> String {
         unsafe { getFileNameFromCTFont(self.ct_font(), index) }
     }
+    /*unsafe fn print_font_name(&self, c: i32, arg1: i32, arg2: i32) {
+        if self.usingGraphite() {
+            aat_print_font_name(c, arg1, arg2);
+        }
+    }*/
+
+    unsafe fn get_font_metrics(&self) -> (Scaled, Scaled, Scaled, Scaled, Scaled) {
+        aat_get_font_metrics(self.attributes)
+    }
+
+    unsafe fn get_flags(&self, _font_number: usize) -> u16 {
+        if !CFDictionaryGetValue(
+            self.attributes,
+            kCTVerticalFormsAttributeName as *const libc::c_void,
+        )
+        .is_null()
+        {
+            0x100
+        } else {
+            0
+        }
+    }
+
+    /// ot_font_get, aat_font_get
+    unsafe fn poorly_named_getter(&self, what: XetexExtCmd) -> i32 {
+        aat_font_get(what, self.attributes)
+    }
+
+    /// ot_font_get_1, aat_font_get_1
+    unsafe fn poorly_named_getter_1(&self, what: XetexExtCmd, param1: i32) -> i32 {
+        aat_font_get_1(what, self.attributes, param1)
+    }
+
+    /// ot_font_get_2, aat_font_get_2
+    unsafe fn poorly_named_getter_2(&self, what: XetexExtCmd, param1: i32, param2: i32) -> i32 {
+        aat_font_get_2(what, self.attributes, param1, param2)
+    }
+
+    unsafe fn poorly_named_getter_3(
+        &self,
+        what: XetexExtCmd,
+        param1: i32,
+        param2: i32,
+        param3: i32,
+    ) -> i32 {
+        unimplemented!()
+    }
 
     /// getExtendFactor
     fn extend_factor(&self) -> f64 {
@@ -355,20 +403,21 @@ impl TextLayoutEngine for AATLayoutEngine {
     }
 
     /// mapCharToGlyph
-    unsafe fn map_char_to_glyph(&self, chr: char) -> u32 {
-        MapCharToGlyph_AAT(self.attributes, chr as _) as u32
+    fn map_char_to_glyph(&self, chr: char) -> u32 {
+        unsafe { MapCharToGlyph_AAT(self.attributes, chr as _) as u32 }
     }
 
     /// getFontCharRange
     /// Another candidate for using XeTeXFontInst directly
-    unsafe fn font_char_range(&self, reqFirst: libc::c_int) -> libc::c_int {
-        GetFontCharRange_AAT(self.attributes, reqFirst)
+    fn font_char_range(&self, reqFirst: i32) -> i32 {
+        unsafe { GetFontCharRange_AAT(self.attributes, reqFirst) }
     }
 
     /// mapGlyphToIndex
     /// Should use engine.font directly
-    unsafe fn map_glyph_to_index(&self, glyphName: *const libc::c_char) -> i32 {
-        MapGlyphToIndex_AAT(self.attributes, glyphName)
+    fn map_glyph_to_index(&self, glyph_name: &str) -> i32 {
+        let name = CString::new(glyph_name).unwrap();
+        unsafe { MapGlyphToIndex_AAT(self.attributes, name.as_ptr()) }
     }
 }