mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-11-17 06:07:12 +00:00
Code Issues Releases Wiki Activity

fixed onscreen keyboard in SDL2

Browse Source
This commit is contained in:
Zeno Rogue
2025-09-09 09:37:50 +02:00
parent 6f4c79f06e
commit aad7a4d866
2 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
dialogs.cpp
View File

@@ -709,6 +709,8 @@ EX namespace dialog {
#endif #endif
} }
EX string keyboard_what;
EX void display() { EX void display() {
callhooks(hooks_display_dialog); callhooks(hooks_display_dialog);
@@ -925,6 +927,14 @@ EX namespace dialog {
if(in) { if(in) {
if(c == 1) getcstat = SDLK_LEFT; if(c == 1) getcstat = SDLK_LEFT;
else if(c == 2) getcstat = SDLK_RIGHT; else if(c == 2) getcstat = SDLK_RIGHT;
else if(c == 3) {
getcstat = PSEUDOKEY_ONSCREEN_KEYBOARD;
keyboard_what = "pi";
}
else if(c >= 32) {
getcstat = PSEUDOKEY_ONSCREEN_KEYBOARD;
keyboard_what = ""; keyboard_what += c;
}
else getcstat = c; else getcstat = c;
} }
displayfr(xpos, mid, 2, dfsize * I.scale/100, s, dialogcolor_over(in), 8); displayfr(xpos, mid, 2, dfsize * I.scale/100, s, dialogcolor_over(in), 8);
@@ -1465,14 +1475,7 @@ EX namespace dialog {
keyhandler = [this, &ne] (int sym, int uni) { keyhandler = [this, &ne] (int sym, int uni) {
handleNavigation(sym, uni); handleNavigation(sym, uni);
if((uni >= '0' && uni <= '9') || among(uni, '.', '+', '-', '*', '/', '^', '(', ')', ',', '|', ' ', '=', 3) || (uni >= 'a' && uni <= 'z')) { if(uni == '\b' || uni == '\t') {
#if SDLVER == 1
if(uni == 3) ne.s += "pi";
else ne.s += uni;
apply_edit();
#endif
}
else if(uni == '\b' || uni == '\t') {
ne.s = ne.s. substr(0, isize(ne.s)-utfsize_before(ne.s, isize(ne.s))); ne.s = ne.s. substr(0, isize(ne.s)-utfsize_before(ne.s, isize(ne.s)));
sscanf(ne.s.c_str(), LDF, ne.editwhat); sscanf(ne.s.c_str(), LDF, ne.editwhat);
apply_edit(); apply_edit();
@@ -1520,6 +1523,18 @@ EX namespace dialog {
apply_slider(); apply_slider();
} }
else if(uni == PSEUDOKEY_ONSCREEN_KEYBOARD) {
ne.s += keyboard_what;
apply_edit();
}
else if(uni >= 32) {
#if SDLVER < 2
if((uni >= '0' && uni <= '9') || among(uni, '.', '+', '-', '*', '/', '^', '(', ')', ',', '|', ' ', '=') || (uni >= 'a' && uni <= 'z')) {
ne.s += uni;
apply_edit();
}
#endif
}
else if(doexiton(sym, uni)) ne.popfinal(); else if(doexiton(sym, uni)) ne.popfinal();
}; };
} }

1
sysconfig.h
View File

@@ -249,6 +249,7 @@
#define PSEUDOKEY_NOHINT 2506 #define PSEUDOKEY_NOHINT 2506
#define PSEUDOKEY_LIST_SLIDER 2507 #define PSEUDOKEY_LIST_SLIDER 2507
#define PSEUDOKEY_SELECT 2508 #define PSEUDOKEY_SELECT 2508
#define PSEUDOKEY_ONSCREEN_KEYBOARD 2509
#ifndef CAP_PNG #ifndef CAP_PNG
#define CAP_PNG (!ISMOBWEB) #define CAP_PNG (!ISMOBWEB)