forgot to remove
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@651 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
parent
588d07d5c8
commit
162b1954ab
2 changed files with 3 additions and 6 deletions
|
|
@ -130,15 +130,13 @@ static LRESULT CALLBACK wndproc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) {
|
||||||
int n = wp;
|
int n = wp;
|
||||||
const int base = 'A' - 1;
|
const int base = 'A' - 1;
|
||||||
|
|
||||||
if(n <= 0x1f) {
|
if(n != 0x1b && n <= 0x1f) {
|
||||||
n = (n + base) | MwLLControlMask;
|
n = (n + base) | MwLLControlMask;
|
||||||
if(!(GetKeyState(VK_LSHIFT) || GetKeyState(VK_RSHIFT))) n += 0x20;
|
if(!(GetKeyState(VK_LSHIFT) || GetKeyState(VK_RSHIFT))) n += 0x20;
|
||||||
}
|
}
|
||||||
if(HIBYTE(VkKeyScan(wp)) & 2) n |= MwLLControlMask;
|
if(HIBYTE(VkKeyScan(wp)) & 2) n |= MwLLControlMask;
|
||||||
if(msg == WM_SYSCHAR) n |= MwLLAltMask;
|
if(msg == WM_SYSCHAR) n |= MwLLAltMask;
|
||||||
|
|
||||||
printf("%c\n", n & 0xff);
|
|
||||||
|
|
||||||
if((0x20 <= n && n <= 0x7f) || (n & MwLLKeyMask)) MwLLDispatch(u->ll, key, &n);
|
if((0x20 <= n && n <= 0x7f) || (n & MwLLKeyMask)) MwLLDispatch(u->ll, key, &n);
|
||||||
} else if(msg == WM_SETFOCUS) {
|
} else if(msg == WM_SETFOCUS) {
|
||||||
MwLLDispatch(u->ll, focus_in, NULL);
|
MwLLDispatch(u->ll, focus_in, NULL);
|
||||||
|
|
|
||||||
|
|
@ -257,7 +257,6 @@ void MwLLGetXYWH(MwLL handle, int* x, int* y, unsigned int* w, unsigned int* h)
|
||||||
if(handle->top) {
|
if(handle->top) {
|
||||||
int rx, ry;
|
int rx, ry;
|
||||||
Window child;
|
Window child;
|
||||||
XWindowAttributes xwa;
|
|
||||||
|
|
||||||
XTranslateCoordinates(handle->display, handle->window, root, 0, 0, &rx, &ry, &child);
|
XTranslateCoordinates(handle->display, handle->window, root, 0, 0, &rx, &ry, &child);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue