AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 10:05:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to intercept textinput events and replicate characters entered into in-game chat

Browse Source
This commit is contained in:
UnknownShadow200 2019-10-23 23:25:09 +11:00
parent b11f5a7e61
commit a610e42f43
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Window.c
View File

@ -2995,13 +2995,17 @@ static EM_BOOL Window_Key(int type, const EmscriptenKeyboardEvent* ev , void* da
(key >= KEY_INSERT && key <= KEY_MENU) || (key >= KEY_ENTER && key <= KEY_NUMLOCK && key != KEY_SPACE);
}
static EM_BOOL Window_KeyPress(int type, const EmscriptenKeyboardEvent* ev, void* data) {
/* reused for touch keyboard input down in Window_OpenKeyboard */
EMSCRIPTEN_KEEPALIVE void Window_ProcessKeyChar(int charCode) {
char keyChar;
Window_CorrectFocus();
if (Convert_TryUnicodeToCP437(ev->charCode, &keyChar)) {
if (Convert_TryUnicodeToCP437(charCode, &keyChar)) {
Event_RaiseInt(&InputEvents.Press, keyChar);
}
}
static EM_BOOL Window_KeyPress(int type, const EmscriptenKeyboardEvent* ev, void* data) {
Window_CorrectFocus();
Window_ProcessKeyChar(ev->charCode);
return true;
}
@ -3188,6 +3192,13 @@ void Window_OpenKeyboard(void) {
if (!elem) {
elem = document.createElement('textarea');
elem.setAttribute('style', 'position:absolute; left:0; top:0; width:100%; height:100%; opacity:0.3; resize:none; pointer-events:none;');
elem.addEventListener("textInput",
function(ev) {
for (var i = 0; i < ev.data.length; i++) {
var code = ev.data.charCodeAt(i);
ccall('Window_ProcessKeyChar', 'void', ['number'], [code]);
}
}, false);
window.cc_inputElem = elem;
}
@ -3196,6 +3207,7 @@ void Window_OpenKeyboard(void) {
elem.click();
});
}
void Window_CloseKeyboard(void) {
if (!Input_TouchMode) return;
Platform_LogConst("CLOSE SESAME");

4
src/World.c
View File

@ -250,6 +250,10 @@ float Respawn_HighestSolidY(struct AABB* bb) {
for (z = minZ; z <= maxZ; z++) { v.Z = (float)z;
for (x = minX; x <= maxX; x++) { v.X = (float)x;
/* TODO: Maybe use how picking gets blocks, so the bedrock */
/* just below and just on borders of the map is treated as such */
/* Not sure if this is really necessary though, it seems to work */
/* just fine already when you're standing on the bottom of the map. */
block = World_SafeGetBlock(x, y, z);
Vec3_Add(&blockBB.Min, &v, &Blocks.MinBB[block]);
Vec3_Add(&blockBB.Max, &v, &Blocks.MaxBB[block]);