License revisited: it's GPLv2 or later

[tig] / tig.c

diff --git a/tig.c b/tig.c
index 975e7dc..d86d51f 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -1,8 +1,9 @@
 /* Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -857,7 +858,7 @@ update_view_title(struct view *view)
                        wprintw(view->title, " %lds", secs);
        }
 
-
+       wmove(view->title, 0, view->width - 1);
        wrefresh(view->title);
 }
 
@@ -906,7 +907,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 +925,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,7 +1358,7 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
        }
 
        if (prev && view != prev) {
-               if (!backgrounded) {
+               if (split && !backgrounded) {
                        /* "Blur" the previous view. */
                        update_view_title(prev);
                }
@@ -2205,15 +2219,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. */
@@ -2415,8 +2421,10 @@ read_properties(const char *cmd, int separator,
                        namelen = value - name;
                        *value++ = 0;
                        valuelen = strlen(value);
-                       if (valuelen > 0)
-                               value[valuelen - 1] = 0;
+                       if (valuelen > 0) {
+                               valuelen--;
+                               value[valuelen] = 0;
+                       }
 
                } else {
                        namelen = strlen(name);
@@ -2689,7 +2697,7 @@ main(int argc, char *argv[])
  * - link:http://www.kernel.org/pub/software/scm/cogito/docs/[cogito(7)]
  *
  * Other git repository browsers:
-*
+ *
  *  - gitk(1)
  *  - qgit(1)
  *  - gitview(1)