Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/tmux/dist Fix merge conflicts after tmux 1.5 im...
details: https://anonhg.NetBSD.org/src/rev/d16aa8fb2e6f
branches: trunk
changeset: 768502:d16aa8fb2e6f
user: jmmv <jmmv%NetBSD.org@localhost>
date: Wed Aug 17 18:48:34 2011 +0000
description:
Fix merge conflicts after tmux 1.5 import.
diffstat:
external/bsd/tmux/dist/cmd-copy-buffer.c | 205 -----------
external/bsd/tmux/dist/cmd-generic.c | 423 -----------------------
external/bsd/tmux/dist/cmd-last-pane.c | 58 ---
external/bsd/tmux/dist/cmd-last-window.c | 58 ---
external/bsd/tmux/dist/cmd-lock-client.c | 53 --
external/bsd/tmux/dist/cmd-lock-session.c | 53 --
external/bsd/tmux/dist/cmd-next-layout.c | 54 --
external/bsd/tmux/dist/cmd-next-window.c | 76 ----
external/bsd/tmux/dist/cmd-paste-buffer.c | 195 ++--------
external/bsd/tmux/dist/cmd-previous-layout.c | 54 --
external/bsd/tmux/dist/cmd-previous-window.c | 76 ----
external/bsd/tmux/dist/cmd-server-info.c | 60 +-
external/bsd/tmux/dist/cmd-set-window-option.c | 47 --
external/bsd/tmux/dist/cmd-show-window-options.c | 50 --
external/bsd/tmux/dist/cmd-string.c | 2 +-
external/bsd/tmux/dist/compat/imsg-buffer.c | 2 +-
external/bsd/tmux/dist/compat/imsg.c | 2 +-
external/bsd/tmux/dist/environ.c | 2 +-
external/bsd/tmux/dist/input.c | 153 ++++++--
external/bsd/tmux/dist/job.c | 216 ++++-------
external/bsd/tmux/dist/layout-string.c | 168 ---------
external/bsd/tmux/dist/options.c | 2 +-
external/bsd/tmux/dist/screen-write.c | 80 +++-
external/bsd/tmux/dist/screen.c | 21 +-
external/bsd/tmux/dist/server-fn.c | 21 +-
external/bsd/tmux/dist/session.c | 60 ++-
external/bsd/tmux/dist/tty-acs.c | 2 +-
external/bsd/tmux/dist/tty-keys.c | 70 ++-
external/bsd/tmux/dist/tty-term.c | 82 +++-
external/bsd/tmux/dist/window.c | 155 +++++++-
30 files changed, 649 insertions(+), 1851 deletions(-)
diffs (truncated from 3414 to 300 lines):
diff -r bc80bb7b8766 -r d16aa8fb2e6f external/bsd/tmux/dist/cmd-copy-buffer.c
--- a/external/bsd/tmux/dist/cmd-copy-buffer.c Wed Aug 17 18:40:03 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +0,0 @@
-/* $Id: cmd-copy-buffer.c,v 1.2 2011/03/12 03:02:58 christos Exp $ */
-
-/*
- * Copyright (c) 2009 Tiago Cunha <me%tiagocunha.org@localhost>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "tmux.h"
-
-/*
- * Copies a session paste buffer to another session.
- */
-
-int cmd_copy_buffer_parse(struct cmd *, int, char **, char **);
-int cmd_copy_buffer_exec(struct cmd *, struct cmd_ctx *);
-void cmd_copy_buffer_free(struct cmd *);
-void cmd_copy_buffer_init(struct cmd *, int);
-size_t cmd_copy_buffer_print(struct cmd *, char *, size_t);
-
-struct cmd_copy_buffer_data {
- char *dst_session;
- char *src_session;
- int dst_idx;
- int src_idx;
-};
-
-const struct cmd_entry cmd_copy_buffer_entry = {
- "copy-buffer", "copyb",
- "[-a src-index] [-b dst-index] [-s src-session] [-t dst-session]",
- 0, "",
- cmd_copy_buffer_init,
- cmd_copy_buffer_parse,
- cmd_copy_buffer_exec,
- cmd_copy_buffer_free,
- cmd_copy_buffer_print
-};
-
-/* ARGSUSED */
-void
-cmd_copy_buffer_init(struct cmd *self, unused int arg)
-{
- struct cmd_copy_buffer_data *data;
-
- self->data = data = xmalloc(sizeof *data);
- data->dst_session = NULL;
- data->src_session = NULL;
- data->dst_idx = -1;
- data->src_idx = -1;
-}
-
-int
-cmd_copy_buffer_parse(struct cmd *self, int argc, char **argv, char **cause)
-{
- struct cmd_copy_buffer_data *data;
- const char *errstr;
- int n, opt;
-
- self->entry->init(self, KEYC_NONE);
- data = self->data;
-
- while ((opt = getopt(argc, argv, "a:b:s:t:")) != -1) {
- switch (opt) {
- case 'a':
- if (data->src_idx == -1) {
- n = strtonum(optarg, 0, INT_MAX, &errstr);
- if (errstr != NULL) {
- xasprintf(cause, "buffer %s", errstr);
- goto error;
- }
- data->src_idx = n;
- }
- break;
- case 'b':
- if (data->dst_idx == -1) {
- n = strtonum(optarg, 0, INT_MAX, &errstr);
- if (errstr != NULL) {
- xasprintf(cause, "buffer %s", errstr);
- goto error;
- }
- data->dst_idx = n;
- }
- break;
- case 's':
- if (data->src_session == NULL)
- data->src_session = xstrdup(optarg);
- break;
- case 't':
- if (data->dst_session == NULL)
- data->dst_session = xstrdup(optarg);
- break;
- default:
- goto usage;
- }
- }
- argc -= optind;
- argv += optind;
-
- return (0);
-
-usage:
- xasprintf(cause, "usage: %s %s", self->entry->name, self->entry->usage);
-
-error:
- self->entry->free(self);
- return (-1);
-}
-
-int
-cmd_copy_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
-{
- struct cmd_copy_buffer_data *data = self->data;
- struct paste_buffer *pb;
- struct paste_stack *dst_ps, *src_ps;
- char *pdata;
- struct session *dst_session, *src_session;
- u_int limit;
-
- if ((dst_session = cmd_find_session(ctx, data->dst_session)) == NULL ||
- (src_session = cmd_find_session(ctx, data->src_session)) == NULL)
- return (-1);
- dst_ps = &dst_session->buffers;
- src_ps = &src_session->buffers;
-
- if (data->src_idx == -1) {
- if ((pb = paste_get_top(src_ps)) == NULL) {
- ctx->error(ctx, "no buffers");
- return (-1);
- }
- } else {
- if ((pb = paste_get_index(src_ps, data->src_idx)) == NULL) {
- ctx->error(ctx, "no buffer %d", data->src_idx);
- return (-1);
- }
- }
- limit = options_get_number(&dst_session->options, "buffer-limit");
-
- pdata = xmalloc(pb->size);
- memcpy(pdata, pb->data, pb->size);
-
- if (data->dst_idx == -1)
- paste_add(dst_ps, pdata, pb->size, limit);
- else if (paste_replace(dst_ps, data->dst_idx, pdata, pb->size) != 0) {
- ctx->error(ctx, "no buffer %d", data->dst_idx);
- xfree(pdata);
- return (-1);
- }
-
- return (0);
-}
-
-void
-cmd_copy_buffer_free(struct cmd *self)
-{
- struct cmd_copy_buffer_data *data = self->data;
-
- if (data->dst_session != NULL)
- xfree(data->dst_session);
- if (data->src_session != NULL)
- xfree(data->src_session);
- xfree(data);
-}
-
-size_t
-cmd_copy_buffer_print(struct cmd *self, char *buf, size_t len)
-{
- struct cmd_copy_buffer_data *data = self->data;
- size_t off = 0;
-
- off += xsnprintf(buf, len, "%s", self->entry->name);
- if (data == NULL)
- return (off);
- if (off < len && data->src_idx != -1) {
- off += xsnprintf(buf + off, len - off, " -a %d",
- data->src_idx);
- }
- if (off < len && data->dst_idx != -1) {
- off += xsnprintf(buf + off, len - off, " -b %d",
- data->dst_idx);
- }
- if (off < len && data->src_session != NULL) {
- off += cmd_prarg(buf + off, len - off, " -s ",
- data->src_session);
- }
- if (off < len && data->dst_session != NULL) {
- off += cmd_prarg(buf + off, len - off, " -t ",
- data->dst_session);
- }
- return (off);
-}
diff -r bc80bb7b8766 -r d16aa8fb2e6f external/bsd/tmux/dist/cmd-generic.c
--- a/external/bsd/tmux/dist/cmd-generic.c Wed Aug 17 18:40:03 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,423 +0,0 @@
-/* $Id: cmd-generic.c,v 1.1.1.1 2011/03/10 09:15:37 jmmv Exp $ */
-
-/*
- * Copyright (c) 2008 Nicholas Marriott <nicm%users.sourceforge.net@localhost>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "tmux.h"
-
-int cmd_getopt(int, char **, const char *, const char *);
-int cmd_parse_flags(int, const char *, uint64_t *);
-size_t cmd_print_flags(char *, size_t, size_t, uint64_t);
-int cmd_fill_argument(int, char **, char **, int, char **);
-
-size_t
-cmd_prarg(char *buf, size_t len, const char *prefix, char *arg)
-{
- if (strchr(arg, ' ') != NULL)
- return (xsnprintf(buf, len, "%s\"%s\"", prefix, arg));
- return (xsnprintf(buf, len, "%s%s", prefix, arg));
-}
-
-/* Append two flag strings together and call getopt. */
-int
-cmd_getopt(int argc, char **argv, const char *flagstr, const char *chflagstr)
-{
- char tmp[BUFSIZ];
-
- if (strlcpy(tmp, flagstr, sizeof tmp) >= sizeof tmp)
- fatalx("strlcpy overflow");
- if (strlcat(tmp, chflagstr, sizeof tmp) >= sizeof tmp)
- fatalx("strlcat overflow");
- return (getopt(argc, argv, tmp));
-}
-
-/* Return if flag character is set. */
-int
-cmd_check_flag(uint64_t chflags, int flag)
-{
- if (flag >= 'A' && flag <= 'Z')
- flag = 26 + flag - 'A';
- else if (flag >= 'a' && flag <= 'z')
- flag = flag - 'a';
- else
- return (0);
- return ((chflags & (1ULL << flag)) != 0);
-}
-
-/* Set flag character. */
-void
-cmd_set_flag(uint64_t *chflags, int flag)
-{
- if (flag >= 'A' && flag <= 'Z')
- flag = 26 + flag - 'A';
- else if (flag >= 'a' && flag <= 'z')
- flag = flag - 'a';
- else
- return;
- (*chflags) |= (1ULL << flag);
-}
-
-/* If this option is expected, set it in chflags, otherwise return -1. */
-int
-cmd_parse_flags(int opt, const char *chflagstr, uint64_t *chflags)
-{
- if (strchr(chflagstr, opt) == NULL)
- return (-1);
- cmd_set_flag(chflags, opt);
- return (0);
-}
-
Home |
Main Index |
Thread Index |
Old Index