circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2020-04-07 16:01:29 +01:00
parent 8fa0b0cd26 1c8f7c1f7a
commit 6a2f32b4fd
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
input-keys.c
View File

@@ -270,6 +270,8 @@ input_key_get_mouse(struct screen *s, struct mouse_event *m, u_int x, u_int y,
/* If this pane is not in button or all mode, discard motion events. */ /* If this pane is not in button or all mode, discard motion events. */
if (MOUSE_DRAG(m->b) && (s->mode & MOTION_MOUSE_MODES) == 0) if (MOUSE_DRAG(m->b) && (s->mode & MOTION_MOUSE_MODES) == 0)
return (0); return (0);
if ((s->mode & ALL_MOUSE_MODES) == 0)
return (0);
/* /*
* If this event is a release event and not in all mode, discard it. * If this event is a release event and not in all mode, discard it.

4
popup.c
View File

@@ -200,9 +200,9 @@ popup_handle_drag(struct client *c, struct popup_data *pd,
pd->dy = m->y - pd->py; pd->dy = m->y - pd->py;
server_redraw_client(c); server_redraw_client(c);
} else if (pd->dragging == SIZE) { } else if (pd->dragging == SIZE) {
if (m->x < pd->px + 2) if (m->x < pd->px + 3)
return; return;
if (m->y < pd->py + 2) if (m->y < pd->py + 3)
return; return;
pd->sx = m->x - pd->px; pd->sx = m->x - pd->px;
pd->sy = m->y - pd->py; pd->sy = m->y - pd->py;

4
screen.c
View File

@@ -535,6 +535,7 @@ screen_alternate_on(struct screen *s, struct grid_cell *gc, int cursor)
grid_view_clear(s->grid, 0, 0, sx, sy, 8); grid_view_clear(s->grid, 0, 0, sx, sy, 8);
s->saved_flags = s->grid->flags;
s->grid->flags &= ~GRID_HISTORY; s->grid->flags &= ~GRID_HISTORY;
} }
@@ -578,7 +579,8 @@ screen_alternate_off(struct screen *s, struct grid_cell *gc, int cursor)
* Turn history back on (so resize can use it) and then resize back to * Turn history back on (so resize can use it) and then resize back to
* the current size. * the current size.
*/ */
s->grid->flags |= GRID_HISTORY; if (s->saved_flags & GRID_HISTORY)
s->grid->flags |= GRID_HISTORY;
if (sy > s->saved_grid->sy || sx != s->saved_grid->sx) if (sy > s->saved_grid->sy || sx != s->saved_grid->sx)
screen_resize(s, sx, sy, 1); screen_resize(s, sx, sy, 1);

1
tmux.h
View File

@@ -763,6 +763,7 @@ struct screen {
u_int saved_cy; u_int saved_cy;
struct grid *saved_grid; struct grid *saved_grid;
struct grid_cell saved_cell; struct grid_cell saved_cell;
int saved_flags;
bitstr_t *tabs; bitstr_t *tabs;
struct screen_sel *sel; struct screen_sel *sel;