svn commit: trunk/busybox: console-tools include

[aldot at busybox.net]

Author: aldot
Date: 2006-10-25 08:07:56 -0700 (Wed, 25 Oct 2006)
New Revision: 16437

Log:
- revert r16191; re-add resize() applet.
   text	   data	    bss	    dec	    hex	filename
    288	      0	      0	    288	    120	console-tools/_resize.o.gcc-2.95
    258	      0	      0	    258	    102	console-tools/_resize.o.gcc-3.3
    252	      0	      0	    252	     fc	console-tools/_resize.o.gcc-3.4


Added:
   trunk/busybox/console-tools/resize.c

Modified:
   trunk/busybox/console-tools/Config.in
   trunk/busybox/console-tools/Kbuild
   trunk/busybox/include/applets.h
   trunk/busybox/include/usage.h


Changeset:
Modified: trunk/busybox/console-tools/Config.in
===================================================================
--- trunk/busybox/console-tools/Config.in	2006-10-25 12:46:46 UTC (rev 16436)
+++ trunk/busybox/console-tools/Config.in	2006-10-25 15:07:56 UTC (rev 16437)
@@ -58,6 +58,23 @@
 	  This program is used to reset the terminal screen, if it
 	  gets messed up.
 
+config RESIZE
+	bool "resize"
+	default n
+	help
+	  This program is used to (re)set the width and height of your current
+	  terminal.
+
+config FEATURE_RESIZE_PRINT
+	bool "print environment variables"
+	default n
+	depends on RESIZE
+	help
+	  Prints the newly set size (number of columns and rows) of
+	  the terminal.
+	  E.g.:
+	  COLUMNS=80;LINES=44;export COLUMNS LINES;
+
 config SETCONSOLE
 	bool "setconsole"
 	default n

Modified: trunk/busybox/console-tools/Kbuild
===================================================================
--- trunk/busybox/console-tools/Kbuild	2006-10-25 12:46:46 UTC (rev 16436)
+++ trunk/busybox/console-tools/Kbuild	2006-10-25 15:07:56 UTC (rev 16437)
@@ -14,5 +14,6 @@
 lib-$(CONFIG_LOADKMAP)		+= loadkmap.o
 lib-$(CONFIG_OPENVT)		+= openvt.o
 lib-$(CONFIG_RESET)		+= reset.o
+lib-$(CONFIG_RESIZE)		+= resize.o
 lib-$(CONFIG_SETKEYCODES)	+= setkeycodes.o
 lib-$(CONFIG_SETLOGCONS)	+= setlogcons.o

Added: trunk/busybox/console-tools/resize.c
===================================================================
--- trunk/busybox/console-tools/resize.c	2006-10-25 12:46:46 UTC (rev 16436)
+++ trunk/busybox/console-tools/resize.c	2006-10-25 15:07:56 UTC (rev 16437)
@@ -0,0 +1,38 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * resize - set terminal width and height.
+ *
+ * Copyright 2006 Bernhard Fischer
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+/* no options, no getopt */
+#include "busybox.h"
+
+int resize_main(int argc, char **argv)
+{
+	struct termios old, new;
+	struct winsize w = {0,0,0,0};
+	int ret;
+
+	tcgetattr(STDOUT_FILENO, &old); /* fiddle echo */
+	new = old;
+	new.c_cflag |= (CLOCAL | CREAD);
+	new.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
+	tcsetattr(STDOUT_FILENO, TCSANOW, &new);
+	/* save_cursor_pos 7
+	 * scroll_whole_screen [r
+	 * put_cursor_waaaay_off [$x;$yH
+	 * get_cursor_pos [6n
+	 * restore_cursor_pos 8
+	 */
+	printf("\0337\033[r\033[999;999H\033[6n");
+	scanf("\033[%hu;%huR", &w.ws_row, &w.ws_col);
+	ret = ioctl(STDOUT_FILENO, TIOCSWINSZ, &w);
+	printf("\0338");
+	tcsetattr(STDOUT_FILENO, TCSANOW, &old);
+	if (ENABLE_FEATURE_RESIZE_PRINT)
+		printf("COLUMNS=%d;LINES=%d;export COLUMNS LINES;\n",
+			w.ws_col, w.ws_row);
+	return ret;
+}

Modified: trunk/busybox/include/applets.h
===================================================================
--- trunk/busybox/include/applets.h	2006-10-25 12:46:46 UTC (rev 16436)
+++ trunk/busybox/include/applets.h	2006-10-25 15:07:56 UTC (rev 16437)
@@ -237,6 +237,7 @@
 USE_HALT(APPLET_ODDNAME(reboot, halt, _BB_DIR_SBIN, _BB_SUID_NEVER, reboot))
 USE_RENICE(APPLET(renice, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_RESET(APPLET(reset, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+USE_RESIZE(APPLET(resize, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_RM(APPLET(rm, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_RMDIR(APPLET(rmdir, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_NEVER))

Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2006-10-25 12:46:46 UTC (rev 16436)
+++ trunk/busybox/include/usage.h	2006-10-25 15:07:56 UTC (rev 16437)
@@ -2473,6 +2473,11 @@
 #define reset_full_usage \
 	"Resets the screen."
 
+#define resize_trivial_usage \
+	""
+#define resize_full_usage \
+	"Resizes the screen."
+
 #define rm_trivial_usage \
 	"[OPTION]... FILE..."
 #define rm_full_usage \