josh/jes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move KEYMOD_ enums to a Keymod namespacing class

Browse Source
This commit is contained in:
Josh Holtrop 2016-12-29 18:51:00 -05:00
parent 0295c593ab
commit 90aa5ada70
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/Window.cc
View File

@ -286,10 +286,10 @@ void Window::handle_keyval(uint32_t keyval)
case 'x':
m_buffer_pane->kill_character_at_cursor();
break;
case KEYMOD_CTRL + 'w':
case Keymod::CTRL + 'w':
m_buffer_pane->write_file();
break;
case KEYMOD_CTRL + 'q':
case Keymod::CTRL + 'q':
m_exit_requested = true;
break;
}
@ -326,20 +326,20 @@ uint32_t Window::get_keyval(SDL_Keycode keysym)
}
else
{
keyval |= KEYMOD_SHIFT;
keyval |= Keymod::SHIFT;
}
}
if ((m_keymod & KMOD_CTRL) != 0u)
{
keyval |= KEYMOD_CTRL;
keyval |= Keymod::CTRL;
}
if ((m_keymod & KMOD_ALT) != 0u)
{
keyval |= KEYMOD_ALT;
keyval |= Keymod::ALT;
}
if ((m_keymod & KMOD_GUI) != 0u)
{
keyval |= KEYMOD_GUI;
keyval |= Keymod::GUI;
}
return keyval;
}

12
src/gui/Window.h
View File

@ -12,13 +12,17 @@ class BufferPane;
class Window
{
public:
class Keymod
{
public:
enum : uint32_t
{
KEYMOD_CTRL = 0x10000,
KEYMOD_ALT = 0x20000,
KEYMOD_SHIFT = 0x40000,
KEYMOD_GUI = 0x80000,
CTRL = 0x10000,
ALT = 0x20000,
SHIFT = 0x40000,
GUI = 0x80000,
};
};
enum class CursorMovement : uint8_t