comparison src/keyboard.c @ 12173:f31fca0fcdb0

(modify_event_symbol): Mask out high bits here, and only for certain purposes. table_size now unsigned. (modify_event_symbol) [HAVE_X_WINDOWS]: Use x_get_keysym_name. (make_lispy_event): Don't mask high bits here. Supply -1 as table_size for system-specific keys.

12172:58ce63f11008

extern Lisp_Object Qmenu_enable;

Lisp_Object recursive_edit_unwind (), command_loop ();
Lisp_Object Fthis_command_keys ();
Lisp_Object Qextended_command_history;

Lisp_Object Qpolling_period;

extern Lisp_Object Vprint_level, Vprint_length;

	{
	  /* We need to use an alist rather than a vector as the cache
	     since we can't make a vector long enuf.  */
	  if (NILP (system_key_syms))
	    system_key_syms = Fcons (Qnil, Qnil);
	  return modify_event_symbol (event->code & 0xffffff,
				      event->modifiers,
				      Qfunction_key,
				      current_kboard->Vsystem_key_alist,
				      0, &system_key_syms, 0xffffff);
	}

      return modify_event_symbol (event->code - 0xff00,
				  event->modifiers,
				  Qfunction_key, Qnil,

     unsigned modifiers;
     Lisp_Object symbol_kind;
     Lisp_Object name_alist;
     char **name_table;
     Lisp_Object *symbol_table;
     int table_size;
{
  Lisp_Object value;
  Lisp_Object symbol_int;

  XSETINT (symbol_int, symbol_num);

  /* Is this a request for a valid symbol?  */
  if (symbol_num < 0 || symbol_num >= table_size)
    return Qnil;

      /* No; let's create it.  */
      if (!NILP (name_alist))
	value = Fcdr_safe (Fassq (symbol_int, name_alist));
      else if (name_table[symbol_num])
	value = intern (name_table[symbol_num]);

      if (NILP (value))
	{
	  char buf[20];
	  sprintf (buf, "key-%d", symbol_num);

12173:f31fca0fcdb0

extern Lisp_Object Qmenu_enable;

Lisp_Object recursive_edit_unwind (), command_loop ();
Lisp_Object Fthis_command_keys ();
Lisp_Object Qextended_command_history;

extern char *x_get_keysym_name ();

Lisp_Object Qpolling_period;

extern Lisp_Object Vprint_level, Vprint_length;

	{
	  /* We need to use an alist rather than a vector as the cache
	     since we can't make a vector long enuf.  */
	  if (NILP (system_key_syms))
	    system_key_syms = Fcons (Qnil, Qnil);
	  return modify_event_symbol (event->code,
				      event->modifiers,
				      Qfunction_key,
				      current_kboard->Vsystem_key_alist,
				      0, &system_key_syms, (unsigned)-1);
	}

      return modify_event_symbol (event->code - 0xff00,
				  event->modifiers,
				  Qfunction_key, Qnil,

     unsigned modifiers;
     Lisp_Object symbol_kind;
     Lisp_Object name_alist;
     char **name_table;
     Lisp_Object *symbol_table;
     unsigned int table_size;
{
  Lisp_Object value;
  Lisp_Object symbol_int;

  /* Get rid of the "vendor-specific" bit here.  */
  XSETINT (symbol_int, symbol_num & 0xffffff);

  /* Is this a request for a valid symbol?  */
  if (symbol_num < 0 || symbol_num >= table_size)
    return Qnil;

      /* No; let's create it.  */
      if (!NILP (name_alist))
	value = Fcdr_safe (Fassq (symbol_int, name_alist));
      else if (name_table[symbol_num])
	value = intern (name_table[symbol_num]);

#ifdef HAVE_X_WINDOWS
      if (NILP (value))
	{
	  char *name = x_get_keysym_name (symbol_num);
	  if (name)
	    value = intern (name);
	}
#endif

      if (NILP (value))
	{
	  char buf[20];
	  sprintf (buf, "key-%d", symbol_num);