circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove some stuff that accidentally ended up here from portable, and 

remove a little-used debug function.
pull/1/head
nicm 2015-05-08 15:56:49 +00:00
parent d174b9cfcc
commit 879de25583
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
grid.c
View File

@ -49,15 +49,16 @@ const struct grid_cell grid_default_cell = { 0, 0, 8, 8, (1 << 4) | 1, " " };
int grid_check_y(struct grid *, u_int); int grid_check_y(struct grid *, u_int);
#ifdef DEBUG void grid_reflow_join(struct grid *, u_int *, struct grid_line *, u_int);
int void grid_reflow_split(struct grid *, u_int *, struct grid_line *, u_int,
grid_check_y(struct grid *gd, u_int py) u_int);
{ void grid_reflow_move(struct grid *, u_int *, struct grid_line *);
if ((py) >= (gd)->hsize + (gd)->sy) size_t grid_string_cells_fg(const struct grid_cell *, int *);
log_fatalx("y out of range: %u", py); size_t grid_string_cells_bg(const struct grid_cell *, int *);
return (0); void grid_string_cells_code(const struct grid_cell *,
} const struct grid_cell *, char *, size_t, int);
#else
/* Check grid y position. */
int int
grid_check_y(struct grid *gd, u_int py) grid_check_y(struct grid *gd, u_int py)
{ {
@ -67,16 +68,6 @@ grid_check_y(struct grid *gd, u_int py)
} }
return (0); return (0);
} }
#endif
void grid_reflow_join(struct grid *, u_int *, struct grid_line *, u_int);
void grid_reflow_split(struct grid *, u_int *, struct grid_line *, u_int,
u_int);
void grid_reflow_move(struct grid *, u_int *, struct grid_line *);
size_t grid_string_cells_fg(const struct grid_cell *, int *);
size_t grid_string_cells_bg(const struct grid_cell *, int *);
void grid_string_cells_code(const struct grid_cell *,
const struct grid_cell *, char *, size_t, int);
/* Create a new grid. */ /* Create a new grid. */
struct grid * struct grid *

5
server-client.c
View File

@ -1178,11 +1178,6 @@ server_client_msg_identify(struct client *c, struct imsg *imsg)
return; return;
c->flags |= CLIENT_IDENTIFIED; c->flags |= CLIENT_IDENTIFIED;
#ifdef __CYGWIN__
c->fd = open(c->ttyname, O_RDWR|O_NOCTTY);
c->cwd = open(".", O_RDONLY);
#endif
if (c->flags & CLIENT_CONTROL) { if (c->flags & CLIENT_CONTROL) {
c->stdin_callback = control_callback; c->stdin_callback = control_callback;