Changeset afa200a

Timestamp:

Aug 15, 2009, 7:08:20 PM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

12bc46a

Parents:

f1d7d0f

git-author:

Anders Kaseorg <andersk@mit.edu> (08/04/09 00:18:32)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/15/09 19:08:20)

Message:

Add const qualifiers for owl_keymap *.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• functions.c (modified) (3 diffs)
• keymap.c (modified) (5 diffs)
• owl.h (modified) (2 diffs)

functions.c

@@ -2901 +2901 @@
   owl_list l;
   owl_fmtext fm;
-  owl_keymap *km;
+  const owl_keymap *km;
   owl_keyhandler *kh;
   int i, numkm;
@@ -2930 +2930 @@
 char *owl_function_keymap_summary(const char *name)
 {
-  owl_keymap *km 
+  const owl_keymap *km 
     = owl_keyhandler_get_keymap(owl_global_get_keyhandler(&g), name);
   if (km) return owl_keymap_summary(km);
@@ -2940 +2940 @@
 {
   owl_fmtext fm;
-  owl_keymap *km;
+  const owl_keymap *km;
 
   owl_fmtext_init_null(&fm);

keymap.c

@@ -24 +24 @@
 }
 
-void owl_keymap_set_submap(owl_keymap *km, owl_keymap *submap)
+void owl_keymap_set_submap(owl_keymap *km, const owl_keymap *submap)
 {
   km->submap = submap;
@@ -54 +54 @@
 
 /* returns a summary line describing this keymap.  the caller must free. */
-char *owl_keymap_summary(owl_keymap *km)
+char *owl_keymap_summary(const owl_keymap *km)
 {
   char *s;
@@ -66 +66 @@
 
 /* Appends details about the keymap to fm */
-void owl_keymap_get_details(owl_keymap *km, owl_fmtext *fm)
+void owl_keymap_get_details(const owl_keymap *km, owl_fmtext *fm)
 {
   int i, nbindings; 
@@ -187 +187 @@
 /* sets the active keymap, which will also reset any key state.
  * returns the new keymap, or NULL on failure. */
-owl_keymap *owl_keyhandler_activate(owl_keyhandler *kh, const char *mapname)
-{
-  owl_keymap *km;
+const owl_keymap *owl_keyhandler_activate(owl_keyhandler *kh, const char *mapname)
+{
+  const owl_keymap *km;
   if (kh->active && !strcmp(mapname, kh->active->name)) return(kh->active);
   km = owl_dict_find_element(&kh->keymaps, mapname);
@@ -202 +202 @@
 int owl_keyhandler_process(owl_keyhandler *kh, owl_input j)
 {
-  owl_keymap     *km;
+  const owl_keymap     *km;
   const owl_keybinding *kb;
   int i, match;

owl.h

@@ -448 +448 @@
   char     *desc;               /* description */
   owl_list  bindings;           /* key bindings */
-  struct _owl_keymap *submap;   /* submap */
+  const struct _owl_keymap *submap;     /* submap */
   void (*default_fn)(owl_input j);      /* default action (takes a keypress) */
   void (*prealways_fn)(owl_input  j);   /* always called before a keypress is received */
@@ -456 +456 @@
 typedef struct _owl_keyhandler {
   owl_dict  keymaps;            /* dictionary of keymaps */
-  owl_keymap *active;           /* currently active keymap */
+  const owl_keymap *active;             /* currently active keymap */
   int       in_esc;             /* escape pressed? */
   int       kpstack[OWL_KEYMAP_MAXSTACK+1]; /* current stack of keypresses */