(lisp, shortlisp): Add lao.elc.

[gnu-emacs] / src / w32inevt.c

diff --git a/src/w32inevt.c b/src/w32inevt.c
index 80e8cdf21c46fe5f5a1f1a486f6cd8827680e758..76f5be277be97aca8986c45cd3d9b165d1c870a5 100644 (file)
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -1,4 +1,4 @@
-/* Input event support for Windows NT port of GNU Emacs.
+/* Input event support for Emacs on the Microsoft W32 API.
    Copyright (C) 1992, 1993, 1995 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -47,6 +47,9 @@ extern void reinvoke_input_signal (void);
 /* from dispnew.c */
 extern int change_frame_size (FRAME_PTR, int, int, int, int);
 
+/* from w32fns.c */
+extern Lisp_Object Vw32_alt_is_meta;
+
 /* Event queue */
 #define EVENT_QUEUE_SIZE 50
 static INPUT_RECORD event_queue[EVENT_QUEUE_SIZE];
@@ -92,8 +95,8 @@ get_frame (void)
 
 /* Translate console modifiers to emacs modifiers.  
    German keyboard support (Kai Morgan Zeise 2/18/95).  */
-int 
-win32_kbd_mods_to_emacs (DWORD mods)
+int
+w32_kbd_mods_to_emacs (DWORD mods)
 {
   int retval = 0;
 
@@ -103,7 +106,7 @@ win32_kbd_mods_to_emacs (DWORD mods)
     mods &= ~ (RIGHT_ALT_PRESSED | LEFT_CTRL_PRESSED);
 
   if (mods & (RIGHT_ALT_PRESSED | LEFT_ALT_PRESSED))
-    retval = meta_modifier;
+    retval = ((NILP (Vw32_alt_is_meta)) ? alt_modifier : meta_modifier);
   
   if (mods & (RIGHT_CTRL_PRESSED | LEFT_CTRL_PRESSED))
     {
@@ -122,13 +125,13 @@ win32_kbd_mods_to_emacs (DWORD mods)
 
 /* The return code indicates key code size. */
 int
-win32_kbd_patch_key (KEY_EVENT_RECORD *event)
+w32_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)
     {
@@ -159,7 +162,7 @@ win32_kbd_patch_key (KEY_EVENT_RECORD *event)
   event->uChar.AsciiChar = ansi_code[0];
   return isdead;
 }
-  
+
 /* Map virtual key codes into:
    -1 - Ignore this key
    -2 - ASCII char
@@ -292,7 +295,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev)
   static BOOL map_virt_key_init_done;
   
   /* Skip key-up events.  */
-  if (event->bKeyDown == FALSE)
+  if (!event->bKeyDown)
     return 0;
   
   if (event->wVirtualKeyCode > 0xff)
@@ -318,7 +321,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev)
      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)
     {
@@ -328,7 +331,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev)
     {
       /* ASCII */
       emacs_ev->kind = ascii_keystroke;
-      key_flag = win32_kbd_patch_key (event); /* 95.7.25 by himi */
+      key_flag = w32_kbd_patch_key (event); /* 95.7.25 by himi */
       if (key_flag == 0) 
        return 0;
       XSETINT (emacs_ev->code, event->uChar.AsciiChar);
@@ -354,14 +357,17 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev)
     {
       /* 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.
        */
-#ifndef HAVE_NTGUI
       map |= 0xff00;
-#endif
       XSETINT (emacs_ev->code, map);
+#endif /* HAVE_NTGUI */
     }
 /* for Mule 2.2 (Based on Emacs 19.28) */
 #ifdef MULE
@@ -369,7 +375,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev)
 #else
   XSETFRAME (emacs_ev->frame_or_window, get_frame ());
 #endif
-  emacs_ev->modifiers = win32_kbd_mods_to_emacs (event->dwControlKeyState);
+  emacs_ev->modifiers = w32_kbd_mods_to_emacs (event->dwControlKeyState);
   emacs_ev->timestamp = GetTickCount ();
   if (key_flag == 2) return -1; /* 95.7.25 by himi */
   return 1;
@@ -377,7 +383,7 @@ key_event (KEY_EVENT_RECORD *event, struct input_event *emacs_ev)
 
 /* Mouse position hook.  */
 void 
-win32_mouse_position (FRAME_PTR *f,
+w32_mouse_position (FRAME_PTR *f,
 #ifndef MULE
                      int insist,
 #endif
@@ -388,8 +394,8 @@ win32_mouse_position (FRAME_PTR *f,
                      unsigned long *time)
 {
   BLOCK_INPUT;
-  
-#ifndef MULE
+
+#ifndef MULE  
   insist = insist;
 #endif
 
@@ -476,7 +482,7 @@ do_mouse_event (MOUSE_EVENT_RECORD *event,
   
   button_state = event->dwButtonState;
   emacs_ev->timestamp = GetTickCount ();
-  emacs_ev->modifiers = win32_kbd_mods_to_emacs (event->dwControlKeyState) |
+  emacs_ev->modifiers = w32_kbd_mods_to_emacs (event->dwControlKeyState) |
     ((event->dwButtonState & mask) ? down_modifier : up_modifier);
   
   XSETFASTINT (emacs_ev->x, event->dwMousePosition.X);
@@ -501,8 +507,8 @@ resize_event (WINDOW_BUFFER_SIZE_RECORD *event)
 }
 
 int 
-win32_read_socket (int sd, struct input_event *bufp, int numchars,
-                  int waitp, int expected)
+w32_console_read_socket (int sd, struct input_event *bufp, int numchars,
+                        int waitp, int expected)
 {
   BOOL no_events = TRUE;
   int nev, ret = 0, add;
@@ -518,7 +524,7 @@ win32_read_socket (int sd, struct input_event *bufp, int numchars,
   
   for (;;)
     {
-      nev = fill_queue (waitp != 0);
+      nev = fill_queue (0);
       if (nev <= 0)
         {
          /* If nev == -1, there was some kind of error