Factor out cursor moving

[tig] / tig.c

diff --git a/tig.c b/tig.c
index 4770e72..f744657 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -906,7 +906,6 @@ resize_display(void)
                        wresize(view->win, view->height, view->width);
                        mvwin(view->win,   offset, 0);
                        mvwin(view->title, offset + view->height, 0);
-                       wrefresh(view->win);
                }
 
                offset += view->height + 1;
@@ -925,6 +924,20 @@ redraw_display(void)
        }
 }
 
+static void
+update_display_cursor(void)
+{
+       struct view *view = display[current_view];
+
+       /* Move the cursor to the right-most column of the cursor line.
+        *
+        * XXX: This could turn out to be a bit expensive, but it ensures that
+        * the cursor does not jump around. */
+       if (view->lines) {
+               wmove(view->win, view->lineno - view->offset, view->width - 1);
+               wrefresh(view->win);
+       }
+}
 
 /*
  * Navigation
@@ -1344,17 +1357,15 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
        }
 
        if (prev && view != prev) {
-               /* Continue loading split views in the background. */
-               if (!split)
-                       end_update(prev);
-               else if (!backgrounded)
+               if (split && !backgrounded) {
                        /* "Blur" the previous view. */
                        update_view_title(prev);
+               }
 
                view->parent = prev;
        }
 
-       if (view->pipe) {
+       if (view->pipe && view->lines == 0) {
                /* Clear the old view and let the incremental updating refill
                 * the screen. */
                wclear(view->win);
@@ -1621,8 +1632,8 @@ pager_enter(struct view *view, struct line *line)
        scroll_view(view, REQ_SCROLL_LINE_DOWN);
 
        /* FIXME: A minor workaround. Scrolling the view will call report("")
-        * but if we are scolling a non-current view this won't properly update
-        * the view title. */
+        * but if we are scrolling a non-current view this won't properly
+        * update the view title. */
        if (split)
                update_view_title(view);
 
@@ -2207,15 +2218,7 @@ report(const char *msg, ...)
        }
 
        update_view_title(view);
-
-       /* Move the cursor to the right-most column of the cursor line.
-        *
-        * XXX: This could turn out to be a bit expensive, but it ensures that
-        * the cursor does not jump around. */
-       if (view->lines) {
-               wmove(view->win, view->lineno - view->offset, view->width - 1);
-               wrefresh(view->win);
-       }
+       update_display_cursor();
 }
 
 /* Controls when nodelay should be in effect when polling user input. */
@@ -2426,7 +2429,8 @@ read_properties(const char *cmd, int separator,
                        valuelen = 0;
                }
 
-               state = read_property(name, namelen, value, valuelen);
+               if (namelen)
+                       state = read_property(name, namelen, value, valuelen);
        }
 
        if (state != ERR && ferror(pipe))