circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-12 17:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Whitespace and more syncing.

Browse Source
This commit is contained in:
Nicholas Marriott 2009-06-25 16:34:50 +00:00
parent 8df98d1f5b
commit bb459beb03
13 changed files with 27 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd-attach-session.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-attach-session.c,v 1.25 2009-05-04 17:58:26 nicm Exp $ */ /* $Id: cmd-attach-session.c,v 1.26 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -77,4 +77,3 @@ cmd_attach_session_exec(struct cmd *self, struct cmd_ctx *ctx)
return (1); return (1);
} }

4
cmd-list-clients.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-list-clients.c,v 1.15 2009-05-19 16:29:35 nicm Exp $ */ /* $Id: cmd-list-clients.c,v 1.16 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -59,7 +59,7 @@ cmd_list_clients_exec(unused struct cmd *self, struct cmd_ctx *ctx)
else else
s_utf8 = ""; s_utf8 = "";
ctx->print(ctx, "%s: %s [%ux%u %s]%s", c->tty.path, ctx->print(ctx, "%s: %s [%ux%u %s]%s", c->tty.path,
c->session->name, c->tty.sx, c->tty.sy, c->session->name, c->tty.sx, c->tty.sy,
c->tty.termname, s_utf8); c->tty.termname, s_utf8);
} }

4
cmd-select-layout.c
View File

@ -1,4 +1,4 @@
/* $Id: cmd-select-layout.c,v 1.2 2009-05-18 21:32:36 nicm Exp $ */ /* $Id: cmd-select-layout.c,v 1.3 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -78,7 +78,7 @@ cmd_select_layout_exec(struct cmd *self, struct cmd_ctx *ctx)
ctx->error(ctx, "unknown or ambiguous layout: %s", data->arg); ctx->error(ctx, "unknown or ambiguous layout: %s", data->arg);
return (-1); return (-1);
} }
if (layout_select(wl->window, layout) == 0) if (layout_select(wl->window, layout) == 0)
ctx->info(ctx, "layout now: %s", layout_name(wl->window)); ctx->info(ctx, "layout now: %s", layout_name(wl->window));

6
grid-view.c
View File

@ -1,4 +1,4 @@
/* $Id: grid-view.c,v 1.13 2009-06-25 16:21:32 nicm Exp $ */ /* $Id $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -133,7 +133,7 @@ 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( grid_view_insert_lines_region(
struct grid *gd, u_int rupper, u_int rlower, u_int py, u_int ny) struct grid *gd, unused u_int rupper, u_int rlower, u_int py, u_int ny)
{ {
GRID_DEBUG( GRID_DEBUG(
gd, "rupper=%u, rlower=%u, py=%u, ny=%u", rupper, rlower, py, ny); gd, "rupper=%u, rlower=%u, py=%u, ny=%u", rupper, rlower, py, ny);
@ -163,7 +163,7 @@ 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( grid_view_delete_lines_region(
struct grid *gd, u_int rupper, u_int rlower, u_int py, u_int ny) struct grid *gd, unused u_int rupper, u_int rlower, u_int py, u_int ny)
{ {
GRID_DEBUG( GRID_DEBUG(
gd, "rupper=%u, rlower=%u, py=%u, ny=%u", rupper, rlower, py, ny); gd, "rupper=%u, rlower=%u, py=%u, ny=%u", rupper, rlower, py, ny);

4
grid.c
View File

@ -1,4 +1,4 @@
/* $Id: grid.c,v 1.20 2009-06-25 16:21:32 nicm Exp $ */ /* $Id: grid.c,v 1.21 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -517,5 +517,3 @@ grid_string_cells(struct grid *gd, u_int px, u_int py, u_int nx)
buf[off] = '\0'; buf[off] = '\0';
return (buf); return (buf);
} }

10
screen-write.c
View File

@ -1,4 +1,4 @@
/* $Id: screen-write.c,v 1.51 2009-06-25 16:21:32 nicm Exp $ */ /* $Id $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -89,7 +89,7 @@ screen_write_strlen(int utf8flag, const char *fmt, ...)
size++; size++;
ptr++; ptr++;
} }
} }
return (size); return (size);
} }
@ -148,7 +148,7 @@ screen_write_vnputs(struct screen_write_ctx *ctx, ssize_t maxlen,
*utf8buf = *ptr; *utf8buf = *ptr;
ptr++; ptr++;
} }
width = utf8_width(utf8buf); width = utf8_width(utf8buf);
if (maxlen > 0 && size + width > (size_t) maxlen) { if (maxlen > 0 && size + width > (size_t) maxlen) {
while (size < (size_t) maxlen) { while (size < (size_t) maxlen) {
@ -301,12 +301,12 @@ screen_write_alignmenttest(struct screen_write_ctx *ctx)
memcpy(&gc, &grid_default_cell, sizeof gc); memcpy(&gc, &grid_default_cell, sizeof gc);
gc.data = 'E'; gc.data = 'E';
for (yy = 0; yy < screen_size_y(s); yy++) { for (yy = 0; yy < screen_size_y(s); yy++) {
for (xx = 0; xx < screen_size_x(s); xx++) for (xx = 0; xx < screen_size_x(s); xx++)
grid_view_set_cell(s->grid, xx, yy, &gc); grid_view_set_cell(s->grid, xx, yy, &gc);
} }
s->cx = 0; s->cx = 0;
s->cy = 0; s->cy = 0;

14
server.c
View File

@ -1,4 +1,4 @@
/* $Id: server.c,v 1.148 2009-06-25 16:21:32 nicm Exp $ */ /* $Id: server.c,v 1.149 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -131,7 +131,7 @@ server_client_index(struct client *c)
int int
server_start(char *path) server_start(char *path)
{ {
int retcode, pair[2], srv_fd; int pair[2], srv_fd;
char *cause; char *cause;
#ifdef HAVE_SETPROCTITLE #ifdef HAVE_SETPROCTITLE
char rpathbuf[MAXPATHLEN]; char rpathbuf[MAXPATHLEN];
@ -152,10 +152,6 @@ server_start(char *path)
} }
close(pair[0]); close(pair[0]);
#ifdef DEBUG
xmalloc_clear();
#endif
/* /*
* Must daemonise before loading configuration as the PID changes so * Must daemonise before loading configuration as the PID changes so
* $TMUX would be wrong for sessions created in the config file. * $TMUX would be wrong for sessions created in the config file.
@ -194,11 +190,7 @@ server_start(char *path)
srv_fd = server_create_socket(); srv_fd = server_create_socket();
server_create_client(pair[1]); server_create_client(pair[1]);
retcode = server_main(srv_fd); exit(server_main(srv_fd));
#ifdef DEBUG
xmalloc_report(getpid(), "server");
#endif
exit(retcode);
} }
/* Create server socket. */ /* Create server socket. */

