remove merge conflict artifacts, prefix MwIsKeyUTF8
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
Some checks failed
pyrite-dev/milsko/pipeline/head There was a failure building this commit
This commit is contained in:
parent
597dbe4e5a
commit
2e30d7f4d9
4 changed files with 6 additions and 8 deletions
|
|
@ -834,7 +834,7 @@ static void keyboard_key(void* data,
|
|||
key = MwLLKeyControl;
|
||||
break;
|
||||
default:
|
||||
if(MwIsKeyUTF8(sym)) {
|
||||
if(MwStringIsKeyUTF8(sym)) {
|
||||
key = sym;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -558,7 +558,7 @@ static void MwLLNextEventImpl(MwLL handle) {
|
|||
strcpy(str, s);
|
||||
}
|
||||
|
||||
if(MwIsKeyUTF8(sym)) {
|
||||
if(MwStringIsKeyUTF8(sym)) {
|
||||
char s = str[0];
|
||||
|
||||
if(ev.xkey.state & (ShiftMask | LockMask) && !(ev.xkey.state & (ControlMask | Mod1Mask))) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue