Fixup BSD specific things from last merge

There's entries for header files we don't use, and the cvsimport doesn't
like removing files automatically, etc., and it won't have known to have
done this from autoconf's POV, so define that in the correct place, hence
the removal of the previously committed Makefile.

4 files changed, 1 insertions, 314 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index e566bb2a..00000000
--- a/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@
-# $OpenBSD$
-
-PROG=	tmux
-SRCS=	arguments.c \
-	attributes.c \
-	cfg.c \
-	client.c \
-	clock.c \
-	cmd-attach-session.c \
-	cmd-bind-key.c \
-	cmd-break-pane.c \
-	cmd-capture-pane.c \
-	cmd-choose-buffer.c \
-	cmd-choose-client.c \
-	cmd-choose-list.c \
-	cmd-choose-tree.c \
-	cmd-clear-history.c \
-	cmd-clock-mode.c \
-	cmd-command-prompt.c \
-	cmd-confirm-before.c \
-	cmd-copy-mode.c \
-	cmd-delete-buffer.c \
-	cmd-detach-client.c \
-	cmd-display-message.c \
-	cmd-display-panes.c \
-	cmd-find-window.c \
-	cmd-has-session.c \
-	cmd-if-shell.c \
-	cmd-join-pane.c \
-	cmd-kill-pane.c \
-	cmd-kill-server.c \
-	cmd-kill-session.c \
-	cmd-kill-window.c \
-	cmd-link-window.c \
-	cmd-list-buffers.c \
-	cmd-list-clients.c \
-	cmd-list-commands.c \
-	cmd-list-keys.c \
-	cmd-list-panes.c \
-	cmd-list-sessions.c \
-	cmd-list-windows.c \
-	cmd-list.c \
-	cmd-load-buffer.c \
-	cmd-lock-server.c \
-	cmd-move-window.c \
-	cmd-new-session.c \
-	cmd-new-window.c \
-	cmd-paste-buffer.c \
-	cmd-pipe-pane.c \
-	cmd-refresh-client.c \
-	cmd-rename-session.c \
-	cmd-rename-window.c \
-	cmd-resize-pane.c \
-	cmd-respawn-pane.c \
-	cmd-respawn-window.c \
-	cmd-rotate-window.c \
-	cmd-run-shell.c \
-	cmd-save-buffer.c \
-	cmd-select-layout.c \
-	cmd-select-pane.c \
-	cmd-select-window.c \
-	cmd-send-keys.c \
-	cmd-set-buffer.c \
-	cmd-set-environment.c \
-	cmd-set-option.c \
-	cmd-show-environment.c \
-	cmd-show-messages.c \
-	cmd-show-options.c \
-	cmd-source-file.c \
-	cmd-split-window.c \
-	cmd-string.c \
-	cmd-suspend-client.c \
-	cmd-swap-pane.c \
-	cmd-swap-window.c \
-	cmd-switch-client.c \
-	cmd-unbind-key.c \
-	cmd-unlink-window.c \
-	cmd-wait-for.c \
-	cmd.c \
-	cmd-queue.c \
-	colour.c \
-	control.c \
-	control-notify.c \
-	environ.c \
-	format.c \
-	grid-cell.c \
-	grid-view.c \
-	grid.c \
-	input-keys.c \
-	input.c \
-	job.c \
-	key-bindings.c \
-	key-string.c \
-	layout-custom.c \
-	layout-set.c \
-	layout.c \
-	log.c \
-	mode-key.c \
-	names.c \
-	notify.c \
-	options-table.c \
-	options.c \
-	paste.c \
-	procname.c \
-	resize.c \
-	screen-redraw.c \
-	screen-write.c \
-	screen.c \
-	server-client.c \
-	server-fn.c \
-	server-window.c \
-	server.c \
-	session.c \
-	signal.c \
-	status.c \
-	style.c \
-	tmux.c \
-	tty-acs.c \
-	tty-keys.c \
-	tty-term.c \
-	tty.c \
-	utf8.c \
-	window-choose.c \
-	window-clock.c \
-	window-copy.c \
-	window.c \
-	xmalloc.c \
-	xterm-keys.c
-
-CDIAGFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
-CDIAGFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
-CDIAGFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
-CDIAGFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
-
-LDADD=  -lutil -lcurses -levent
-DPADD=  ${LIBUTIL} ${LIBCURSES} ${LIBEVENT}
-
-.include <bsd.prog.mk>
diff --git a/Makefile.am b/Makefile.am
index 690e466d..e5a7286e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -122,7 +122,6 @@ dist_tmux_SOURCES = \
 	cmd-select-pane.c \
 	cmd-select-window.c \
 	cmd-send-keys.c \
