asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10123 from bojidar-bg/7695-key-kp-enter

Browse source 
Rename KEY_RETURN to KEY_ENTER and KEY_ENTER to KEY_KP_ENTER
This commit is contained in:
Juan Linietsky 2017-08-06 21:04:11 -03:00 committed by GitHub
commit 134b3edf5a
18 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/global_constants.cpp
View file

@ -67,8 +67,8 @@ static _GlobalConstant _global_constants[] = {
BIND_GLOBAL_CONSTANT(KEY_TAB), BIND_GLOBAL_CONSTANT(KEY_TAB),
BIND_GLOBAL_CONSTANT(KEY_BACKTAB), BIND_GLOBAL_CONSTANT(KEY_BACKTAB),
BIND_GLOBAL_CONSTANT(KEY_BACKSPACE), BIND_GLOBAL_CONSTANT(KEY_BACKSPACE),
BIND_GLOBAL_CONSTANT(KEY_RETURN),
BIND_GLOBAL_CONSTANT(KEY_ENTER), BIND_GLOBAL_CONSTANT(KEY_ENTER),
BIND_GLOBAL_CONSTANT(KEY_KP_ENTER),
BIND_GLOBAL_CONSTANT(KEY_INSERT), BIND_GLOBAL_CONSTANT(KEY_INSERT),
BIND_GLOBAL_CONSTANT(KEY_DELETE), BIND_GLOBAL_CONSTANT(KEY_DELETE),
BIND_GLOBAL_CONSTANT(KEY_PAUSE), BIND_GLOBAL_CONSTANT(KEY_PAUSE),

4
core/input_map.cpp
View file

@ -219,11 +219,11 @@ void InputMap::load_default() {
add_action("ui_accept"); add_action("ui_accept");
key.instance(); key.instance();
key->set_scancode(KEY_RETURN); key->set_scancode(KEY_ENTER);
action_add_event("ui_accept", key); action_add_event("ui_accept", key);
key.instance(); key.instance();
key->set_scancode(KEY_ENTER); key->set_scancode(KEY_KP_ENTER);
action_add_event("ui_accept", key); action_add_event("ui_accept", key);
key.instance(); key.instance();

4
core/os/keyboard.cpp
View file

@ -42,8 +42,8 @@ static const _KeyCodeText _keycodes[] = {
{KEY_TAB ,"Tab"}, {KEY_TAB ,"Tab"},
{KEY_BACKTAB ,"BackTab"}, {KEY_BACKTAB ,"BackTab"},
{KEY_BACKSPACE ,"BackSpace"}, {KEY_BACKSPACE ,"BackSpace"},
{KEY_RETURN ,"Return"},
{KEY_ENTER ,"Enter"}, {KEY_ENTER ,"Enter"},
{KEY_KP_ENTER ,"Kp Enter"},
{KEY_INSERT ,"Insert"}, {KEY_INSERT ,"Insert"},
{KEY_DELETE ,"Delete"}, {KEY_DELETE ,"Delete"},
{KEY_PAUSE ,"Pause"}, {KEY_PAUSE ,"Pause"},
@ -294,8 +294,8 @@ bool keycode_has_unicode(uint32_t p_keycode) {
case KEY_TAB: case KEY_TAB:
case KEY_BACKTAB: case KEY_BACKTAB:
case KEY_BACKSPACE: case KEY_BACKSPACE:
case KEY_RETURN:
case KEY_ENTER: case KEY_ENTER:
case KEY_KP_ENTER:
case KEY_INSERT: case KEY_INSERT:
case KEY_DELETE: case KEY_DELETE:
case KEY_PAUSE: case KEY_PAUSE:

4
core/os/keyboard.h
View file

@ -57,8 +57,8 @@ enum KeyList {
KEY_TAB = SPKEY | 0x02, KEY_TAB = SPKEY | 0x02,
KEY_BACKTAB = SPKEY | 0x03, KEY_BACKTAB = SPKEY | 0x03,
KEY_BACKSPACE = SPKEY | 0x04, KEY_BACKSPACE = SPKEY | 0x04,
KEY_RETURN = SPKEY | 0x05, KEY_ENTER = SPKEY | 0x05,
KEY_ENTER = SPKEY | 0x06, KEY_KP_ENTER = SPKEY | 0x06,
KEY_INSERT = SPKEY | 0x07, KEY_INSERT = SPKEY | 0x07,
KEY_DELETE = SPKEY | 0x08, KEY_DELETE = SPKEY | 0x08,
KEY_PAUSE = SPKEY | 0x09, KEY_PAUSE = SPKEY | 0x09,

4
core/project_settings.cpp
View file

@ -925,10 +925,10 @@ ProjectSettings::ProjectSettings() {
GLOBAL_DEF("application/config/use_shared_user_dir", true); GLOBAL_DEF("application/config/use_shared_user_dir", true);
key.instance(); key.instance();
key->set_scancode(KEY_RETURN); key->set_scancode(KEY_ENTER);
va.push_back(key); va.push_back(key);
key.instance(); key.instance();
key->set_scancode(KEY_ENTER); key->set_scancode(KEY_KP_ENTER);
va.push_back(key); va.push_back(key);
key.instance(); key.instance();
key->set_scancode(KEY_SPACE); key->set_scancode(KEY_SPACE);

4
doc/base/classes.xml
View file

@ -846,10 +846,10 @@
<constant name="KEY_BACKSPACE" value="16777220"> <constant name="KEY_BACKSPACE" value="16777220">
Backspace Key Backspace Key
</constant> </constant>
<constant name="KEY_RETURN" value="16777221"> <constant name="KEY_ENTER" value="16777221">
Return Key (On Main Keyboard) Return Key (On Main Keyboard)
</constant> </constant>
<constant name="KEY_ENTER" value="16777222"> <constant name="KEY_KP_ENTER" value="16777222">
Enter Key (On Numpad) Enter Key (On Numpad)
</constant> </constant>
<constant name="KEY_INSERT" value="16777223"> <constant name="KEY_INSERT" value="16777223">

4
editor/editor_name_dialog.cpp
View file

@ -42,8 +42,8 @@ void EditorNameDialog::_line_gui_input(const Ref<InputEvent> &p_event) {
return; return;
switch (k->get_scancode()) { switch (k->get_scancode()) {
case KEY_ENTER: case KEY_KP_ENTER:
case KEY_RETURN: { case KEY_ENTER: {
if (get_hide_on_ok()) if (get_hide_on_ok())
hide(); hide();

2
editor/project_manager.cpp
View file

@ -573,7 +573,7 @@ void ProjectManager::_unhandled_input(const Ref<InputEvent> &p_ev) {
switch (k->get_scancode()) { switch (k->get_scancode()) {
case KEY_RETURN: { case KEY_ENTER: {
_open_project(); _open_project();
} break; } break;

2
platform/haiku/key_mapping_haiku.cpp
View file

@ -83,7 +83,7 @@ static _HaikuTranslatePair _fn_to_keycode[] = {
static _HaikuTranslatePair _hb_to_keycode[] = { static _HaikuTranslatePair _hb_to_keycode[] = {
{ KEY_BACKSPACE, B_BACKSPACE }, { KEY_BACKSPACE, B_BACKSPACE },
{ KEY_TAB, B_TAB }, { KEY_TAB, B_TAB },
{ KEY_RETURN, B_RETURN }, { KEY_ENTER, B_RETURN },
{ KEY_CAPSLOCK, B_CAPS_LOCK }, { KEY_CAPSLOCK, B_CAPS_LOCK },
{ KEY_ESCAPE, B_ESCAPE }, { KEY_ESCAPE, B_ESCAPE },
{ KEY_SPACE, B_SPACE }, { KEY_SPACE, B_SPACE },

2
platform/javascript/dom_keys.h
View file

@ -249,7 +249,7 @@ int dom2godot_scancode(int dom_keycode) {
case DOM_VK_RETURN: case DOM_VK_RETURN:
case DOM_VK_ENTER: // unused according to MDN case DOM_VK_ENTER: // unused according to MDN
return KEY_RETURN; return KEY_ENTER;
case DOM_VK_SHIFT: return KEY_SHIFT; case DOM_VK_SHIFT: return KEY_SHIFT;
case DOM_VK_CONTROL: return KEY_CONTROL; case DOM_VK_CONTROL: return KEY_CONTROL;

4
platform/osx/os_osx.mm
View file

@ -518,7 +518,7 @@ static int translateKey(unsigned int key) {
/* 21 */ KEY_BRACELEFT, /* 21 */ KEY_BRACELEFT,
/* 22 */ KEY_I, /* 22 */ KEY_I,
/* 23 */ KEY_P, /* 23 */ KEY_P,
/* 24 */ KEY_RETURN, /* 24 */ KEY_ENTER,
/* 25 */ KEY_L, /* 25 */ KEY_L,
/* 26 */ KEY_J, /* 26 */ KEY_J,
/* 27 */ KEY_APOSTROPHE, /* 27 */ KEY_APOSTROPHE,
@ -558,7 +558,7 @@ static int translateKey(unsigned int key) {
/* 49 */ KEY_UNKNOWN, /* VolumeDown */ /* 49 */ KEY_UNKNOWN, /* VolumeDown */
/* 4a */ KEY_UNKNOWN, /* Mute */ /* 4a */ KEY_UNKNOWN, /* Mute */
/* 4b */ KEY_KP_DIVIDE, /* 4b */ KEY_KP_DIVIDE,
/* 4c */ KEY_ENTER, /* 4c */ KEY_KP_ENTER,
/* 4d */ KEY_UNKNOWN, /* 4d */ KEY_UNKNOWN,
/* 4e */ KEY_KP_SUBTRACT, /* 4e */ KEY_KP_SUBTRACT,
/* 4f */ KEY_UNKNOWN, /* 4f */ KEY_UNKNOWN,

2
platform/windows/key_mapping_win.cpp
View file

@ -44,7 +44,7 @@ static _WinTranslatePair _vk_to_keycode[] = {
//VK_CLEAR (0x0C) //VK_CLEAR (0x0C)
{ KEY_RETURN, VK_RETURN }, //(0x0D) { KEY_ENTER, VK_RETURN }, //(0x0D)
{ KEY_SHIFT, VK_SHIFT }, //(0x10) { KEY_SHIFT, VK_SHIFT }, //(0x10)

2
platform/windows/os_windows.cpp
View file

@ -807,7 +807,7 @@ void OS_Windows::process_key_events() {
if ((ke.lParam & (1 << 24)) && (ke.wParam == VK_RETURN)) { if ((ke.lParam & (1 << 24)) && (ke.wParam == VK_RETURN)) {
// Special case for Numpad Enter key // Special case for Numpad Enter key
k->set_scancode(KEY_ENTER); k->set_scancode(KEY_KP_ENTER);
} else { } else {
k->set_scancode(KeyMappingWindows::get_keysym(ke.wParam)); k->set_scancode(KeyMappingWindows::get_keysym(ke.wParam));
} }

4
platform/x11/key_mapping_x11.cpp
View file

@ -44,7 +44,7 @@ static _XTranslatePair _xkeysym_to_keycode[] = {
{ XK_Tab, KEY_TAB }, { XK_Tab, KEY_TAB },
{ XK_ISO_Left_Tab, KEY_BACKTAB }, { XK_ISO_Left_Tab, KEY_BACKTAB },
{ XK_BackSpace, KEY_BACKSPACE }, { XK_BackSpace, KEY_BACKSPACE },
{ XK_Return, KEY_RETURN }, { XK_Return, KEY_ENTER },
{ XK_Insert, KEY_INSERT }, { XK_Insert, KEY_INSERT },
{ XK_Delete, KEY_DELETE }, { XK_Delete, KEY_DELETE },
{ XK_Clear, KEY_DELETE }, { XK_Clear, KEY_DELETE },
@ -78,7 +78,7 @@ static _XTranslatePair _xkeysym_to_keycode[] = {
{ XK_Help, KEY_HELP }, { XK_Help, KEY_HELP },
{ XK_KP_Space, KEY_SPACE }, { XK_KP_Space, KEY_SPACE },
{ XK_KP_Tab, KEY_TAB }, { XK_KP_Tab, KEY_TAB },
{ XK_KP_Enter, KEY_ENTER }, { XK_KP_Enter, KEY_KP_ENTER },
{ XK_Home, KEY_HOME }, { XK_Home, KEY_HOME },
{ XK_Left, KEY_LEFT }, { XK_Left, KEY_LEFT },
{ XK_Up, KEY_UP }, { XK_Up, KEY_UP },

4
scene/gui/line_edit.cpp
View file

@ -229,8 +229,8 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
bool handled = true; bool handled = true;
switch (code) { switch (code) {
case KEY_ENTER: case KEY_KP_ENTER:
case KEY_RETURN: { case KEY_ENTER: {
emit_signal("text_entered", text); emit_signal("text_entered", text);
if (OS::get_singleton()->has_virtual_keyboard()) if (OS::get_singleton()->has_virtual_keyboard())

4
scene/gui/popup_menu.cpp
View file

@ -249,8 +249,8 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
} }
} }
} break; } break;
case KEY_RETURN: case KEY_ENTER:
case KEY_ENTER: { case KEY_KP_ENTER: {
if (mouse_over >= 0 && mouse_over < items.size() && !items[mouse_over].separator) { if (mouse_over >= 0 && mouse_over < items.size() && !items[mouse_over].separator) {

6
scene/gui/text_edit.cpp
View file

@ -1805,7 +1805,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
return; return;
} }
if (k->get_scancode() == KEY_ENTER || k->get_scancode() == KEY_RETURN || k->get_scancode() == KEY_TAB) { if (k->get_scancode() == KEY_KP_ENTER || k->get_scancode() == KEY_ENTER || k->get_scancode() == KEY_TAB) {
_confirm_completion(); _confirm_completion();
accept_event(); accept_event();
@ -1974,8 +1974,8 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
switch (k->get_scancode()) { switch (k->get_scancode()) {
case KEY_ENTER: case KEY_KP_ENTER:
case KEY_RETURN: { case KEY_ENTER: {
if (readonly) if (readonly)
break; break;

8
scene/gui/tree.cpp
View file

@ -1917,8 +1917,8 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool
void Tree::_text_editor_modal_close() { void Tree::_text_editor_modal_close() {
if (Input::get_singleton()->is_key_pressed(KEY_ESCAPE) || if (Input::get_singleton()->is_key_pressed(KEY_ESCAPE) ||
Input::get_singleton()->is_key_pressed(KEY_ENTER) || Input::get_singleton()->is_key_pressed(KEY_KP_ENTER) ||
Input::get_singleton()->is_key_pressed(KEY_RETURN)) { Input::get_singleton()->is_key_pressed(KEY_ENTER)) {
return; return;
} }
@ -2237,8 +2237,8 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
} break; } break;
case KEY_F2: case KEY_F2:
case KEY_RETURN: case KEY_ENTER:
case KEY_ENTER: { case KEY_KP_ENTER: {
if (selected_item) { if (selected_item) {
//bring up editor if possible //bring up editor if possible