comparison src/xterm.c @ 1324:44215417cf6e

* xterm.c (x_find_modifier_meanings): If there are no modifiers containing a Meta_ keysym, use the Alt keysyms to denote meta. (construct_mouse_click): Set the down_modifier bit on mouse button press events. (XTread_socket): When processing keypress events, use x_meta_mod_mask when processing ordinary ASCII characters, not just when processing function keys and other non-ASCII events. (XTread_socket): If we receive a MappingNotify event with the `request' member set to `MappingModifier', then call x_find_modifier_meanings to refresh x_meta_mod_mask.

1323:25b5b55a3916

/* Initialize mode_switch_bit and modifier_meaning.  */
static void
x_find_modifier_meanings ()
{
  KeyCode min_code, max_code;
  KeySym *syms;
  int syms_per_code;
  XModifierKeymap *mods;

  x_meta_mod_mask = 0;
  
  XDisplayKeycodes (x_current_display, &min_code, &max_code);
  syms = XGetKeyboardMapping (x_current_display,

	  {
	    int code_col;

	    for (code_col = 0; code_col < syms_per_code; code_col++)
	      {
		int sym = syms[(code * syms_per_code) + code_col];

		if (sym == XK_Meta_L || sym == XK_Meta_R)
		  {
		    x_meta_mod_mask |= (1 << row);
		    break;
		  }
	      }
	  }
	}
  }

  XFree ((char *) syms);
  XFreeModifierMap (mods);
}


/* Convert a set of X modifier bits to the proper form for a
   struct input_event modifiers value.  */

     otherwise.  */
  result->kind = no_event;
  XSET (result->code, Lisp_Int, event->button);
  result->timestamp = event->time;
  result->modifiers = (x_convert_modifiers (event->state)
		       | (event->type == ButtonRelease ? up_modifier : 0));

  /* Notice if the mouse is still grabbed.  */
  if (event->type == ButtonPress)
    {
      if (! x_mouse_grabbed)

		    {
		      register int i;

		      if (nbytes == 1)
			{
			  if (modifiers & Mod1Mask)
			    *copy_buffer |= METABIT;
			  bufp->kind = ascii_keystroke;
			  XSET (bufp->code, Lisp_Int, *copy_buffer);
			  bufp->frame = f;
			  bufp->timestamp = event.xkey.time;

	case MappingNotify:
	  if (event.xmapping.request == MappingKeyboard)
	    /* Someone has changed the keyboard mapping - flush the
	       local cache.  */
	    XRefreshKeyboardMapping (&event.xmapping);
	  break;

	default:
	  break;
	}

1324:44215417cf6e

/* Initialize mode_switch_bit and modifier_meaning.  */
static void
x_find_modifier_meanings ()
{
  int min_code, max_code;
  KeySym *syms;
  int syms_per_code;
  XModifierKeymap *mods;
  int alt_mod_mask = 0;

  x_meta_mod_mask = 0;
  
  XDisplayKeycodes (x_current_display, &min_code, &max_code);
  syms = XGetKeyboardMapping (x_current_display,

	  {
	    int code_col;

	    for (code_col = 0; code_col < syms_per_code; code_col++)
	      {
		int sym = syms[((code - min_code) * syms_per_code) + code_col];

		switch (sym)
		  {
		  case XK_Meta_L:
		  case XK_Meta_R:
		    x_meta_mod_mask |= (1 << row);
		    break;

		  case XK_Alt_L:
		  case XK_Alt_R:
		    alt_mod_mask |= (1 << row);
		    break;
		  }
	      }
	  }
	}
  }

  /* If we couldn't find any meta keys, accept any alt keys as meta keys.  */
  if (! x_meta_mod_mask)
    x_meta_mod_mask = alt_mod_mask;

  XFree ((char *) syms);
  XFreeModifiermap (mods);
}


/* Convert a set of X modifier bits to the proper form for a
   struct input_event modifiers value.  */

     otherwise.  */
  result->kind = no_event;
  XSET (result->code, Lisp_Int, event->button);
  result->timestamp = event->time;
  result->modifiers = (x_convert_modifiers (event->state)
		       | (event->type == ButtonRelease
			  ? up_modifier 
			  : down_modifier));

  /* Notice if the mouse is still grabbed.  */
  if (event->type == ButtonPress)
    {
      if (! x_mouse_grabbed)

		    {
		      register int i;

		      if (nbytes == 1)
			{
			  if (modifiers & x_meta_mod_mask)
			    *copy_buffer |= METABIT;
			  bufp->kind = ascii_keystroke;
			  XSET (bufp->code, Lisp_Int, *copy_buffer);
			  bufp->frame = f;
			  bufp->timestamp = event.xkey.time;

	case MappingNotify:
	  if (event.xmapping.request == MappingKeyboard)
	    /* Someone has changed the keyboard mapping - flush the
	       local cache.  */
	    XRefreshKeyboardMapping (&event.xmapping);
	  else if (event.xmapping.request == MappingModifier)
	    x_find_modifier_meanings ();
	  break;

	default:
	  break;
	}