-
-
Notifications
You must be signed in to change notification settings - Fork 1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GLK: Splitting font related info from Conf into their own classes
- Loading branch information
1 parent
f25b3d9
commit 1021da1
Showing
18 changed files
with
353 additions
and
223 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* ScummVM - Graphic Adventure Engine | ||
| * | ||
| * ScummVM is the legal property of its developers, whose names | ||
| * are too numerous to list here. Please refer to the COPYRIGHT | ||
| * file distributed with this source distribution. | ||
| * | ||
| * This program is free software{} you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation{} either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY{} without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program{} if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| * | ||
| */ | ||
|
|
||
| #include "glk/fonts.h" | ||
| #include "glk/glk.h" | ||
| #include "glk/screen.h" | ||
| #include "glk/windows.h" | ||
|
|
||
| namespace Glk { | ||
|
|
||
| FontInfo::FontInfo() : _size(0), _aspect(0), _cellW(0), _cellH(0), _leading(0), _baseLine(0), | ||
| _linkStyle(0), _moreFont(PROPB), _moreAlign(0), _caps(0) { | ||
| Common::fill(&_linkColor[0], &_linkColor[3], 0); | ||
| Common::fill(&_linkSave[0], &_linkSave[3], 0); | ||
| Common::fill(&_moreColor[0], &_moreColor[3], 0); | ||
| Common::fill(&_moreSave[0], &_moreSave[3], 0); | ||
| } | ||
|
|
||
| /*--------------------------------------------------------------------------*/ | ||
|
|
||
| PropFontInfo::PropFontInfo() : _justify(0), _quotes(0), _dashes(0), _spaces(0), _caretShape(0) { | ||
| Common::fill(&_caretColor[0], &_caretColor[3], 0); | ||
| Common::fill(&_caretSave[0], &_caretSave[3], 0); | ||
| } | ||
|
|
||
| /*--------------------------------------------------------------------------*/ | ||
|
|
||
| void PropFontInfo::drawCaret(const Point &pos) { | ||
| const byte *rgb = _caretColor; | ||
| Graphics::Screen &s = *g_vm->_screen; | ||
| uint color = s.format.RGBToColor(rgb[0], rgb[1], rgb[2]); | ||
| int x = pos.x / GLI_SUBPIX, y = pos.y; | ||
|
|
||
| switch (_caretShape) { | ||
| case SMALL_DOT: | ||
| s.hLine(x + 0, y + 1, x + 0, color); | ||
| s.hLine(x - 1, y + 2, x + 1, color); | ||
| s.hLine(x - 2, y + 3, x + 2, color); | ||
| break; | ||
|
|
||
| case FAT_DOT: | ||
| s.hLine(x + 0, y + 1, x + 0, color); | ||
| s.hLine(x - 1, y + 2, x + 1, color); | ||
| s.hLine(x - 2, y + 3, x + 2, color); | ||
| s.hLine(x - 3, y + 4, x + 3, color); | ||
| break; | ||
|
|
||
| case THIN_LINE: | ||
| s.vLine(x, y - _baseLine + 1, y - 1, color); | ||
| break; | ||
|
|
||
| case FAT_LINE: | ||
| s.fillRect(Rect(x, y - _baseLine + 1, x + 1, y - 1), color); | ||
| break; | ||
|
|
||
| default: | ||
| // BLOCK | ||
| s.fillRect(Rect(x, y - _baseLine + 1, x + _cellW, y - 1), color); | ||
| break; | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } // End of namespace Glk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* ScummVM - Graphic Adventure Engine | ||
| * | ||
| * ScummVM is the legal property of its developers, whose names | ||
| * are too numerous to list here. Please refer to the COPYRIGHT | ||
| * file distributed with this source distribution. | ||
| * | ||
| * This program is free software; you can redistribute it and/or | ||
| * modify it under the terms of the GNU General Public License | ||
| * as published by the Free Software Foundation; either version 2 | ||
| * of the License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | ||
| * | ||
| */ | ||
|
|
||
| #ifndef GLK_FONTS_H | ||
| #define GLK_FONTS_H | ||
|
|
||
| #include "glk/glk_types.h" | ||
| #include "glk/utils.h" | ||
|
|
||
| namespace Glk { | ||
|
|
||
| enum FACES { MONOR, MONOB, MONOI, MONOZ, PROPR, PROPB, PROPI, PROPZ, CUSTOM, CUSTOM2 }; | ||
| enum TYPES { MONOF, PROPF }; | ||
| enum STYLES { FONTR, FONTB, FONTI, FONTZ }; | ||
|
|
||
| /** | ||
| * Font configuration info | ||
| */ | ||
| struct FontInfo { | ||
| double _size; | ||
| double _aspect; | ||
| int _cellW, _cellH; | ||
| int _leading; | ||
| int _baseLine; | ||
| byte _linkColor[3], _linkSave[3]; | ||
| byte _moreColor[3], _moreSave[3]; | ||
| int _linkStyle; | ||
| FACES _moreFont; | ||
| int _moreAlign; | ||
| Common::String _morePrompt; | ||
| int _caps; | ||
|
|
||
| /** | ||
| * Constructor | ||
| */ | ||
| FontInfo(); | ||
| }; | ||
|
|
||
| /** | ||
| * Font info for mono (fixed size) fonts | ||
| */ | ||
| struct MonoFontInfo : public FontInfo { | ||
| }; | ||
|
|
||
| /** | ||
| * Font info fro proportinate (variable size) fonts | ||
| */ | ||
| struct PropFontInfo : public MonoFontInfo { | ||
| byte _caretColor[3], _caretSave[3]; | ||
| int _caretShape; | ||
| int _justify; | ||
| int _quotes; | ||
| int _dashes; | ||
| int _spaces; | ||
|
|
||
| /** | ||
| * Constructor | ||
| */ | ||
| PropFontInfo(); | ||
|
|
||
| /** | ||
| * Draws the text input caret at the given position | ||
| * @remarks The position specifies the caret's bottom-left corner, | ||
| * and the X position is in multiples of GLI_SUBPIX | ||
| */ | ||
| void drawCaret(const Point &pos); | ||
| }; | ||
|
|
||
| } // End of namespace Glk | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ MODULE_OBJS := \ | |
| conf.o \ | ||
| detection.o \ | ||
| events.o \ | ||
| fonts.o \ | ||
| glk.o \ | ||
| glk_api.o \ | ||
| picture.o \ | ||
|
|
||
Oops, something went wrong.