comparison src/w32fns.c @ 15314:796d825f4444

(reset_modifiers): Only clear a modifier if the modifier key has been detected to have been released since Emacs lost focus. (win32_wnd_proc): Have Windows translate VK_NUMLOCK and VK_SCROLL key downs; don't reset the modifier state when Emacs loses focus.

15313:0fad77a676b7

/* Functions for the Win32 window system.
   Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

   it regains focus, be conservative and clear all modifiers since 
   we cannot reconstruct the left and right modifier state.  */
static void
reset_modifiers ()
{
  if (!modifiers_recorded)
    return;
  bzero (modifiers, sizeof (modifiers));
}

static int
modifier_set (int vkey)
{

	windows_translate = 1;
	break;
      case VK_CONTROL: 
      case VK_CAPITAL: 
      case VK_SHIFT:
	windows_translate = 1;
	break;
      default:
	/* If not defined as a function key, change it to a WM_CHAR message. */
	if (lispy_function_keys[wParam] == 0)

	 this message afterwards.  So this is a good time to reset our
	 keyboard modifiers' state. */
      reset_modifiers ();
      goto dflt;

    case WM_KILLFOCUS:
    case WM_SETFOCUS:
      reset_modifiers ();
    case WM_MOVE:
    case WM_SIZE:
    case WM_SYSCOMMAND:
    case WM_COMMAND:
      wmsg.dwModifiers = win32_get_modifiers ();

15314:796d825f4444

/* Functions for the Win32 window system.
   Copyright (C) 1989, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by

   it regains focus, be conservative and clear all modifiers since 
   we cannot reconstruct the left and right modifier state.  */
static void
reset_modifiers ()
{
  SHORT ctrl, alt;

  if (!modifiers_recorded)
    return;

  ctrl = GetAsyncKeyState (VK_CONTROL);
  alt = GetAsyncKeyState (VK_MENU);

  if (ctrl == 0 || alt == 0)
    /* Emacs doesn't have keyboard focus.  Do nothing.  */
    return;

  if (!(ctrl & 0x08000))
    /* Clear any recorded control modifier state.  */
    modifiers[EMACS_RCONTROL] = modifiers[EMACS_LCONTROL] = 0;

  if (!(alt & 0x08000))
    /* Clear any recorded alt modifier state.  */
    modifiers[EMACS_RMENU] = modifiers[EMACS_LMENU] = 0;

  /* Otherwise, leave the modifier state as it was when Emacs lost
     keyboard focus.  */
}

static int
modifier_set (int vkey)
{

	windows_translate = 1;
	break;
      case VK_CONTROL: 
      case VK_CAPITAL: 
      case VK_SHIFT:
      case VK_NUMLOCK:
      case VK_SCROLL: 
	windows_translate = 1;
	break;
      default:
	/* If not defined as a function key, change it to a WM_CHAR message. */
	if (lispy_function_keys[wParam] == 0)

	 this message afterwards.  So this is a good time to reset our
	 keyboard modifiers' state. */
      reset_modifiers ();
      goto dflt;

    case WM_SETFOCUS:
      reset_modifiers ();
    case WM_KILLFOCUS:
    case WM_MOVE:
    case WM_SIZE:
    case WM_SYSCOMMAND:
    case WM_COMMAND:
      wmsg.dwModifiers = win32_get_modifiers ();