Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
Makefile.am command.c command.h feature.h options.c startup.c
Removed Files:
netdisp.c
Log Message:
Fri Aug 18 13:41:14 2006 Michael Jennings (mej)
Addressed licensing concerns.
----------------------------------------------------------------------
===================================================================
RCS file: /cvs/e/eterm/Eterm/src/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- Makefile.am 18 Jun 2006 03:06:27 -0000 1.31
+++ Makefile.am 18 Aug 2006 17:41:19 -0000 1.32
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.31 2006/06/18 03:06:27 mej Exp $
+# $Id: Makefile.am,v 1.32 2006/08/18 17:41:19 mej Exp $
lib_LTLIBRARIES = libEterm.la
bin_PROGRAMS = Eterm
@@ -9,14 +9,14 @@
SSE2_SRCS = sse2_cmod.c
SSE2_OBJS = sse2_cmod.lo
-libEterm_la_SOURCES = actions.c actions.h buttons.c buttons.h command.c
\
- command.h draw.c draw.h e.c e.h eterm_debug.h
eterm_utmp.h \
- events.c events.h feature.h font.c font.h grkelot.c
\
- grkelot.h icon.h menus.c menus.h misc.c misc.h netdisp.c
\
- options.c options.h pixmap.c pixmap.h profile.h screen.c
\
- screen.h script.c script.h scrollbar.c scrollbar.h
\
- startup.c startup.h system.c system.h term.c term.h
\
- timer.c timer.h utmp.c windows.c windows.h defaultfont.c
\
+libEterm_la_SOURCES = actions.c actions.h buttons.c buttons.h command.c
\
+ command.h draw.c draw.h e.c e.h eterm_debug.h
eterm_utmp.h \
+ events.c events.h feature.h font.c font.h grkelot.c
\
+ grkelot.h icon.h menus.c menus.h misc.c misc.h
\
+ options.c options.h pixmap.c pixmap.h profile.h screen.c
\
+ screen.h script.c script.h scrollbar.c scrollbar.h
\
+ startup.c startup.h system.c system.h term.c term.h
\
+ timer.c timer.h utmp.c windows.c windows.h defaultfont.c
\
defaultfont.h libscream.c scream.h screamcfg.h
EXTRA_libEterm_la_SOURCES = $(MMX_SRCS) $(SSE2_SRCS)
===================================================================
RCS file: /cvs/e/eterm/Eterm/src/command.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- command.c 19 May 2006 20:45:41 -0000 1.112
+++ command.c 18 Aug 2006 17:41:19 -0000 1.113
@@ -1,40 +1,27 @@
-/*--------------------------------*-C-*---------------------------------*
- * File: command.c
- */
-/* notes: */
-/*----------------------------------------------------------------------*
- * Copyright 1992 John Bovey, University of Kent at Canterbury.
- *
- * You can do what you like with this source code as long as
- * you don't try to make money out of it and you include an
- * unaltered copy of this message (including the copyright).
- *
- * This module has been very heavily modified by R. Nation
- * <[EMAIL PROTECTED]>
- * No additional restrictions are applied
- *
- * Additional modification by Garrett D'Amore <[EMAIL PROTECTED]> to
- * allow vt100 printing. No additional restrictions are applied.
- *
- * Integrated modifications by Steven Hirsch <[EMAIL PROTECTED]> to
- * properly support X11 mouse report mode and support for DEC
- * "private mode" save/restore functions.
+/*
+ * Copyright (C) 1997-2006, Michael Jennings
*
- * Integrated key-related changes by Jakub Jelinek <[EMAIL PROTECTED]>
- * to handle Shift+function keys properly.
- * Should be used with enclosed termcap / terminfo database.
- *
- * Extensive modifications by mj olesen <[EMAIL PROTECTED]>
- * No additional restrictions.
- *
- * Further modification and cleanups for Solaris 2.x and Linux 1.2.x
- * by Raul Garcia Garcia <[EMAIL PROTECTED]>. No additional restrictions.
- *
- * As usual, the author accepts no responsibility for anything, nor does
- * he guarantee anything whatsoever.
- *----------------------------------------------------------------------*/
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies of the Software, its documentation and marketing & publicity
+ * materials, and acknowledgment shall be given in the documentation, materials
+ * and software packages that this Software was used.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
-static const char cvs_ident[] = "$Id: command.c,v 1.112 2006/05/19 20:45:41
mej Exp $";
+static const char cvs_ident[] = "$Id: command.c,v 1.113 2006/08/18 17:41:19
mej Exp $";
/* includes: */
#include "config.h"
===================================================================
RCS file: /cvs/e/eterm/Eterm/src/command.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- command.h 1 Sep 2005 06:16:49 -0000 1.22
+++ command.h 18 Aug 2006 17:41:19 -0000 1.23
@@ -386,9 +386,6 @@
extern void main_loop(void);
extern int v_doPending(void);
extern void v_writeBig(int, char *, int);
-#ifdef DISPLAY_IS_IP
-extern char *network_display(const char *);
-#endif
_XFUNCPROTOEND
===================================================================
RCS file: /cvs/e/eterm/Eterm/src/feature.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- feature.h 13 Feb 2006 19:52:45 -0000 1.49
+++ feature.h 18 Aug 2006 17:41:19 -0000 1.50
@@ -206,9 +206,6 @@
/********************* Miscellaneous options *********************/
-/* To have $DISPLAY and the "\E[7n" response be IP addresses rather than
FQDN's */
-/* #define DISPLAY_IS_IP */
-
/* To have "\E[7n" reply with the display name. This is a potential security
risk,
* so its use is discouraged and unsupported. */
/* #define ENABLE_DISPLAY_ANSWER */
===================================================================
RCS file: /cvs/e/eterm/Eterm/src/options.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- options.c 13 Feb 2006 19:52:45 -0000 1.142
+++ options.c 18 Aug 2006 17:41:19 -0000 1.143
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: options.c,v 1.142 2006/02/13 19:52:45
mej Exp $";
+static const char cvs_ident[] = "$Id: options.c,v 1.143 2006/08/18 17:41:19
mej Exp $";
#include "config.h"
#include "feature.h"
@@ -661,11 +661,6 @@
printf(" +MULTI_CHARSET");
#else
printf(" -MULTI_CHARSET");
-#endif
-#ifdef DISPLAY_IS_IP
- printf(" +DISPLAY_IS_IP");
-#else
- printf(" -DISPLAY_IS_IP");
#endif
#ifdef ENABLE_DISPLAY_ANSWER
printf(" +ENABLE_DISPLAY_ANSWER");
===================================================================
RCS file: /cvs/e/eterm/Eterm/src/startup.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- startup.c 24 Feb 2006 21:58:58 -0000 1.56
+++ startup.c 18 Aug 2006 17:41:19 -0000 1.57
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: startup.c,v 1.56 2006/02/24 21:58:58 mej
Exp $";
+static const char cvs_ident[] = "$Id: startup.c,v 1.57 2006/08/18 17:41:19 mej
Exp $";
#include "config.h"
#include "feature.h"
@@ -261,24 +261,10 @@
}
#endif
-#ifdef DISPLAY_IS_IP
- /* Fixup display_name for export over pty to any interested terminal
- * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
- * (for the first non-loopback interface) that we get from
- * network_display(). This is more "name-resolution-portable", if you
- * will, and probably allows for faster x-client startup if your name
- * server is beyond a slow link or overloaded at client startup. Of
- * course that only helps the shell's child processes, not us.
- *
- * Giving out the display_name also affords a potential security hole
- */
-
- val = display_name = network_display(display_name);
- if (val == NULL)
-#endif /* DISPLAY_IS_IP */
- val = XDisplayString(Xdisplay);
- if (display_name == NULL)
- display_name = val; /* use broken `:0' value */
+ val = XDisplayString(Xdisplay);
+ if (display_name == NULL) {
+ display_name = val;
+ }
i = strlen(val);
display_string = MALLOC(i + 9);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