-	cmd-server-info.c \
 	cmd-set-buffer.c \
 	cmd-set-environment.c \
 	cmd-set-option.c \
@@ -131,7 +130,6 @@ dist_tmux_SOURCES = \
 	cmd-show-options.c \
 	cmd-source-file.c \
 	cmd-split-window.c \
-	cmd-start-server.c \
 	cmd-string.c \
 	cmd-suspend-client.c \
 	cmd-swap-pane.c \
@@ -175,6 +173,7 @@ dist_tmux_SOURCES = \
 	session.c \
 	signal.c \
 	status.c \
+	style.c \
 	tmux.c \
 	tty-acs.c \
 	tty-keys.c \
diff --git a/cmd-server-info.c b/cmd-server-info.c
deleted file mode 100644
index 3aa5df8a..00000000
--- a/cmd-server-info.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/* $Id$ */
-
-/*
- * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
- *
- * 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 <sys/utsname.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "tmux.h"
-
-/*
- * Show various information about server.
- */
-
-enum cmd_retval	 cmd_server_info_exec(struct cmd *, struct cmd_q *);
-
-const struct cmd_entry cmd_server_info_entry = {
-	"server-info", "info",
-	"", 0, 0,
-	"",
-	0,
-	NULL,
-	cmd_server_info_exec
-};
-
-enum cmd_retval
-cmd_server_info_exec(unused struct cmd *self, struct cmd_q *cmdq)
-{
-	struct tty_term				*term;
-	struct client				*c;
-	struct session				*s;
-	struct winlink				*wl;
-	struct window				*w;
-	struct window_pane			*wp;
-	struct tty_code				*code;
-	const struct tty_term_code_entry	*ent;
-	struct utsname				 un;
-	struct job				*job;
-	struct grid				*gd;
-	struct grid_line			*gl;
-	u_int		 			 i, j, k, lines;
-	size_t					 size;
-	char					 out[80];
-	char					*tim;
-	time_t		 			 t;
-
-	tim = ctime(&start_time);
-	*strchr(tim, '\n') = '\0';
-	cmdq_print(cmdq,
-	    "tmux " VERSION ", pid %ld, started %s", (long) getpid(), tim);
-	cmdq_print(cmdq, "socket path %s, debug level %d", socket_path,
-	    debug_level);
-	if (uname(&un) >= 0) {
-		cmdq_print(cmdq, "system is %s %s %s %s",
-		    un.sysname, un.release, un.version, un.machine);
-	}
-	if (cfg_file != NULL)
-		cmdq_print(cmdq, "configuration file is %s", cfg_file);
-	else
-		cmdq_print(cmdq, "configuration file not specified");
-	cmdq_print(cmdq, "protocol version is %d", PROTOCOL_VERSION);
-	cmdq_print(cmdq, "%s", "");
-
-	cmdq_print(cmdq, "Clients:");
-	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
-			continue;
-
-		cmdq_print(cmdq,"%2d: %s (%d, %d): %s [%ux%u %s bs=%hho "
-		    "class=%u] [flags=0x%x/0x%x, references=%u]", i,
-		    c->tty.path, c->ibuf.fd, c->tty.fd, c->session->name,
-		    c->tty.sx, c->tty.sy, c->tty.termname,
-		    c->tty.tio.c_cc[VERASE], c->tty.class,
-		    c->flags, c->tty.flags, c->references);
-	}
-	cmdq_print(cmdq, "%s", "");
-
-	cmdq_print(cmdq, "Sessions: [%zu]", sizeof (struct grid_cell));
-	RB_FOREACH(s, sessions, &sessions) {
-		t = s->creation_time.tv_sec;
-		tim = ctime(&t);
-		*strchr(tim, '\n') = '\0';
-
-		cmdq_print(cmdq, "%2u: %s: %u windows (created %s) [%ux%u] "
-		    "[flags=0x%x]", s->id, s->name,
-		    winlink_count(&s->windows), tim, s->sx, s->sy, s->flags);
-		RB_FOREACH(wl, winlinks, &s->windows) {
-			w = wl->window;
-			cmdq_print(cmdq, "%4u: %s [%ux%u] [flags=0x%x, "
-			    "references=%u, last layout=%d]", wl->idx, w->name,
-			    w->sx, w->sy, w->flags, w->references,
-			    w->lastlayout);
-			j = 0;
-			TAILQ_FOREACH(wp, &w->panes, entry) {
-				lines = size = 0;
-				gd = wp->base.grid;
-				for (k = 0; k < gd->hsize + gd->sy; k++) {
-					gl = &gd->linedata[k];
-					if (gl->celldata == NULL)
-						continue;
-					lines++;
-					size += gl->cellsize *
-					    sizeof *gl->celldata;
-				}
-				cmdq_print(cmdq,
-				    "%6u: %s %lu %d %u/%u, %zu bytes", j,
-				    wp->tty, (u_long) wp->pid, wp->fd, lines,
-				    gd->hsize + gd->sy, size);
-				j++;
-			}
-		}
-	}
-	cmdq_print(cmdq, "%s", "");
-
-	cmdq_print(cmdq, "Terminals:");
-	LIST_FOREACH(term, &tty_terms, entry) {
-		cmdq_print(cmdq, "%s [references=%u, flags=0x%x]:",
-		    term->name, term->references, term->flags);
-		for (i = 0; i < NTTYCODE; i++) {
-			ent = &tty_term_codes[i];
-			code = &term->codes[ent->code];
-			switch (code->type) {
-			case TTYCODE_NONE:
-				cmdq_print(cmdq, "%2u: %s: [missing]",
-				    ent->code, ent->name);
-				break;
-			case TTYCODE_STRING:
-				strnvis(out, code->value.string, sizeof out,
-				    VIS_OCTAL|VIS_TAB|VIS_NL);
-				cmdq_print(cmdq, "%2u: %s: (string) %s",
-				    ent->code, ent->name, out);
-				break;
-			case TTYCODE_NUMBER:
-				cmdq_print(cmdq, "%2u: %s: (number) %d",
-				    ent->code, ent->name, code->value.number);
-				break;
-			case TTYCODE_FLAG:
-				cmdq_print(cmdq, "%2u: %s: (flag) %s",
-				    ent->code, ent->name,
-				    code->value.flag ? "true" : "false");
-				break;
-			}
-		}
-	}
-	cmdq_print(cmdq, "%s", "");
-
-	cmdq_print(cmdq, "Jobs:");
-	LIST_FOREACH(job, &all_jobs, lentry) {
-		cmdq_print(cmdq, "%s [fd=%d, pid=%d, status=%d]",
-		    job->cmd, job->fd, job->pid, job->status);
-	}
-
-	return (CMD_RETURN_NORMAL);
-}
diff --git a/cmd-show-messages.c b/cmd-show-messages.c
index 393ed789..0905c32e 100644
--- a/cmd-show-messages.c
+++ b/cmd-show-messages.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <vis.h>
 
 #include "tmux.h"