rename some stuff
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good

This commit is contained in:
Nishi 2026-04-20 00:23:04 +09:00
commit 47ba1a9b50
Signed by: nishi
GPG key ID: 27EF69B208EB9343
6 changed files with 44 additions and 15 deletions

View file

@ -166,13 +166,13 @@ static LRESULT CALLBACK wndproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
const int base = 'A' - 1;
if(n != 0x1b && n <= 0x1f) {
n = (n + base) | MwKEY_CONTROL_MASK;
n = (n + base) | MwKEY_CONTROL_FLAG;
if(!(GetKeyState(VK_LSHIFT) || GetKeyState(VK_RSHIFT))) n += 0x20;
}
if(HIBYTE(VkKeyScan(wp)) & 2) n |= MwKEY_CONTROL_MASK;
if(msg == WM_SYSCHAR) n |= MwKEY_ALT_MASK;
if(HIBYTE(VkKeyScan(wp)) & 2) n |= MwKEY_CONTROL_FLAG;
if(msg == WM_SYSCHAR) n |= MwKEY_ALT_FLAG;
if((0x20 <= n && n <= 0x7f) || (n & MwKEY_MASK)) MwLLDispatch(u->ll, key, &n);
if((0x20 <= n && n <= 0x7f) || (n & MwKEY_FLAG)) MwLLDispatch(u->ll, key, &n);
} else if(msg == WM_SETFOCUS) {
MwLLDispatch(u->ll, focus_in, NULL);
} else if(msg == WM_KILLFOCUS) {
@ -193,7 +193,7 @@ static LRESULT CALLBACK wndproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
if(wp == VK_CONTROL) n = MwKEY_CONTROL;
if((msg == WM_SYSKEYDOWN || msg == WM_SYSKEYUP) && n != -1 && wp != VK_MENU) {
n |= MwKEY_ALT_MASK;
n |= MwKEY_ALT_FLAG;
}
if(n != -1) {
if(msg == WM_KEYDOWN || msg == WM_SYSKEYDOWN) {

View file

@ -807,10 +807,10 @@ static void keyboard_key(void* data,
}
if((self->wayland.mod_state & 4) == 4) {
key |= MwKEY_CONTROL_MASK;
key |= MwKEY_CONTROL_FLAG;
}
if((self->wayland.mod_state & 8) == 8) {
key |= MwKEY_ALT_MASK;
key |= MwKEY_ALT_FLAG;
}
if(key != -1) {

View file

@ -815,10 +815,10 @@ static void MwLLNextEventImpl(MwLL handle) {
}
if(n != MwKEY_CONTROL && ev.xkey.state & ControlMask) {
n |= MwKEY_CONTROL_MASK;
n |= MwKEY_CONTROL_FLAG;
}
if(n != MwKEY_ALT && ev.xkey.state & Mod1Mask) {
n |= MwKEY_ALT_MASK;
n |= MwKEY_ALT_FLAG;
}
if(n != -1) {

View file

@ -113,9 +113,9 @@ static void key(MwWidget handle, int code) {
t->cursor++;
} else if(code == MwKEY_ENTER) {
MwDispatchUserHandler(handle, MwNactivateHandler, NULL);
} else if(code == (MwKEY_CONTROL_MASK | 'v')) {
} else if(code == (MwKEY_CONTROL_FLAG | 'v')) {
MwLLGetClipboard(handle->lowlevel, MwCLIPBOARD_MAIN);
} else if(!(code & MwKEY_MASK)) {
} else if(!(code & MwKEY_FLAG)) {
int incr = 0;
out = malloc(strlen(str) + 5 + 1);
incr += MwUTF8Copy(str, 0, out, 0, t->cursor);