circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-16 01:18:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2019-05-03 21:02:26 +01:00
commit 4d505574dc
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd-queue.c
View File

@ -94,6 +94,7 @@ cmdq_insert_after(struct cmdq_item *after, struct cmdq_item *item)
log_debug("%s %s: %s after %s", __func__, cmdq_name(c), log_debug("%s %s: %s after %s", __func__, cmdq_name(c),
item->name, after->name); item->name, after->name);
after = item;
item = next; item = next;
} while (item != NULL); } while (item != NULL);
} }

2
cmd-resize-pane.c
View File

@ -143,7 +143,7 @@ cmd_resize_pane_mouse_update(struct client *c, struct mouse_event *m)
} }
w = wl->window; w = wl->window;
y = m->y; x = m->x; y = m->y + m->oy; x = m->x + m->ox;
if (m->statusat == 0 && y > 0) if (m->statusat == 0 && y > 0)
y--; y--;
else if (m->statusat > 0 && y >= (u_int)m->statusat) else if (m->statusat > 0 && y >= (u_int)m->statusat)

4
cmd.c
View File

@ -483,8 +483,8 @@ cmd_mouse_at(struct window_pane *wp, struct mouse_event *m, u_int *xp,
x = m->lx + m->ox; x = m->lx + m->ox;
y = m->ly + m->oy; y = m->ly + m->oy;
} else { } else {
x = m->x; x = m->x + m->ox;
y = m->y; y = m->y + m->oy;
} }
log_debug("%s: x=%u, y=%u%s", __func__, x, y, last ? " (last)" : ""); log_debug("%s: x=%u, y=%u%s", __func__, x, y, last ? " (last)" : "");

4
server-client.c
View File

@ -446,6 +446,8 @@ server_client_check_mouse(struct client *c, struct key_event *event)
type = DRAG; type = DRAG;
if (c->tty.mouse_drag_flag) { if (c->tty.mouse_drag_flag) {
x = m->x, y = m->y, b = m->b; x = m->x, y = m->y, b = m->b;
if (x == m->lx && y == m->ly)
return (KEYC_UNKNOWN);
log_debug("drag update at %u,%u", x, y); log_debug("drag update at %u,%u", x, y);
} else { } else {
x = m->lx, y = m->ly, b = m->lb; x = m->lx, y = m->ly, b = m->lb;
@ -553,8 +555,6 @@ have_event:
return (KEYC_UNKNOWN); return (KEYC_UNKNOWN);
px = px + m->ox; px = px + m->ox;
py = py + m->oy; py = py + m->oy;
m->x = x + m->ox;
m->y = y + m->oy;
/* Try the pane borders if not zoomed. */ /* Try the pane borders if not zoomed. */
if (~s->curw->window->flags & WINDOW_ZOOMED) { if (~s->curw->window->flags & WINDOW_ZOOMED) {

1
tty-keys.c
View File

@ -429,6 +429,7 @@ tty_keys_build(struct tty *tty)
if (o != NULL) { if (o != NULL) {
a = options_array_first(o); a = options_array_first(o);
while (a != NULL) { while (a != NULL) {
i = options_array_item_index(a);
ov = options_array_item_value(a); ov = options_array_item_value(a);
tty_keys_add(tty, ov->string, KEYC_USER + i); tty_keys_add(tty, ov->string, KEYC_USER + i);
a = options_array_next(a); a = options_array_next(a);

2
window-copy.c
View File

@ -3505,6 +3505,8 @@ window_copy_start_drag(struct client *c, struct mouse_event *m)
window_copy_update_cursor(wme, x, y); window_copy_update_cursor(wme, x, y);
window_copy_start_selection(wme); window_copy_start_selection(wme);
window_copy_redraw_screen(wme); window_copy_redraw_screen(wme);
window_copy_drag_update(c, m);
} }
static void static void