circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-29 17:28:49 +00:00
Code Issues Projects Releases Wiki Activity

Stupid style nits.

Browse Source
This commit is contained in:
Nicholas Marriott 2010-04-06 21:45:36 +00:00
parent f2a4ef5260
commit 67300e9524
4 changed files with 11 additions and 16 deletions

2
server-fn.c
View File

@ -1,4 +1,4 @@
/* $Id: server-fn.c,v 1.103 2010-03-27 15:12:56 nicm Exp $ */ /* $Id: server-fn.c,v 1.104 2010-04-06 21:45:36 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>

2
status.c
View File

@ -1,4 +1,4 @@
/* $Id: status.c,v 1.146 2010-03-31 18:24:08 nicm Exp $ */ /* $Id: status.c,v 1.147 2010-04-06 21:45:36 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>

3
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.552 2010-04-05 05:11:44 micahcowan Exp $ */ /* $Id: tmux.h,v 1.553 2010-04-06 21:45:36 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -542,7 +542,6 @@ struct mode_key_table {
#define MODE_MOUSE 0x10 #define MODE_MOUSE 0x10
#define MODE_WRAP 0x20 /* whether lines wrap */ #define MODE_WRAP 0x20 /* whether lines wrap */
/* /*
* A single UTF-8 character. * A single UTF-8 character.
* *

20
window-copy.c
View File

@ -1,4 +1,4 @@
/* $Id: window-copy.c,v 1.113 2010-04-05 05:11:44 micahcowan Exp $ */ /* $Id: window-copy.c,v 1.114 2010-04-06 21:45:36 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -111,9 +111,11 @@ enum window_copy_input_type {
*/ */
struct window_copy_mode_data { struct window_copy_mode_data {
struct screen screen; struct screen screen;
struct screen *backing;
struct mode_key_data mdata; struct screen *backing;
int backing_written; /* backing display has started */
struct mode_key_data mdata
u_int oy; u_int oy;
@ -128,9 +130,6 @@ struct window_copy_mode_data {
u_int lastcx; /* position in last line with content */ u_int lastcx; /* position in last line with content */
u_int lastsx; /* size of last line with content */ u_int lastsx; /* size of last line with content */
int backing_written; /* where to write next line
in backing */
enum window_copy_input_type inputtype; enum window_copy_input_type inputtype;
const char *inputprompt; const char *inputprompt;
char *inputstr; char *inputstr;
@ -196,17 +195,14 @@ window_copy_init(struct window_pane *wp)
void void
window_copy_init_from_pane(struct window_pane *wp) window_copy_init_from_pane(struct window_pane *wp)
{ {
struct window_copy_mode_data *data; struct window_copy_mode_data *data = wp->modedata;
struct screen *s; struct screen *s = &data->screen;
struct screen_write_ctx ctx; struct screen_write_ctx ctx;
u_int i; u_int i;
if (wp->mode != &window_copy_mode) if (wp->mode != &window_copy_mode)
fatalx("not in copy mode"); fatalx("not in copy mode");
data = wp->modedata;
s = &data->screen;
data->backing = &wp->base; data->backing = &wp->base;
data->cx = data->backing->cx; data->cx = data->backing->cx;
data->cy = data->backing->cy; data->cy = data->backing->cy;
@ -289,7 +285,7 @@ window_copy_vadd(struct window_pane *wp, const char *fmt, va_list ap)
screen_write_carriagereturn(&back_ctx); screen_write_carriagereturn(&back_ctx);
screen_write_linefeed(&back_ctx, 0); screen_write_linefeed(&back_ctx, 0);
} else } else
data->backing_written++; data->backing_written = 1;
screen_write_vnputs(&back_ctx, 0, &gc, utf8flag, fmt, ap); screen_write_vnputs(&back_ctx, 0, &gc, utf8flag, fmt, ap);
screen_write_stop(&back_ctx); screen_write_stop(&back_ctx);