Move input keys into an enum class and rename Win32Window to somethin…

…g more unique

CMakeLists.txt

@@ -64,8 +64,8 @@ set(ZWIDGET_INCLUDES
 )
 
 set(ZWIDGET_WIN32_SOURCES
-	src/window/win32/win32window.cpp
-	src/window/win32/win32window.h
+	src/window/win32/win32displaywindow.cpp
+	src/window/win32/win32displaywindow.h
 )
 
 set(ZWIDGET_COCOA_SOURCES

include/zwidget/core/widget.h

@@ -85,7 +85,7 @@ class Widget : DisplayWindowHost
 	void CaptureMouse();
 	void ReleaseMouseCapture();
 
-	bool GetKeyState(EInputKey key);
+	bool GetKeyState(InputKey key);
 
 	std::string GetClipboardText();
 	void SetClipboardText(const std::string& text);
@@ -114,16 +114,16 @@ class Widget : DisplayWindowHost
 protected:
 	virtual void OnPaintFrame(Canvas* canvas) { }
 	virtual void OnPaint(Canvas* canvas) { }
-	virtual bool OnMouseDown(const Point& pos, int key) { return false; }
-	virtual bool OnMouseDoubleclick(const Point& pos, int key) { return false; }
-	virtual bool OnMouseUp(const Point& pos, int key) { return false; }
-	virtual bool OnMouseWheel(const Point& pos, EInputKey key) { return false; }
+	virtual bool OnMouseDown(const Point& pos, InputKey key) { return false; }
+	virtual bool OnMouseDoubleclick(const Point& pos, InputKey key) { return false; }
+	virtual bool OnMouseUp(const Point& pos, InputKey key) { return false; }
+	virtual bool OnMouseWheel(const Point& pos, InputKey key) { return false; }
 	virtual void OnMouseMove(const Point& pos) { }
 	virtual void OnMouseLeave() { }
 	virtual void OnRawMouseMove(int dx, int dy) { }
 	virtual void OnKeyChar(std::string chars) { }
-	virtual void OnKeyDown(EInputKey key) { }
-	virtual void OnKeyUp(EInputKey key) { }
+	virtual void OnKeyDown(InputKey key) { }
+	virtual void OnKeyUp(InputKey key) { }
 	virtual void OnGeometryChanged() { }
 	virtual void OnClose() { delete this; }
 	virtual void OnSetFocus() { }
@@ -138,14 +138,14 @@ class Widget : DisplayWindowHost
 	// DisplayWindowHost
 	void OnWindowPaint() override;
 	void OnWindowMouseMove(const Point& pos) override;
-	void OnWindowMouseDown(const Point& pos, EInputKey key) override;
-	void OnWindowMouseDoubleclick(const Point& pos, EInputKey key) override;
-	void OnWindowMouseUp(const Point& pos, EInputKey key) override;
-	void OnWindowMouseWheel(const Point& pos, EInputKey key) override;
+	void OnWindowMouseDown(const Point& pos, InputKey key) override;
+	void OnWindowMouseDoubleclick(const Point& pos, InputKey key) override;
+	void OnWindowMouseUp(const Point& pos, InputKey key) override;
+	void OnWindowMouseWheel(const Point& pos, InputKey key) override;
 	void OnWindowRawMouseMove(int dx, int dy) override;
 	void OnWindowKeyChar(std::string chars) override;
-	void OnWindowKeyDown(EInputKey key) override;
-	void OnWindowKeyUp(EInputKey key) override;
+	void OnWindowKeyDown(InputKey key) override;
+	void OnWindowKeyUp(InputKey key) override;
 	void OnWindowGeometryChanged() override;
 	void OnWindowClose() override;
 	void OnWindowActivated() override;

include/zwidget/widgets/checkboxlabel/checkboxlabel.h

@@ -21,10 +21,10 @@ class CheckboxLabel : public Widget
 
 protected:
 	void OnPaint(Canvas* canvas) override;
-	bool OnMouseDown(const Point& pos, int key) override;
-	bool OnMouseUp(const Point& pos, int key) override;
+	bool OnMouseDown(const Point& pos, InputKey key) override;
+	bool OnMouseUp(const Point& pos, InputKey key) override;
 	void OnMouseLeave() override;
-	void OnKeyUp(EInputKey key) override;
+	void OnKeyUp(InputKey key) override;
 
 private:
 	std::string text;

include/zwidget/widgets/lineedit/lineedit.h

@@ -59,7 +59,7 @@ class LineEdit : public Widget
 	void SetInputMask(const std::string& mask);
 	void SetDecimalCharacter(const std::string& decimal_char);
 
-	std::function<bool(int key)> FuncIgnoreKeyDown;
+	std::function<bool(InputKey key)> FuncIgnoreKeyDown;
 	std::function<std::string(std::string text)> FuncFilterKeyChar;
 	std::function<void()> FuncBeforeEditChanged;
 	std::function<void()> FuncAfterEditChanged;
@@ -72,12 +72,12 @@ class LineEdit : public Widget
 	void OnPaintFrame(Canvas* canvas) override;
 	void OnPaint(Canvas* canvas) override;
 	void OnMouseMove(const Point& pos) override;
-	bool OnMouseDown(const Point& pos, int key) override;
-	bool OnMouseDoubleclick(const Point& pos, int key) override;
-	bool OnMouseUp(const Point& pos, int key) override;
+	bool OnMouseDown(const Point& pos, InputKey key) override;
+	bool OnMouseDoubleclick(const Point& pos, InputKey key) override;
+	bool OnMouseUp(const Point& pos, InputKey key) override;
 	void OnKeyChar(std::string chars) override;
-	void OnKeyDown(EInputKey key) override;
-	void OnKeyUp(EInputKey key) override;
+	void OnKeyDown(InputKey key) override;
+	void OnKeyUp(InputKey key) override;
 	void OnGeometryChanged() override;
 	void OnEnableChanged() override;
 	void OnSetFocus() override;

include/zwidget/widgets/listview/listview.h

@@ -25,10 +25,10 @@ class ListView : public Widget
 protected:
 	void OnPaint(Canvas* canvas) override;
 	void OnPaintFrame(Canvas* canvas) override;
-	bool OnMouseDown(const Point& pos, int key) override;
-	bool OnMouseDoubleclick(const Point& pos, int key) override;
-	bool OnMouseWheel(const Point& pos, EInputKey key) override;
-	void OnKeyDown(EInputKey key) override;
+	bool OnMouseDown(const Point& pos, InputKey key) override;
+	bool OnMouseDoubleclick(const Point& pos, InputKey key) override;
+	bool OnMouseWheel(const Point& pos, InputKey key) override;
+	void OnKeyDown(InputKey key) override;
 	void OnGeometryChanged() override;
 	void OnScrollbarScroll();
 

include/zwidget/widgets/pushbutton/pushbutton.h

@@ -21,12 +21,12 @@ class PushButton : public Widget
 protected:
 	void OnPaintFrame(Canvas* canvas) override;
 	void OnPaint(Canvas* canvas) override;
-	bool OnMouseDown(const Point& pos, int key) override;
-	bool OnMouseUp(const Point& pos, int key) override;
+	bool OnMouseDown(const Point& pos, InputKey key) override;
+	bool OnMouseUp(const Point& pos, InputKey key) override;
 	void OnMouseMove(const Point& pos) override;
 	void OnMouseLeave() override;
-	void OnKeyDown(EInputKey key) override;
-	void OnKeyUp(EInputKey key) override;
+	void OnKeyDown(InputKey key) override;
+	void OnKeyUp(InputKey key) override;
 
 private:
 	std::string text;

include/zwidget/widgets/scrollbar/scrollbar.h

@@ -47,8 +47,8 @@ class Scrollbar : public Widget
 	std::function<void()> FuncScrollEnd;
 
 protected:
-	bool OnMouseDown(const Point& pos, int key) override;
-	bool OnMouseUp(const Point& pos, int key) override;
+	bool OnMouseDown(const Point& pos, InputKey key) override;
+	bool OnMouseUp(const Point& pos, InputKey key) override;
 	void OnMouseMove(const Point& pos) override;
 	void OnMouseLeave() override;
 	void OnPaint(Canvas* canvas) override;

include/zwidget/widgets/tabwidget/tabwidget.h

@@ -94,8 +94,8 @@ class TabBarTab : public Widget
 protected:
 	void OnPaintFrame(Canvas* canvas) override;
 	void OnGeometryChanged() override;
-	bool OnMouseDown(const Point& pos, int key) override;
-	bool OnMouseUp(const Point& pos, int key) override;
+	bool OnMouseDown(const Point& pos, InputKey key) override;
+	bool OnMouseUp(const Point& pos, InputKey key) override;
 	void OnMouseMove(const Point& pos) override;
 	void OnMouseLeave() override;
 

include/zwidget/widgets/textedit/textedit.h

@@ -56,12 +56,12 @@ class TextEdit : public Widget
 	void OnPaintFrame(Canvas* canvas) override;
 	void OnPaint(Canvas* canvas) override;
 	void OnMouseMove(const Point& pos) override;
-	bool OnMouseDown(const Point& pos, int key) override;
-	bool OnMouseDoubleclick(const Point& pos, int key) override;
-	bool OnMouseUp(const Point& pos, int key) override;
+	bool OnMouseDown(const Point& pos, InputKey key) override;
+	bool OnMouseDoubleclick(const Point& pos, InputKey key) override;
+	bool OnMouseUp(const Point& pos, InputKey key) override;
 	void OnKeyChar(std::string chars) override;
-	void OnKeyDown(EInputKey key) override;
-	void OnKeyUp(EInputKey key) override;
+	void OnKeyDown(InputKey key) override;
+	void OnKeyUp(InputKey key) override;
 	void OnGeometryChanged() override;
 	void OnEnableChanged() override;
 	void OnSetFocus() override;

include/zwidget/window/window.h

@@ -3,6 +3,7 @@
 #include <memory>
 #include <string>
 #include <functional>
+#include <cstdint>
 #include "../core/rect.h"
 
 class Engine;
@@ -24,91 +25,72 @@ enum class StandardCursor
 	wait
 };
 
