Skip to content

Commit da120a7

Browse files
committed
titlecase for key names
1 parent e52da8a commit da120a7

File tree

3 files changed

+33
-32
lines changed

3 files changed

+33
-32
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
CMakeLists.txt.user
77
CMakeSettings.json
88
*~
9+
*.TMP

sources/libengine/keybinds.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace cage
2323

2424
CAGE_FORCE_INLINE String finishName(String s)
2525
{
26-
return replace(trim(s), " ", "+");
26+
return replace(trim(s), " ", " + ");
2727
}
2828

2929
struct MatcherBase
@@ -124,11 +124,11 @@ namespace cage
124124
{
125125
String w;
126126
if (direction > 0)
127-
w = "WHUP";
127+
w = "WhUp";
128128
else if (direction < 0)
129-
w = "WHDN";
129+
w = "WhDn";
130130
else
131-
w = "WHEEL";
131+
w = "Wheel";
132132
return finishName(Stringizer() + getModifiersNames(requiredFlags) + " " + w);
133133
}
134134
};

sources/libengine/window/window.cpp

+28-28
Original file line numberDiff line numberDiff line change
@@ -824,43 +824,43 @@ namespace cage
824824
case GLFW_KEY_SPACE:
825825
return "_____";
826826
case GLFW_KEY_ESCAPE:
827-
return "ESC";
827+
return "Esc";
828828
case GLFW_KEY_ENTER:
829-
return "ENTER";
829+
return "Enter";
830830
case GLFW_KEY_TAB:
831-
return "TAB";
831+
return "Tab";
832832
case GLFW_KEY_BACKSPACE:
833-
return "BACK";
833+
return "Back";
834834
case GLFW_KEY_INSERT:
835-
return "INS";
835+
return "Ins";
836836
case GLFW_KEY_DELETE:
837-
return "DEL";
837+
return "Del";
838838
case GLFW_KEY_RIGHT:
839-
return "RIGHT";
839+
return "Right";
840840
case GLFW_KEY_LEFT:
841-
return "LEFT";
841+
return "Left";
842842
case GLFW_KEY_DOWN:
843-
return "DOWN";
843+
return "Down";
844844
case GLFW_KEY_UP:
845-
return "UP";
845+
return "Up";
846846
case GLFW_KEY_PAGE_UP:
847-
return "PGUP";
847+
return "PgUp";
848848
case GLFW_KEY_PAGE_DOWN:
849-
return "PGDN";
849+
return "PgDn";
850850
case GLFW_KEY_HOME:
851-
return "HOME";
851+
return "Home";
852852
case GLFW_KEY_END:
853-
return "END";
853+
return "End";
854854
case GLFW_KEY_CAPS_LOCK:
855-
return "CAPS";
855+
return "Caps";
856856
case GLFW_KEY_SCROLL_LOCK:
857-
return "SCROLL";
857+
return "Scroll";
858858
case GLFW_KEY_NUM_LOCK:
859-
return "NUM";
859+
return "Num";
860860
case GLFW_KEY_PRINT_SCREEN:
861-
return "PRTSC";
861+
return "Prtsc";
862862
case GLFW_KEY_PAUSE:
863-
return "PAUSE";
863+
return "Pause";
864864
case GLFW_KEY_F1:
865865
return "F1";
866866
case GLFW_KEY_F2:
@@ -912,37 +912,37 @@ namespace cage
912912
case GLFW_KEY_F25:
913913
return "F25";
914914
case GLFW_KEY_KP_ENTER:
915-
return "ENT";
915+
return "Ent";
916916
}
917917
const auto s = glfwGetKeyName(key, 0);
918918
if (!s)
919919
return "???";
920-
return unicodeTransformString(String(s), UnicodeTransformConfig{ UnicodeTransformEnum::Uppercase });
920+
return unicodeTransformString(String(s), UnicodeTransformConfig{ UnicodeTransformEnum::Titlecase });
921921
}
922922

923923
detail::StringBase<27> getButtonsNames(MouseButtonsFlags buttons)
924924
{
925925
String res;
926926
if (any(buttons & MouseButtonsFlags::Left))
927-
res += "LMB ";
927+
res += "Lmb ";
928928
if (any(buttons & MouseButtonsFlags::Middle))
929-
res += "MMB ";
929+
res += "Mmb ";
930930
if (any(buttons & MouseButtonsFlags::Right))
931-
res += "RMB ";
931+
res += "Rmb ";
932932
return trim(res);
933933
}
934934

935935
detail::StringBase<27> getModifiersNames(ModifiersFlags mods)
936936
{
937937
String res;
938938
if (any(mods & ModifiersFlags::Ctrl))
939-
res += "CTRL ";
939+
res += "Ctrl ";
940940
if (any(mods & ModifiersFlags::Shift))
941-
res += "SHIFT ";
941+
res += "Shift ";
942942
if (any(mods & ModifiersFlags::Alt))
943-
res += "ALT ";
943+
res += "Alt ";
944944
if (any(mods & ModifiersFlags::Super))
945-
res += "SUPER ";
945+
res += "Super ";
946946
return trim(res);
947947
}
948948

0 commit comments

Comments
 (0)