Change meaning for return value for "Refresh"

Allowing "Refresh" to return 0 was always wrong.  Returning zero
should mean no command as found.
Allowing it to return non-zero to mean "apply changes to children"
is now unused, so discard that.

Now all Refresh functions that do something return 1.  So if no such
function was found, call pane_check_size() to ensure that size matches
parent, as that is a basic requirement of simple panes.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/core-pane.c b/core-pane.c
index 090569bb940dec188a0ddd2d03fbd43ffbc4556c..4efb5c6bfb1ff64c462d1d0a95582b5be9f20cf3 100644 (file)
--- a/core-pane.c
+++ b/core-pane.c
@@ -108,8 +108,8 @@ static void __pane_refresh(struct cmd_info *ci)
                        ci->extra |= DAMAGED_CURSOR;
                damage &= DAMAGED_SIZE;
                ci->comm = p->handle;
-               if (p->handle->func(ci))
-                       damage |= ci->extra;
+               if (p->handle->func(ci) == 0)
+                       pane_check_size(p);
        }
        p->damaged = 0;
        list_for_each_entry(c, &p->children, siblings) {

diff --git a/display-ncurses.c b/display-ncurses.c
index 50a8687cc0f5d72e90f757ea63d3b0cc3d446ae3..6534a614739a410899a3c182f9a60820589114df 100644 (file)
--- a/display-ncurses.c
+++ b/display-ncurses.c
@@ -165,7 +165,7 @@ DEF_CMD(ncurses_handle)
                tv.tv_sec = 0;
                tv.tv_usec = 0;
                event_add(l, &tv);
-               return 0;
+               return 1;
        }
        return 0;
 }

diff --git a/emacs-search.c b/emacs-search.c
index 86036b126c482cd7992ece76fedb24681241c463..c52d15c1c44346e9a0b2d7fbc0ccc6e3b8fa814a 100644 (file)
--- a/emacs-search.c
+++ b/emacs-search.c
@@ -130,12 +130,6 @@ DEF_CMD(search_backward)
        return 1;
 }
 
-DEF_CMD(search_refresh)
-{
-       pane_check_size(ci->focus);
-       return 1;
-}
-
 DEF_CMD(search_close)
 {
        struct es_info *esi = ci->focus->data;
@@ -217,7 +211,6 @@ static void emacs_search_init_map(void)
        key_add(es_map, "C-Chr-W", &search_add);
        key_add(es_map, "C-Chr-C", &search_add);
        key_add(es_map, "C-Chr-R", &search_backward);
-       key_add(es_map, "Refresh", &search_refresh);
        key_add(es_map, "Close", &search_close);
 }
 

diff --git a/lib-keymap.c b/lib-keymap.c
index acea32d38ed99e9a378cce1b87b0be55e8e01037..6aafce223ddb3b97477ec740cf9123e0bb2d9b67 100644 (file)
--- a/lib-keymap.c
+++ b/lib-keymap.c
@@ -55,10 +55,6 @@ DEF_CMD(keymap_handle)
                return 1;
        }
 
-       if (strcmp(ci->key, "Refresh") == 0) {
-               pane_check_size(ci->home);
-               return 0;
-       }
        if (kd->global && strcmp(ci->key, "global-key-root") == 0) {
                ci->focus = ci->home;
                return 1;

diff --git a/lib-popup.c b/lib-popup.c
index b6a5bce849c3987517932d32f048965f5aec0e62..b4a8b73c48781ec801684cb11eb424d8cb19ceb9 100644 (file)
--- a/lib-popup.c
+++ b/lib-popup.c
@@ -72,7 +72,7 @@ DEF_CMD(popup_handle)
 
        if (strcmp(ci->key, "Refresh") == 0) {
                popup_resize(p, ppi->style);
-               return 0;
+               return 1;
        }
        if (strcmp(ci->key, "popup:Abort") == 0) {
                pane_focus(ppi->target);

diff --git a/lib-tile.c b/lib-tile.c
index 2811e346e54f0954a070433c2746ba3c3febc0c9..c75e178e7577289d577e2cbcc9ab93d254f88026 100644 (file)
--- a/lib-tile.c
+++ b/lib-tile.c
@@ -71,7 +71,7 @@ DEF_CMD(tile_handle)
                        tile_avail(p, NULL);
                        tile_adjust(p);
                }
-               return 0;
+               return 1;
        }
        return 0;
 }

