mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Some more long lines.
This commit is contained in:
		@@ -84,7 +84,8 @@ cmd_find_window_match_flags(struct args *args)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
cmd_find_window_match(struct cmd_find_window_data_list *find_list,
 | 
					cmd_find_window_match(struct cmd_find_window_data_list *find_list,
 | 
				
			||||||
    int match_flags, struct winlink *wl, const char *str, const char *searchstr)
 | 
					    int match_flags, struct winlink *wl, const char *str,
 | 
				
			||||||
 | 
					    const char *searchstr)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct cmd_find_window_data	 find_data;
 | 
						struct cmd_find_window_data	 find_data;
 | 
				
			||||||
	struct window_pane		*wp;
 | 
						struct window_pane		*wp;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -267,7 +267,8 @@ cmd_set_option_user(struct cmd *self, struct cmd_q *cmdq, const char* optstr,
 | 
				
			|||||||
/* Unset an option. */
 | 
					/* Unset an option. */
 | 
				
			||||||
int
 | 
					int
 | 
				
			||||||
cmd_set_option_unset(struct cmd *self, struct cmd_q *cmdq,
 | 
					cmd_set_option_unset(struct cmd *self, struct cmd_q *cmdq,
 | 
				
			||||||
    const struct options_table_entry *oe, struct options *oo, const char *value)
 | 
					    const struct options_table_entry *oe, struct options *oo,
 | 
				
			||||||
 | 
					    const char *value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct args	*args = self->args;
 | 
						struct args	*args = self->args;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -287,7 +288,8 @@ cmd_set_option_unset(struct cmd *self, struct cmd_q *cmdq,
 | 
				
			|||||||
/* Set an option. */
 | 
					/* Set an option. */
 | 
				
			||||||
int
 | 
					int
 | 
				
			||||||
cmd_set_option_set(struct cmd *self, struct cmd_q *cmdq,
 | 
					cmd_set_option_set(struct cmd *self, struct cmd_q *cmdq,
 | 
				
			||||||
    const struct options_table_entry *oe, struct options *oo, const char *value)
 | 
					    const struct options_table_entry *oe, struct options *oo,
 | 
				
			||||||
 | 
					    const char *value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct options_entry	*o;
 | 
						struct options_entry	*o;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -335,7 +337,8 @@ cmd_set_option_set(struct cmd *self, struct cmd_q *cmdq,
 | 
				
			|||||||
/* Set a string option. */
 | 
					/* Set a string option. */
 | 
				
			||||||
struct options_entry *
 | 
					struct options_entry *
 | 
				
			||||||
cmd_set_option_string(struct cmd *self, unused struct cmd_q *cmdq,
 | 
					cmd_set_option_string(struct cmd *self, unused struct cmd_q *cmdq,
 | 
				
			||||||
    const struct options_table_entry *oe, struct options *oo, const char *value)
 | 
					    const struct options_table_entry *oe, struct options *oo,
 | 
				
			||||||
 | 
					    const char *value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct args		*args = self->args;
 | 
						struct args		*args = self->args;
 | 
				
			||||||
	struct options_entry	*o;
 | 
						struct options_entry	*o;
 | 
				
			||||||
@@ -356,7 +359,8 @@ cmd_set_option_string(struct cmd *self, unused struct cmd_q *cmdq,
 | 
				
			|||||||
/* Set a number option. */
 | 
					/* Set a number option. */
 | 
				
			||||||
struct options_entry *
 | 
					struct options_entry *
 | 
				
			||||||
cmd_set_option_number(unused struct cmd *self, struct cmd_q *cmdq,
 | 
					cmd_set_option_number(unused struct cmd *self, struct cmd_q *cmdq,
 | 
				
			||||||
    const struct options_table_entry *oe, struct options *oo, const char *value)
 | 
					    const struct options_table_entry *oe, struct options *oo,
 | 
				
			||||||
 | 
					    const char *value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	long long	 ll;
 | 
						long long	 ll;
 | 
				
			||||||
	const char     	*errstr;
 | 
						const char     	*errstr;
 | 
				
			||||||
@@ -373,7 +377,8 @@ cmd_set_option_number(unused struct cmd *self, struct cmd_q *cmdq,
 | 
				
			|||||||
/* Set a key option. */
 | 
					/* Set a key option. */
 | 
				
			||||||
struct options_entry *
 | 
					struct options_entry *
 | 
				
			||||||
cmd_set_option_key(unused struct cmd *self, struct cmd_q *cmdq,
 | 
					cmd_set_option_key(unused struct cmd *self, struct cmd_q *cmdq,
 | 
				
			||||||
    const struct options_table_entry *oe, struct options *oo, const char *value)
 | 
					    const struct options_table_entry *oe, struct options *oo,
 | 
				
			||||||
 | 
					    const char *value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int	key;
 | 
						int	key;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -388,7 +393,8 @@ cmd_set_option_key(unused struct cmd *self, struct cmd_q *cmdq,
 | 
				
			|||||||
/* Set a colour option. */
 | 
					/* Set a colour option. */
 | 
				
			||||||
struct options_entry *
 | 
					struct options_entry *
 | 
				
			||||||
cmd_set_option_colour(unused struct cmd *self, struct cmd_q *cmdq,
 | 
					cmd_set_option_colour(unused struct cmd *self, struct cmd_q *cmdq,
 | 
				
			||||||
    const struct options_table_entry *oe, struct options *oo, const char *value)
 | 
					    const struct options_table_entry *oe, struct options *oo,
 | 
				
			||||||
 | 
					    const char *value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int	colour;
 | 
						int	colour;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -403,7 +409,8 @@ cmd_set_option_colour(unused struct cmd *self, struct cmd_q *cmdq,
 | 
				
			|||||||
/* Set an attributes option. */
 | 
					/* Set an attributes option. */
 | 
				
			||||||
struct options_entry *
 | 
					struct options_entry *
 | 
				
			||||||
cmd_set_option_attributes(unused struct cmd *self, struct cmd_q *cmdq,
 | 
					cmd_set_option_attributes(unused struct cmd *self, struct cmd_q *cmdq,
 | 
				
			||||||
    const struct options_table_entry *oe, struct options *oo, const char *value)
 | 
					    const struct options_table_entry *oe, struct options *oo,
 | 
				
			||||||
 | 
					    const char *value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int	attr;
 | 
						int	attr;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -418,7 +425,8 @@ cmd_set_option_attributes(unused struct cmd *self, struct cmd_q *cmdq,
 | 
				
			|||||||
/* Set a flag option. */
 | 
					/* Set a flag option. */
 | 
				
			||||||
struct options_entry *
 | 
					struct options_entry *
 | 
				
			||||||
cmd_set_option_flag(unused struct cmd *self, struct cmd_q *cmdq,
 | 
					cmd_set_option_flag(unused struct cmd *self, struct cmd_q *cmdq,
 | 
				
			||||||
    const struct options_table_entry *oe, struct options *oo, const char *value)
 | 
					    const struct options_table_entry *oe, struct options *oo,
 | 
				
			||||||
 | 
					    const char *value)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	int	flag;
 | 
						int	flag;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -137,7 +137,8 @@ environ_unset(struct environ *env, const char *name)
 | 
				
			|||||||
 * environment.
 | 
					 * environment.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
environ_update(const char *vars, struct environ *srcenv, struct environ *dstenv)
 | 
					environ_update(const char *vars, struct environ *srcenv,
 | 
				
			||||||
 | 
					    struct environ *dstenv)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct environ_entry	*envent;
 | 
						struct environ_entry	*envent;
 | 
				
			||||||
	char			*copyvars, *var, *next;
 | 
						char			*copyvars, *var, *next;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -131,7 +131,8 @@ grid_view_insert_lines(struct grid *gd, u_int py, u_int ny)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Insert lines in region. */
 | 
					/* Insert lines in region. */
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
grid_view_insert_lines_region(struct grid *gd, u_int rlower, u_int py, u_int ny)
 | 
					grid_view_insert_lines_region(struct grid *gd, u_int rlower, u_int py,
 | 
				
			||||||
 | 
					    u_int ny)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	u_int	ny2;
 | 
						u_int	ny2;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -160,7 +161,8 @@ grid_view_delete_lines(struct grid *gd, u_int py, u_int ny)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Delete lines inside scroll region. */
 | 
					/* Delete lines inside scroll region. */
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
grid_view_delete_lines_region(struct grid *gd, u_int rlower, u_int py, u_int ny)
 | 
					grid_view_delete_lines_region(struct grid *gd, u_int rlower, u_int py,
 | 
				
			||||||
 | 
					    u_int ny)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	u_int	ny2;
 | 
						u_int	ny2;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,8 +23,8 @@
 | 
				
			|||||||
#include "tmux.h"
 | 
					#include "tmux.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Set window layouts - predefined methods to arrange windows. These are one-off
 | 
					 * Set window layouts - predefined methods to arrange windows. These are
 | 
				
			||||||
 * and generate a layout tree.
 | 
					 * one-off and generate a layout tree.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void	layout_set_even_h(struct window *);
 | 
					void	layout_set_even_h(struct window *);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -65,7 +65,8 @@ screen_write_reset(struct screen_write_ctx *ctx)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Write character. */
 | 
					/* Write character. */
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
screen_write_putc(struct screen_write_ctx *ctx, struct grid_cell *gc, u_char ch)
 | 
					screen_write_putc(struct screen_write_ctx *ctx, struct grid_cell *gc,
 | 
				
			||||||
 | 
					    u_char ch)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	grid_cell_one(gc, ch);
 | 
						grid_cell_one(gc, ch);
 | 
				
			||||||
	screen_write_cell(ctx, gc);
 | 
						screen_write_cell(ctx, gc);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -291,7 +291,8 @@ server_kill_window(struct window *w)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
int
 | 
					int
 | 
				
			||||||
server_link_window(struct session *src, struct winlink *srcwl,
 | 
					server_link_window(struct session *src, struct winlink *srcwl,
 | 
				
			||||||
    struct session *dst, int dstidx, int killflag, int selectflag, char **cause)
 | 
					    struct session *dst, int dstidx, int killflag, int selectflag,
 | 
				
			||||||
 | 
					    char **cause)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct winlink		*dstwl;
 | 
						struct winlink		*dstwl;
 | 
				
			||||||
	struct session_group	*srcsg, *dstsg;
 | 
						struct session_group	*srcsg, *dstsg;
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								server.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								server.c
									
									
									
									
									
								
							@@ -216,7 +216,7 @@ server_loop(void)
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Check if the server should be shutting down (no more clients or sessions). */
 | 
					/* Check if the server should exit (no more clients or sessions). */
 | 
				
			||||||
int
 | 
					int
 | 
				
			||||||
server_should_shutdown(void)
 | 
					server_should_shutdown(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								tty.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								tty.c
									
									
									
									
									
								
							@@ -548,8 +548,8 @@ tty_update_mode(struct tty *tty, int mode, struct screen *s)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
tty_emulate_repeat(
 | 
					tty_emulate_repeat(struct tty *tty, enum tty_code_code code,
 | 
				
			||||||
    struct tty *tty, enum tty_code_code code, enum tty_code_code code1, u_int n)
 | 
					    enum tty_code_code code1, u_int n)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (tty_term_has(tty->term, code))
 | 
						if (tty_term_has(tty->term, code))
 | 
				
			||||||
		tty_putcode1(tty, code, n);
 | 
							tty_putcode1(tty, code, n);
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								utf8.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								utf8.c
									
									
									
									
									
								
							@@ -247,8 +247,7 @@ utf8_append(struct utf8_data *utf8data, u_char ch)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Check if two width tree entries overlap. */
 | 
					/* Check if two width tree entries overlap. */
 | 
				
			||||||
int
 | 
					int
 | 
				
			||||||
utf8_overlap(
 | 
					utf8_overlap(struct utf8_width_entry *item1, struct utf8_width_entry *item2)
 | 
				
			||||||
    struct utf8_width_entry *item1, struct utf8_width_entry *item2)
 | 
					 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	if (item1->first >= item2->first && item1->first <= item2->last)
 | 
						if (item1->first >= item2->first && item1->first <= item2->last)
 | 
				
			||||||
		return (1);
 | 
							return (1);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2033,7 +2033,8 @@ window_copy_cursor_next_word(struct window_pane *wp, const char *separators)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
window_copy_cursor_next_word_end(struct window_pane *wp, const char *separators)
 | 
					window_copy_cursor_next_word_end(struct window_pane *wp,
 | 
				
			||||||
 | 
					    const char *separators)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct window_copy_mode_data	*data = wp->modedata;
 | 
						struct window_copy_mode_data	*data = wp->modedata;
 | 
				
			||||||
	struct options			*oo = &wp->window->options;
 | 
						struct options			*oo = &wp->window->options;
 | 
				
			||||||
@@ -2084,7 +2085,8 @@ window_copy_cursor_next_word_end(struct window_pane *wp, const char *separators)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* Move to the previous place where a word begins. */
 | 
					/* Move to the previous place where a word begins. */
 | 
				
			||||||
void
 | 
					void
 | 
				
			||||||
window_copy_cursor_previous_word(struct window_pane *wp, const char *separators)
 | 
					window_copy_cursor_previous_word(struct window_pane *wp,
 | 
				
			||||||
 | 
					    const char *separators)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct window_copy_mode_data	*data = wp->modedata;
 | 
						struct window_copy_mode_data	*data = wp->modedata;
 | 
				
			||||||
	u_int				 px, py;
 | 
						u_int				 px, py;
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								window.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								window.c
									
									
									
									
									
								
							@@ -1162,7 +1162,8 @@ window_pane_visible(struct window_pane *wp)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
char *
 | 
					char *
 | 
				
			||||||
window_pane_search(struct window_pane *wp, const char *searchstr, u_int *lineno)
 | 
					window_pane_search(struct window_pane *wp, const char *searchstr,
 | 
				
			||||||
 | 
					    u_int *lineno)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct screen	*s = &wp->base;
 | 
						struct screen	*s = &wp->base;
 | 
				
			||||||
	char		*newsearchstr, *line, *msg;
 | 
						char		*newsearchstr, *line, *msg;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user