libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-13 23:43:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GLK: FROTZ: Move setReverseVideo into Window

Browse Source
This commit is contained in:
Paul Gilbert 2019-03-13 20:19:11 -07:00
parent 7a13a60678
commit d6b41b59f3
5 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/glk/frotz/glk_interface.cpp
View File

@ -693,12 +693,5 @@ uint GlkInterface::roundDiv(uint x, uint y) {
return quotient; return quotient;
} }
void GlkInterface::os_set_reverse_video(bool flag) {
#ifdef GARGLK
_reverseVideo = flag;
garglk_set_reversevideo(flag);
#endif
}
} // End of namespace Frotz } // End of namespace Frotz
} // End of namespace Glk } // End of namespace Glk

5
engines/glk/frotz/glk_interface.h
View File

@ -242,11 +242,6 @@ protected:
* Waits for the user to type an input line * Waits for the user to type an input line
*/ */
zchar os_read_line(int max, zchar *buf, int timeout, int width, int continued); zchar os_read_line(int max, zchar *buf, int timeout, int width, int continued);
/**
* Set whether reverse video mode is active
*/
void os_set_reverse_video(bool flag);
public: public:
/** /**
* Constructor * Constructor

2
engines/glk/frotz/processor_screen.cpp
View File

@ -437,7 +437,7 @@ void Processor::z_show_status() {
// Move to top of the status window, and print in reverse style. // Move to top of the status window, and print in reverse style.
_wp.setWindow(1); _wp.setWindow(1);
os_set_reverse_video(true); _wp._upper.setReverseVideo(true);
_wp._upper.setCursor(Point(1, 1)); _wp._upper.setCursor(Point(1, 1));
// If the screen width is below 55 characters then we have to use // If the screen width is below 55 characters then we have to use

19
engines/glk/frotz/windows.cpp
View File

@ -257,14 +257,12 @@ void Window::setStyle(int style) {
void Window::updateStyle() { void Window::updateStyle() {
uint style = _currStyle; uint style = _currStyle;
/*
if (style & REVERSE_STYLE) {
os_set_reverse_video(true);
}*/
if (!_win) if (!_win)
createGlkWindow(); createGlkWindow();
if (style & REVERSE_STYLE)
setReverseVideo(true);
if (style & FIXED_WIDTH_STYLE) { if (style & FIXED_WIDTH_STYLE) {
if (_currFont == GRAPHICS_FONT) if (_currFont == GRAPHICS_FONT)
_win->_stream->setStyle(style_User1); // character graphics _win->_stream->setStyle(style_User1); // character graphics
@ -287,11 +285,12 @@ void Window::updateStyle() {
_win->_stream->setStyle(style_Normal); // propr _win->_stream->setStyle(style_Normal); // propr
} }
/* if (_currStyle == 0)
if (_currStyle == 0) { setReverseVideo(false);
os_set_reverse_video(false); }
}
*/ void Window::setReverseVideo(bool reverse) {
_win->_stream->setReverseVideo(reverse);
} }
void Window::createGlkWindow() { void Window::createGlkWindow() {

5
engines/glk/frotz/windows.h
View File

@ -192,6 +192,11 @@ public:
* Set the textstyle * Set the textstyle
*/ */
void setStyle(int style = -1); void setStyle(int style = -1);
/**
* Set reverse video
*/
void setReverseVideo(bool reverse);
}; };
/** /**