omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

map keys and handle key events on Android and OS X

Browse Source
This commit is contained in:
omigamedev
2017-04-17 19:35:48 +02:00
parent 54082591f1
commit 45cf8c9168
11 changed files with 595 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/app.cpp
View File

@@ -652,7 +652,7 @@ bool App::mouse_scroll(float x, float y, float delta)
layout[main_id]->update();
return ret == kEventResult::Consumed;
}
bool App::key_down(int key)
bool App::key_down(kKey key)
{
KeyEvent e;
e.m_type = kEventType::KeyDown;
@@ -661,7 +661,7 @@ bool App::key_down(int key)
layout[main_id]->update();
return ret == kEventResult::Consumed;
}
bool App::key_up(int key)
bool App::key_up(kKey key)
{
KeyEvent e;
e.m_type = kEventType::KeyUp;
@@ -670,12 +670,12 @@ bool App::key_up(int key)
layout[main_id]->update();
return ret == kEventResult::Consumed;
}
bool App::key_char(int key)
bool App::key_char(char key)
{
KeyEvent e;
e.m_type = kEventType::KeyChar;
e.m_key = key;
e.m_char = key;
auto ret = layout[main_id]->on_event(&e);
layout[main_id]->update();
return ret == kEventResult::Consumed;
}
}

6
engine/app.h
View File

@@ -52,7 +52,7 @@ public:
bool mouse_move(float x, float y);
bool mouse_up(int button, float x, float y);
bool mouse_scroll(float x, float y, float delta);
bool key_down(int key);
bool key_up(int key);
bool key_char(int key);
bool key_down(kKey key);
bool key_up(kKey key);
bool key_char(char key);
};

4
engine/canvas.h
View File

@@ -58,12 +58,12 @@ public:
}
virtual void undo() override
{
m_canvas->m_layers[m_stroke->m_layer].m_rtt.bindTexture();
m_canvas->m_layers[m_layer_idx].m_rtt.bindTexture();
glm::vec2 box_sz = m_box.zw() - m_box.xy();
glTexSubImage2D(GL_TEXTURE_2D, 0, m_box.x, m_box.y, box_sz.x, box_sz.y, GL_RGBA, GL_UNSIGNED_BYTE, m_image.get());
m_canvas->m_layers[m_stroke->m_layer].m_rtt.unbindTexture();
m_canvas->m_layers[m_layer_idx].m_rtt.unbindTexture();
}
};

3
engine/event.cpp Normal file
View File

@@ -0,0 +1,3 @@
#include "pch.h"
#include "event.h"

64
engine/event.h Normal file
View File

@@ -0,0 +1,64 @@
#pragma once
enum class kKey : uint8_t
{
Unknown,
AndroidVolumeUp,
AndroidVolumeDown,
AndroidHome,
KeySpacebar,
KeyE,
};
enum class kEventResult : uint8_t
{
Consumed,
Available,
};
enum class kEventCategory : uint8_t
{
MouseEvent,
KeyEvent,
ButtonEvent,
};
enum class kEventType : uint8_t
{
MouseDownL,
MouseDownR,
MouseMove,
MouseUpL,
MouseUpR,
MouseEnter,
MouseLeave,
MouseScroll,
KeyDown,
KeyUp,
KeyChar,
ButtonDown,
ButtonUp,
};
class Event
{
public:
kEventCategory m_cat;
kEventType m_type;
};
class MouseEvent : public Event
{
public:
MouseEvent() { m_cat = kEventCategory::MouseEvent; }
glm::vec2 m_pos;
float m_scroll_delta;
};
class KeyEvent : public Event
{
public:
KeyEvent() { m_cat = kEventCategory::KeyEvent; }
kKey m_key;
char m_char;
};

240
engine/keymap.h Normal file
View File