-enum EInputKey
+enum class InputKey : uint32_t
 {
-	IK_None, IK_LeftMouse, IK_RightMouse, IK_Cancel,
-	IK_MiddleMouse, IK_Unknown05, IK_Unknown06, IK_Unknown07,
-	IK_Backspace, IK_Tab, IK_Unknown0A, IK_Unknown0B,
-	IK_Unknown0C, IK_Enter, IK_Unknown0E, IK_Unknown0F,
-	IK_Shift, IK_Ctrl, IK_Alt, IK_Pause,
-	IK_CapsLock, IK_Unknown15, IK_Unknown16, IK_Unknown17,
-	IK_Unknown18, IK_Unknown19, IK_Unknown1A, IK_Escape,
-	IK_Unknown1C, IK_Unknown1D, IK_Unknown1E, IK_Unknown1F,
-	IK_Space, IK_PageUp, IK_PageDown, IK_End,
-	IK_Home, IK_Left, IK_Up, IK_Right,
-	IK_Down, IK_Select, IK_Print, IK_Execute,
-	IK_PrintScrn, IK_Insert, IK_Delete, IK_Help,
-	IK_0, IK_1, IK_2, IK_3,
-	IK_4, IK_5, IK_6, IK_7,
-	IK_8, IK_9, IK_Unknown3A, IK_Unknown3B,
-	IK_Unknown3C, IK_Unknown3D, IK_Unknown3E, IK_Unknown3F,
-	IK_Unknown40, IK_A, IK_B, IK_C,
-	IK_D, IK_E, IK_F, IK_G,
-	IK_H, IK_I, IK_J, IK_K,
-	IK_L, IK_M, IK_N, IK_O,
-	IK_P, IK_Q, IK_R, IK_S,
-	IK_T, IK_U, IK_V, IK_W,
-	IK_X, IK_Y, IK_Z, IK_Unknown5B,
-	IK_Unknown5C, IK_Unknown5D, IK_Unknown5E, IK_Unknown5F,
-	IK_NumPad0, IK_NumPad1, IK_NumPad2, IK_NumPad3,
-	IK_NumPad4, IK_NumPad5, IK_NumPad6, IK_NumPad7,
-	IK_NumPad8, IK_NumPad9, IK_GreyStar, IK_GreyPlus,
-	IK_Separator, IK_GreyMinus, IK_NumPadPeriod, IK_GreySlash,
-	IK_F1, IK_F2, IK_F3, IK_F4,
-	IK_F5, IK_F6, IK_F7, IK_F8,
-	IK_F9, IK_F10, IK_F11, IK_F12,
-	IK_F13, IK_F14, IK_F15, IK_F16,
-	IK_F17, IK_F18, IK_F19, IK_F20,
-	IK_F21, IK_F22, IK_F23, IK_F24,
-	IK_Unknown88, IK_Unknown89, IK_Unknown8A, IK_Unknown8B,
-	IK_Unknown8C, IK_Unknown8D, IK_Unknown8E, IK_Unknown8F,
-	IK_NumLock, IK_ScrollLock, IK_Unknown92, IK_Unknown93,
-	IK_Unknown94, IK_Unknown95, IK_Unknown96, IK_Unknown97,
-	IK_Unknown98, IK_Unknown99, IK_Unknown9A, IK_Unknown9B,
-	IK_Unknown9C, IK_Unknown9D, IK_Unknown9E, IK_Unknown9F,
-	IK_LShift, IK_RShift, IK_LControl, IK_RControl,
-	IK_UnknownA4, IK_UnknownA5, IK_UnknownA6, IK_UnknownA7,
-	IK_UnknownA8, IK_UnknownA9, IK_UnknownAA, IK_UnknownAB,
-	IK_UnknownAC, IK_UnknownAD, IK_UnknownAE, IK_UnknownAF,
-	IK_UnknownB0, IK_UnknownB1, IK_UnknownB2, IK_UnknownB3,
-	IK_UnknownB4, IK_UnknownB5, IK_UnknownB6, IK_UnknownB7,
-	IK_UnknownB8, IK_UnknownB9, IK_Semicolon, IK_Equals,
-	IK_Comma, IK_Minus, IK_Period, IK_Slash,
-	IK_Tilde, IK_UnknownC1, IK_UnknownC2, IK_UnknownC3,
-	IK_UnknownC4, IK_UnknownC5, IK_UnknownC6, IK_UnknownC7,
-	IK_Joy1, IK_Joy2, IK_Joy3, IK_Joy4,
-	IK_Joy5, IK_Joy6, IK_Joy7, IK_Joy8,
-	IK_Joy9, IK_Joy10, IK_Joy11, IK_Joy12,
-	IK_Joy13, IK_Joy14, IK_Joy15, IK_Joy16,
-	IK_UnknownD8, IK_UnknownD9, IK_UnknownDA, IK_LeftBracket,
-	IK_Backslash, IK_RightBracket, IK_SingleQuote, IK_UnknownDF,
-	IK_JoyX, IK_JoyY, IK_JoyZ, IK_JoyR,
-	IK_MouseX, IK_MouseY, IK_MouseZ, IK_MouseW,
-	IK_JoyU, IK_JoyV, IK_UnknownEA, IK_UnknownEB,
-	IK_MouseWheelUp, IK_MouseWheelDown, IK_Unknown10E, IK_Unknown10F,
-	IK_JoyPovUp, IK_JoyPovDown, IK_JoyPovLeft, IK_JoyPovRight,
-	IK_UnknownF4, IK_UnknownF5, IK_Attn, IK_CrSel,
-	IK_ExSel, IK_ErEof, IK_Play, IK_Zoom,
-	IK_NoName, IK_PA1, IK_OEMClear
-};
-
-enum EInputType
-{
-	IST_None,
-	IST_Press,
-	IST_Hold,
-	IST_Release,
-	IST_Axis
-};
-
-class KeyEvent
-{
-public:
-	EInputKey Key;
-	bool Ctrl = false;
-	bool Alt = false;
-	bool Shift = false;
-	Point MousePos = Point(0.0, 0.0);
+	None, LeftMouse, RightMouse, Cancel,
+	MiddleMouse, Unknown05, Unknown06, Unknown07,
+	Backspace, Tab, Unknown0A, Unknown0B,
+	Unknown0C, Enter, Unknown0E, Unknown0F,
+	Shift, Ctrl, Alt, Pause,
+	CapsLock, Unknown15, Unknown16, Unknown17,
+	Unknown18, Unknown19, Unknown1A, Escape,
+	Unknown1C, Unknown1D, Unknown1E, Unknown1F,
+	Space, PageUp, PageDown, End,
+	Home, Left, Up, Right,
+	Down, Select, Print, Execute,
+	PrintScrn, Insert, Delete, Help,
+	_0, _1, _2, _3,
+	_4, _5, _6, _7,
+	_8, _9, Unknown3A, Unknown3B,
+	Unknown3C, Unknown3D, Unknown3E, Unknown3F,
+	Unknown40, A, B, C,
+	D, E, F, G,
+	H, I, J, K,
+	L, M, N, O,
+	P, Q, R, S,
+	T, U, V, W,
+	X, Y, Z, Unknown5B,
+	Unknown5C, Unknown5D, Unknown5E, Unknown5F,
+	NumPad0, NumPad1, NumPad2, NumPad3,
+	NumPad4, NumPad5, NumPad6, NumPad7,
+	NumPad8, NumPad9, GreyStar, GreyPlus,
+	Separator, GreyMinus, NumPadPeriod, GreySlash,
+	F1, F2, F3, F4,
+	F5, F6, F7, F8,
+	F9, F10, F11, F12,
+	F13, F14, F15, F16,
+	F17, F18, F19, F20,
+	F21, F22, F23, F24,
+	Unknown88, Unknown89, Unknown8A, Unknown8B,
+	Unknown8C, Unknown8D, Unknown8E, Unknown8F,
+	NumLock, ScrollLock, Unknown92, Unknown93,
+	Unknown94, Unknown95, Unknown96, Unknown97,
+	Unknown98, Unknown99, Unknown9A, Unknown9B,
+	Unknown9C, Unknown9D, Unknown9E, Unknown9F,
+	LShift, RShift, LControl, RControl,
+	UnknownA4, UnknownA5, UnknownA6, UnknownA7,
+	UnknownA8, UnknownA9, UnknownAA, UnknownAB,
+	UnknownAC, UnknownAD, UnknownAE, UnknownAF,
+	UnknownB0, UnknownB1, UnknownB2, UnknownB3,
+	UnknownB4, UnknownB5, UnknownB6, UnknownB7,
+	UnknownB8, UnknownB9, Semicolon, Equals,
+	Comma, Minus, Period, Slash,
+	Tilde, UnknownC1, UnknownC2, UnknownC3,
+	UnknownC4, UnknownC5, UnknownC6, UnknownC7,
+	Joy1, Joy2, Joy3, Joy4,
+	Joy5, Joy6, Joy7, Joy8,
+	Joy9, Joy10, Joy11, Joy12,
+	Joy13, Joy14, Joy15, Joy16,
+	UnknownD8, UnknownD9, UnknownDA, LeftBracket,
+	Backslash, RightBracket, SingleQuote, UnknownDF,
+	JoyX, JoyY, JoyZ, JoyR,
+	MouseX, MouseY, MouseZ, MouseW,
+	JoyU, JoyV, UnknownEA, UnknownEB,
+	MouseWheelUp, MouseWheelDown, Unknown10E, Unknown10F,
+	JoyPovUp, JoyPovDown, JoyPovLeft, JoyPovRight,
+	UnknownF4, UnknownF5, Attn, CrSel,
+	ExSel, ErEof, Play, Zoom,
+	NoName, PA1, OEMClear
 };
 
 class DisplayWindow;
