xemacs-beta: src/keymap.c comparison

comparison src/keymap.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	966663fcf606
children	c42ec1d1cded

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 /* Prefixing a key with this character is the same as sending a meta bit. */
 Lisp_Object Vmeta_prefix_char;
 Lisp_Object Qkeymapp;
 Lisp_Object Vsingle_space_string;
 Lisp_Object Qsuppress_keymap;
 Lisp_Object Qmodeline_map;
 Lisp_Object Qtoolbar_map;
+EXFUN (Fkeymap_fullness, 1);
+EXFUN (Fset_keymap_name, 2);
+EXFUN (Fsingle_key_description, 1);
 static void describe_command (Lisp_Object definition, Lisp_Object buffer);
 static void describe_map (Lisp_Object keymap, Lisp_Object elt_prefix,
 			  void (*elt_describer) (Lisp_Object, Lisp_Object),
 			  int partial,
 			  Lisp_Object shadow,
 			  int mice_only_p,
 			  Lisp_Object buffer);
 Lisp_Object Qcontrol, Qctrl, Qmeta, Qsuper, Qhyper, Qalt, Qshift;
-/* Lisp_Object Qsymbol;	defined in general.c */
+Lisp_Object Qbutton0, Qbutton1, Qbutton2, Qbutton3;
-Lisp_Object Qbutton0, Qbutton1, Qbutton2, Qbutton3, Qbutton4, Qbutton5,
+Lisp_Object Qbutton4, Qbutton5, Qbutton6, Qbutton7;
-Qbutton6, Qbutton7;
+Lisp_Object Qbutton0up, Qbutton1up, Qbutton2up, Qbutton3up;
-Lisp_Object Qbutton0up, Qbutton1up, Qbutton2up, Qbutton3up, Qbutton4up,
+Lisp_Object Qbutton4up, Qbutton5up, Qbutton6up, Qbutton7up;
-Qbutton5up, Qbutton6up, Qbutton7up;
 #if defined(HAVE_OFFIX_DND) || defined(HAVE_MS_WINDOWS)
 Lisp_Object Qdrop0, Qdrop1, Qdrop2, Qdrop3, Qdrop4, Qdrop5, Qdrop6, Qdrop7;
 #endif
 Lisp_Object Qmenu_selection;
 /* Emacs compatibility */
 /************************************************************************/
 /*                     The keymap Lisp object                           */
 /************************************************************************/
-static Lisp_Object mark_keymap (Lisp_Object, void (*) (Lisp_Object));
-static void print_keymap (Lisp_Object, Lisp_Object, int);
-/* No need for keymap_equal #### Why not? */
-DEFINE_LRECORD_IMPLEMENTATION ("keymap", keymap,
-mark_keymap, print_keymap, 0, 0, 0,
-			       struct keymap);
 static Lisp_Object
 mark_keymap (Lisp_Object obj, void (*markobj) (Lisp_Object))
 {
 struct keymap *keymap = XKEYMAP (obj);
 ((markobj) (keymap->parents));
 ((size == 1) ? "y" : "ies"),
 keymap->header.uid);
 write_c_string (buf, printcharfun);
 }
