tog: expand horizontal split support to all views With this, hsplits are now available to the same parent/child view combinations as vsplits. Includes OB1 log truncation fix from op@ that was reported 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 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347
diff --git a/tog/tog.c b/tog/tog.c
index 9cc2f49..a81a484 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -790,6 +790,13 @@ view_is_fullscreen(struct tog_view *view)
return view->nlines == LINES && view->ncols == COLS;
}
+static int
+view_is_hsplit_top(struct tog_view *view)
+{
+ return view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
+ view_is_splitscreen(view->child);
+}
+
static void
view_border(struct tog_view *view)
{
@@ -965,8 +972,7 @@ view_search_start(struct tog_view *view)
if (view->nlines < 1)
return NULL;
- if (view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
- view_is_splitscreen(view->child))
+ if (view_is_hsplit_top(view))
v = view->child;
mvwaddstr(v->window, v->nlines - 1, 0, "/");
@@ -1006,8 +1012,7 @@ get_compound_key(struct tog_view *view, int c)
struct tog_view *v = view;
int x, n = 0;
- if (view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
- view_is_splitscreen(view->child))
+ if (view_is_hsplit_top(view))
v = view->child;
else if (view->mode == TOG_VIEW_SPLIT_VERT && view->parent)
v = view->parent;
@@ -1747,7 +1752,7 @@ draw_commit(struct tog_view *view, struct got_commit_object *commit,
if (newline)
*newline = '\0';
limit = avail - col;
- if (view->child && view_is_splitscreen(view->child) && limit > 0)
+ if (view->child && !view_is_hsplit_top(view) && limit > 0)
limit--; /* for the border */
err = format_line(&wlogmsg, &logmsg_width, &scrollx, logmsg, view->x,
limit, col, 1);
@@ -2328,7 +2333,7 @@ tree_view_walk_path(struct tog_tree_view_state *s,
}
static const struct got_error *
-browse_commit_tree(struct tog_view **new_view, int begin_x,
+browse_commit_tree(struct tog_view **new_view, int begin_y, int begin_x,
struct commit_queue_entry *entry, const char *path,
const char *head_ref_name, struct got_repository *repo)
{
@@ -2336,7 +2341,7 @@ browse_commit_tree(struct tog_view **new_view, int begin_x,
struct tog_tree_view_state *s;
struct tog_view *tree_view;
- tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
+ tree_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_TREE);
if (tree_view == NULL)
return got_error_from_errno("view_open");
@@ -2825,8 +2830,7 @@ log_move_cursor_down(struct tog_view *view, int page)
if (!page) {
int eos = view->nlines - 2;
- if (view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
- view_is_splitscreen(view->child))
+ if (view_is_hsplit_top(view))
--eos; /* border consumes the last line */
if (s->selected < MIN(eos, s->commits.ncommits - 1))
++s->selected;
@@ -2931,11 +2935,9 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
}
eos = nscroll = view->nlines - 1;
- if (view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
- view_is_splitscreen(view->child))
+ if (view_is_hsplit_top(view))
--eos; /* border */
-
switch (ch) {
case 'q':
s->quit = 1;
@@ -3035,7 +3037,7 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
}
break;
case KEY_ENTER:
- case '\r': {
+ case '\r':
view->count = 0;
if (s->selected_entry == NULL)
break;
@@ -3050,7 +3052,8 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
if (err)
break;
- if (view->mode == TOG_VIEW_SPLIT_HRZN) { /* safe to split */
+ if (view_is_parent_view(view) &&
+ view->mode == TOG_VIEW_SPLIT_HRZN) { /* safe to split */
err = view_init_hsplit(view, begin_y);
if (err)
break;
@@ -3072,20 +3075,27 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
} else
*new_view = diff_view;
break;
- }
case 't':
view->count = 0;
if (s->selected_entry == NULL)
break;
if (view_is_parent_view(view))
- begin_x = view_split_begin_x(view->begin_x);
- err = browse_commit_tree(&tree_view, begin_x,
+ view_get_split(view, &begin_y, &begin_x);
+ err = browse_commit_tree(&tree_view, begin_y, begin_x,
s->selected_entry, s->in_repo_path, s->head_ref_name,
s->repo);
if (err)
break;
+ if (view_is_parent_view(view) &&
+ view->mode == TOG_VIEW_SPLIT_HRZN) {
+ err = view_init_hsplit(view, begin_y);
+ if (err)
+ break;
+ }
view->focussed = 0;
tree_view->focussed = 1;
+ tree_view->mode = view->mode;
+ tree_view->nlines = view->lines - begin_y;
if (view_is_parent_view(view)) {
err = view_close_child(view);
if (err)
@@ -3164,9 +3174,8 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
case 'r':
view->count = 0;
if (view_is_parent_view(view))
- begin_x = view_split_begin_x(view->begin_x);
- ref_view = view_open(view->nlines, view->ncols,
- view->begin_y, begin_x, TOG_VIEW_REF);
+ view_get_split(view, &begin_y, &begin_x);
+ ref_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_REF);
if (ref_view == NULL)
return got_error_from_errno("view_open");
err = open_ref_view(ref_view, s->repo);
@@ -3174,8 +3183,16 @@ input_log_view(struct tog_view **new_view, struct tog_view *view, int ch)
view_close(ref_view);
return err;
}
+ if (view_is_parent_view(view) &&
+ view->mode == TOG_VIEW_SPLIT_HRZN) {
+ err = view_init_hsplit(view, begin_y);
+ if (err)
+ break;
+ }
view->focussed = 0;
ref_view->focussed = 1;
+ ref_view->mode = view->mode;
+ ref_view->nlines = view->lines - begin_y;
if (view_is_parent_view(view)) {
err = view_close_child(view);
if (err)
@@ -5396,8 +5413,7 @@ input_blame_view(struct tog_view **new_view, struct tog_view *view, int ch)
int eos, nscroll, begin_y = 0, begin_x = 0;
eos = nscroll = view->nlines - 2;
- if (view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
- view_is_splitscreen(view->child))
+ if (view_is_hsplit_top(view))
--eos; /* border */
switch (ch) {
@@ -5604,7 +5620,8 @@ input_blame_view(struct tog_view **new_view, struct tog_view *view, int ch)
view_close(diff_view);
break;
}
- if (view->mode == TOG_VIEW_SPLIT_HRZN) {
+ if (view_is_parent_view(view) &&
+ view->mode == TOG_VIEW_SPLIT_HRZN) {
err = view_init_hsplit(view, begin_y);
if (err)
break;
@@ -5838,8 +5855,7 @@ draw_tree_entries(struct tog_view *view, const char *parent_path)
int limit = view->nlines;
s->ndisplayed = 0;
- if (view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
- view_is_splitscreen(view->child))
+ if (view_is_hsplit_top(view))
--limit; /* border */
werase(view->window);
@@ -6114,7 +6130,7 @@ done:
}
static const struct got_error *
-log_selected_tree_entry(struct tog_view **new_view, int begin_x,
+log_selected_tree_entry(struct tog_view **new_view, int begin_y, int begin_x,
struct tog_tree_view_state *s)
{
struct tog_view *log_view;
@@ -6123,7 +6139,7 @@ log_selected_tree_entry(struct tog_view **new_view, int begin_x,
*new_view = NULL;
- log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
+ log_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_LOG);
if (log_view == NULL)
return got_error_from_errno("view_open");
@@ -6371,7 +6387,7 @@ input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
struct tog_tree_view_state *s = &view->state.tree;
struct tog_view *log_view, *ref_view;
struct got_tree_entry *te;
- int begin_x = 0, n, nscroll = view->nlines - 3;
+ int begin_y = 0, begin_x = 0, n, nscroll = view->nlines - 3;
switch (ch) {
case 'i':
@@ -6383,10 +6399,18 @@ input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
if (!s->selected_entry)
break;
if (view_is_parent_view(view))
- begin_x = view_split_begin_x(view->begin_x);
- err = log_selected_tree_entry(&log_view, begin_x, s);
+ view_get_split(view, &begin_y, &begin_x);
+ err = log_selected_tree_entry(&log_view, begin_y, begin_x, s);
+ if (view_is_parent_view(view) &&
+ view->mode == TOG_VIEW_SPLIT_HRZN) {
+ err = view_init_hsplit(view, begin_y);
+ if (err)
+ break;
+ }
view->focussed = 0;
log_view->focussed = 1;
+ log_view->mode = view->mode;
+ log_view->nlines = view->lines - begin_y;
if (view_is_parent_view(view)) {
err = view_close_child(view);
if (err)
@@ -6401,9 +6425,8 @@ input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
case 'r':
view->count = 0;
if (view_is_parent_view(view))
- begin_x = view_split_begin_x(view->begin_x);
- ref_view = view_open(view->nlines, view->ncols,
- view->begin_y, begin_x, TOG_VIEW_REF);
+ view_get_split(view, &begin_y, &begin_x);
+ ref_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_REF);
if (ref_view == NULL)
return got_error_from_errno("view_open");
err = open_ref_view(ref_view, s->repo);
@@ -6411,8 +6434,16 @@ input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
view_close(ref_view);
return err;
}
+ if (view_is_parent_view(view) &&
+ view->mode == TOG_VIEW_SPLIT_HRZN) {
+ err = view_init_hsplit(view, begin_y);
+ if (err)
+ break;
+ }
view->focussed = 0;
ref_view->focussed = 1;
+ ref_view->mode = view->mode;
+ ref_view->nlines = view->lines - begin_y;
if (view_is_parent_view(view)) {
err = view_close_child(view);
if (err)
@@ -6580,7 +6611,8 @@ input_tree_view(struct tog_view **new_view, struct tog_view *view, int ch)
if (err)
break;
- if (view->mode == TOG_VIEW_SPLIT_HRZN) {
+ if (view_is_parent_view(view) &&
+ view->mode == TOG_VIEW_SPLIT_HRZN) {
err = view_init_hsplit(view, begin_y);
if (err)
break;
@@ -7114,8 +7146,7 @@ show_ref_view(struct tog_view *view)
werase(view->window);
s->ndisplayed = 0;
- if (view->mode == TOG_VIEW_SPLIT_HRZN && view->child &&
- view_is_splitscreen(view->child))
+ if (view_is_hsplit_top(view))
--limit; /* border */
if (limit == 0)
@@ -7253,7 +7284,7 @@ show_ref_view(struct tog_view *view)
}
static const struct got_error *
-browse_ref_tree(struct tog_view **new_view, int begin_x,
+browse_ref_tree(struct tog_view **new_view, int begin_y, int begin_x,
struct tog_reflist_entry *re, struct got_repository *repo)
{
const struct got_error *err = NULL;
@@ -7271,7 +7302,7 @@ browse_ref_tree(struct tog_view **new_view, int begin_x,
}
- tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
+ tree_view = view_open(0, 0, begin_y, begin_x, TOG_VIEW_TREE);
if (tree_view == NULL) {
err = got_error_from_errno("view_open");
goto done;
@@ -7334,7 +7365,8 @@ input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
if (err)
break;
- if (view->mode == TOG_VIEW_SPLIT_HRZN) {
+ if (view_is_parent_view(view) &&
+ view->mode == TOG_VIEW_SPLIT_HRZN) {
err = view_init_hsplit(view, begin_y);
if (err)
break;
@@ -7360,13 +7392,21 @@ input_ref_view(struct tog_view **new_view, struct tog_view *view, int ch)
if (!s->selected_entry)
break;
if (view_is_parent_view(view))
- begin_x = view_split_begin_x(view->begin_x);
- err = browse_ref_tree(&tree_view, begin_x, s->selected_entry,
- s->repo);
+ view_get_split(view, &begin_y, &begin_x);
+ err = browse_ref_tree(&tree_view, begin_y, begin_x,
+ s->selected_entry, s->repo);
if (err || tree_view == NULL)
break;
+ if (view_is_parent_view(view) &&
+ view->mode == TOG_VIEW_SPLIT_HRZN) {
+ err = view_init_hsplit(view, begin_y);
+ if (err)
+ break;
+ }
view->focussed = 0;
tree_view->focussed = 1;
+ tree_view->mode = view->mode;
+ tree_view->nlines = view->lines - begin_y;
if (view_is_parent_view(view)) {
err = view_close_child(view);
if (err)