tog: resize main view drawing the child view on top of the main view when the layout is split-screen can produce some ugly glitches when double-width characters are involved. (issue found by stsp) ok stsp@
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177
diff --git a/tog/tog.c b/tog/tog.c
index 0a55123..4a079e6 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -763,30 +763,35 @@ view_resize(struct tog_view *view)
else
ncols = view->ncols + (COLS - view->cols);
- if (wresize(view->window, nlines, ncols) == ERR)
- return got_error_from_errno("wresize");
- if (replace_panel(view->panel, view->window) == ERR)
- return got_error_from_errno("replace_panel");
- wclear(view->window);
-
- view->nlines = nlines;
- view->ncols = ncols;
- view->lines = LINES;
- view->cols = COLS;
-
if (view->child) {
view->child->begin_x = view_split_begin_x(view->begin_x);
if (view->child->begin_x == 0) {
+ ncols = COLS;
+
view_fullscreen(view->child);
if (view->child->focussed)
show_panel(view->child->panel);
else
show_panel(view->panel);
} else {
+ ncols = view->child->begin_x;
+
view_splitscreen(view->child);
show_panel(view->child->panel);
}
- }
+ } else if (view->parent == NULL)
+ ncols = COLS;
+
+ if (wresize(view->window, nlines, ncols) == ERR)
+ return got_error_from_errno("wresize");
+ if (replace_panel(view->panel, view->window) == ERR)
+ return got_error_from_errno("replace_panel");
+ wclear(view->window);
+
+ view->nlines = nlines;
+ view->ncols = ncols;
+ view->lines = LINES;
+ view->cols = COLS;
return NULL;
}
@@ -804,11 +809,13 @@ view_close_child(struct tog_view *view)
return err;
}
-static void
+static const struct got_error *
view_set_child(struct tog_view *view, struct tog_view *child)
{
view->child = child;
child->parent = view;
+
+ return view_resize(view);
}
static int
@@ -1085,6 +1092,10 @@ view_loop(struct tog_view *view)
if (view->parent) {
view->parent->child = NULL;
view->parent->focus_child = 0;
+
+ err = view_resize(view->parent);
+ if (err)
+ break;
} else
TAILQ_REMOVE(&views, view, entry);
@@ -2697,7 +2708,9 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
err = view_close_child(view);
if (err)
return err;
- view_set_child(view, diff_view);
+ err = view_set_child(view, diff_view);
+ if (err)
+ return err;
view->focus_child = 1;
} else
*new_view = diff_view;
@@ -2718,7 +2731,9 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
err = view_close_child(view);
if (err)
return err;
- view_set_child(view, tree_view);
+ err = view_set_child(view, tree_view);
+ if (err)
+ return err;
view->focus_child = 1;
} else
*new_view = tree_view;
@@ -2802,7 +2817,9 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
err = view_close_child(view);
if (err)
return err;
- view_set_child(view, ref_view);
+ err = view_set_child(view, ref_view);
+ if (err)
+ return err;
view->focus_child = 1;
} else
*new_view = ref_view;
@@ -5103,7 +5120,9 @@ input_blame_view(struct tog_view **new_view, struct tog_view *view, int ch)
err = view_close_child(view);
if (err)
break;
- view_set_child(view, diff_view);
+ err = view_set_child(view, diff_view);
+ if (err)
+ break;
view->focus_child = 1;
} else
*new_view = diff_view;
@@ -5847,7 +5866,9 @@ input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
err = view_close_child(view);
if (err)
return err;
- view_set_child(view, log_view);
+ err = view_set_child(view, log_view);
+ if (err)
+ return err;
view->focus_child = 1;
} else
*new_view = log_view;
@@ -5870,7 +5891,9 @@ input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
err = view_close_child(view);
if (err)
return err;
- view_set_child(view, ref_view);
+ err = view_set_child(view, ref_view);
+ if (err)
+ return err;
view->focus_child = 1;
} else
*new_view = ref_view;
@@ -6004,7 +6027,9 @@ input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
err = view_close_child(view);
if (err)
return err;
- view_set_child(view, blame_view);
+ err = view_set_child(view, blame_view);
+ if (err)
+ return err;
view->focus_child = 1;
} else
*new_view = blame_view;
@@ -6730,7 +6755,9 @@ input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
err = view_close_child(view);
if (err)
return err;
- view_set_child(view, log_view);
+ err = view_set_child(view, log_view);
+ if (err)
+ return err;
view->focus_child = 1;
} else
*new_view = log_view;
@@ -6750,7 +6777,9 @@ input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
err = view_close_child(view);
if (err)
return err;
- view_set_child(view, tree_view);
+ err = view_set_child(view, tree_view);
+ if (err)
+ return err;
view->focus_child = 1;
} else
*new_view = tree_view;