+/* No need for keymap_equal #### Why not? */
+DEFINE_LRECORD_IMPLEMENTATION ("keymap", keymap,
+mark_keymap, print_keymap, 0, 0, 0,
+			       struct keymap);
 /************************************************************************/
 /*                Traversing keymaps and their parents                  */
 /************************************************************************/
 /************************************************************************/
 static Lisp_Object
 make_keymap (int size)
 {
-Lisp_Object result = Qnil;
+Lisp_Object result;
 struct keymap *keymap = alloc_lcrecord_type (struct keymap, lrecord_keymap);
 XSETKEYMAP (result, keymap);
 keymap->parents = Qnil;
 Fset_keymap_name (keymap, name);
 return keymap;
 }
 DEFUN ("keymap-parents", Fkeymap_parents, 1, 1, 0, /*
-Return the `parent' keymaps of the given keymap, or nil.
+Return the `parent' keymaps of KEYMAP, or nil.
 The parents of a keymap are searched for keybindings when a key sequence
 isn't bound in this one.  `(current-global-map)' is the default parent
 of all keymaps.
 */
 (keymap))
 {
 return Qnil;
 }
 DEFUN ("set-keymap-parents", Fset_keymap_parents, 2, 2, 0, /*
-Sets the `parent' keymaps of the given keymap.
+Set the `parent' keymaps of KEYMAP to PARENTS.
 The parents of a keymap are searched for keybindings when a key sequence
 isn't bound in this one.  `(current-global-map)' is the default parent
 of all keymaps.
 */
 (keymap, parents))
 return XKEYMAP (keymap)->name;
 }
 DEFUN ("set-keymap-prompt", Fset_keymap_prompt, 2, 2, 0, /*
-Sets the `prompt' of KEYMAP to string NEW-PROMPT, or `nil'
+Set the `prompt' of KEYMAP to string NEW-PROMPT, or `nil'
 if no prompt is desired.  The prompt is shown in the echo-area
 when reading a key-sequence to be looked-up in this keymap.
 */
 (keymap, new_prompt))
 {
 return XKEYMAP (keymap)->prompt;
 }
 DEFUN ("keymap-prompt", Fkeymap_prompt, 1, 2, 0, /*
-Return the `prompt' of the given keymap.
+Return the `prompt' of KEYMAP.
 If non-nil, the prompt is shown in the echo-area
 when reading a key-sequence to be looked-up in this keymap.
 */
 (keymap, use_inherited))
 {
 struct gcpro gcpro1, gcpro2, gcpro3;
 if (VECTORP (keys))
 len = XVECTOR_LENGTH (keys);
 else if (STRINGP (keys))
-len = string_char_length (XSTRING (keys));
+len = XSTRING_CHAR_LENGTH (keys);
 else if (CHAR_OR_CHAR_INTP (keys) || SYMBOLP (keys) || CONSP (keys))
 {
 if (!CONSP (keys)) keys = list1 (keys);
 len = 1;
 keys = make_vector (1, keys); /* this is kinda sleazy. */
 */
 (keymap, keys, accept_default))
 {
 /* This function can GC */
 if (VECTORP (keys))
-{
+return lookup_keys (keymap,
-return lookup_keys (keymap,
+			XVECTOR_LENGTH (keys),
-			  XVECTOR_LENGTH (keys),
+			XVECTOR_DATA (keys),
-XVECTOR_DATA (keys),
+			!NILP (accept_default));
-!NILP (accept_default));
-}
 else if (SYMBOLP (keys) || CHAR_OR_CHAR_INTP (keys) || CONSP (keys))
-{
+return lookup_keys (keymap, 1, &keys, !NILP (accept_default));
-return lookup_keys (keymap, 1, &keys,
+else if (STRINGP (keys))
-			  !NILP (accept_default));
+{
-}
+int length = XSTRING_CHAR_LENGTH (keys);
-else if (!STRINGP (keys))
-{
-keys = wrong_type_argument (Qsequencep, keys);
-return Flookup_key (keymap, keys, accept_default);
-}
-else /* STRINGP (keys) */
-{
-int length = string_char_length (XSTRING (keys));
 int i;
 struct key_data *raw_keys = alloca_array (struct key_data, length);
 if (length == 0)
 	return Qnil;
 Emchar n = string_char (XSTRING (keys), i);
 	  define_key_parser (make_char (n), &(raw_keys[i]));
 	}
 return raw_lookup_key (keymap, raw_keys, length, 0,
 			     !NILP (accept_default));
+}
+else
+{
+keys = wrong_type_argument (Qsequencep, keys);
+return Flookup_key (keymap, keys, accept_default);
 }
 }
 /* Given a key sequence, returns a list of keymaps to search for bindings.
 Does all manner of semi-hairy heuristics, like looking in the current
 the function is unspecified.  If the function inserts new elements into
 the keymap, it may or may not be called with them later.  No element of
 the keymap will ever be passed to the function more than once.
 The function will not be called on elements of this keymap's parents
-(see the function `keymap-parents') or upon keymaps which are contained
+\(see the function `keymap-parents') or upon keymaps which are contained
 within this keymap (multi-character definitions).
 It will be called on "meta" characters since they are not really
 two-character sequences.
 If the optional third argument SORT-FIRST is non-nil, then the elements of
 */
 (chr))
 {
 Bufbyte buf[200];
 Bufbyte *p;
-unsigned int c;
+Emchar c;
 Lisp_Object ctl_arrow = current_buffer->ctl_arrow;
 int ctl_p = !NILP (ctl_arrow);
 Emchar printable_min = (CHAR_OR_CHAR_INTP (ctl_arrow)
 			  ? XCHAR_OR_CHAR_INT (ctl_arrow)
 			  : ((EQ (ctl_arrow, Qt) || NILP (ctl_arrow))
 (struct describe_map_shadow_closure *) arg;
 if (EQ (map, c->self))
 return Qzero;		/* Not shadowed; terminate search */
-return (!NILP (keymap_lookup_directly (map,
+return !NILP (keymap_lookup_directly (map,
-					 c->raw_key->keysym,
+					c->raw_key->keysym,
-					 c->raw_key->modifiers)))
+					c->raw_key->modifiers))
 ? Qt : Qnil;
 }
 static Lisp_Object

Mercurial > hg > xemacs-beta

comparison src/keymap.c @ 272:c5d627a313b1 r21-0b34