@@ -0,0 +1,240 @@
enum {
kVK_ANSI_A = 0x00,
kVK_ANSI_S = 0x01,
kVK_ANSI_D = 0x02,
kVK_ANSI_F = 0x03,
kVK_ANSI_H = 0x04,
kVK_ANSI_G = 0x05,
kVK_ANSI_Z = 0x06,
kVK_ANSI_X = 0x07,
kVK_ANSI_C = 0x08,
kVK_ANSI_V = 0x09,
kVK_ANSI_B = 0x0B,
kVK_ANSI_Q = 0x0C,
kVK_ANSI_W = 0x0D,
kVK_ANSI_E = 0x0E,
kVK_ANSI_R = 0x0F,
kVK_ANSI_Y = 0x10,
kVK_ANSI_T = 0x11,
kVK_ANSI_1 = 0x12,
kVK_ANSI_2 = 0x13,
kVK_ANSI_3 = 0x14,
kVK_ANSI_4 = 0x15,
kVK_ANSI_6 = 0x16,
kVK_ANSI_5 = 0x17,
kVK_ANSI_Equal = 0x18,
kVK_ANSI_9 = 0x19,
kVK_ANSI_7 = 0x1A,
kVK_ANSI_Minus = 0x1B,
kVK_ANSI_8 = 0x1C,
kVK_ANSI_0 = 0x1D,
kVK_ANSI_RightBracket = 0x1E,
kVK_ANSI_O = 0x1F,
kVK_ANSI_U = 0x20,
kVK_ANSI_LeftBracket = 0x21,
kVK_ANSI_I = 0x22,
kVK_ANSI_P = 0x23,
kVK_ANSI_L = 0x25,
kVK_ANSI_J = 0x26,
kVK_ANSI_Quote = 0x27,
kVK_ANSI_K = 0x28,
kVK_ANSI_Semicolon = 0x29,
kVK_ANSI_Backslash = 0x2A,
kVK_ANSI_Comma = 0x2B,
kVK_ANSI_Slash = 0x2C,
kVK_ANSI_N = 0x2D,
kVK_ANSI_M = 0x2E,
kVK_ANSI_Period = 0x2F,
kVK_ANSI_Grave = 0x32,
kVK_ANSI_KeypadDecimal = 0x41,
kVK_ANSI_KeypadMultiply = 0x43,
kVK_ANSI_KeypadPlus = 0x45,
kVK_ANSI_KeypadClear = 0x47,
kVK_ANSI_KeypadDivide = 0x4B,
kVK_ANSI_KeypadEnter = 0x4C,
kVK_ANSI_KeypadMinus = 0x4E,
kVK_ANSI_KeypadEquals = 0x51,
kVK_ANSI_Keypad0 = 0x52,
kVK_ANSI_Keypad1 = 0x53,
kVK_ANSI_Keypad2 = 0x54,
kVK_ANSI_Keypad3 = 0x55,
kVK_ANSI_Keypad4 = 0x56,
kVK_ANSI_Keypad5 = 0x57,
kVK_ANSI_Keypad6 = 0x58,
kVK_ANSI_Keypad7 = 0x59,
kVK_ANSI_Keypad8 = 0x5B,
kVK_ANSI_Keypad9 = 0x5C
};
/* keycodes for keys that are independent of keyboard layout*/
enum {
kVK_Return = 0x24,
kVK_Tab = 0x30,
kVK_Space = 0x31,
kVK_Delete = 0x33,
kVK_Escape = 0x35,
kVK_Command = 0x37,
kVK_Shift = 0x38,
kVK_CapsLock = 0x39,
kVK_Option = 0x3A,
kVK_Control = 0x3B,
kVK_RightShift = 0x3C,
kVK_RightOption = 0x3D,
kVK_RightControl = 0x3E,
kVK_Function = 0x3F,
kVK_F17 = 0x40,
kVK_VolumeUp = 0x48,
kVK_VolumeDown = 0x49,
kVK_Mute = 0x4A,
kVK_F18 = 0x4F,
kVK_F19 = 0x50,
kVK_F20 = 0x5A,
kVK_F5 = 0x60,
kVK_F6 = 0x61,
kVK_F7 = 0x62,
kVK_F3 = 0x63,
kVK_F8 = 0x64,
kVK_F9 = 0x65,
kVK_F11 = 0x67,
kVK_F13 = 0x69,
kVK_F16 = 0x6A,
kVK_F14 = 0x6B,
kVK_F10 = 0x6D,
kVK_F12 = 0x6F,
kVK_F15 = 0x71,
kVK_Help = 0x72,
kVK_Home = 0x73,
kVK_PageUp = 0x74,
kVK_ForwardDelete = 0x75,
kVK_F4 = 0x76,
kVK_End = 0x77,
kVK_F2 = 0x78,
kVK_PageDown = 0x79,
kVK_F1 = 0x7A,
kVK_LeftArrow = 0x7B,
kVK_RightArrow = 0x7C,
kVK_DownArrow = 0x7D,
kVK_UpArrow = 0x7E
};
kKey convert_key(int key)
{
#define CASE(K,V) case K: return V;
switch(key)
{
CASE(kVK_ANSI_A, kKey::Unknown);
CASE(kVK_ANSI_S, kKey::Unknown);
CASE(kVK_ANSI_D, kKey::Unknown);
CASE(kVK_ANSI_F, kKey::Unknown);
CASE(kVK_ANSI_H, kKey::Unknown);
CASE(kVK_ANSI_G, kKey::Unknown);
CASE(kVK_ANSI_Z, kKey::Unknown);
CASE(kVK_ANSI_X, kKey::Unknown);
CASE(kVK_ANSI_C, kKey::Unknown);
CASE(kVK_ANSI_V, kKey::Unknown);
CASE(kVK_ANSI_B, kKey::Unknown);
CASE(kVK_ANSI_Q, kKey::Unknown);
CASE(kVK_ANSI_W, kKey::Unknown);
CASE(kVK_ANSI_E, kKey::KeyE);
CASE(kVK_ANSI_R, kKey::Unknown);
CASE(kVK_ANSI_Y, kKey::Unknown);
CASE(kVK_ANSI_T, kKey::Unknown);
CASE(kVK_ANSI_1, kKey::Unknown);
CASE(kVK_ANSI_2, kKey::Unknown);
CASE(kVK_ANSI_3, kKey::Unknown);
CASE(kVK_ANSI_4, kKey::Unknown);
CASE(kVK_ANSI_6, kKey::Unknown);
CASE(kVK_ANSI_5, kKey::Unknown);
CASE(kVK_ANSI_Equal, kKey::Unknown);
CASE(kVK_ANSI_9, kKey::Unknown);
CASE(kVK_ANSI_7, kKey::Unknown);
CASE(kVK_ANSI_Minus, kKey::Unknown);
CASE(kVK_ANSI_8, kKey::Unknown);
CASE(kVK_ANSI_0, kKey::Unknown);
CASE(kVK_ANSI_RightBracket, kKey::Unknown);
CASE(kVK_ANSI_O, kKey::Unknown);
CASE(kVK_ANSI_U, kKey::Unknown);
CASE(kVK_ANSI_LeftBracket, kKey::Unknown);
CASE(kVK_ANSI_I, kKey::Unknown);
CASE(kVK_ANSI_P, kKey::Unknown);
CASE(kVK_ANSI_L, kKey::Unknown);
CASE(kVK_ANSI_J, kKey::Unknown);
CASE(kVK_ANSI_Quote, kKey::Unknown);
CASE(kVK_ANSI_K, kKey::Unknown);
CASE(kVK_ANSI_Semicolon, kKey::Unknown);
CASE(kVK_ANSI_Backslash, kKey::Unknown);
CASE(kVK_ANSI_Comma, kKey::Unknown);
CASE(kVK_ANSI_Slash, kKey::Unknown);
CASE(kVK_ANSI_N, kKey::Unknown);
CASE(kVK_ANSI_M, kKey::Unknown);
CASE(kVK_ANSI_Period, kKey::Unknown);
CASE(kVK_ANSI_Grave, kKey::Unknown);
CASE(kVK_ANSI_KeypadDecimal, kKey::Unknown);
CASE(kVK_ANSI_KeypadMultiply, kKey::Unknown);
CASE(kVK_ANSI_KeypadPlus, kKey::Unknown);
CASE(kVK_ANSI_KeypadClear, kKey::Unknown);
CASE(kVK_ANSI_KeypadDivide, kKey::Unknown);
CASE(kVK_ANSI_KeypadEnter, kKey::Unknown);
CASE(kVK_ANSI_KeypadMinus, kKey::Unknown);
CASE(kVK_ANSI_KeypadEquals, kKey::Unknown);
CASE(kVK_ANSI_Keypad0, kKey::Unknown);
CASE(kVK_ANSI_Keypad1, kKey::Unknown);
CASE(kVK_ANSI_Keypad2, kKey::Unknown);
CASE(kVK_ANSI_Keypad3, kKey::Unknown);
CASE(kVK_ANSI_Keypad4, kKey::Unknown);
CASE(kVK_ANSI_Keypad5, kKey::Unknown);
CASE(kVK_ANSI_Keypad6, kKey::Unknown);
CASE(kVK_ANSI_Keypad7, kKey::Unknown);
CASE(kVK_ANSI_Keypad8, kKey::Unknown);
CASE(kVK_ANSI_Keypad9, kKey::Unknown);
CASE(kVK_Return, kKey::Unknown);
CASE(kVK_Tab, kKey::Unknown);
CASE(kVK_Space, kKey::Unknown);
CASE(kVK_Delete, kKey::Unknown);
CASE(kVK_Escape, kKey::Unknown);
CASE(kVK_Command, kKey::Unknown);
CASE(kVK_Shift, kKey::Unknown);
CASE(kVK_CapsLock, kKey::Unknown);
CASE(kVK_Option, kKey::Unknown);
CASE(kVK_Control, kKey::Unknown);
CASE(kVK_RightShift, kKey::Unknown);
CASE(kVK_RightOption, kKey::Unknown);
CASE(kVK_RightControl, kKey::Unknown);
CASE(kVK_Function, kKey::Unknown);
CASE(kVK_F17, kKey::Unknown);
CASE(kVK_VolumeUp, kKey::Unknown);
CASE(kVK_VolumeDown, kKey::Unknown);
CASE(kVK_Mute, kKey::Unknown);
CASE(kVK_F18, kKey::Unknown);
CASE(kVK_F19, kKey::Unknown);
CASE(kVK_F20, kKey::Unknown);
CASE(kVK_F5, kKey::Unknown);
CASE(kVK_F6, kKey::Unknown);
CASE(kVK_F7, kKey::Unknown);
CASE(kVK_F3, kKey::Unknown);
CASE(kVK_F8, kKey::Unknown);
CASE(kVK_F9, kKey::Unknown);
CASE(kVK_F11, kKey::Unknown);
CASE(kVK_F13, kKey::Unknown);
CASE(kVK_F16, kKey::Unknown);
CASE(kVK_F14, kKey::Unknown);
CASE(kVK_F10, kKey::Unknown);
CASE(kVK_F12, kKey::Unknown);
CASE(kVK_F15, kKey::Unknown);
CASE(kVK_Help, kKey::Unknown);
CASE(kVK_Home, kKey::Unknown);
CASE(kVK_PageUp, kKey::Unknown);
CASE(kVK_ForwardDelete, kKey::Unknown);
CASE(kVK_F4, kKey::Unknown);
CASE(kVK_End, kKey::Unknown);
CASE(kVK_F2, kKey::Unknown);
CASE(kVK_PageDown, kKey::Unknown);
CASE(kVK_F1, kKey::Unknown);
CASE(kVK_LeftArrow, kKey::Unknown);
CASE(kVK_RightArrow, kKey::Unknown);
CASE(kVK_DownArrow, kKey::Unknown);
CASE(kVK_UpArrow, kKey::Unknown);
default:
return kKey::Unknown;
}
}

