mirror of
https://github.com/tmate-io/tmate.git
synced 2024-11-23 08:33:17 +01:00
|PatchSet 873
|Date: 2011/03/28 20:44:31 |Author: nicm |Branch: HEAD |Tag: (none) |Log: |Style: uint -> u_int and a missing else.
This commit is contained in:
parent
129f0dc893
commit
8ab7fcf7eb
4
paste.c
4
paste.c
@ -1,4 +1,4 @@
|
|||||||
/* $Id: paste.c,v 1.16 2010-12-30 22:39:49 tcunha Exp $ */
|
/* $Id: paste.c,v 1.17 2011-04-06 22:18:56 nicm Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
/* Return each item of the stack in turn. */
|
/* Return each item of the stack in turn. */
|
||||||
struct paste_buffer *
|
struct paste_buffer *
|
||||||
paste_walk_stack(struct paste_stack *ps, uint *idx)
|
paste_walk_stack(struct paste_stack *ps, u_int *idx)
|
||||||
{
|
{
|
||||||
struct paste_buffer *pb;
|
struct paste_buffer *pb;
|
||||||
|
|
||||||
|
4
tmux.h
4
tmux.h
@ -1,4 +1,4 @@
|
|||||||
/* $Id: tmux.h,v 1.614 2011-04-06 22:17:33 nicm Exp $ */
|
/* $Id: tmux.h,v 1.615 2011-04-06 22:18:56 nicm Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -1450,7 +1450,7 @@ void tty_keys_free(struct tty *);
|
|||||||
int tty_keys_next(struct tty *);
|
int tty_keys_next(struct tty *);
|
||||||
|
|
||||||
/* paste.c */
|
/* paste.c */
|
||||||
struct paste_buffer *paste_walk_stack(struct paste_stack *, uint *);
|
struct paste_buffer *paste_walk_stack(struct paste_stack *, u_int *);
|
||||||
struct paste_buffer *paste_get_top(struct paste_stack *);
|
struct paste_buffer *paste_get_top(struct paste_stack *);
|
||||||
struct paste_buffer *paste_get_index(struct paste_stack *, u_int);
|
struct paste_buffer *paste_get_index(struct paste_stack *, u_int);
|
||||||
int paste_free_top(struct paste_stack *);
|
int paste_free_top(struct paste_stack *);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Id: window-copy.c,v 1.127 2010-12-30 22:39:49 tcunha Exp $ */
|
/* $Id: window-copy.c,v 1.128 2011-04-06 22:18:56 nicm Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
|
||||||
@ -368,8 +368,8 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key)
|
|||||||
if (np == 0)
|
if (np == 0)
|
||||||
np = 1;
|
np = 1;
|
||||||
|
|
||||||
if (data->inputtype == WINDOW_COPY_JUMPFORWARD
|
if (data->inputtype == WINDOW_COPY_JUMPFORWARD ||
|
||||||
|| data->inputtype == WINDOW_COPY_JUMPBACK) {
|
data->inputtype == WINDOW_COPY_JUMPBACK) {
|
||||||
/* Ignore keys with modifiers. */
|
/* Ignore keys with modifiers. */
|
||||||
if ((key & KEYC_MASK_MOD) == 0) {
|
if ((key & KEYC_MASK_MOD) == 0) {
|
||||||
data->jumpchar = key;
|
data->jumpchar = key;
|
||||||
@ -385,7 +385,7 @@ window_copy_key(struct window_pane *wp, struct session *sess, int key)
|
|||||||
data->inputtype = WINDOW_COPY_OFF;
|
data->inputtype = WINDOW_COPY_OFF;
|
||||||
window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1);
|
window_copy_redraw_lines(wp, screen_size_y(s) - 1, 1);
|
||||||
return;
|
return;
|
||||||
} if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) {
|
} else if (data->inputtype == WINDOW_COPY_NUMERICPREFIX) {
|
||||||
if (window_copy_key_numeric_prefix(wp, key) == 0)
|
if (window_copy_key_numeric_prefix(wp, key) == 0)
|
||||||
return;
|
return;
|
||||||
data->inputtype = WINDOW_COPY_OFF;
|
data->inputtype = WINDOW_COPY_OFF;
|
||||||
@ -1617,7 +1617,7 @@ window_copy_cursor_jump(struct window_pane *wp)
|
|||||||
struct window_copy_mode_data *data = wp->modedata;
|
struct window_copy_mode_data *data = wp->modedata;
|
||||||
struct screen *back_s = data->backing;
|
struct screen *back_s = data->backing;
|
||||||
const struct grid_cell *gc;
|
const struct grid_cell *gc;
|
||||||
uint px, py, xx;
|
u_int px, py, xx;
|
||||||
|
|
||||||
px = data->cx + 1;
|
px = data->cx + 1;
|
||||||
py = screen_hsize(back_s) + data->cy - data->oy;
|
py = screen_hsize(back_s) + data->cy - data->oy;
|
||||||
@ -1643,7 +1643,7 @@ window_copy_cursor_jump_back(struct window_pane *wp)
|
|||||||
struct window_copy_mode_data *data = wp->modedata;
|
struct window_copy_mode_data *data = wp->modedata;
|
||||||
struct screen *back_s = data->backing;
|
struct screen *back_s = data->backing;
|
||||||
const struct grid_cell *gc;
|
const struct grid_cell *gc;
|
||||||
uint px, py;
|
u_int px, py;
|
||||||
|
|
||||||
px = data->cx;
|
px = data->cx;
|
||||||
py = screen_hsize(back_s) + data->cy - data->oy;
|
py = screen_hsize(back_s) + data->cy - data->oy;
|
||||||
|
Loading…
Reference in New Issue
Block a user