From 162b1954ab11b85c6e37f000fcbbcb707f7cbaf0 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Sun, 9 Nov 2025 08:39:45 +0000 Subject: [PATCH] forgot to remove git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@651 b9cfdab3-6d41-4d17-bbe4-086880011989 --- src/backend/gdi.c | 4 +--- src/backend/x11.c | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/backend/gdi.c b/src/backend/gdi.c index a4d9abb..b650de2 100644 --- a/src/backend/gdi.c +++ b/src/backend/gdi.c @@ -130,15 +130,13 @@ static LRESULT CALLBACK wndproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { int n = wp; const int base = 'A' - 1; - if(n <= 0x1f) { + if(n != 0x1b && n <= 0x1f) { n = (n + base) | MwLLControlMask; if(!(GetKeyState(VK_LSHIFT) || GetKeyState(VK_RSHIFT))) n += 0x20; } if(HIBYTE(VkKeyScan(wp)) & 2) n |= MwLLControlMask; if(msg == WM_SYSCHAR) n |= MwLLAltMask; - printf("%c\n", n & 0xff); - if((0x20 <= n && n <= 0x7f) || (n & MwLLKeyMask)) MwLLDispatch(u->ll, key, &n); } else if(msg == WM_SETFOCUS) { MwLLDispatch(u->ll, focus_in, NULL); diff --git a/src/backend/x11.c b/src/backend/x11.c index a7f32aa..b957b6c 100644 --- a/src/backend/x11.c +++ b/src/backend/x11.c @@ -255,9 +255,8 @@ void MwLLGetXYWH(MwLL handle, int* x, int* y, unsigned int* w, unsigned int* h) XGetGeometry(handle->display, handle->window, &root, x, y, w, h, &border, &depth); if(handle->top) { - int rx, ry; - Window child; - XWindowAttributes xwa; + int rx, ry; + Window child; XTranslateCoordinates(handle->display, handle->window, root, 0, 0, &rx, &ry, &child);