Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove window(1).
details: https://anonhg.NetBSD.org/src/rev/d694c011d48a
branches: trunk
changeset: 777357:d694c011d48a
user: jmmv <jmmv%NetBSD.org@localhost>
date: Thu Feb 16 04:52:47 2012 +0000
description:
Remove window(1).
window(1) was replaced by tmux(1) on March 2011. The source code has
been reimported into othersrc/usr.bin/window and an up-to-date package
is available in pkgsrc/misc/window.
This removal was approved by core@, with the condition that it be done
once netbsd-6 had been brached. And the branching has just happened!
diffstat:
distrib/sets/lists/base/mi | 4 +-
distrib/sets/lists/man/mi | 8 +-
doc/CHANGES | 5 +-
usr.bin/Makefile | 4 +-
usr.bin/window/Makefile | 22 -
usr.bin/window/README | 195 --------
usr.bin/window/alias.h | 54 --
usr.bin/window/char.c | 153 ------
usr.bin/window/char.h | 59 --
usr.bin/window/cmd.c | 308 ------------
usr.bin/window/cmd1.c | 175 -------
usr.bin/window/cmd2.c | 160 ------
usr.bin/window/cmd3.c | 67 --
usr.bin/window/cmd4.c | 60 --
usr.bin/window/cmd5.c | 133 -----
usr.bin/window/cmd6.c | 115 ----
usr.bin/window/cmd7.c | 289 ------------
usr.bin/window/compress.c | 909 -------------------------------------
usr.bin/window/context.c | 139 -----
usr.bin/window/context.h | 85 ---
usr.bin/window/defs.h | 128 -----
usr.bin/window/error.c | 108 ----
usr.bin/window/export.sh | 77 ---
usr.bin/window/lcmd.c | 130 -----
usr.bin/window/lcmd.h | 83 ---
usr.bin/window/lcmd1.c | 439 ------------------
usr.bin/window/lcmd2.c | 392 ----------------
usr.bin/window/local.h | 49 --
usr.bin/window/main.c | 199 --------
usr.bin/window/mloop.c | 92 ---
usr.bin/window/parser.h | 62 --
usr.bin/window/parser1.c | 231 ---------
usr.bin/window/parser2.c | 237 ---------
usr.bin/window/parser3.c | 191 -------
usr.bin/window/parser4.c | 300 ------------
usr.bin/window/parser5.c | 203 --------
usr.bin/window/scanner.c | 595 ------------------------
usr.bin/window/startup.c | 100 ----
usr.bin/window/string.c | 153 ------
usr.bin/window/token.h | 81 ---
usr.bin/window/tt.h | 179 -------
usr.bin/window/ttf100.c | 73 ---
usr.bin/window/ttgeneric.c | 598 ------------------------
usr.bin/window/tth19.c | 307 ------------
usr.bin/window/tth29.c | 100 ----
usr.bin/window/ttinit.c | 123 -----
usr.bin/window/ttoutput.c | 150 ------
usr.bin/window/tttermcap.c | 121 -----
usr.bin/window/tttvi925.c | 68 --
usr.bin/window/ttwyse60.c | 80 ---
usr.bin/window/ttwyse75.c | 80 ---
usr.bin/window/ttzapple.c | 525 ---------------------
usr.bin/window/ttzentec.c | 70 --
usr.bin/window/value.h | 52 --
usr.bin/window/var.c | 149 ------
usr.bin/window/var.h | 63 --
usr.bin/window/win.c | 368 ---------------
usr.bin/window/window.1 | 985 -----------------------------------------
usr.bin/window/window_string.h | 75 ---
usr.bin/window/windowrc | 88 ---
usr.bin/window/ww.h | 391 ----------------
usr.bin/window/wwadd.c | 90 ---
usr.bin/window/wwalloc.c | 75 ---
usr.bin/window/wwbox.c | 67 --
usr.bin/window/wwchild.c | 74 ---
usr.bin/window/wwclose.c | 64 --
usr.bin/window/wwclreol.c | 97 ----
usr.bin/window/wwclreos.c | 58 --
usr.bin/window/wwcursor.c | 96 ---
usr.bin/window/wwdata.c | 42 -
usr.bin/window/wwdelchar.c | 127 -----
usr.bin/window/wwdelete.c | 142 -----
usr.bin/window/wwdelline.c | 90 ---
usr.bin/window/wwdump.c | 122 -----
usr.bin/window/wwend.c | 70 --
usr.bin/window/wwenviron.c | 112 ----
usr.bin/window/wwerror.c | 71 --
usr.bin/window/wwflush.c | 121 -----
usr.bin/window/wwframe.c | 246 ----------
usr.bin/window/wwgets.c | 111 ----
usr.bin/window/wwinit.c | 416 -----------------
usr.bin/window/wwinschar.c | 133 -----
usr.bin/window/wwinsline.c | 90 ---
usr.bin/window/wwiomux.c | 243 ----------
usr.bin/window/wwlabel.c | 97 ----
usr.bin/window/wwmisc.c | 71 --
usr.bin/window/wwmove.c | 101 ----
usr.bin/window/wwopen.c | 201 --------
usr.bin/window/wwprintf.c | 62 --
usr.bin/window/wwpty.c | 67 --
usr.bin/window/wwputc.c | 50 --
usr.bin/window/wwputs.c | 54 --
usr.bin/window/wwredraw.c | 61 --
usr.bin/window/wwredrawwin.c | 75 ---
usr.bin/window/wwrint.c | 83 ---
usr.bin/window/wwscroll.c | 237 ---------
usr.bin/window/wwsize.c | 193 --------
usr.bin/window/wwspawn.c | 94 ---
usr.bin/window/wwsuspend.c | 60 --
usr.bin/window/wwterminfo.c | 122 -----
usr.bin/window/wwtty.c | 182 -------
usr.bin/window/wwunframe.c | 79 ---
usr.bin/window/wwupdate.c | 276 -----------
usr.bin/window/wwwrite.c | 306 ------------
usr.bin/window/xx.c | 272 -----------
usr.bin/window/xx.h | 77 ---
usr.bin/window/xxflush.c | 199 --------
107 files changed, 11 insertions(+), 17204 deletions(-)
diffs (truncated from 17694 to 300 lines):
diff -r 36b88e91e7c0 -r d694c011d48a distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Thu Feb 16 02:47:54 2012 +0000
+++ b/distrib/sets/lists/base/mi Thu Feb 16 04:52:47 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.984 2012/02/14 14:03:34 wiz Exp $
+# $NetBSD: mi,v 1.985 2012/02/16 04:52:49 jmmv Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -742,7 +742,7 @@
./usr/bin/who base-util-bin
./usr/bin/whoami base-util-bin
./usr/bin/whois base-netutil-bin
-./usr/bin/window base-util-bin
+./usr/bin/window base-util-bin obsolete
./usr/bin/write base-util-bin
./usr/bin/xargs base-util-bin
./usr/bin/xz base-util-bin
diff -r 36b88e91e7c0 -r d694c011d48a distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Thu Feb 16 02:47:54 2012 +0000
+++ b/distrib/sets/lists/man/mi Thu Feb 16 04:52:47 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1379 2012/02/14 17:35:11 plunky Exp $
+# $NetBSD: mi,v 1.1380 2012/02/16 04:52:50 jmmv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -573,7 +573,7 @@
./usr/share/man/cat1/who.0 man-util-catman .cat
./usr/share/man/cat1/whoami.0 man-util-catman .cat
./usr/share/man/cat1/whois.0 man-netutil-catman .cat
-./usr/share/man/cat1/window.0 man-util-catman .cat
+./usr/share/man/cat1/window.0 man-util-catman obsolete
./usr/share/man/cat1/write.0 man-util-catman .cat
./usr/share/man/cat1/x68k/aout2hux.0 man-util-catman .cat
./usr/share/man/cat1/x68k/bellctrl.0 man-util-catman .cat
@@ -3494,7 +3494,7 @@
./usr/share/man/html1/who.html man-util-htmlman html
./usr/share/man/html1/whoami.html man-util-htmlman html
./usr/share/man/html1/whois.html man-netutil-htmlman html
-./usr/share/man/html1/window.html man-util-htmlman html
+./usr/share/man/html1/window.html man-util-htmlman obsolete
./usr/share/man/html1/write.html man-util-htmlman html
./usr/share/man/html1/x68k/aout2hux.html man-util-htmlman html
./usr/share/man/html1/x68k/bellctrl.html man-util-htmlman html
@@ -6080,7 +6080,7 @@
./usr/share/man/man1/who.1 man-util-man .man
./usr/share/man/man1/whoami.1 man-util-man .man
./usr/share/man/man1/whois.1 man-netutil-man .man
-./usr/share/man/man1/window.1 man-util-man .man
+./usr/share/man/man1/window.1 man-util-man obsolete
./usr/share/man/man1/write.1 man-util-man .man
./usr/share/man/man1/x68k/aout2hux.1 man-util-man .man
./usr/share/man/man1/x68k/bellctrl.1 man-util-man .man
diff -r 36b88e91e7c0 -r d694c011d48a doc/CHANGES
--- a/doc/CHANGES Thu Feb 16 02:47:54 2012 +0000
+++ b/doc/CHANGES Thu Feb 16 04:52:47 2012 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1671 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1672 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -25,4 +25,5 @@
Changes from NetBSD 6.0 to NetBSD 7.0:
-
+ window(1): Removed from the base system in favor of tmux. Use the
+ pkgsrc/misc/window package from now on. [jmmv 20120215]
diff -r 36b88e91e7c0 -r d694c011d48a usr.bin/Makefile
--- a/usr.bin/Makefile Thu Feb 16 02:47:54 2012 +0000
+++ b/usr.bin/Makefile Thu Feb 16 04:52:47 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2012/02/07 19:13:31 joerg Exp $
+# $NetBSD: Makefile,v 1.208 2012/02/16 04:52:47 jmmv Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include <bsd.own.mk>
@@ -31,7 +31,7 @@
uniq units unvis unzip usbhidaction usbhidctl users utoppya \
uudecode uuencode uuidgen vacation vgrind videoctl vis \
vmstat vndcompress w \
- wall wc what whereis who whois window \
+ wall wc what whereis who whois \
write xargs xinstall xlint xstr yes
SUBDIR+= ../external/zlib/pigz/bin/pigz
diff -r 36b88e91e7c0 -r d694c011d48a usr.bin/window/Makefile
--- a/usr.bin/window/Makefile Thu Feb 16 02:47:54 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2010/02/03 15:34:46 roy Exp $
-# @(#)Makefile 8.1 (Berkeley) 6/6/93
-
-PROG= window
-SRCS= char.c cmd.c cmd1.c cmd2.c cmd3.c cmd4.c cmd5.c cmd6.c cmd7.c \
- context.c error.c lcmd.c lcmd1.c lcmd2.c main.c mloop.c parser1.c \
- parser2.c parser3.c parser4.c parser5.c scanner.c startup.c string.c \
- ttf100.c ttgeneric.c tth19.c tth29.c ttinit.c ttoutput.c tttermcap.c \
- tttvi925.c ttwyse60.c ttwyse75.c ttzapple.c ttzentec.c var.c win.c \
- wwadd.c wwalloc.c wwbox.c wwchild.c wwclose.c wwclreol.c wwclreos.c \
- wwcursor.c wwdata.c wwdelchar.c wwdelete.c wwdelline.c wwdump.c \
- wwend.c wwenviron.c wwerror.c wwflush.c wwframe.c wwgets.c wwinit.c \
- wwinschar.c wwinsline.c wwiomux.c wwlabel.c wwmisc.c wwmove.c \
- wwopen.c wwprintf.c wwpty.c wwputc.c wwputs.c wwredraw.c \
- wwredrawwin.c wwrint.c wwscroll.c wwsize.c wwspawn.c wwsuspend.c \
- wwterminfo.c wwtty.c wwunframe.c wwupdate.c wwwrite.c xx.c xxflush.c \
- compress.c
-MAN= window.1
-DPADD= ${LIBTERMINFO} ${LIBUTIL}
-LDADD= -lterminfo -lutil
-
-.include <bsd.prog.mk>
diff -r 36b88e91e7c0 -r d694c011d48a usr.bin/window/README
--- a/usr.bin/window/README Thu Feb 16 02:47:54 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,195 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Edward Wang at The University of California, Berkeley.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * @(#)README 8.1 (Berkeley) 6/6/93
- */
-
-Compilation notes:
-
- Compiler options:
-
- BYTE_ORDER (used only in ww.h)
- It should already be defined in machine/endian.h.
- The code knows about BIG_ENDIAN, LITTLE_ENDIAN, and PDP_ENDIAN.
- It only cares about byte order in words, so PDP_ENDIAN
- is the same as LITTLE_ENDIAN.
- OLD_TTY
- If you don't have Posix termios, then define this.
- VMIN_BUG
- Even if you have Posix termios, define this if the MIN and TIME
- feature in noncanonical mode doesn't work correctly.
-
- Ok, there's another one, STR_DEBUG. It turns on consistency checks
- in the string allocator. It's been left on since performace doesn't
- seem to suffer. There's an abort() somewhere when an inconsistency
- is found. It hasn't happened in years.
-
- The file local.h contains locally tunable constants.
-
- The makefile used to be updated with mkmf; it has been changed
-at various times to use cpp -M and, currently, mkdep. The only library
-it needs is termcap.
-
- Window, as is, only runs on 4.3 (or later) machines.
-
- On 4.2 machines, at least these modifications must be done:
-
- delete uses of window size ioctls: TIOCGWINSZ, TIOCSWINSZ,
- struct winsize
- add to ww.h
- typedef int fd_set;
- #define FD_ZERO(s) (*(s) = 0)
- #define FD_SET(b, s) (*(s) |= 1 << (b))
- #define FD_ISSET(b, s) (*(s) & 1 << (b))
- add to ww.h
- #define sigmask(s) (1 << (s) - 1)
-
-
-A few notes about the internals:
-
- The window package. Windows are opened by calling wwopen().
-Wwwrite() is the primitive for writing to windows. Wwputc(), wwputs(),
-and wwprintf() are also supported. Some of the outputs to windows are
-delayed. Wwupdate() updates the terminal to match the internal screen
-buffer. Wwspawn() spawns a child process on the other end of a window,
-with its environment tailored to the window. Visible windows are
-doubly linked in the order of their overlap. Wwadd() inserts a window
-into the list at a given place. Wwdelete() deletes it. Windows not in
-the list are not visible, though wwwrite() still works. Window was
-written before the days of X and Sunview, so some of the terminology
-is not standard.
-
- Most functions return -1 on error. Wwopen() returns the null
-pointer. An error number is saved in wwerrno. Wwerror() returns an
-error string based on wwerrno suitable for printing.
-
- The terminal drivers perform all output to the physical terminal,
-including special functions like character and line insertion and
-deletion. The window package keeps a list of known terminals. At
-initialization time, the terminal type is matched against the list to
-find the right terminal driver to use. The last driver, the generic
-driver, matches all terminals and uses the termcap database. The
-interface between the window package the terminal driver is the `tt'
-structure. It contains pointers to functions to perform special
-functions and terminal output, as well as flags about the
-characteristics of the terminal. Most of these ideas are borrowed
-from the Maryland window package, which in turn is based on Goslin's
-Emacs.
-
- The IO system is semi-synchronous. Terminal input is signal
-driven, and everything else is done synchronously with a single
-poll(). It is roughly event-driven, though not in a clean way.
-
- Normally, in both conversation mode and command mode, window
-sleeps in a poll() in wwiomux() waiting for data from the
-pseudo-terminals. At the same time, terminal input causes SIGIO which
-is caught by wwrint(). The poll() returns when at least one of the
-pseudo-terminals becomes ready for reading.
-
- Wwrint() is the interrupt handler for tty input. It reads input
-into a linear buffer accessed through four pointers:
-
- +-------+--------------+----------------+
- | empty | data | empty |
- +-------+--------------+----------------+
- ^ ^ ^ ^
- | | | |
- wwib wwibp wwibq wwibe
-
-Wwrint() appends characters at the end and increments wwibq (*wwibq++
-= c), and characters are taken off the buffer at wwibp using the
-wwgetc() and wwpeekc() macros. As is the convention in C, wwibq
-and wwibe point to one position beyond the end. In addition,
-wwrint() will do a longjmp(wwjmpbuf) if wwsetjmp is true. This is
-used by wwiomux() to interrupt the poll() which would otherwise
-resume after the interrupt. (Actually, I hear this is not true,
-but the longjmp feature is used to avoid a race condition as well.
-Anyway, it means I didn't have to depend on a feature in a
-daily-changing kernel, but that's another story.) The macro
-wwinterrupt() returns true if the input buffer is non-empty.
-Wwupdate(), wwwrite(), and wwiomux() check this condition and will
-return at the first convenient opportunity when it becomes true.
-In the case of wwwrite(), the flag ww_nointr in the window structure
-overrides this. This feature allows the user to interrupt lengthy
-outputs safely. The structure of the input buffer is designed to
-avoid race conditions without blocking interrupts.
-
- Actually, wwsetjmp and wwinterrupt() are part of a software
-interrupt scheme used by the two interrupt catchers wwrint() and
-wwchild(). Asserting the interrupt lets the synchronous parts of
-the program know that there's an interesting asynchronous condition
-(i.e., got a keyboard character, or a child process died) that they
-might want to process before anything else. The synchronous routines
-can check for this condition with wwinterrupt() or by arranging
-that a longjmp() be done.
-
- Wwiomux() copies pseudo-terminal output into their corresponding
-windows. Without anything to do, it blocks in a poll(), waiting for
-read ready on pseudo-terminals. Reads are done into per-window buffers
-in the window structures. When there is at least one buffer non-empty,
-wwiomux() finds the top most of these windows and writes it using
-wwwrite(). Then the process is repeated. A non-blocking poll() is
-done after a wwwrite() to pick up any output that may have come in
-during the write, which may take a long time. Specifically, we use
-this to stop output or flush buffer when a pseudo-terminal tells us to
-(we use pty packet mode). The poll() blocks only when all of the
-windows' buffers are empty. A wwupdate() is done prior to this, which
-is the only time the screen is guaranteed to be completely up to date.
-Wwiomux() loops until wwinterrupt() becomes true.
-
- The top level routine for all this is mloop(). In conversation
-mode, it simply calls wwiomux(), which only returns when input is
-available. The input buffer is then written to the pseudo-terminal of
-the current window. If the escape character is found in the input,
-command mode is entered. Otherwise, the process is repeated. In
-command mode, control is transferred to docmd() which returns only when
-conversation mode is reentered. Docmd() and other command processing
-routines typically wait for input in a loop:
-
- while (wwpeekc() < 0)
- wwiomux();
-
-When the loop terminates, wwgetc() is used to read the input buffer.
-
- Output to the physical terminal is handled by the lowest level
Home |
Main Index |
Thread Index |
Old Index