4
status.c
View File

@ -1,4 +1,4 @@
/* $Id: status.c,v 1.87 2009-06-25 16:21:32 nicm Exp $ */ /* $Id: status.c,v 1.88 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -847,7 +847,7 @@ status_prompt_key(struct client *c, int key)
c->prompt_index += n; c->prompt_index += n;
} }
c->flags |= CLIENT_STATUS; c->flags |= CLIENT_STATUS;
break; break;
case MODEKEYCMD_CHOOSE: case MODEKEYCMD_CHOOSE:
if (*c->prompt_buffer != '\0') { if (*c->prompt_buffer != '\0') {

5
tmux.c
View File

@ -1,4 +1,4 @@
/* $Id: tmux.c,v 1.134 2009-06-25 16:21:32 nicm Exp $ */ /* $Id: tmux.c,v 1.135 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -504,8 +504,5 @@ out:
buffer_destroy(cctx.srv_in); buffer_destroy(cctx.srv_in);
buffer_destroy(cctx.srv_out); buffer_destroy(cctx.srv_out);
#ifdef DEBUG
xmalloc_report(getpid(), "client");
#endif
return (retcode); return (retcode);
} }

4
tmux.h
View File

@ -1,4 +1,4 @@
/* $Id: tmux.h,v 1.341 2009-06-25 16:25:15 nicm Exp $ */ /* $Id: tmux.h,v 1.342 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -1684,4 +1684,4 @@ int printflike3 printpath(char *, size_t, const char *, ...);
char *xdirname(const char *); char *xdirname(const char *);
char *xbasename(const char *); char *xbasename(const char *);
#endif #endif /* TMUX_H */

