/* from dispnew.c */
extern int change_frame_size (FRAME_PTR, int, int, int, int);
+/* from w32fns.c */
+extern Lisp_Object Vwin32_alt_is_meta;
+
/* Event queue */
#define EVENT_QUEUE_SIZE 50
static INPUT_RECORD event_queue[EVENT_QUEUE_SIZE];
/* Translate console modifiers to emacs modifiers.
German keyboard support (Kai Morgan Zeise 2/18/95). */
-static int
+int
win32_kbd_mods_to_emacs (DWORD mods)
{
int retval = 0;
mods &= ~ (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED);
if (mods & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED))
- retval = meta_modifier;
+ retval = ((NILP (Vwin32_alt_is_meta)) ? alt_modifier : meta_modifier);
if (mods & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED))
{
}
/* The return code indicates key code size. */
-static int
+int
win32_kbd_patch_key (KEY_EVENT_RECORD *event)
{
unsigned int key_code = event->wVirtualKeyCode;
unsigned int mods = event->dwControlKeyState;
BYTE keystate[256];
static BYTE ansi_code[4];
- static int isdead;
+ static int isdead = 0;
if (isdead == 2)
{
}
if (event->uChar.AsciiChar != 0)
return 1;
+
memset (keystate, 0, sizeof (keystate));
if (mods & SHIFT_PRESSED)
keystate[VK_SHIFT] = 0x80;
if (mods & CAPSLOCK_ON)
keystate[VK_CAPITAL] = 1;
+ if ((mods & LEFT_CTRL_PRESSED) && (mods & RIGHT_ALT_PRESSED))
+ {
+ keystate[VK_CONTROL] = 0x80;
+ keystate[VK_LCONTROL] = 0x80;
+ keystate[VK_MENU] = 0x80;
+ keystate[VK_RMENU] = 0x80;
+ }
+
isdead = ToAscii (event->wVirtualKeyCode, event->wVirtualScanCode,
keystate, (LPWORD) ansi_code, 0);
if (isdead == 0)
event->uChar.AsciiChar = ansi_code[0];
return isdead;
}
-
+
/* Map virtual key codes into:
-1 - Ignore this key
-2 - ASCII char
/* return code -1 means that event_queue_ptr won't be incremented.
In other word, this event makes two key codes. (by himi) */
-static int
+int
key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev)
{
int map;
static BOOL map_virt_key_init_done;
/* Skip key-up events. */
- if (event->bKeyDown == FALSE)
+ if (!event->bKeyDown)
return 0;
if (event->wVirtualKeyCode > 0xff)
the queue. If they're backing up then we don't generally want
to honor them later since that leads to significant slop in
cursor motion when the system is under heavy load. */
-
+
map = map_virt_key[event->wVirtualKeyCode];
if (map == -1)
{
{
/* non-ASCII */
emacs_ev->kind = non_ascii_keystroke;
+#ifdef HAVE_NTGUI
+ /* use Windows keysym map */
+ XSETINT (emacs_ev->code, event->wVirtualKeyCode);
+#else
/*
* make_lispy_event () now requires non-ascii codes to have
* the full X keysym values (2nd byte is 0xff). add it on.
*/
map |= 0xff00;
XSETINT (emacs_ev->code, map);
+#endif /* HAVE_NTGUI */
}
/* for Mule 2.2 (Based on Emacs 19.28) */
#ifdef MULE
unsigned long *time)
{
BLOCK_INPUT;
-
-#ifndef MULE
+
+#ifndef MULE
insist = insist;
#endif