Commit 5c60c32a7d03db0967a09aee2994a92589d31a8e
2018-10-18T11:29:42
switch between full- and splitscreen when window size changes
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
diff --git a/tog/tog.c b/tog/tog.c
index a9cdcb7..faaa00b 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -327,6 +327,56 @@ view_split_begin_x(int begin_x)
return (COLS >= 120 ? COLS/2 : 0);
}
+static const struct got_error *view_resize(struct tog_view *);
+
+static const struct got_error *
+view_splitscreen(struct tog_view *view)
+{
+ const struct got_error *err = NULL;
+
+ view->begin_y = 0;
+ view->begin_x = view_split_begin_x(0);
+ view->nlines = LINES;
+ view->ncols = COLS - view->begin_x;
+ view->lines = LINES;
+ view->cols = COLS;
+ err = view_resize(view);
+ if (err)
+ return err;
+
+ if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
+ return got_error_from_errno();
+
+ return NULL;
+}
+
+static const struct got_error *
+view_fullscreen(struct tog_view *view)
+{
+ const struct got_error *err = NULL;
+
+ view->begin_x = 0;
+ view->begin_y = 0;
+ view->nlines = LINES;
+ view->ncols = COLS;
+ view->lines = LINES;
+ view->cols = COLS;
+ err = view_resize(view);
+ if (err)
+ return err;
+
+ if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
+ return got_error_from_errno();
+
+ return NULL;
+}
+
+static int
+view_is_parent_view(struct tog_view *view)
+{
+ return view->parent == NULL;
+}
+
static const struct got_error *
view_resize(struct tog_view *view)
{
@@ -351,13 +401,21 @@ view_resize(struct tog_view *view)
view->lines = LINES;
view->cols = COLS;
- return NULL;
-}
+ if (view_is_parent_view(view)) {
+ view->child->begin_x = view_split_begin_x(view->begin_x);
+ if (view->child->begin_x == 0) {
+ view_fullscreen(view->child);
+ if (view->child->focussed)
+ show_panel(view->child->panel);
+ else
+ show_panel(view->panel);
+ } else {
+ view_splitscreen(view->child);
+ show_panel(view->child->panel);
+ }
+ }
-static int
-view_is_parent_view(struct tog_view *view)
-{
- return view->parent == NULL;
+ return NULL;
}
static const struct got_error *
@@ -390,48 +448,6 @@ view_is_splitscreen(struct tog_view *view)
}
static const struct got_error *
-view_splitscreen(struct tog_view *view)
-{
- const struct got_error *err = NULL;
-
- view->begin_y = 0;
- view->begin_x = view_split_begin_x(0);
- view->nlines = LINES;
- view->ncols = COLS - view->begin_x;
- view->lines = LINES;
- view->cols = COLS;
- err = view_resize(view);
- if (err)
- return err;
-
- if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
- return got_error_from_errno();
-
- return NULL;
-}
-
-static const struct got_error *
-view_fullscreen(struct tog_view *view)
-{
- const struct got_error *err = NULL;
-
- view->begin_x = 0;
- view->begin_y = 0;
- view->nlines = LINES;
- view->ncols = COLS;
- view->lines = LINES;
- view->cols = COLS;
- err = view_resize(view);
- if (err)
- return err;
-
- if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
- return got_error_from_errno();
-
- return NULL;
-}
-
-static const struct got_error *
view_input(struct tog_view **new, struct tog_view **dead,
struct tog_view **focus, int *done, struct tog_view *view,
struct tog_view_list_head *views)