diff options
author | Daniel Colascione <dancol@dancol.org> | 2012-09-17 03:55:02 -0800 |
---|---|---|
committer | Daniel Colascione <dancol@dancol.org> | 2012-09-17 03:55:02 -0800 |
commit | 0fda9b750e337d876c9461db7d4426a3f0b81482 (patch) | |
tree | 1e1659bfa590cd8375c564c6fb5c3bafa65e06c0 /src/w32inevt.c | |
parent | 8b33967313f09a736a833816d32fd52e10640969 (diff) |
Implement cygw32
Here, we use the generic window-system configuration system we just
implemented to support the w32 window-system in the mainline build
under Cygwin. (Previously, the w32 window system could only be
compiled as part of the NT-native Emacs build process.)
The changes in this patch need to be applied atomically in order to
avoid breaking Emacs. The changes include:
- Changes throughout the Lisp and C code to not assume that
NT Emacs and the w32 window system are synonymous.
- Wiring up the regular select(2) event loop to Windows messages
- Cleaning up the w32 drag-and-drop receiving code.
- Exposing Cygwin path conversion functions to elisp.
- Unicode file dialog support when compiling for Cygwin.
- Splitting the w32 term lisp initialization code into code
applicable to any w32 window-system and code specific to
system-type windows-nt.
- Integrating the old and new w32 code into the build system.
Diffstat (limited to 'src/w32inevt.c')
-rw-r--r-- | src/w32inevt.c | 172 |
1 files changed, 3 insertions, 169 deletions
diff --git a/src/w32inevt.c b/src/w32inevt.c index 731dd6715d..ca97fed1fe 100644 --- a/src/w32inevt.c +++ b/src/w32inevt.c @@ -71,6 +71,9 @@ w32_read_console_input (HANDLE h, INPUT_RECORD *rec, DWORD recsize, : ReadConsoleInputA (h, rec, recsize, waiting)); } +/* Set by w32_console_toggle_lock_key. */ +int faked_key; + static int fill_queue (BOOL block) { @@ -111,67 +114,7 @@ get_frame (void) /* Translate console modifiers to emacs modifiers. German keyboard support (Kai Morgan Zeise 2/18/95). */ -int -w32_kbd_mods_to_emacs (DWORD mods, WORD key) -{ - int retval = 0; - - /* If we recognize right-alt and left-ctrl as AltGr, and it has been - pressed, first remove those modifiers. */ - if (!NILP (Vw32_recognize_altgr) - && (mods & (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED)) - == (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED)) - mods &= ~ (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED); - if (mods & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED)) - retval = ((NILP (Vw32_alt_is_meta)) ? alt_modifier : meta_modifier); - - if (mods & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) - { - retval |= ctrl_modifier; - if ((mods & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) - == (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED)) - retval |= meta_modifier; - } - - if (mods & LEFT_WIN_PRESSED) - retval |= w32_key_to_modifier (VK_LWIN); - if (mods & RIGHT_WIN_PRESSED) - retval |= w32_key_to_modifier (VK_RWIN); - if (mods & APPS_PRESSED) - retval |= w32_key_to_modifier (VK_APPS); - if (mods & SCROLLLOCK_ON) - retval |= w32_key_to_modifier (VK_SCROLL); - - /* Just in case someone wanted the original behavior, make it - optional by setting w32-capslock-is-shiftlock to t. */ - if (NILP (Vw32_capslock_is_shiftlock) - /* Keys that should _not_ be affected by CapsLock. */ - && ( (key == VK_BACK) - || (key == VK_TAB) - || (key == VK_CLEAR) - || (key == VK_RETURN) - || (key == VK_ESCAPE) - || ((key >= VK_SPACE) && (key <= VK_HELP)) - || ((key >= VK_NUMPAD0) && (key <= VK_F24)) - || ((key >= VK_NUMPAD_CLEAR) && (key <= VK_NUMPAD_DELETE)) - )) - { - /* Only consider shift state. */ - if ((mods & SHIFT_PRESSED) != 0) - retval |= shift_modifier; - } - else - { - /* Ignore CapsLock state if not enabled. */ - if (NILP (Vw32_enable_caps_lock)) - mods &= ~CAPSLOCK_ON; - if ((mods & (SHIFT_PRESSED | CAPSLOCK_ON)) != 0) - retval |= shift_modifier; - } - - return retval; -} #if 0 /* Return nonzero if the virtual key is a dead key. */ @@ -188,90 +131,7 @@ is_dead_key (int wparam) /* The return code indicates key code size. cpID is the codepage to use for translation to Unicode; -1 means use the current console input codepage. */ -int -w32_kbd_patch_key (KEY_EVENT_RECORD *event, int cpId) -{ - unsigned int key_code = event->wVirtualKeyCode; - unsigned int mods = event->dwControlKeyState; - BYTE keystate[256]; - static BYTE ansi_code[4]; - static int isdead = 0; - if (isdead == 2) - { - event->uChar.AsciiChar = ansi_code[2]; - isdead = 0; - return 1; - } - if (event->uChar.AsciiChar != 0) - return 1; - - memset (keystate, 0, sizeof (keystate)); - keystate[key_code] = 0x80; - if (mods & SHIFT_PRESSED) - keystate[VK_SHIFT] = 0x80; - if (mods & CAPSLOCK_ON) - keystate[VK_CAPITAL] = 1; - /* If we recognize right-alt and left-ctrl as AltGr, set the key - states accordingly before invoking ToAscii. */ - if (!NILP (Vw32_recognize_altgr) - && (mods & LEFT_CTRL_PRESSED) && (mods & RIGHT_ALT_PRESSED)) - { - keystate[VK_CONTROL] = 0x80; - keystate[VK_LCONTROL] = 0x80; - keystate[VK_MENU] = 0x80; - keystate[VK_RMENU] = 0x80; - } - -#if 0 - /* Because of an OS bug, ToAscii corrupts the stack when called to - convert a dead key in console mode on NT4. Unfortunately, trying - to check for dead keys using MapVirtualKey doesn't work either - - these functions apparently use internal information about keyboard - layout which doesn't get properly updated in console programs when - changing layout (though apparently it gets partly updated, - otherwise ToAscii wouldn't crash). */ - if (is_dead_key (event->wVirtualKeyCode)) - return 0; -#endif - - /* On NT, call ToUnicode instead and then convert to the current - console input codepage. */ - if (os_subtype == OS_NT) - { - WCHAR buf[128]; - - isdead = ToUnicode (event->wVirtualKeyCode, event->wVirtualScanCode, - keystate, buf, 128, 0); - if (isdead > 0) - { - /* When we are called from the GUI message processing code, - we are passed the current keyboard codepage, a positive - number, to use below. */ - if (cpId == -1) - cpId = GetConsoleCP (); - - event->uChar.UnicodeChar = buf[isdead - 1]; - isdead = WideCharToMultiByte (cpId, 0, buf, isdead, - ansi_code, 4, NULL, NULL); - } - else - isdead = 0; - } - else - { - isdead = ToAscii (event->wVirtualKeyCode, event->wVirtualScanCode, - keystate, (LPWORD) ansi_code, 0); - } - - if (isdead == 0) - return 0; - event->uChar.AsciiChar = ansi_code[0]; - return isdead; -} - - -static int faked_key = 0; /* return code -1 means that event_queue_ptr won't be incremented. In other word, this event makes two key codes. (by himi) */ @@ -532,32 +392,6 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev, int *isdead) return 1; } -int -w32_console_toggle_lock_key (int vk_code, Lisp_Object new_state) -{ - int cur_state = (GetKeyState (vk_code) & 1); - - if (NILP (new_state) - || (NUMBERP (new_state) - && ((XUINT (new_state)) & 1) != cur_state)) - { - faked_key = vk_code; - - keybd_event ((BYTE) vk_code, - (BYTE) MapVirtualKey (vk_code, 0), - KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); - keybd_event ((BYTE) vk_code, - (BYTE) MapVirtualKey (vk_code, 0), - KEYEVENTF_EXTENDEDKEY | 0, 0); - keybd_event ((BYTE) vk_code, - (BYTE) MapVirtualKey (vk_code, 0), - KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0); - cur_state = !cur_state; - } - - return cur_state; -} - /* Mouse position hook. */ void w32_console_mouse_position (FRAME_PTR *f, |