Compare commits
2 Commits
4d3c84596d
...
d6ccd02271
Author | SHA1 | Date |
---|---|---|
mars | d6ccd02271 | |
mars | 2c25af29b0 |
120
src/main.rs
120
src/main.rs
|
@ -19,7 +19,7 @@ use winit::event::{Event, WindowEvent};
|
|||
use winit::event_loop::{ControlFlow, EventLoop};
|
||||
use winit::window::{Window, WindowBuilder};
|
||||
|
||||
static FONT_DATA: &[u8] = include_bytes!("/usr/share/fonts/local/TamzenForPowerline10x20r.bdf");
|
||||
static FONT_DATA: &[u8] = include_bytes!("ter-u20n.bdf");
|
||||
|
||||
pub struct TermListener {
|
||||
sender: Sender<TermEvent>,
|
||||
|
@ -120,43 +120,26 @@ impl App {
|
|||
pub fn load_colors(color: &mut Colors) {
|
||||
use NamedColor::*;
|
||||
|
||||
let hex = |hex: u32| -> Rgb {
|
||||
Rgb {
|
||||
r: (hex >> 16) as u8,
|
||||
g: (hex >> 8) as u8,
|
||||
b: hex as u8,
|
||||
}
|
||||
};
|
||||
|
||||
// Rose Pine theme
|
||||
let maps = [
|
||||
(Black, Rgb { r: 0, g: 0, b: 0 }),
|
||||
(Red, Rgb { r: 255, g: 0, b: 0 }),
|
||||
(Green, Rgb { r: 0, g: 255, b: 0 }),
|
||||
(Blue, Rgb { r: 0, g: 0, b: 255 }),
|
||||
(
|
||||
Yellow,
|
||||
Rgb {
|
||||
r: 255,
|
||||
g: 255,
|
||||
b: 0,
|
||||
},
|
||||
),
|
||||
(
|
||||
Magenta,
|
||||
Rgb {
|
||||
r: 255,
|
||||
g: 0,
|
||||
b: 255,
|
||||
},
|
||||
),
|
||||
(
|
||||
Cyan,
|
||||
Rgb {
|
||||
r: 0,
|
||||
g: 255,
|
||||
b: 255,
|
||||
},
|
||||
),
|
||||
(
|
||||
White,
|
||||
Rgb {
|
||||
r: 255,
|
||||
g: 255,
|
||||
b: 255,
|
||||
},
|
||||
),
|
||||
(Foreground, hex(0xe0def4)),
|
||||
(Background, hex(0x191724)),
|
||||
(Black, hex(0x6e6a86)),
|
||||
(Red, hex(0xeb6f92)),
|
||||
(Green, hex(0x7fb59f)),
|
||||
(Yellow, hex(0xf6c177)),
|
||||
(Blue, hex(0x31748f)),
|
||||
(Magenta, hex(0xc4a7e7)),
|
||||
(Cyan, hex(0x9ccfd8)),
|
||||
(White, hex(0xe0def4)),
|
||||
];
|
||||
|
||||
for map in maps.iter() {
|
||||
|
@ -164,8 +147,6 @@ impl App {
|
|||
}
|
||||
|
||||
let dupes = [
|
||||
(Background, Black),
|
||||
(Foreground, White),
|
||||
(BrightBlack, Black),
|
||||
(BrightRed, Red),
|
||||
(BrightGreen, Green),
|
||||
|
@ -198,19 +179,17 @@ impl App {
|
|||
let term_row = cell.point.line.0 as usize;
|
||||
let term_col = cell.point.column.0 as usize;
|
||||
|
||||
if (term_row + 1) * self.cell_height >= height
|
||||
|| (term_col + 1) * self.cell_width >= width
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
let bg = self.color_to_u32(&cell.bg);
|
||||
let fg = self.color_to_u32(&cell.fg);
|
||||
|
||||
let mut px_row = term_row * width * self.cell_height;
|
||||
|
||||
if (term_row + 1) * self.cell_height > height {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (term_col + 1) * self.cell_width > width {
|
||||
continue;
|
||||
}
|
||||
|
||||
for y in 0..self.cell_height {
|
||||
let px_start = px_row + term_col * self.cell_width;
|
||||
for x in 0..self.cell_width {
|
||||
|
@ -230,6 +209,53 @@ impl App {
|
|||
}
|
||||
}
|
||||
|
||||
let term_row = content.cursor.point.line.0 as usize;
|
||||
let term_col = content.cursor.point.column.0 as usize;
|
||||
let mut px_row = term_row * width * self.cell_height + term_col * self.cell_width;
|
||||
|
||||
let cursor_color = 0x00ff00ff;
|
||||
|
||||
use alacritty_terminal::ansi::CursorShape;
|
||||
match content.cursor.shape {
|
||||
CursorShape::Block => {
|
||||
for _y in 0..self.cell_height {
|
||||
for x in 0..self.cell_width {
|
||||
buffer[px_row + x as usize] = cursor_color;
|
||||
}
|
||||
|
||||
px_row += width;
|
||||
}
|
||||
}
|
||||
CursorShape::Beam => {
|
||||
for _y in 0..self.cell_height {
|
||||
buffer[px_row] = cursor_color;
|
||||
px_row += width;
|
||||
}
|
||||
}
|
||||
CursorShape::Underline => {
|
||||
px_row += (self.cell_height - 1) * width;
|
||||
for x in 0..self.cell_width {
|
||||
buffer[px_row + x as usize] = cursor_color;
|
||||
}
|
||||
}
|
||||
CursorShape::HollowBlock => {
|
||||
for x in 0..self.cell_width {
|
||||
buffer[px_row + x as usize] = cursor_color;
|
||||
}
|
||||
|
||||
for y in 0..(self.cell_height - 1) {
|
||||
buffer[px_row] = cursor_color;
|
||||
buffer[px_row + self.cell_width - 1] = cursor_color;
|
||||
px_row += width;
|
||||
}
|
||||
|
||||
for x in 0..self.cell_width {
|
||||
buffer[px_row + x as usize] = cursor_color;
|
||||
}
|
||||
}
|
||||
CursorShape::Hidden => {}
|
||||
}
|
||||
|
||||
log::debug!("Missing characters: {:?}", missing_chars);
|
||||
|
||||
self.graphics
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,94 @@
|
|||
Copyright (C) 2020 Dimitar Toshkov Zhekov,
|
||||
with Reserved Font Name "Terminus Font".
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
Loading…
Reference in New Issue