comparison src/w32term.c @ 23677:70999481c915

(convert_to_key_event): Removed. (is_dead_key): Copied to w32fns.c. (w32_read_socket): Generate language_change_event. Modify to work with keyboard handling changes in w32_wnd_proc.

23676:704d2e178bcb

/* Record the last 100 characters stored
   to help debug the loss-of-chars-during-GC problem.  */
int temp_index;
short temp_buffer[100];

extern int key_event (KEY_EVENT_RECORD *, struct input_event *, int *isdead);

/* Map a W32 WM_CHAR message into a KEY_EVENT_RECORD so that
   we can use the same routines to handle input in both console
   and window modes.  */

static void
convert_to_key_event (W32Msg *msgp, KEY_EVENT_RECORD *eventp)
{
  eventp->bKeyDown = TRUE;
  eventp->wRepeatCount = 1;
  eventp->wVirtualKeyCode = msgp->msg.wParam;
  eventp->wVirtualScanCode = (msgp->msg.lParam & 0xFF0000) >> 16;
  eventp->uChar.AsciiChar = 0;
  eventp->dwControlKeyState = msgp->dwModifiers;
}

/* Return nonzero if the virtual key is a dead key.  */

static int
is_dead_key (int wparam)
{
  unsigned int code = MapVirtualKey (wparam, 2);

  /* Windows 95 returns 0x8000, NT returns 0x80000000.  */
  if ((code & 0x8000) || (code & 0x80000000))
    return 1;
  else
    return 0;
}

/* Read events coming from the W32 shell.
   This routine is called by the SIGIO handler.
   We return as soon as there are no more events to be read.

				   msg.rect.bottom - msg.rect.top);
		  }
	      }
	  break;

	case WM_KEYDOWN:
	case WM_SYSKEYDOWN:
	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
	  
	  if (f && !f->iconified)

	      if (temp_index == sizeof temp_buffer / sizeof (short))
		temp_index = 0;
	      temp_buffer[temp_index++] = msg.msg.wParam;
	      bufp->kind = non_ascii_keystroke;
	      bufp->code = msg.msg.wParam;
	      bufp->modifiers = w32_kbd_mods_to_emacs (msg.dwModifiers,
                                                         msg.msg.wParam);
	      XSETFRAME (bufp->frame_or_window, f);
	      bufp->timestamp = msg.msg.time;
	      bufp++;
	      numchars--;
	      count++;

	case WM_CHAR:
	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
	  
	  if (f && !f->iconified)
	    {
	      if (numchars > 1) 
		{
		  int add;
		  int isdead = 0;
		  KEY_EVENT_RECORD key, *keyp = &key;

		  if (temp_index == sizeof temp_buffer / sizeof (short))
		    temp_index = 0;
		  
		  convert_to_key_event (&msg, keyp);
		  add = key_event (keyp, bufp, &isdead);
		  XSETFRAME (bufp->frame_or_window, f);
		  if (add == -1)
		    {
		      /* The key pressed generated two characters, most likely
			 an accent character and a key that could not be
			 combined with it.  Prepend the message on the queue
			 again to process the second character (which is
			 being held internally in key_event), and process
			 the first character now.  */
		      prepend_msg (&msg);
		      add = 1;
		    }

		  if (isdead)
		    break;

		  bufp += add;
		  numchars -= add;
		  count += add;
		} 
	      else 
		{
		  abort ();
		}
	    }
	  break;

	case WM_MOUSEMOVE:
	  if (dpyinfo->grabbed && last_mouse_frame

	case WM_COMMAND:
	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);

	  if (f)
	    {
	      extern void menubar_selection_callback (FRAME_PTR f, void * client_data);
	      menubar_selection_callback (f, (void *)msg.msg.wParam);
	    }

	  check_visibility = 1;
	  break;

23677:70999481c915

/* Record the last 100 characters stored
   to help debug the loss-of-chars-during-GC problem.  */
int temp_index;
short temp_buffer[100];


/* Read events coming from the W32 shell.
   This routine is called by the SIGIO handler.
   We return as soon as there are no more events to be read.

				   msg.rect.bottom - msg.rect.top);
		  }
	      }
	  break;

	case WM_INPUTLANGCHANGE:
	  /* Generate a language change event.  */
	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);

	  if (f)
	    {
	      if (numchars == 0)
		abort ();
	  
	      bufp->kind = language_change_event;
	      XSETFRAME (bufp->frame_or_window, f);
	      bufp->code = msg.msg.wParam;
	      bufp->modifiers = msg.msg.lParam & 0xffff;
	      bufp++;
	      count++;
	      numchars--;
	    }
	  break;

	case WM_KEYDOWN:
	case WM_SYSKEYDOWN:
	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
	  
	  if (f && !f->iconified)

	      if (temp_index == sizeof temp_buffer / sizeof (short))
		temp_index = 0;
	      temp_buffer[temp_index++] = msg.msg.wParam;
	      bufp->kind = non_ascii_keystroke;
	      bufp->code = msg.msg.wParam;
	      bufp->modifiers = msg.dwModifiers;
	      XSETFRAME (bufp->frame_or_window, f);
	      bufp->timestamp = msg.msg.time;
	      bufp++;
	      numchars--;
	      count++;

	case WM_CHAR:
	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
	  
	  if (f && !f->iconified)
	    {
	      if (temp_index == sizeof temp_buffer / sizeof (short))
		temp_index = 0;
	      temp_buffer[temp_index++] = msg.msg.wParam;
	      bufp->kind = ascii_keystroke;
	      bufp->code = msg.msg.wParam;
	      bufp->modifiers = msg.dwModifiers;
	      XSETFRAME (bufp->frame_or_window, f);
	      bufp->timestamp = msg.msg.time;
	      bufp++;
	      numchars--;
	      count++;
	    }
	  break;

	case WM_MOUSEMOVE:
	  if (dpyinfo->grabbed && last_mouse_frame

	case WM_COMMAND:
	  f = x_window_to_frame (dpyinfo, msg.msg.hwnd);

	  if (f)
	    {
	      extern void menubar_selection_callback
		(FRAME_PTR f, void * client_data);
	      menubar_selection_callback (f, (void *)msg.msg.wParam);
	    }

	  check_visibility = 1;
	  break;