Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-06 03:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[rust] rename NcStyleMask to NcStyle

Browse Source
This commit is contained in:
joseLuís 2021-06-15 18:22:48 +02:00
parent 80b7391d96
commit e95f540c02
8 changed files with 77 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rust/src/cells/methods.rs
View File

@ -2,7 +2,7 @@
use crate::{
cstring, error, nccell_load, NcAlphaBits, NcCell, NcChannelPair, NcColor, NcEgc, NcEgcBackstop,
NcPaletteIndex, NcPlane, NcResult, NcRgb, NcStyleMask, NCRESULT_ERR,
NcPaletteIndex, NcPlane, NcResult, NcRgb, NcStyle, NCRESULT_ERR,
};
#[allow(unused_imports)] // for the doc comments
@ -18,7 +18,7 @@ impl NcCell {
gcluster: (ch as u32).to_le(),
gcluster_backstop: 0 as NcEgcBackstop,
width: 0_u8,
stylemask: 0 as NcStyleMask,
stylemask: 0 as NcStyle,
channels: 0 as NcChannelPair,
}
}
@ -74,7 +74,7 @@ impl NcCell {
plane: &mut NcPlane,
cell: &mut NcCell,
gcluster: &str,
style: NcStyleMask,
style: NcStyle,
channels: NcChannelPair,
) -> NcResult<u32> {
let bytes = crate::nccell_prime(plane, cell, gcluster, style, channels);
@ -304,14 +304,14 @@ impl NcCell {
crate::nccellcmp(plane1, cell1, plane2, cell2)
}
/// Saves the [NcStyleMask] and the [NcChannelPair], and returns the [NcEgc].
/// Saves the [NcStyle] and the [NcChannelPair], and returns the [NcEgc].
/// (These are the three elements of an NcCell).
///
/// *C style function: [nccell_fg_alpha()][crate::nccell_fg_alpha].*
pub fn extract(
&mut self,
plane: &mut NcPlane,
styles: &mut NcStyleMask,
styles: &mut NcStyle,
channels: &mut NcChannelPair,
) -> NcEgc {
crate::nccell_extract(plane, self, styles, channels)
@ -327,31 +327,31 @@ impl NcCell {
crate::nccell_extract(plane, self, &mut _styles, &mut _channels)
}
/// Returns the [NcStyleMask] bits.
/// Returns the [NcStyle] bits.
///
/// *C style function: [nccell_styles()][crate::nccell_styles].*
pub fn styles(&mut self) -> NcStyleMask {
pub fn styles(&mut self) -> NcStyle {
crate::nccell_styles(self)
}
/// Removes the specified [NcStyleMask] bits.
/// Removes the specified [NcStyle] bits.
///
/// *C style function: [nccell_off()][crate::nccell_off_styles].*
pub fn off_styles(&mut self, stylebits: NcStyleMask) {
pub fn off_styles(&mut self, stylebits: NcStyle) {
crate::nccell_off_styles(self, stylebits)
}
/// Adds the specified [NcStyleMask] bits.
/// Adds the specified [NcStyle] bits.
///
/// *C style function: [nccell_on()][crate::nccell_on_styles].*
pub fn on_styles(&mut self, stylebits: NcStyleMask) {
pub fn on_styles(&mut self, stylebits: NcStyle) {
crate::nccell_on_styles(self, stylebits)
}
/// Sets just the specified [NcStyleMask] bits.
/// Sets just the specified [NcStyle] bits.
///
/// *C style function: [nccell_set_styles()][crate::nccell_set_styles].*
pub fn set_styles(&mut self, stylebits: NcStyleMask) {
pub fn set_styles(&mut self, stylebits: NcStyle) {
crate::nccell_set_styles(self, stylebits)
}
}
@ -413,7 +413,7 @@ impl NcCell {
/// *C style function: [nccells_load_box()][crate::nccells_load_box].*
pub fn load_box(
plane: &mut NcPlane,
style: NcStyleMask,
style: NcStyle,
channels: NcChannelPair,
ul: &mut NcCell,
ur: &mut NcCell,
@ -433,7 +433,7 @@ impl NcCell {
/// *C style function: [nccells_double_box()][crate::nccells_double_box].*
pub fn double_box(
plane: &mut NcPlane,
style: NcStyleMask,
style: NcStyle,
channels: NcChannelPair,
ul: &mut NcCell,
ur: &mut NcCell,
@ -452,7 +452,7 @@ impl NcCell {
/// *C style function: [nccells_rounded_box()][crate::nccells_double_box].*
pub fn rounded_box(
plane: &mut NcPlane,
style: NcStyleMask,
style: NcStyle,
channels: NcChannelPair,
ul: &mut NcCell,
ur: &mut NcCell,

10
rust/src/cells/mod.rs
View File

@ -95,7 +95,7 @@ pub use reimplemented::*;
/// about the plane.
///
/// At any `NcCell`, we can have a theoretically arbitrarily long UTF-8 string,
/// a foreground color, a background color, and an [`NcStyleMask`] attribute set.
/// a foreground color, a background color, and an [`NcStyle`] attribute set.
///
/// Valid grapheme cluster contents include:
///
@ -112,7 +112,7 @@ pub use reimplemented::*;
/// NcCell: 128 bits structure comprised of the following 5 elements:
///
/// GCLUSTER GCLUSTER GCLUSTER GCLUSTER 1. NcEgc
/// 00000000 ~~~~~~~~ 11111111 11111111 2. NcEgcBackstop + 3. width + 4. NcStyleMask
/// 00000000 ~~~~~~~~ 11111111 11111111 2. NcEgcBackstop + 3. width + 4. NcStyle
/// ~~AA~~~~ RRRRRRRR GGGGGGGG BBBBBBBB 5. NcChannelPair
/// ~~AA~~~~ RRRRRRRR GGGGGGGG BBBBBBBB |
///
@ -130,7 +130,7 @@ pub use reimplemented::*;
/// 3. (8b) column width
/// WWWWWWWW
///
/// 4. (16b) NcStyleMask
/// 4. (16b) NcStyle
/// 11111111 11111111
///
/// 5. (64b) NcChannelPair
@ -352,7 +352,7 @@ pub type NcEgc = char;
///
pub type NcEgcBackstop = u8;
// NcStyleMask
// NcStyle
///
/// An `u16` of `NCSTYLE_*` boolean styling attribute flags
///
@ -380,7 +380,7 @@ pub type NcEgcBackstop = u8;
///
/// `type in C: uint16_t`
///
pub type NcStyleMask = u16;
pub type NcStyle = u16;
///
pub const NCSTYLE_BLINK: u16 = crate::bindings::ffi::NCSTYLE_BLINK as u16;

30
rust/src/cells/reimplemented.rs
View File

@ -4,9 +4,9 @@ use libc::strcmp;
use crate::{
cstring, nccell_release, NcAlphaBits, NcCell, NcChannel, NcChannelPair, NcColor, NcEgc,
NcIntResult, NcPaletteIndex, NcPlane, NcRgb, NcStyleMask, NCCELL_BGDEFAULT_MASK,
NCCELL_BG_PALETTE, NCCELL_FGDEFAULT_MASK, NCCELL_FG_PALETTE, NCCELL_OPAQUE, NCRESULT_ERR,
NCRESULT_OK, NCSTYLE_MASK,
NcIntResult, NcPaletteIndex, NcPlane, NcRgb, NcStyle, NCCELL_BGDEFAULT_MASK, NCCELL_BG_PALETTE,
NCCELL_FGDEFAULT_MASK, NCCELL_FG_PALETTE, NCCELL_OPAQUE, NCRESULT_ERR, NCRESULT_OK,
NCSTYLE_MASK,
};
// Alpha -----------------------------------------------------------------------
@ -243,37 +243,37 @@ pub fn nccell_set_bg_palindex(cell: &mut NcCell, index: NcPaletteIndex) {
// Styles ----------------------------------------------------------------------
/// Extracts the [NcStyleMask] bits from an [NcCell].
/// Extracts the [NcStyle] bits from an [NcCell].
///
/// *Method: NcCell.[cell_styles()][NcCell#method.cell_styles].*
#[inline]
pub const fn nccell_styles(cell: &NcCell) -> NcStyleMask {
pub const fn nccell_styles(cell: &NcCell) -> NcStyle {
cell.stylemask
}
/// Adds the specified [NcStyleMask] bits to an [NcCell]'s existing spec.,
/// Adds the specified [NcStyle] bits to an [NcCell]'s existing spec.,
/// whether they're actively supported or not.
///
/// *Method: NcCell.[styles_on()][NcCell#method.styles_on].*
#[inline]
pub fn nccell_on_styles(cell: &mut NcCell, stylebits: NcStyleMask) {
pub fn nccell_on_styles(cell: &mut NcCell, stylebits: NcStyle) {
cell.stylemask |= stylebits & NCSTYLE_MASK as u16;
}
/// Removes the specified [NcStyleMask] bits from an [NcCell]'s existing spec.
/// Removes the specified [NcStyle] bits from an [NcCell]'s existing spec.
///
/// *Method: NcCell.[styles_off()][NcCell#method.styles_off].*
#[inline]
pub fn nccell_off_styles(cell: &mut NcCell, stylebits: NcStyleMask) {
pub fn nccell_off_styles(cell: &mut NcCell, stylebits: NcStyle) {
cell.stylemask &= !(stylebits & NCSTYLE_MASK as u16);
}
/// Sets *just* the specified [NcStyleMask] bits for an [NcCell],
/// Sets *just* the specified [NcStyle] bits for an [NcCell],
/// whether they're actively supported or not.
///
/// *Method: NcCell.[styles_set()][NcCell#method.styles_set].*
#[inline]
pub fn nccell_set_styles(cell: &mut NcCell, stylebits: NcStyleMask) {
pub fn nccell_set_styles(cell: &mut NcCell, stylebits: NcStyle) {
cell.stylemask = stylebits & NCSTYLE_MASK as u16;
}
@ -365,7 +365,7 @@ pub fn nccell_strdup(plane: &NcPlane, cell: &NcCell) -> NcEgc {
// Misc. -----------------------------------------------------------------------
/// Saves the [NcStyleMask] and the [NcChannelPair],
/// Saves the [NcStyle] and the [NcChannelPair],
/// and returns the [NcEgc], of an [NcCell].
///
/// *Method: NcCell.[extract()][NcCell#method.extract].*
@ -373,7 +373,7 @@ pub fn nccell_strdup(plane: &NcPlane, cell: &NcCell) -> NcEgc {
pub fn nccell_extract(
plane: &NcPlane,
cell: &NcCell,
stylemask: &mut NcStyleMask,
stylemask: &mut NcStyle,
channels: &mut NcChannelPair,
) -> NcEgc {
if *stylemask != 0 {
@ -430,7 +430,7 @@ pub fn nccell_prime(
plane: &mut NcPlane,
cell: &mut NcCell,
gcluster: &str,
style: NcStyleMask,
style: NcStyle,
channels: NcChannelPair,
) -> NcIntResult {
cell.stylemask = style;
@ -448,7 +448,7 @@ pub fn nccell_prime(
/// *Method: NcCell.[load_box()][NcCell#method.load_box].*
pub fn nccells_load_box(
plane: &mut NcPlane,
style: NcStyleMask,
style: NcStyle,
channels: NcChannelPair,
ul: &mut NcCell,
ur: &mut NcCell,

10
rust/src/direct/methods.rs
View File

@ -6,7 +6,7 @@ use crate::ffi::sigset_t;
use crate::{
cstring, error, error_ref_mut, rstring, NcAlign, NcBlitter, NcChannelPair, NcColor, NcDim,
NcDirect, NcDirectFlags, NcDirectV, NcEgc, NcError, NcInput, NcPaletteIndex, NcResult, NcRgb,
NcScale, NcStyleMask, NcTime, NCRESULT_ERR,
NcScale, NcStyle, NcTime, NCRESULT_ERR,
};
/// # `NcDirect` constructors and destructors
@ -137,7 +137,7 @@ impl NcDirect {
}
}
/// ## NcDirect methods: `NcPaletteIndex`, `NcRgb`, `NcStyleMask` & default color
/// ## NcDirect methods: `NcPaletteIndex`, `NcRgb`, `NcStyle` & default color
impl NcDirect {
/// Sets the foreground [NcPaletteIndex].
///
@ -220,7 +220,7 @@ impl NcDirect {
/// Removes the specified styles.
///
/// *C style function: [ncdirect_off_styles()][crate::ncdirect_off_styles].*
pub fn styles_off(&mut self, stylebits: NcStyleMask) -> NcResult<()> {
pub fn styles_off(&mut self, stylebits: NcStyle) -> NcResult<()> {
error![
unsafe { crate::ncdirect_off_styles(self, stylebits.into()) },
&format!("NcDirect.styles_off({:0X})", stylebits)
@ -230,7 +230,7 @@ impl NcDirect {
/// Adds the specified styles.
///
/// *C style function: [ncdirect_on_styles()][crate::ncdirect_on_styles].*
pub fn styles_on(&mut self, stylebits: NcStyleMask) -> NcResult<()> {
pub fn styles_on(&mut self, stylebits: NcStyle) -> NcResult<()> {
error![
unsafe { crate::ncdirect_on_styles(self, stylebits.into()) },
&format!("NcDirect.styles_on({:0X})", stylebits)
@ -240,7 +240,7 @@ impl NcDirect {
/// Sets just the specified styles.
///
/// *C style function: [ncdirect_set_styles()][crate::ncdirect_set_styles].*
pub fn styles_set(&mut self, stylebits: NcStyleMask) -> NcResult<()> {
pub fn styles_set(&mut self, stylebits: NcStyle) -> NcResult<()> {
error![
unsafe { crate::ncdirect_set_styles(self, stylebits.into()) },
&format!("NcDirect.styles_set({:0X})", stylebits)

15
rust/src/notcurses/methods.rs
View File

@ -5,7 +5,7 @@ use core::ptr::{null, null_mut};
use crate::{
cstring, error, error_ref_mut, notcurses_init, rstring, NcAlign, NcBlitter, NcChannelPair,
NcDim, NcEgc, NcError, NcFile, NcInput, NcLogLevel, NcPlane, NcResult, NcScale, NcSignalSet,
NcStats, NcStyleMask, NcTime, Notcurses, NotcursesOptions, NCOPTION_NO_ALTERNATE_SCREEN,
NcStats, NcStyle, NcTime, Notcurses, NotcursesOptions, NCOPTION_NO_ALTERNATE_SCREEN,
NCOPTION_SUPPRESS_BANNERS, NCRESULT_ERR,
};
@ -133,7 +133,7 @@ impl Notcurses {
/// Retrieves the current contents of the specified [NcCell][crate::NcCell]
/// as last rendered, returning the [NcEgc] (or None on error) and writing
/// out the [NcStyleMask] and the [NcChannelPair].
/// out the [NcStyle] and the [NcChannelPair].
///
/// This NcEgc must be freed by the caller.
///
@ -142,7 +142,7 @@ impl Notcurses {
&mut self,
y: NcDim,
x: NcDim,
stylemask: &mut NcStyleMask,
stylemask: &mut NcStyle,
channels: &mut NcChannelPair,
) -> Option<NcEgc> {
let egc = unsafe { crate::notcurses_at_yx(self, x as i32, y as i32, stylemask, channels) };
@ -153,7 +153,8 @@ impl Notcurses {
Some(egc)
}
/// Returns the bottommost [NcPlane], of which there is always at least one.
/// Returns the bottommost [NcPlane] on the standard pile,
/// of which there is always at least one.
///
/// *C style function: [notcurses_bottom()][crate::notcurses_bottom].*
pub fn bottom(&mut self) -> &mut NcPlane {
@ -674,7 +675,7 @@ impl Notcurses {
rstring![crate::notcurses_str_scalemode(scalemode)].to_string()
}
/// Returns an [NcStyleMask] with the supported curses-style attributes.
/// Returns an [NcStyle] with the supported curses-style attributes.
///
/// The attribute is only indicated as supported if the terminal can support
/// it together with color.
@ -682,8 +683,8 @@ impl Notcurses {
/// For more information, see the "ncv" capability in terminfo(5).
///
/// *C style function: [notcurses_supported_styles()][crate::notcurses_supported_styles].*
pub fn supported_styles(&self) -> NcStyleMask {
unsafe { crate::notcurses_supported_styles(self) as NcStyleMask }
pub fn supported_styles(&self) -> NcStyle {
unsafe { crate::notcurses_supported_styles(self) as NcStyle }
}
/// Returns our current idea of the terminal dimensions in rows and cols.

43
rust/src/plane/methods.rs
View File

@ -7,8 +7,8 @@ use core::{
use crate::{
cstring, error, error_ref, error_ref_mut, rstring, NcAlign, NcAlphaBits, NcBlitter, NcBoxMask,
NcCell, NcChannel, NcChannelPair, NcColor, NcDim, NcEgc, NcError, NcFadeCb, NcOffset,
NcPaletteIndex, NcPixelGeometry, NcPlane, NcPlaneOptions, NcResizeCb, NcResult, NcRgb,
NcStyleMask, NcTime, Notcurses, NCRESULT_ERR,
NcPaletteIndex, NcPixelGeometry, NcPlane, NcPlaneOptions, NcResizeCb, NcResult, NcRgb, NcStyle,
NcTime, Notcurses, NCRESULT_ERR,
};
/// # NcPlaneOptions Constructors
@ -455,7 +455,7 @@ impl NcPlane {
}
// -----------------------------------------------------------------------------
/// ## NcPlane methods: `NcStyleMask` & `PaletteIndex`
/// ## NcPlane methods: `NcStyle` & `PaletteIndex`
impl NcPlane {
/// Sets the given style throughout the specified region, keeping content
/// and channels unchanged.
@ -463,12 +463,7 @@ impl NcPlane {
/// Returns the number of cells set.
///
/// *C style function: [ncplane_format()][crate::ncplane_format].*
pub fn format(
&mut self,
y_stop: NcDim,
x_stop: NcDim,
stylemask: NcStyleMask,
) -> NcResult<NcDim> {
pub fn format(&mut self, y_stop: NcDim, x_stop: NcDim, stylemask: NcStyle) -> NcResult<NcDim> {
let res =
unsafe { crate::ncplane_format(self, y_stop as i32, x_stop as i32, stylemask as u32) };
error![
@ -481,14 +476,14 @@ impl NcPlane {
/// Returns the current styling for this NcPlane.
///
/// *C style function: [ncplane_styles()][crate::ncplane_styles].*
pub fn styles(&self) -> NcStyleMask {
pub fn styles(&self) -> NcStyle {
unsafe { crate::ncplane_styles(self) }
}
/// Removes the specified styles from this NcPlane's existing spec.
///
/// *C style function: [ncplane_off_styles()][crate::ncplane_off_styles].*
pub fn off_styles(&mut self, stylemask: NcStyleMask) {
pub fn off_styles(&mut self, stylemask: NcStyle) {
unsafe {
crate::ncplane_off_styles(self, stylemask as u32);
}
@ -497,7 +492,7 @@ impl NcPlane {
/// Adds the specified styles to this NcPlane's existing spec.
///
/// *C style function: [ncplane_on_styles()][crate::ncplane_on_styles].*
pub fn on_styles(&mut self, stylemask: NcStyleMask) {
pub fn on_styles(&mut self, stylemask: NcStyle) {
unsafe {
crate::ncplane_on_styles(self, stylemask as u32);
}
@ -506,7 +501,7 @@ impl NcPlane {
/// Sets just the specified styles for this NcPlane.
///
/// *C style function: [ncplane_set_styles()][crate::ncplane_set_styles].*
pub fn set_styles(&mut self, stylemask: NcStyleMask) {
pub fn set_styles(&mut self, stylemask: NcStyle) {
unsafe {
crate::ncplane_set_styles(self, stylemask as u32);
}
@ -541,14 +536,14 @@ impl NcPlane {
/// ## NcPlane methods: `NcCell` & `NcEgc`
impl NcPlane {
/// Retrieves the current contents of the [NcCell] under the cursor,
/// returning the [NcEgc] and writing out the [NcStyleMask] and the [NcChannelPair].
/// returning the [NcEgc] and writing out the [NcStyle] and the [NcChannelPair].
///
/// This NcEgc must be freed by the caller.
///
/// *C style function: [ncplane_at_cursor()][crate::ncplane_at_cursor].*
pub fn at_cursor(
&mut self,
stylemask: &mut NcStyleMask,
stylemask: &mut NcStyle,
channels: &mut NcChannelPair,
) -> NcResult<NcEgc> {
let egc = unsafe { crate::ncplane_at_cursor(self, stylemask, channels) };
@ -579,7 +574,7 @@ impl NcPlane {
}
/// Retrieves the current contents of the specified [NcCell], returning the
/// [NcEgc] and writing out the [NcStyleMask] and the [NcChannelPair].
/// [NcEgc] and writing out the [NcStyle] and the [NcChannelPair].
///
/// This NcEgc must be freed by the caller.
///
@ -588,7 +583,7 @@ impl NcPlane {
&mut self,
y: NcDim,
x: NcDim,
stylemask: &mut NcStyleMask,
stylemask: &mut NcStyle,
channels: &mut NcChannelPair,
) -> NcResult<NcEgc> {
let egc = unsafe { crate::ncplane_at_yx(self, y as i32, x as i32, stylemask, channels) };
@ -652,7 +647,7 @@ impl NcPlane {
pub fn set_base(
&mut self,
egc: &str,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
) -> NcResult<u32> {
let res =
@ -1761,7 +1756,7 @@ impl NcPlane {
#[inline]
pub fn double_box(
&mut self,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
y_stop: NcDim,
x_stop: NcDim,
@ -1778,7 +1773,7 @@ impl NcPlane {
#[inline]
pub fn double_box_sized(
&mut self,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
y_len: NcDim,
x_len: NcDim,
@ -1815,7 +1810,7 @@ impl NcPlane {
#[inline]
pub fn perimeter_double(
&mut self,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
boxmask: NcBoxMask,
) -> NcResult<()> {
@ -1831,7 +1826,7 @@ impl NcPlane {
#[inline]
pub fn perimeter_rounded(
&mut self,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
boxmask: NcBoxMask,
) -> NcResult<()> {
@ -1933,7 +1928,7 @@ impl NcPlane {
pub fn gradient(
&mut self,
egc: &NcEgc,
stylemask: NcStyleMask,
stylemask: NcStyle,
ul: NcChannelPair,
ur: NcChannelPair,
ll: NcChannelPair,
@ -1973,7 +1968,7 @@ impl NcPlane {
pub fn gradient_sized(
&mut self,
egc: &NcEgc,
stylemask: NcStyleMask,
stylemask: NcStyle,
ul: NcChannel,
ur: NcChannel,
ll: NcChannel,

2
rust/src/plane/mod.rs
View File

@ -233,7 +233,7 @@ pub use reimplemented::*;
/// - [`NcAlphaBits`](#ncplane-methods-ncalphabits)
/// - [`NcChannel` & `NcChannelPair`](#ncplane-methods-ncchannel)
/// - [`NcColor`, `NcRgb` & default color](#ncplane-methods-nccolor-ncrgb--default-color)
/// - [`NcStyleMask` & `NcPaletteIndex`](#ncplane-methods-ncstylemask--paletteindex)
/// - [`NcStyle` & `NcPaletteIndex`](#ncplane-methods-ncstylemask--paletteindex)
/// - [`NcCell` & `NcEgc`](#ncplane-methods-nccell--ncegc)
/// - [cursor](#ncplane-methods-cursor)
/// - [`NcPlane` & `Notcurses`](#ncplane-methods-ncplane--notcurses)

16
rust/src/plane/reimplemented.rs
View File

@ -4,7 +4,7 @@ use core::ptr::null_mut;
use crate::{
cstring, nccell_release, NcAlign, NcAlphaBits, NcBoxMask, NcCell, NcChannel, NcChannelPair,
NcColor, NcDim, NcEgc, NcIntResult, NcPlane, NcRgb, NcStyleMask, NCRESULT_ERR, NCRESULT_OK,
NcColor, NcDim, NcEgc, NcIntResult, NcPlane, NcRgb, NcStyle, NCRESULT_ERR, NCRESULT_OK,
};
// Alpha -----------------------------------------------------------------------
@ -410,7 +410,7 @@ pub fn ncplane_perimeter(
#[inline]
pub fn ncplane_perimeter_double(
plane: &mut NcPlane,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
boxmask: NcBoxMask,
) -> NcIntResult {
@ -472,7 +472,7 @@ pub fn ncplane_perimeter_double(
#[inline]
pub fn ncplane_perimeter_rounded(
plane: &mut NcPlane,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
boxmask: NcBoxMask,
) -> NcIntResult {
@ -575,7 +575,7 @@ pub fn ncplane_box_sized(
#[inline]
pub fn ncplane_double_box(
plane: &mut NcPlane,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
y_stop: NcDim,
x_stop: NcDim,
@ -634,7 +634,7 @@ pub fn ncplane_double_box(
#[inline]
pub fn ncplane_double_box_sized(
plane: &mut NcPlane,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
y_len: NcDim,
x_len: NcDim,
@ -660,7 +660,7 @@ pub fn ncplane_double_box_sized(
#[inline]
pub fn ncplane_rounded_box(
plane: &mut NcPlane,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
y_stop: NcDim,
x_stop: NcDim,
@ -718,7 +718,7 @@ pub fn ncplane_rounded_box(
#[inline]
pub fn ncplane_rounded_box_sized(
plane: &mut NcPlane,
stylemask: NcStyleMask,
stylemask: NcStyle,
channels: NcChannelPair,
y_len: NcDim,
x_len: NcDim,
@ -750,7 +750,7 @@ pub fn ncplane_rounded_box_sized(
pub fn ncplane_gradient_sized(
plane: &mut NcPlane,
egc: &NcEgc,
stylemask: NcStyleMask,
stylemask: NcStyle,
ul: NcChannel,
ur: NcChannel,
ll: NcChannel,