system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-04 15:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make an 8x10 version of Peanut. It looks a bit nicer I think.

Browse source
This commit is contained in:
Andreas Kling 2018-10-11 14:44:27 +02:00
parent ab5266b924
commit 7df67570e6
3 changed files with 1068 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Widgets/Painter.cpp
View file

@ -3,7 +3,14 @@
#include "Widget.h"
#include <AK/Assertions.h>
#include <SDL.h>
#if 0
#include "Peanut8x8.h"
#define FONT_NAMESPACE Peanut8x8
#else
#include "Peanut8x10.h"
#define FONT_NAMESPACE Peanut8x10
#endif
Painter::Painter(Widget& widget)
: m_widget(widget)
@ -43,29 +50,29 @@ void Painter::drawText(const Rect& rect, const String& text, TextAlignment align
point = rect.location();
point.moveBy(m_widget.x(), m_widget.y());;
} else if (alignment == TextAlignment::Center) {
int textWidth = text.length() * Peanut8x8::fontWidth;
int textWidth = text.length() * FONT_NAMESPACE::fontWidth;
point = rect.center();
point.moveBy(-(textWidth / 2), -(Peanut8x8::fontWidth / 2));
point.moveBy(-(textWidth / 2), -(FONT_NAMESPACE::fontWidth / 2));
point.moveBy(m_widget.x(), m_widget.y());
} else {
ASSERT_NOT_REACHED();
}
for (int row = 0; row < Peanut8x8::fontHeight; ++row) {
for (int row = 0; row < FONT_NAMESPACE::fontHeight; ++row) {
int y = point.y() + row;
dword* bits = scanline(y);
for (unsigned i = 0; i < text.length(); ++i) {
byte ch = text[i];
if (ch == ' ')
continue;
if (ch < Peanut8x8::firstCharacter || ch > Peanut8x8::lastCharacter) {
if (ch < FONT_NAMESPACE::firstCharacter || ch > FONT_NAMESPACE::lastCharacter) {
printf("Font doesn't have 0x%02x ('%c')\n", ch, ch);
ASSERT_NOT_REACHED();
}
const char* fontCharacter = Peanut8x8::font[ch - Peanut8x8::firstCharacter];
int x = point.x() + i * Peanut8x8::fontWidth;
for (unsigned j = 0; j < Peanut8x8::fontWidth; ++j) {
char fc = fontCharacter[row * Peanut8x8::fontWidth + j];
const char* fontCharacter = FONT_NAMESPACE::font[ch - FONT_NAMESPACE::firstCharacter];
int x = point.x() + i * FONT_NAMESPACE::fontWidth;
for (unsigned j = 0; j < FONT_NAMESPACE::fontWidth; ++j) {
char fc = fontCharacter[row * FONT_NAMESPACE::fontWidth + j];
if (fc == '#')
bits[x + j] = color.value();
}

1049
Widgets/Peanut8x10.h Normal file
View file

File diff suppressed because it is too large Load diff

8
Widgets/TerminalWidget.cpp
View file

@ -13,7 +13,7 @@ TerminalWidget::TerminalWidget(Widget* parent)
{
g_tw = this;
setRect({ 100, 300, columns() * 8, rows() * 8 });
setRect({ 100, 300, columns() * 8, rows() * 10 });
printf("rekt: %d x %d\n", width(), height());
m_screen = new CharacterWithAttributes[rows() * columns()];
for (unsigned row = 0; row < m_rows; ++row) {
@ -64,11 +64,11 @@ void TerminalWidget::onPaint(PaintEvent&)
char buf[2] = { 0, 0 };
for (unsigned row = 0; row < m_rows; ++row) {
int y = row * 8;
int y = row * 10;
for (unsigned column = 0; column < m_columns; ++column) {
int x = column * 8;
buf[0] = at(row, column).character;
painter.drawText({ x, y, width(), 8 }, buf, Painter::TextAlignment::TopLeft, Color(0xa0, 0xa0, 0xa0));
painter.drawText({ x, y, width(), 10 }, buf, Painter::TextAlignment::TopLeft, Color(0xa0, 0xa0, 0xa0));
}
}
}
@ -90,7 +90,7 @@ void TerminalWidget::onReceive(byte ch)
auto addChar = [&] (byte ch) {
at(m_cursorRow, m_cursorColumn).character = ch;
if (++m_cursorColumn > m_columns) {
if (++m_cursorColumn >= m_columns) {
m_cursorColumn = 0;
if (m_cursorRow < (m_rows - 1)) {
++m_cursorRow;