* terms.c: Merge ...

* win.c: ... here.
* Makefile.am: Remove terms.c.

src/ChangeLog

@@ -1,5 +1,9 @@
 2003-10-26  Pavel Roskin  <proski@gnu.org>
 
+	* terms.c: Merge ...
+	* win.c: ... here.
+	* Makefile.am: Remove terms.c.
+
 	* panel.h: Fix duplication between cpanel and current_panel in
 	favor of current_panel.  Ditto opanel and other_panel.
 

src/Makefile.am

@@ -56,7 +56,7 @@ SRCS =	achown.c achown.h background.c background.h boxes.c boxes.h	\
 	option.c option.h panel.h panelize.c panelize.h poptalloca.h	\
 	popt.c poptconfig.c popt.h popthelp.c poptint.h poptparse.c	\
 	profile.c profile.h regex.c rxvt.c screen.c setup.c setup.h	\
-	slint.c	subshell.c subshell.h terms.c textconf.c textconf.h	\
+	slint.c	subshell.c subshell.h textconf.c textconf.h		\
 	tree.c tree.h treestore.c treestore.h tty.h user.c user.h	\
 	util.c util.h utilunix.c view.c view.h vfsdummy.h widget.c	\
 	widget.h win.c win.h wtools.c wtools.h

src/terms.c

@@ -1,44 +0,0 @@
-/* Term name pollution avoiding.
-   Copyright (C) 1994 Miguel de Icaza
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include <config.h>
-#include <stdio.h>
-#include "global.h"
-#include "main.h"
-#include "win.h"
-
-/* This flag is set by xterm detection routine in function main() */
-/* It is used by function view_other_cmd() */
-int xterm_flag = 0;
-
-/* The following routines only work on xterm terminals */
-
-void do_enter_ca_mode (void)
-{
-    if (!xterm_flag)
-	return;
-    fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h");
-    fflush (stdout);
-}
-
-void do_exit_ca_mode (void)
-{
-    if (!xterm_flag)
-	return;
-    fprintf (stdout, ESC_STR "[?47l" ESC_STR "8" ESC_STR "[m");
-    fflush (stdout);
-}

src/win.c

@@ -123,6 +123,28 @@ void mc_noraw_mode (void)
     noraw ();
 }
 
+/* This flag is set by xterm detection routine in function main() */
+/* It is used by function view_other_cmd() */
+int xterm_flag = 0;
+
+/* The following routines only work on xterm terminals */
+
+void do_enter_ca_mode (void)
+{
+    if (!xterm_flag)
+	return;
+    fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h");
+    fflush (stdout);
+}
+
+void do_exit_ca_mode (void)
+{
+    if (!xterm_flag)
+	return;
+    fprintf (stdout, ESC_STR "[?47l" ESC_STR "8" ESC_STR "[m");
+    fflush (stdout);
+}
+
 /* This table is a mapping between names and the constants we use
  * We use this to allow users to define alternate definitions for
  * certain keys that may be missing from the terminal database