Commit acdafe9c25c0e859deb1540d58c50723221f12c8
2020-12-03T19:25:08
remove redundant "child_focussed" variable from struct tog_view ok naddy
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
diff --git a/tog/tog.c b/tog/tog.c
index 7fbce6f..19f8a05 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -449,7 +449,6 @@ struct tog_view {
int focussed;
struct tog_view *parent;
struct tog_view *child;
- int child_focussed;
/* type-specific state */
enum tog_view_type type;
@@ -849,10 +848,8 @@ view_input(struct tog_view **new, struct tog_view **dead,
case '\t':
if (view->child) {
*focus = view->child;
- view->child_focussed = 1;
} else if (view->parent) {
*focus = view->parent;
- view->parent->child_focussed = 0;
}
break;
case 'q':
@@ -868,7 +865,6 @@ view_input(struct tog_view **new, struct tog_view **dead,
break;
if (view_is_splitscreen(view->child)) {
*focus = view->child;
- view->child_focussed = 1;
err = view_fullscreen(view->child);
} else
err = view_splitscreen(view->child);
@@ -879,7 +875,6 @@ view_input(struct tog_view **new, struct tog_view **dead,
} else {
if (view_is_splitscreen(view)) {
*focus = view;
- view->parent->child_focussed = 1;
err = view_fullscreen(view);
} else {
err = view_splitscreen(view);
@@ -938,7 +933,7 @@ int
view_needs_focus_indication(struct tog_view *view)
{
if (view_is_parent_view(view)) {
- if (view->child == NULL || view->child_focussed)
+ if (view->child == NULL || view->child->focussed)
return 0;
if (!view_is_splitscreen(view->child))
return 0;
@@ -1009,7 +1004,8 @@ view_loop(struct tog_view *view)
else
view = NULL;
if (view) {
- if (view->child && view->child_focussed)
+ if (view->child &&
+ view->child->focussed)
focus_view = view->child;
else
focus_view = view;
@@ -2440,7 +2436,6 @@ input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
*focus_view = diff_view;
- view->child_focussed = 1;
} else
*new_view = diff_view;
break;
@@ -2463,7 +2458,6 @@ input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
*focus_view = tree_view;
- view->child_focussed = 1;
} else
*new_view = tree_view;
break;
@@ -2568,7 +2562,6 @@ input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
*focus_view = ref_view;
- view->child_focussed = 1;
} else
*new_view = ref_view;
break;
@@ -4613,7 +4606,6 @@ input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
*focus_view = diff_view;
- view->child_focussed = 1;
} else
*new_view = diff_view;
if (err)
@@ -5320,7 +5312,6 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
*focus_view = log_view;
- view->child_focussed = 1;
} else
*new_view = log_view;
break;
@@ -5346,7 +5337,6 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
*focus_view = ref_view;
- view->child_focussed = 1;
} else
*new_view = ref_view;
break;
@@ -5445,7 +5435,6 @@ input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
*focus_view = blame_view;
- view->child_focussed = 1;
} else
*new_view = blame_view;
}
@@ -6107,7 +6096,6 @@ input_ref_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
*focus_view = log_view;
- view->child_focussed = 1;
} else
*new_view = log_view;
break;
@@ -6130,7 +6118,6 @@ input_ref_view(struct tog_view **new_view, struct tog_view **dead_view,
break;
}
*focus_view = tree_view;
- view->child_focussed = 1;
} else
*new_view = tree_view;
break;