diff options
| author | nicm <nicm> | 2020-04-09 13:53:50 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2020-04-09 13:53:50 +0000 |
| commit | 315961faeceefae30d3fcce28c3171fdec7e5c5d (patch) | |
| tree | 9bfba9448636c417dba5dc6582bd6b825c6450d9 | |
| parent | b96ac809018c461b55aed66459a68a71dd08047f (diff) | |
Some more, and use of wp->window before wp NULL check in format.c.
| -rw-r--r-- | cmd-switch-client.c | 2 | ||||
| -rw-r--r-- | format.c | 6 | ||||
| -rw-r--r-- | grid.c | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/cmd-switch-client.c b/cmd-switch-client.c index 61677761..cf84c319 100644 --- a/cmd-switch-client.c +++ b/cmd-switch-client.c @@ -73,7 +73,6 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item) return (CMD_RETURN_ERROR); s = item->target.s; wl = item->target.wl; - w = wl->window; wp = item->target.wp; if (args_has(args, 'r')) @@ -115,6 +114,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item) if (item->client == NULL) return (CMD_RETURN_NORMAL); if (wl != NULL && wp != NULL) { + w = wl->window; if (window_push_zoom(w, args_has(self->args, 'Z'))) server_redraw_window(w); window_redraw_active_switch(w, wp); @@ -900,11 +900,12 @@ static void format_cb_pane_at_top(struct format_tree *ft, struct format_entry *fe) { struct window_pane *wp = ft->wp; - struct window *w = wp->window; + struct window *w; int status, flag; if (wp == NULL) return; + w = wp->window; status = options_get_number(w->options, "pane-border-status"); if (status == PANE_STATUS_TOP) @@ -919,11 +920,12 @@ static void format_cb_pane_at_bottom(struct format_tree *ft, struct format_entry *fe) { struct window_pane *wp = ft->wp; - struct window *w = wp->window; + struct window *w; int status, flag; if (wp == NULL) return; + w = wp->window; status = options_get_number(w->options, "pane-border-status"); if (status == PANE_STATUS_BOTTOM) @@ -1343,17 +1343,13 @@ grid_wrap_position(struct grid *gd, u_int px, u_int py, u_int *wx, u_int *wy) void grid_unwrap_position(struct grid *gd, u_int *px, u_int *py, u_int wx, u_int wy) { - u_int yy, ax = 0, ay = 0; + u_int yy, ay = 0; for (yy = 0; yy < gd->hsize + gd->sy - 1; yy++) { if (ay == wy) break; - if (gd->linedata[yy].flags & GRID_LINE_WRAPPED) - ax += gd->linedata[yy].cellused; - else { - ax = 0; + if (~gd->linedata[yy].flags & GRID_LINE_WRAPPED) ay++; - } } /* |