4
tools/fix-ids.sh
View File

@ -1,8 +1,8 @@
# $Id: fix-ids.sh,v 1.1 2009-06-25 16:21:32 nicm Exp $ # $Id: fix-ids.sh,v 1.2 2009-06-25 16:34:50 nicm Exp $
for i in *.[ch] tmux.1; do for i in *.[ch] tmux.1; do
(head -1 $i|grep '$OpenBSD' >/dev/null) || continue (head -1 $i|grep '$OpenBSD' >/dev/null) || continue
mv $i $i~ || exit mv $i $i~ || exit
sed 's/\$OpenBSD.* \$/$Id: fix-ids.sh,v 1.1 2009-06-25 16:21:32 nicm Exp $/' $i~ >$i || exit sed 's/\$OpenBSD.* \$/$\Id $/' $i~ >$i || exit
echo $i echo $i
done done

4
tty.c
View File

@ -1,4 +1,4 @@
/* $Id: tty.c,v 1.106 2009-06-25 16:21:32 nicm Exp $ */ /* $Id: tty.c,v 1.107 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -206,7 +206,7 @@ tty_stop_tty(struct tty *tty)
tty_raw(tty, tty_term_string(tty->term, TTYC_RMKX)); tty_raw(tty, tty_term_string(tty->term, TTYC_RMKX));
tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP)); tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));
tty_raw(tty, tty_term_string(tty->term, TTYC_CLEAR)); tty_raw(tty, tty_term_string(tty->term, TTYC_CLEAR));
tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM)); tty_raw(tty, tty_term_string(tty->term, TTYC_CNORM));
if (tty_term_has(tty->term, TTYC_KMOUS)) if (tty_term_has(tty->term, TTYC_KMOUS))
tty_raw(tty, "\033[?1000l"); tty_raw(tty, "\033[?1000l");

18
xmalloc.c
View File

@ -1,4 +1,4 @@
/* $Id: xmalloc.c,v 1.8 2009-01-29 19:24:34 nicm Exp $ */ /* $Id: xmalloc.c,v 1.9 2009-06-25 16:34:50 nicm Exp $ */
/* /*
* Copyright (c) 2004 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2004 Nicholas Marriott <nicm@users.sourceforge.net>
@ -50,9 +50,6 @@ xcalloc(size_t nmemb, size_t size)
if ((ptr = calloc(nmemb, size)) == NULL) if ((ptr = calloc(nmemb, size)) == NULL)
fatal("xcalloc failed"); fatal("xcalloc failed");
#ifdef DEBUG
xmalloc_new(xmalloc_caller(), ptr, nmemb * size);
#endif
return (ptr); return (ptr);
} }
@ -66,9 +63,6 @@ xmalloc(size_t size)
if ((ptr = malloc(size)) == NULL) if ((ptr = malloc(size)) == NULL)
fatal("xmalloc failed"); fatal("xmalloc failed");
#ifdef DEBUG
xmalloc_new(xmalloc_caller(), ptr, size);
#endif
return (ptr); return (ptr);
} }
@ -85,9 +79,6 @@ xrealloc(void *oldptr, size_t nmemb, size_t size)
if ((newptr = realloc(oldptr, newsize)) == NULL) if ((newptr = realloc(oldptr, newsize)) == NULL)
fatal("xrealloc failed"); fatal("xrealloc failed");
#ifdef DEBUG
xmalloc_change(xmalloc_caller(), oldptr, newptr, nmemb * size);
#endif
return (newptr); return (newptr);
} }
@ -97,10 +88,6 @@ xfree(void *ptr)
if (ptr == NULL) if (ptr == NULL)
fatalx("null pointer"); fatalx("null pointer");
free(ptr); free(ptr);
#ifdef DEBUG
xmalloc_free(ptr);
#endif
} }
int printflike2 int printflike2
@ -125,9 +112,6 @@ xvasprintf(char **ret, const char *fmt, va_list ap)
if (i < 0 || *ret == NULL) if (i < 0 || *ret == NULL)
fatal("xvasprintf failed"); fatal("xvasprintf failed");
#ifdef DEBUG
xmalloc_new(xmalloc_caller(), *ret, i + 1);
#endif
return (i); return (i);
} }