From ab2e1daea2278c421f3648117127756114a8e952 Mon Sep 17 00:00:00 2001 From: Julian Hinxlage Date: Thu, 28 Nov 2019 13:19:08 +0100 Subject: [PATCH] + added more event types --- src/EventType.hpp | 17 +++++++++++------ src/vkvm.cpp | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/EventType.hpp b/src/EventType.hpp index 79f4d94..49ca834 100644 --- a/src/EventType.hpp +++ b/src/EventType.hpp @@ -11,12 +11,17 @@ namespace vkvm { enum EventType { Timer = 1, MouseMove = 2, - MouseButton = 3, - KeyDown = 4, - KeyUp = 5, - UpdateControlRegisters = 6, - Redraw = 7, - RenderText = 8 + MouseLeftUp = 3, + MouseLeftDown = 4, + MouseRightUp = 5, + MouseRightDown = 6, + MouseMiddleDown = 7, + MouseMiddleUp = 8, + KeyDown = 9, + KeyUp = 10, + UpdateControlRegisters = 11, + Redraw = 12, + RenderText = 13 }; } diff --git a/src/vkvm.cpp b/src/vkvm.cpp index 6401b5c..df48721 100644 --- a/src/vkvm.cpp +++ b/src/vkvm.cpp @@ -289,7 +289,7 @@ namespace vkvm { auto getFont() -> FontType { //TODO(julian): get font properly - return FontType(getRegisters()->textMode_font, "", 0, 0); + return {getRegisters()->textMode_font, "", 0, 0}; } auto setFont(const FontType &newValue) -> void {