diff --git a/lib-view.c b/lib-view.c
index 0954a8dee69cadd3ce9a0120431bce934a2b8b9e..f6a571ec283242fed5c8f334f702f56e85000641 100644 (file)
--- a/lib-view.c
+++ b/lib-view.c
@@ -54,7 +54,7 @@ static int view_refresh(struct cmd_info *ci)
        pane_check_size(p);
        p->cx = 0; p->cy = 0;
        if (!vd->border)
-               return 0;
+               return 1;
 
        if (vd->border & BORDER_LEFT) {
                /* Left border is (currently) always a scroll bar */
@@ -118,7 +118,7 @@ static int view_refresh(struct cmd_info *ci)
                pane_text(p, '/', "inverse", 0, 0);
        if (!(~vd->border & (BORDER_RIGHT|BORDER_BOT)))
                pane_text(p, '/', "inverse", p->w-1, p->h-1);
-       return 0;
+       return 1;
 }
 
 DEF_CMD(view_handle)
@@ -189,7 +189,7 @@ DEF_CMD(view_null)
                        }
                        pane_resize(p, x, y, w, h);
                }
-               return 0;
+               return 1;
        }
        return 0;
 }

diff --git a/render-dir.c b/render-dir.c
index 0fc99ac91afd0a75c5ad3098f703d211b97056d1..5b18c205fd5b78f3f1fb638ff7ac182a8963c14d 100644 (file)
--- a/render-dir.c
+++ b/render-dir.c
@@ -294,7 +294,7 @@ DEF_CMD(render_dir_handle)
        found:
                mark_free(dd->bot);
                dd->bot = end;
-               return 0;
+               return 1;
        }
        return 0;
 }

diff --git a/render-format.c b/render-format.c
index 5b9d5fd1b6ac709d67537b855510c24944dc53fd..23f6801098010d05ee65e25f64fe70d2be675642 100644 (file)
--- a/render-format.c
+++ b/render-format.c
@@ -154,12 +154,6 @@ DEF_CMD(format_clone)
        return 1;
 }
 
-DEF_CMD(format_refresh)
-{
-       pane_check_size(ci->home);
-       return 1;
-}
-
 DEF_CMD(format_move_line)
 {
        struct point *pt = *ci->pointp;
@@ -223,7 +217,6 @@ static void render_format_register_map(void)
        key_add(rf_map, "render-line-prev", &render_line_prev);
        key_add(rf_map, "Close", &format_close);
        key_add(rf_map, "Clone", &format_clone);
-       key_add(rf_map, "Refresh", &format_refresh);
 
        key_add(rf_map, "Move-EOL", &format_move_line);
        key_add(rf_map, "Move-Char", &format_move_horiz);

diff --git a/render-hex.c b/render-hex.c
index 4f38e6ff167799d507f8c3b7db9e5cbad53f5b15..c305e986d97236641ee05264aee324582047cd9e 100644 (file)
--- a/render-hex.c
+++ b/render-hex.c
@@ -171,7 +171,7 @@ static int hex_refresh(struct cmd_info *ci)
        struct doc *d;
 
        if (!ci->pointp)
-               return 0;
+               return 1;
        d = (*ci->pointp)->doc;
        pane_check_size(p);
 
@@ -203,7 +203,7 @@ static int hex_refresh(struct cmd_info *ci)
 found:
        mark_free(he->bot);
        he->bot = end;
-       return 0;
+       return 1;
 }
 
 DEF_CMD(render_hex_handle)

diff --git a/render-text.c b/render-text.c
index 9cbc6b64d20e2237fb3e7f81d0d4df705e5219ed..218d38a34138519e3f8b354c72e730a94fe101d0 100644 (file)
--- a/render-text.c
+++ b/render-text.c
@@ -284,7 +284,7 @@ static int text_refresh(struct cmd_info *ci)
 found:
        mark_free(rt->bot);
        rt->bot = end;
-       return 0;
+       return 1;
 }
 
 DEF_CMD(render_text_handle)