@@ -118,14 +100,14 @@ class DisplayWindowHost
 public:
 	virtual void OnWindowPaint() = 0;
 	virtual void OnWindowMouseMove(const Point& pos) = 0;
-	virtual void OnWindowMouseDown(const Point& pos, EInputKey key) = 0;
-	virtual void OnWindowMouseDoubleclick(const Point& pos, EInputKey key) = 0;
-	virtual void OnWindowMouseUp(const Point& pos, EInputKey key) = 0;
-	virtual void OnWindowMouseWheel(const Point& pos, EInputKey key) = 0;
+	virtual void OnWindowMouseDown(const Point& pos, InputKey key) = 0;
+	virtual void OnWindowMouseDoubleclick(const Point& pos, InputKey key) = 0;
+	virtual void OnWindowMouseUp(const Point& pos, InputKey key) = 0;
+	virtual void OnWindowMouseWheel(const Point& pos, InputKey key) = 0;
 	virtual void OnWindowRawMouseMove(int dx, int dy) = 0;
 	virtual void OnWindowKeyChar(std::string chars) = 0;
-	virtual void OnWindowKeyDown(EInputKey key) = 0;
-	virtual void OnWindowKeyUp(EInputKey key) = 0;
+	virtual void OnWindowKeyDown(InputKey key) = 0;
+	virtual void OnWindowKeyUp(InputKey key) = 0;
 	virtual void OnWindowGeometryChanged() = 0;
 	virtual void OnWindowClose() = 0;
 	virtual void OnWindowActivated() = 0;
