circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-05 23:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2014-11-12 21:58:05 +00:00
commit bd803e82e9
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grid-view.c
View File

@ -184,7 +184,7 @@ grid_view_insert_cells(struct grid *gd, u_int px, u_int py, u_int nx)
px = grid_view_x(gd, px); px = grid_view_x(gd, px);
py = grid_view_y(gd, py); py = grid_view_y(gd, py);
sx = grid_view_x(gd, gd->linedata[py].cellsize); sx = grid_view_x(gd, gd->sx);
if (px == sx - 1) if (px == sx - 1)
grid_clear(gd, px, py, 1, 1); grid_clear(gd, px, py, 1, 1);
@ -201,7 +201,7 @@ grid_view_delete_cells(struct grid *gd, u_int px, u_int py, u_int nx)
px = grid_view_x(gd, px); px = grid_view_x(gd, px);
py = grid_view_y(gd, py); py = grid_view_y(gd, py);
sx = grid_view_x(gd, gd->linedata[py].cellsize); sx = grid_view_x(gd, gd->sx);
grid_move_cells(gd, px, px + nx, py, sx - px - nx); grid_move_cells(gd, px, px + nx, py, sx - px - nx);
grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1); grid_clear(gd, sx - nx, py, px + nx - (sx - nx), 1);

4
resize.c
View File

@ -117,10 +117,10 @@ recalculate_sizes(void)
continue; continue;
limit = options_get_number(&w->options, "force-width"); limit = options_get_number(&w->options, "force-width");
if (limit != 0 && ssx > limit) if (limit >= PANE_MINIMUM && ssx > limit)
ssx = limit; ssx = limit;
limit = options_get_number(&w->options, "force-height"); limit = options_get_number(&w->options, "force-height");
if (limit != 0 && ssy > limit) if (limit >= PANE_MINIMUM && ssy > limit)
ssy = limit; ssy = limit;
if (w->sx == ssx && w->sy == ssy) if (w->sx == ssx && w->sy == ssy)

20
window-copy.c
View File

@ -1479,18 +1479,28 @@ void
window_copy_copy_pipe(struct window_pane *wp, struct session *sess, window_copy_copy_pipe(struct window_pane *wp, struct session *sess,
const char *bufname, const char *arg) const char *bufname, const char *arg)
{ {
void *buf; void *buf;
size_t len; size_t len;
struct job *job; struct job *job;
struct format_tree *ft;
char *expanded;
buf = window_copy_get_selection(wp, &len); buf = window_copy_get_selection(wp, &len);
if (buf == NULL) if (buf == NULL)
return; return;
job = job_run(arg, sess, NULL, NULL, NULL); ft = format_create();
format_window_pane(ft, wp);
if (sess != NULL)
format_session(ft, sess);
expanded = format_expand(ft, arg);
job = job_run(expanded, sess, NULL, NULL, NULL);
bufferevent_write(job->event, buf, len); bufferevent_write(job->event, buf, len);
free(expanded);
format_free(ft);
window_copy_copy_buffer(wp, bufname, buf, len); window_copy_copy_buffer(wp, bufname, buf, len);
} }