59
engine/layout.h
View File

@@ -7,6 +7,7 @@
#include "rtt.h"
#include "bezier.h"
#include "canvas.h"
#include "event.h"
#include <tinyxml2.h>
#include <yoga/Yoga.h>
@@ -85,54 +86,6 @@ enum class kShapeType : uint16_t
Slice9 = const_hash("slice9"),
};
enum class kEventResult : uint8_t
{
Consumed,
Available,
};
enum class kEventCategory : uint8_t
{
MouseEvent,
KeyEvent,
};
enum class kEventType : uint8_t
{
MouseDownL,
MouseDownR,
MouseMove,
MouseUpL,
MouseUpR,
MouseEnter,
MouseLeave,
MouseScroll,
KeyDown,
KeyUp,
KeyChar,
};
class Event
{
public:
kEventCategory m_cat;
kEventType m_type;
};
class MouseEvent : public Event
{
public:
MouseEvent() { m_cat = kEventCategory::MouseEvent; }
glm::vec2 m_pos;
float m_scroll_delta;
};
class KeyEvent : public Event
{
public:
KeyEvent() { m_cat = kEventCategory::KeyEvent; }
int m_key;
};
class LayoutManager
{
std::map<uint16_t, std::unique_ptr<class Node>> m_layouts;
@@ -754,7 +707,7 @@ public:
// }
break;
case kEventType::KeyChar:
if (ke->m_key >= 32 && ke->m_key < 32+96)
if (ke->m_char >= 32 && ke->m_char < (32+96))
{
m_string += (char)ke->m_key;
m_text->set_text(m_string.c_str());
@@ -2030,11 +1983,15 @@ public:
m_zoom_canvas += me->m_scroll_delta * 0.1f;
break;
case kEventType::KeyDown:
if (ke->m_key == 'E')
if (ke->m_key == kKey::KeyE)
m_canvas->m_erase = true;
if (ke->m_key == kKey::AndroidVolumeUp)
m_zoom_canvas *= 0.9f;
if (ke->m_key == kKey::AndroidVolumeDown)
m_zoom_canvas *= 1.1f;
break;
case kEventType::KeyUp:
if (ke->m_key == 'E')
if (ke->m_key == kKey::KeyE)
m_canvas->m_erase = false;
default:
break;

17
engine/main.cpp
View File

@@ -5,6 +5,7 @@
#include "texture.h"
#include "image.h"
#include "app.h"
#include "keymap.h"
#ifdef __APPLE__
#include <CoreFoundation/CoreFoundation.h>
@@ -252,6 +253,22 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTime
App::I.mouse_scroll(mouseLoc.x, App::I.height - mouseLoc.y - 1, [theEvent deltaY]);
CGLUnlockContext([[self openGLContext] CGLContextObj]);
}
- (void)keyDown:(NSEvent *)theEvent
{
CGLLockContext([[self openGLContext] CGLContextObj]);
auto keyCode = [theEvent keyCode];
auto chars = [theEvent characters];
App::I.key_down(convert_key(keyCode));
CGLUnlockContext([[self openGLContext] CGLContextObj]);
}
- (void)keyUp:(NSEvent *)theEvent
{
CGLLockContext([[self openGLContext] CGLContextObj]);
auto keyCode = [theEvent keyCode];
auto chars = [theEvent characters];
App::I.key_up(convert_key(keyCode));
CGLUnlockContext([[self openGLContext] CGLContextObj]);
}
@end
@interface Window : NSWindow