@@ -165,7 +147,7 @@ class DisplayWindow
 	virtual void CaptureMouse() = 0;
 	virtual void ReleaseMouseCapture() = 0;
 	virtual void Update() = 0;
-	virtual bool GetKeyState(EInputKey key) = 0;
+	virtual bool GetKeyState(InputKey key) = 0;
 
 	virtual void SetCursor(StandardCursor cursor) = 0;
 

src/core/canvas.cpp

@@ -489,11 +489,11 @@ void BitmapCanvas::drawLineUnclipped(const Point& p0, const Point& p1, const Col
 {
 	if (p0.x == p1.x)
 	{
-		drawTile(whiteTexture.get(), (float)((p0.x - 0.5) * uiscale), (float)(p0.y * uiscale), (float)((p1.x + 0.5) * uiscale), (float)(p1.y * uiscale), 0.0f, 0.0f, 1.0f, 1.0f, color);
+		drawTile(whiteTexture.get(), (float)((p0.x - 0.5) * uiscale), (float)(p0.y * uiscale), (float)uiscale, (float)((p1.y - p0.y) * uiscale), 0.0f, 0.0f, 1.0f, 1.0f, color);
 	}
 	else if (p0.y == p1.y)
 	{
-		drawTile(whiteTexture.get(), (float)(p0.x * uiscale), (float)((p0.y - 0.5) * uiscale), (float)(p1.x * uiscale), (float)((p1.y + 0.5) * uiscale), 0.0f, 0.0f, 1.0f, 1.0f, color);
+		drawTile(whiteTexture.get(), (float)(p0.x * uiscale), (float)((p0.y - 0.5) * uiscale), (float)((p1.x - p0.x) * uiscale), (float)uiscale, 0.0f, 0.0f, 1.0f, 1.0f, color);
 	}
 	else
 	{