pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

change key constants
All checks were successful
pyrite-dev/milsko/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Nishi 2026-04-20 00:18:04 +09:00
commit d3eb93a30a
Signed by: nishi
GPG key ID: 27EF69B208EB9343
8 changed files with 73 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/backend/gdi.c
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) | MwLLControlMask;
n = (n + base) | MwKEY_CONTROL_MASK;
if(!(GetKeyState(VK_LSHIFT) || GetKeyState(VK_RSHIFT))) n += 0x20;
}
if(HIBYTE(VkKeyScan(wp)) & 2) n |= MwLLControlMask;
if(msg == WM_SYSCHAR) n |= MwLLAltMask;
if(HIBYTE(VkKeyScan(wp)) & 2) n |= MwKEY_CONTROL_MASK;
if(msg == WM_SYSCHAR) n |= MwKEY_ALT_MASK;
if((0x20 <= n && n <= 0x7f) || (n & MwLLKeyMask)) MwLLDispatch(u->ll, key, &n);
if((0x20 <= n && n <= 0x7f) || (n & MwKEY_MASK)) MwLLDispatch(u->ll, key, &n);
} else if(msg == WM_SETFOCUS) {
MwLLDispatch(u->ll, focus_in, NULL);
} else if(msg == WM_KILLFOCUS) {
@ -180,20 +180,20 @@ static LRESULT CALLBACK wndproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
} else if(msg == WM_KEYDOWN || msg == WM_KEYUP || msg == WM_SYSKEYDOWN || msg == WM_SYSKEYUP) {
int n = -1;
if(wp == VK_MENU && msg == WM_KEYUP) return 0;
if(wp == VK_LEFT) n = MwLLKeyLeft;
if(wp == VK_RIGHT) n = MwLLKeyRight;
if(wp == VK_UP) n = MwLLKeyUp;
if(wp == VK_DOWN) n = MwLLKeyDown;
if(wp == VK_RETURN) n = MwLLKeyEnter;
if(wp == VK_BACK) n = MwLLKeyBackSpace;
if(wp == VK_ESCAPE) n = MwLLKeyEscape;
if(wp == VK_LSHIFT) n = MwLLKeyLeftShift;
if(wp == VK_RSHIFT) n = MwLLKeyRightShift;
if(wp == VK_MENU) n = MwLLKeyAlt;
if(wp == VK_CONTROL) n = MwLLKeyControl;
if(wp == VK_LEFT) n = MwKEY_LEFT;
if(wp == VK_RIGHT) n = MwKEY_RIGHT;
if(wp == VK_UP) n = MwKEY_UP;
if(wp == VK_DOWN) n = MwKEY_DOWN;
if(wp == VK_RETURN) n = MwKEY_ENTER;
if(wp == VK_BACK) n = MwKEY_BACKSPACE;
if(wp == VK_ESCAPE) n = MwKEY_ESCAPE;
if(wp == VK_LSHIFT) n = MwKEY_LEFTSHIFT;
if(wp == VK_RSHIFT) n = MwKEY_RIGHTSHIFT;
if(wp == VK_MENU) n = MwKEY_ALT;
if(wp == VK_CONTROL) n = MwKEY_CONTROL;
if((msg == WM_SYSKEYDOWN || msg == WM_SYSKEYUP) && n != -1 && wp != VK_MENU) {
n |= MwLLAltMask;
n |= MwKEY_ALT_MASK;
}
if(n != -1) {
if(msg == WM_KEYDOWN || msg == WM_SYSKEYDOWN) {

26
src/backend/wayland.c
View file

@ -766,39 +766,39 @@ static void keyboard_key(void* data,
switch(sym) {
case XKB_KEY_BackSpace:
key = MwLLKeyBackSpace;
key = MwKEY_BACKSPACE;
break;
case XKB_KEY_Left:
key = MwLLKeyLeft;
key = MwKEY_LEFT;
break;
case XKB_KEY_Right:
key = MwLLKeyRight;
key = MwKEY_RIGHT;
break;
case XKB_KEY_Up:
key = MwLLKeyUp;
key = MwKEY_UP;
break;
case XKB_KEY_Down:
key = MwLLKeyDown;
key = MwKEY_DOWN;
break;
case XKB_KEY_Return:
key = MwLLKeyEnter;
key = MwKEY_ENTER;
break;
case XKB_KEY_Escape:
key = MwLLKeyEscape;
key = MwKEY_ESCAPE;
break;
case XKB_KEY_Shift_L:
key = MwLLKeyLeftShift;
key = MwKEY_LEFTSHIFT;
break;
case XKB_KEY_Shift_R:
key = MwLLKeyRightShift;
key = MwKEY_RIGHTSHIFT;
break;
case XKB_KEY_Alt_L:
case XKB_KEY_Alt_R:
key = MwLLKeyAlt;
key = MwKEY_ALT;
break;
case XKB_KEY_Control_L:
case XKB_KEY_Control_R:
key = MwLLKeyControl;
key = MwKEY_CONTROL;
break;
default:
if(MwStringIsKeyUTF8(sym)) {
@ -807,10 +807,10 @@ static void keyboard_key(void* data,
}
if((self->wayland.mod_state & 4) == 4) {
key |= MwLLControlMask;
key |= MwKEY_CONTROL_MASK;
}
if((self->wayland.mod_state & 8) == 8) {
key |= MwLLAltMask;
key |= MwKEY_ALT_MASK;
}
if(key != -1) {

30
src/backend/x11.c
View file

@ -791,34 +791,34 @@ static void MwLLNextEventImpl(MwLL handle) {
}
if(strcmp(str, "BackSpace") == 0) {
n = MwLLKeyBackSpace;
n = MwKEY_BACKSPACE;
} else if(strcmp(str, "Left") == 0) {
n = MwLLKeyLeft;
n = MwKEY_LEFT;
} else if(strcmp(str, "Right") == 0) {
n = MwLLKeyRight;
n = MwKEY_RIGHT;
} else if(strcmp(str, "Up") == 0) {
n = MwLLKeyUp;
n = MwKEY_UP;
} else if(strcmp(str, "Down") == 0) {
n = MwLLKeyDown;
n = MwKEY_DOWN;
} else if(strcmp(str, "Return") == 0) {
n = MwLLKeyEnter;
n = MwKEY_ENTER;
} else if(strcmp(str, "Escape") == 0) {
n = MwLLKeyEscape;
n = MwKEY_ESCAPE;
} else if(strcmp(str, "Shift_L") == 0) {
n = MwLLKeyLeftShift;
n = MwKEY_LEFTSHIFT;
} else if(strcmp(str, "Shift_R") == 0) {
n = MwLLKeyRightShift;
n = MwKEY_RIGHTSHIFT;
} else if(strcmp(str, "Alt_L") == 0 || strcmp(str, "Alt_R") == 0) {
n = MwLLKeyAlt;
n = MwKEY_ALT;
} else if(strcmp(str, "Control_R") == 0 || strcmp(str, "Control_R") == 0) {
n = MwLLKeyControl;
n = MwKEY_CONTROL;
}
if(n != MwLLKeyControl && ev.xkey.state & ControlMask) {
n |= MwLLControlMask;
if(n != MwKEY_CONTROL && ev.xkey.state & ControlMask) {
n |= MwKEY_CONTROL_MASK;
}
if(n != MwLLKeyAlt && ev.xkey.state & Mod1Mask) {
n |= MwLLAltMask;
if(n != MwKEY_ALT && ev.xkey.state & Mod1Mask) {
n |= MwKEY_ALT_MASK;
}
if(n != -1) {