From eaf2c77dda656b28442e6faf93c4cc2b3d998a0a Mon Sep 17 00:00:00 2001 From: Julian Hinxlage Date: Tue, 7 Jan 2020 15:22:17 +0100 Subject: [PATCH] fixed default values --- res/config.toml | 18 +++++++++--------- src/SharedMemory.cpp | 4 +++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/res/config.toml b/res/config.toml index e90cdab..82e77c9 100644 --- a/res/config.toml +++ b/res/config.toml @@ -1,15 +1,15 @@ #defaultKey = 12345 #newKey = 0 layoutVersion = 0 -width = 0 -height = 0 -mode = 0 -redrawInterval = 0 -timerInterruptInterval = 0 +width = 800 +height = 600 +mode = 4 +redrawInterval = 500 +timerInterruptInterval = 1000 backgroundColor = 0 -foregroundColor = 0 -charactersPerRow = 0 -charactersPerColumn = 0 -font = 0 +foregroundColor = 0xffffff +charactersPerRow = 60 +charactersPerColumn = 20 +font = 4 mousePositionX = 0 mousePositionY = 0 \ No newline at end of file diff --git a/src/SharedMemory.cpp b/src/SharedMemory.cpp index 253c060..dc303b8 100644 --- a/src/SharedMemory.cpp +++ b/src/SharedMemory.cpp @@ -78,6 +78,7 @@ void getConfig() { int height = config->get_as("height").value_or(0); int mode = config->get_as("mode").value_or(0); int timerInterruptInterval = config->get_as("timerInterruptInterval").value_or(0); + int redrawInterval = config->get_as("redrawInterval").value_or(0); int backgroundColor = config->get_as("backgroundColor").value_or(0); int foregroundColor = config->get_as("foregroundColor").value_or(0); int charactersPerRow = config->get_as("charactersPerRow").value_or(0); @@ -99,11 +100,12 @@ void getConfig() { vkvm::setHeight(height); vkvm::setMode((vkvm::GraphicMode) mode); vkvm::setTimerInterruptInterval(timerInterruptInterval); + vkvm::setRedrawInterval(redrawInterval); vkvm::setBackgroundColor(vkvm::Color(backgroundColor)); vkvm::setForegroundColor(vkvm::Color(foregroundColor)); vkvm::setCharactersPerRow(charactersPerRow); vkvm::setCharactersPerColumn(charactersPerColumn); - vkvm::setFont(vkvm::FontType::ProFontIIX); + vkvm::setFont(static_cast(font)); vkvm::setMousePosition(mousePositionX, mousePositionY); }