aboutsummaryrefslogtreecommitdiff
path: root/engines/glk/window_text_grid.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/glk/window_text_grid.cpp')
-rw-r--r--engines/glk/window_text_grid.cpp58
1 files changed, 29 insertions, 29 deletions
diff --git a/engines/glk/window_text_grid.cpp b/engines/glk/window_text_grid.cpp
index 123481f639..d1f26da55f 100644
--- a/engines/glk/window_text_grid.cpp
+++ b/engines/glk/window_text_grid.cpp
@@ -28,7 +28,8 @@
namespace Glk {
-TextGridWindow::TextGridWindow(Windows *windows, uint rock) : Window(windows, rock) {
+TextGridWindow::TextGridWindow(Windows *windows, uint rock) : Window(windows, rock),
+ _font(g_conf->_monoInfo) {
_type = wintype_TextGrid;
_width = _height = 0;
_curX = _curY = 0;
@@ -56,8 +57,8 @@ void TextGridWindow::rearrange(const Rect &box) {
Window::rearrange(box);
int newwid, newhgt;
- newwid = box.width() / g_conf->_cellW;
- newhgt = box.height() / g_conf->_cellH;
+ newwid = box.width() / _font._cellW;
+ newhgt = box.height() / _font._cellH;
if (newwid == _width && newhgt == _height)
return;
@@ -74,13 +75,13 @@ void TextGridWindow::rearrange(const Rect &box) {
}
void TextGridWindow::touch(int line) {
- int y = _bbox.top + line * g_conf->_leading;
+ int y = _bbox.top + line * _font._leading;
_lines[line].dirty = true;
- _windows->repaint(Rect(_bbox.left, y, _bbox.right, y + g_conf->_leading));
+ _windows->repaint(Rect(_bbox.left, y, _bbox.right, y + _font._leading));
}
uint TextGridWindow::getSplit(uint size, bool vertical) const {
- return vertical ? size * g_conf->_cellW : size * g_conf->_cellH;
+ return vertical ? size * _font._cellW : size * _font._cellH;
}
void TextGridWindow::putCharUni(uint32 ch) {
@@ -197,7 +198,7 @@ void TextGridWindow::click(const Point &newPos) {
_windows->setFocus(this);
if (_mouseRequest) {
- g_vm->_events->store(evtype_MouseInput, this, x / g_conf->_cellW, y / g_conf->_leading);
+ g_vm->_events->store(evtype_MouseInput, this, x / _font._cellW, y / _font._leading);
_mouseRequest = false;
if (g_conf->_safeClicks)
g_vm->_events->_forceClick = true;
@@ -546,7 +547,7 @@ void TextGridWindow::acceptReadLine(uint32 arg) {
if (arg < 32 || arg > 0xff)
return;
- if (g_conf->_caps && (arg > 0x60 && arg < 0x7b))
+ if (_font._caps && (arg > 0x60 && arg < 0x7b))
arg -= 0x20;
for (ix = _inLen; ix > _inCurs; ix--)
@@ -571,7 +572,7 @@ void TextGridWindow::redraw() {
int i, a, b, k, o;
uint link;
int font;
- byte *fgcolor, *bgcolor;
+ const byte *fgcolor, *bgcolor;
Screen &screen = *g_vm->_screen;
Window::redraw();
@@ -585,30 +586,30 @@ void TextGridWindow::redraw() {
ln->dirty = false;
x = x0;
- y = y0 + i * g_conf->_leading;
+ y = y0 + i * _font._leading;
// clear any stored hyperlink coordinates
- g_vm->_selection->putHyperlink(0, x0, y, x0 + g_conf->_cellW * _width, y + g_conf->_leading);
+ g_vm->_selection->putHyperlink(0, x0, y, x0 + _font._cellW * _width, y + _font._leading);
a = 0;
for (b = 0; b < _width; b++) {
if (ln->_attrs[a] != ln->_attrs[b]) {
link = ln->_attrs[a].hyper;
font = ln->_attrs[a].attrFont(_styles);
- fgcolor = link ? g_conf->_linkColor : ln->_attrs[a].attrFg(_styles);
+ fgcolor = link ? _font._linkColor : ln->_attrs[a].attrFg(_styles);
bgcolor = ln->_attrs[a].attrBg(_styles);
- w = (b - a) * g_conf->_cellW;
- screen.fillRect(Rect::fromXYWH(x, y, w, g_conf->_leading), bgcolor);
+ w = (b - a) * _font._cellW;
+ screen.fillRect(Rect::fromXYWH(x, y, w, _font._leading), bgcolor);
o = x;
- for (k = a, o = x; k < b; k++, o += g_conf->_cellW) {
- screen.drawStringUni(Point(o * GLI_SUBPIX, y + g_conf->_baseLine), font,
+ for (k = a, o = x; k < b; k++, o += _font._cellW) {
+ screen.drawStringUni(Point(o * GLI_SUBPIX, y + _font._baseLine), font,
fgcolor, Common::U32String(&ln->_chars[k], 1), -1);
}
if (link) {
- screen.fillRect(Rect::fromXYWH(x, y + g_conf->_baseLine + 1, w,
- g_conf->_linkStyle), g_conf->_linkColor);
- g_vm->_selection->putHyperlink(link, x, y, x + w, y + g_conf->_leading);
+ screen.fillRect(Rect::fromXYWH(x, y + _font._baseLine + 1, w,
+ _font._linkStyle), _font._linkColor);
+ g_vm->_selection->putHyperlink(link, x, y, x + w, y + _font._leading);
}
x += w;
@@ -617,20 +618,19 @@ void TextGridWindow::redraw() {
}
link = ln->_attrs[a].hyper;
font = ln->_attrs[a].attrFont(_styles);
- fgcolor = link ? g_conf->_linkColor : ln->_attrs[a].attrFg(_styles);
+ fgcolor = link ? _font._linkColor : ln->_attrs[a].attrFg(_styles);
bgcolor = ln->_attrs[a].attrBg(_styles);
- w = (b - a) * g_conf->_cellW;
+ w = (b - a) * _font._cellW;
w += _bbox.right - (x + w);
- screen.fillRect(Rect::fromXYWH(x, y, w, g_conf->_leading), bgcolor);
+ screen.fillRect(Rect::fromXYWH(x, y, w, _font._leading), bgcolor);
- for (k = a, o = x; k < b; k++, o += g_conf->_cellW) {
- screen.drawStringUni(Point(o * GLI_SUBPIX, y + g_conf->_baseLine), font,
+ for (k = a, o = x; k < b; k++, o += _font._cellW) {
+ screen.drawStringUni(Point(o * GLI_SUBPIX, y + _font._baseLine), font,
fgcolor, Common::U32String(&ln->_chars[k], 1));
}
if (link) {
- screen.fillRect(Rect::fromXYWH(x, y + g_conf->_baseLine + 1, w, g_conf->_linkStyle),
- g_conf->_linkColor);
- g_vm->_selection->putHyperlink(link, x, y, x + w, y + g_conf->_leading);
+ screen.fillRect(Rect::fromXYWH(x, y + _font._baseLine + 1, w, _font._linkStyle), _font._linkColor);
+ g_vm->_selection->putHyperlink(link, x, y, x + w, y + _font._leading);
}
}
}
@@ -638,9 +638,9 @@ void TextGridWindow::redraw() {
void TextGridWindow::getSize(uint *width, uint *height) const {
if (width)
- *width = _bbox.width() / g_conf->_cellW;
+ *width = _bbox.width() / _font._cellW;
if (height)
- *height = _bbox.height() / g_conf->_cellH;
+ *height = _bbox.height() / _font._cellH;
}
/*--------------------------------------------------------------------------*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-12 14:39:39 +0000